brcm63xx: add missing bcm96329bhr profile and dts

Hopefully the last missing board.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 45557
owl
Jonas Gorski 2015-04-21 16:43:46 +00:00
parent f03226afe7
commit 5e8eedb897
17 changed files with 88 additions and 53 deletions

View File

@ -39,6 +39,9 @@ brcm63xx_dt_detect() {
"Broadcom BCM963268BU_P300 reference board") "Broadcom BCM963268BU_P300 reference board")
board_name="bcm963268bu_p300" board_name="bcm963268bu_p300"
;; ;;
"Broadcom BCM963269BHR reference board")
board_name="bcm963269bhr"
;;
"Broadcom bcm963281TAN reference board") "Broadcom bcm963281TAN reference board")
board_name="bcm963281tan" board_name="bcm963281tan"
;; ;;

View File

@ -0,0 +1,36 @@
/dts-v1/;
/include/ "bcm63268.dtsi"
/ {
model = "Broadcom BCM963269BHR reference board";
compatible = "brcm,bcm963269bhr", "brcm,bcm63268";
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <20>;
debounce-interval = <60>;
reset {
label = "reset";
gpios = <&gpio1 0 0>;
linux,code = <0x198>;
};
};
gpio-leds {
compatible = "gpio-leds";
usb1 {
label = "963629BHR:green:usb1";
gpios = <&gpio0 9 1>;
};
usb12 {
label = "963629BHR:green:usb1";
gpios = <&gpio0 9 1>;
};
};
};

View File

@ -301,6 +301,8 @@ $(eval $(call ImageDTB,Dummy,BCM96318REF,BCM96318REF,bcm96318ref,96318REF,6318))
$(eval $(call ImageDTB,Dummy,BCM96318REF_P300,BCM96318ref_P300,bcm96318ref_p300,96318REF_P300,6318)) $(eval $(call ImageDTB,Dummy,BCM96318REF_P300,BCM96318ref_P300,bcm96318ref_p300,96318REF_P300,6318))
# Broadcom BCM963268BU_P300 # Broadcom BCM963268BU_P300
$(eval $(call ImageDTB,Dummy,BCM963268BU_P300,BCM963268BU_P300,bcm963268bu_p300,963268BU_P300,63268)) $(eval $(call ImageDTB,Dummy,BCM963268BU_P300,BCM963268BU_P300,bcm963268bu_p300,963268BU_P300,63268))
# Broadcom BCM963269BHR
$(eval $(call ImageDTB,Dummy,BCM963269BHR,BCM963269BHR,bcm963269bhr,963269BHR,63268))
# BT Home Hub 2.0 A # BT Home Hub 2.0 A
$(eval $(call ImageDTB,CFEDTB,BTHOMEHUB2A,HomeHub2A,homehub2a,HOMEHUB2A,6358,--image-offset 0x20000 --block-size 0x20000)) $(eval $(call ImageDTB,CFEDTB,BTHOMEHUB2A,HomeHub2A,homehub2a,HOMEHUB2A,6358,--image-offset 0x20000 --block-size 0x20000))
# BT Voyager V2110, V2110_AA, V2110_ROI # BT Voyager V2110, V2110_AA, V2110_ROI

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1702,6 +1702,75 @@ static struct board_info __initdata boar @@ -1702,6 +1702,52 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_6368 */ #endif /* CONFIG_BCM63XX_CPU_6368 */
/* /*
@ -46,29 +46,6 @@
+ }, + },
+ }, + },
+ }, + },
+
+ .leds = {
+ {
+ .name = "963629BHR:green:usb1",
+ .gpio = 9,
+ .active_low = 1,
+ },
+ {
+ .name = "963629BHR:green:usb2",
+ .gpio = 10,
+ .active_low = 1,
+ },
+ },
+
+ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 32,
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
+ },
+ },
+}; +};
+#endif /* CONFIG_BCM63XX_CPU_63268 */ +#endif /* CONFIG_BCM63XX_CPU_63268 */
+ +
@ -76,7 +53,7 @@
* all boards * all boards
*/ */
static const struct board_info __initconst *bcm963xx_boards[] = { static const struct board_info __initconst *bcm963xx_boards[] = {
@@ -1782,6 +1851,9 @@ static const struct board_info __initcon @@ -1782,6 +1828,9 @@ static const struct board_info __initcon
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
#endif #endif
@ -86,3 +63,11 @@
}; };
static struct of_device_id const bcm963xx_boards_dt[] = { static struct of_device_id const bcm963xx_boards_dt[] = {
@@ -1869,6 +1918,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
+ { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
#endif
#endif /* CONFIG_OF */
{ },

View File

@ -31,7 +31,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
/* BT Voyager 2110 */ /* BT Voyager 2110 */
static struct board_info __initdata board_V2110 = { static struct board_info __initdata board_V2110 = {
@@ -1822,6 +1838,7 @@ static const struct board_info __initcon @@ -1799,6 +1815,7 @@ static const struct board_info __initcon
&board_96348A_122, &board_96348A_122,
&board_CPVA502plus, &board_CPVA502plus,
&board_96348W3, &board_96348W3,
@ -39,7 +39,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6358 #ifdef CONFIG_BCM63XX_CPU_6358
@@ -1886,6 +1903,7 @@ static struct of_device_id const bcm963x @@ -1863,6 +1880,7 @@ static struct of_device_id const bcm963x
{ .compatible = "dynalink,rta770w", .data = &board_rta770w, }, { .compatible = "dynalink,rta770w", .data = &board_rta770w, },
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6348 #ifdef CONFIG_BCM63XX_CPU_6348

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1784,6 +1784,53 @@ static struct board_info __initdata boar @@ -1761,6 +1761,53 @@ static struct board_info __initdata boar
}, },
}, },
}; };
@ -54,7 +54,7 @@
#endif /* CONFIG_BCM63XX_CPU_63268 */ #endif /* CONFIG_BCM63XX_CPU_63268 */
/* /*
@@ -1870,6 +1917,7 @@ static const struct board_info __initcon @@ -1847,6 +1894,7 @@ static const struct board_info __initcon
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr, &board_963269bhr,
@ -62,10 +62,10 @@
#endif #endif
}; };
@@ -1959,6 +2007,7 @@ static struct of_device_id const bcm963x @@ -1937,6 +1985,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
+ { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, + { .compatible = "inteno,vg50", .data = &board_vw6339gu, },
#endif #endif
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */

View File

@ -67,7 +67,7 @@
static struct board_info __initdata board_963269bhr = { static struct board_info __initdata board_963269bhr = {
.name = "963269BHR", .name = "963269BHR",
.expected_cpu_id = 0x63268, .expected_cpu_id = 0x63268,
@@ -1916,6 +1976,7 @@ static const struct board_info __initcon @@ -1893,6 +1953,7 @@ static const struct board_info __initcon
&board_96368mvngr, &board_96368mvngr,
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
@ -75,11 +75,11 @@
&board_963269bhr, &board_963269bhr,
&board_vw6339gu, &board_vw6339gu,
#endif #endif
@@ -2007,6 +2068,7 @@ static struct of_device_id const bcm963x @@ -1984,6 +2045,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
+ { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, },
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
{ .compatible = "inteno,vg50", .data = &board_vw6339gu, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, },
#endif #endif
#endif /* CONFIG_OF */

View File

@ -76,7 +76,7 @@
#endif /* CONFIG_BCM63XX_CPU_6368 */ #endif /* CONFIG_BCM63XX_CPU_6368 */
/* /*
@@ -1974,6 +2035,7 @@ static const struct board_info __initcon @@ -1951,6 +2012,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
@ -84,7 +84,7 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
&board_963268bu_p300, &board_963268bu_p300,
@@ -2066,6 +2128,7 @@ static struct of_device_id const bcm963x @@ -2043,6 +2105,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },

View File

@ -61,7 +61,7 @@
static struct b53_platform_data WAP5813n_b53_pdata = { static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0", .alias = "eth0",
}; };
@@ -2035,6 +2089,7 @@ static const struct board_info __initcon @@ -2012,6 +2066,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
@ -69,7 +69,7 @@
&board_WAP5813n, &board_WAP5813n,
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
@@ -2128,6 +2183,7 @@ static struct of_device_id const bcm963x @@ -2105,6 +2160,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },

View File

@ -61,7 +61,7 @@
static struct b53_platform_data WAP5813n_b53_pdata = { static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0", .alias = "eth0",
}; };
@@ -2090,6 +2144,7 @@ static const struct board_info __initcon @@ -2067,6 +2121,7 @@ static const struct board_info __initcon
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
&board_VR3025u, &board_VR3025u,
@ -69,7 +69,7 @@
&board_WAP5813n, &board_WAP5813n,
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
@@ -2184,6 +2239,7 @@ static struct of_device_id const bcm963x @@ -2161,6 +2216,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },

View File

@ -50,7 +50,7 @@
static struct board_info __initdata board_VR3025u = { static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N", .name = "96368M-1541N",
.expected_cpu_id = 0x6368, .expected_cpu_id = 0x6368,
@@ -2143,6 +2186,7 @@ static const struct board_info __initcon @@ -2120,6 +2163,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
@ -58,7 +58,7 @@
&board_VR3025u, &board_VR3025u,
&board_VR3025un, &board_VR3025un,
&board_WAP5813n, &board_WAP5813n,
@@ -2241,6 +2285,7 @@ static struct of_device_id const bcm963x @@ -2218,6 +2262,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },

View File

@ -38,7 +38,7 @@
static struct board_info __initdata board_HW553 = { static struct board_info __initdata board_HW553 = {
.name = "HW553", .name = "HW553",
.expected_cpu_id = 0x6358, .expected_cpu_id = 0x6358,
@@ -2170,6 +2201,7 @@ static const struct board_info __initcon @@ -2147,6 +2178,7 @@ static const struct board_info __initcon
&board_nb4_ser_r0, &board_nb4_ser_r0,
&board_nb4_fxc_r1, &board_nb4_fxc_r1,
&board_ct6373_1, &board_ct6373_1,
@ -46,7 +46,7 @@
&board_HW553, &board_HW553,
&board_HW556_A, &board_HW556_A,
&board_HW556_B, &board_HW556_B,
@@ -2262,6 +2294,7 @@ static struct of_device_id const bcm963x @@ -2239,6 +2271,7 @@ static struct of_device_id const bcm963x
{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
{ .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, },

View File

@ -51,7 +51,7 @@
static struct board_info __initdata board_A4001N1 = { static struct board_info __initdata board_A4001N1 = {
.name = "963281T_TEF", .name = "963281T_TEF",
.expected_cpu_id = 0x6328, .expected_cpu_id = 0x6328,
@@ -2152,6 +2196,7 @@ static const struct board_info __initcon @@ -2129,6 +2173,7 @@ static const struct board_info __initcon
&board_AR5381u, &board_AR5381u,
&board_AR5387un, &board_AR5387un,
&board_963281TAN, &board_963281TAN,
@ -59,7 +59,7 @@
&board_A4001N1, &board_A4001N1,
&board_dsl_274xb_f1, &board_dsl_274xb_f1,
&board_FAST2704V2, &board_FAST2704V2,
@@ -2240,6 +2285,7 @@ static struct of_device_id const bcm963x @@ -2217,6 +2262,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328

View File

@ -76,7 +76,7 @@
#endif /* CONFIG_BCM63XX_CPU_6318 */ #endif /* CONFIG_BCM63XX_CPU_6318 */
/* /*
@@ -2190,6 +2259,7 @@ static const struct board_info __initcon @@ -2167,6 +2236,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318 #ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref, &board_96318ref,
&board_96318ref_p300, &board_96318ref_p300,
@ -84,7 +84,7 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng, &board_96328avng,
@@ -2283,6 +2353,7 @@ static struct of_device_id const bcm963x @@ -2260,6 +2330,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6318 #ifdef CONFIG_BCM63XX_CPU_6318
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },

View File

@ -49,7 +49,7 @@
static struct sprom_fixup __initdata vr3025u_fixups[] = { static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 }, { .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 }, { .offset = 98, .value = 0x1618 },
@@ -2333,6 +2375,7 @@ static const struct board_info __initcon @@ -2310,6 +2352,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
@ -57,7 +57,7 @@
&board_P870HW51A_V2, &board_P870HW51A_V2,
&board_VR3025u, &board_VR3025u,
&board_VR3025un, &board_VR3025un,
@@ -2435,6 +2478,7 @@ static struct of_device_id const bcm963x @@ -2412,6 +2455,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },

View File

@ -33,7 +33,7 @@
static struct board_info __initdata board_HW520 = { static struct board_info __initdata board_HW520 = {
.name = "HW6358GW_B", .name = "HW6358GW_B",
.expected_cpu_id = 0x6358, .expected_cpu_id = 0x6358,
@@ -2358,6 +2384,7 @@ static const struct board_info __initcon @@ -2335,6 +2361,7 @@ static const struct board_info __initcon
&board_nb4_ser_r0, &board_nb4_ser_r0,
&board_nb4_fxc_r1, &board_nb4_fxc_r1,
&board_ct6373_1, &board_ct6373_1,
@ -41,7 +41,7 @@
&board_HW520, &board_HW520,
&board_HW553, &board_HW553,
&board_HW556_A, &board_HW556_A,
@@ -2467,6 +2494,7 @@ static struct of_device_id const bcm963x @@ -2444,6 +2471,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
{ .compatible = "t-com,spw303v", .data = &board_spw303v, }, { .compatible = "t-com,spw303v", .data = &board_spw303v, },
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, },

View File

@ -28,6 +28,15 @@ define Profile/BCM963268BU_P300
PACKAGES:= kmod-usb-ohci kmod-usb2 kmod-bcm63xx-udc PACKAGES:= kmod-usb-ohci kmod-usb2 kmod-bcm63xx-udc
endef endef
define Profile/BCM963268BU_P300/Description define Profile/BCM963268BU_P300/Description
Package set optimized for the Broadcom BCM963268BU_P300 reference boar. Package set optimized for the Broadcom BCM963268BU_P300 reference board.
endef endef
$(eval $(call Profile,BCM963268BU_P300)) $(eval $(call Profile,BCM963268BU_P300))
define Profile/BCM963269BHR
NAME:=Broadcom BCM963269BHR reference board
PACKAGES:= kmod-usb-ohci kmod-usb2 kmod-bcm63xx-udc
endef
define Profile/BCM963269BHR/Description
Package set optimized for the Broadcom BCM963269BHR reference board.
endef
$(eval $(call Profile,BCM963269BHR))