OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 8... Line 8...
8 .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 2 + 8 .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 2 +
9 2 files changed, 97 insertions(+), 0 deletions(-) 9 2 files changed, 97 insertions(+), 0 deletions(-)
Line 10... Line 10...
10   10  
11 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 11 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
12 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 12 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
13 @@ -792,6 +792,58 @@ static struct board_info __initdata boar 13 @@ -840,6 +840,58 @@ static struct board_info __initdata boar
Line 14... Line 14...
14 #endif /* CONFIG_BCM63XX_CPU_6358 */ 14 #endif /* CONFIG_BCM63XX_CPU_6358 */
15 15
16 /* 16 /*
Line 67... Line 67...
67 + 67 +
68 +/* 68 +/*
69 * all boards 69 * all boards
70 */ 70 */
71 static const struct board_info __initconst *bcm963xx_boards[] = { 71 static const struct board_info __initconst *bcm963xx_boards[] = {
72 @@ -843,6 +895,10 @@ static const struct board_info __initcon 72 @@ -891,6 +943,10 @@ static const struct board_info __initcon
73 &board_HW553, 73 &board_HW553,
74 &board_spw303v, 74 &board_spw303v,
75 #endif 75 #endif
76 + 76 +
77 +#ifdef CONFIG_BCM63XX_CPU_6368 77 +#ifdef CONFIG_BCM63XX_CPU_6368
78 + &board_96368mvwg, 78 + &board_96368mvwg,
79 +#endif 79 +#endif
80 }; 80 };
Line 81... Line 81...
81 81
82 static struct of_device_id const bcm963xx_boards_dt[] = { 82 static struct of_device_id const bcm963xx_boards_dt[] = {
83 @@ -903,6 +959,7 @@ static struct of_device_id const bcm963x 83 @@ -951,6 +1007,7 @@ static struct of_device_id const bcm963x
84 { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, 84 { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
85 #endif 85 #endif
86 #ifdef CONFIG_BCM63XX_CPU_6368 86 #ifdef CONFIG_BCM63XX_CPU_6368
87 + { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, 87 + { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
88 #endif 88 #endif
89 #ifdef CONFIG_BCM63XX_CPU_63268 89 #ifdef CONFIG_BCM63XX_CPU_63268
90 #endif 90 #endif
91 --- a/arch/mips/bcm63xx/boards/board_common.c 91 --- a/arch/mips/bcm63xx/boards/board_common.c
92 +++ b/arch/mips/bcm63xx/boards/board_common.c 92 +++ b/arch/mips/bcm63xx/boards/board_common.c
93 @@ -81,12 +81,25 @@ void __init board_early_setup(const stru 93 @@ -82,12 +82,25 @@ void __init board_early_setup(const stru
94 bcm63xx_pci_enabled = 1; 94 bcm63xx_pci_enabled = 1;
95 if (BCMCPU_IS_6348()) 95 if (BCMCPU_IS_6348())
96 val |= GPIO_MODE_6348_G2_PCI; 96 val |= GPIO_MODE_6348_G2_PCI;
97 + 97 +