brcm63xx: move V2110 to DT

Also readd image generation which was accidentally dropped in r43364.

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

SVN-Revision: 45165
This commit is contained in:
Jonas Gorski 2015-03-30 20:20:49 +00:00
parent d8ba40cfcd
commit f973580488
25 changed files with 113 additions and 25 deletions

View file

@ -66,6 +66,9 @@ brcm63xx_dt_detect() {
"BT Home Hub 2.0 Type A") "BT Home Hub 2.0 Type A")
board_name="homehub2a" board_name="homehub2a"
;; ;;
"BT Voyager 2110")
board_name="v2110"
;;
"BT Voyager V2500V") "BT Voyager V2500V")
board_name="v2500v_bb" board_name="v2500v_bb"
;; ;;
@ -228,9 +231,6 @@ brcm63xx_legacy_detect() {
local board_name local board_name
case "$1" in case "$1" in
V2110)
board_name="v2110"
;;
VW6339GU) VW6339GU)
board_namge="vg50" board_namge="vg50"
;; ;;

View file

@ -0,0 +1,69 @@
/dts-v1/;
/include/ "bcm6348.dtsi"
/ {
model = "BT Voyager 2110";
compatible = "bt,v2110", "brcm,bcm6348";
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <20>;
debounce-interval = <60>;
reset {
label = "reset";
gpios = <&gpio1 1 1>;
linux,code = <0x198>;
};
};
gpio-leds {
compatible = "gpio-leds";
power_green {
label = "V2110:green:power";
gpios = <&gpio0 0 1>;
};
power_red {
label = "V2110:red:power";
gpios = <&gpio0 1 1>;
};
adsl_green {
label = "V2110:green:adsl";
gpios = <&gpio0 2 1>;
};
ppp_green {
label = "V2110:green:ppp";
gpios = <&gpio0 3 1>;
};
wireless_green {
label = "V2110:green:wireless";
gpios = <&gpio0 6 1>;
};
};
};
&pflash {
status = "ok";
linux,part-probe = "bcm63xxpart";
cfe@0 {
label = "CFE";
reg = <0x000000 0x010000>;
read-only;
};
linux@10000 {
label = "linux";
reg = <0x010000 0x3e0000>;
};
nvram@3f0000 {
label = "nvram";
reg = <0x3f0000 0x010000>;
};
};

View file

@ -302,6 +302,8 @@ $(eval $(call ImageDTB,CFEDTB,F5D7633,F5D7633,f5d7633,96348GW-10,6348,--block-si
$(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))
# 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
$(eval $(call ImageDTB,CFEDTB,BTV2110,BTV2110,v2110,V2110,6348,--layoutver 5))
# BT Voyager V2500V, V2500V_SIP_CLUB, V2500V_AA # BT Voyager V2500V, V2500V_SIP_CLUB, V2500V_AA
$(eval $(call ImageDTB,CFEDTB,BTV2500V,BTV2500V,v2500v-bb,V2500V_BB,6348,--layoutver 5)) $(eval $(call ImageDTB,CFEDTB,BTV2500V,BTV2500V,v2500v-bb,V2500V_BB,6348,--layoutver 5))
# Comtrend AR-5381u # Comtrend AR-5381u

View file

@ -34,3 +34,11 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6358 #ifdef CONFIG_BCM63XX_CPU_6358
@@ -1087,6 +1107,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
+ { .compatible = "bt,v2110", .data = &board_V2110, },
{ .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },
{ .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },

View file

@ -43,9 +43,9 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6358 #ifdef CONFIG_BCM63XX_CPU_6358
@@ -1108,6 +1137,8 @@ static struct of_device_id const bcm963x @@ -1109,6 +1138,8 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
{ .compatible = "bt,v2110", .data = &board_V2110, },
{ .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },
+ { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, }, + { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, },
+ { .compatible = "comtrend,ct-5621", .data = &board_ct536_ct5621, }, + { .compatible = "comtrend,ct-5621", .data = &board_ct536_ct5621, },

View file

@ -40,8 +40,8 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6358 #ifdef CONFIG_BCM63XX_CPU_6358
@@ -1141,6 +1167,7 @@ static struct of_device_id const bcm963x @@ -1142,6 +1168,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, { .compatible = "bt,v2110", .data = &board_V2110, },
{ .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },
{ .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, }, { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, },
+ { .compatible = "comtrend,ct-5365", .data = &board_96348A_122, }, + { .compatible = "comtrend,ct-5365", .data = &board_96348A_122, },

View file

@ -36,7 +36,7 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6358 #ifdef CONFIG_BCM63XX_CPU_6358
@@ -1178,6 +1200,7 @@ static struct of_device_id const bcm963x @@ -1179,6 +1201,7 @@ static struct of_device_id const bcm963x
{ .compatible = "t-com,spw500v", .data = &board_spw500v, }, { .compatible = "t-com,spw500v", .data = &board_spw500v, },
{ .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, },
{ .compatible = "tecom,gw6200", .data = &board_gw6200, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, },

View file

@ -81,7 +81,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
}; };
static struct of_device_id const bcm963xx_boards_dt[] = { static struct of_device_id const bcm963xx_boards_dt[] = {
@@ -1222,6 +1279,7 @@ static struct of_device_id const bcm963x @@ -1223,6 +1280,7 @@ static struct of_device_id const bcm963x
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368

View file

@ -64,7 +64,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
#endif #endif
}; };
@@ -1279,6 +1320,7 @@ static struct of_device_id const bcm963x @@ -1280,6 +1321,7 @@ static struct of_device_id const bcm963x
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368

View file

@ -34,7 +34,7 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6358 #ifdef CONFIG_BCM63XX_CPU_6358
@@ -1405,6 +1425,7 @@ static struct of_device_id const bcm963x @@ -1406,6 +1426,7 @@ static struct of_device_id const bcm963x
{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },

View file

@ -40,7 +40,7 @@
&board_HW553, &board_HW553,
&board_spw303v, &board_spw303v,
#endif #endif
@@ -1439,6 +1465,7 @@ static struct of_device_id const bcm963x @@ -1440,6 +1466,7 @@ static struct of_device_id const bcm963x
{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },

View file

@ -45,7 +45,7 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
@@ -1468,6 +1499,7 @@ static struct of_device_id const bcm963x @@ -1469,6 +1500,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, },
{ .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, },

View file

@ -100,7 +100,7 @@
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg, &board_96368mvwg,
&board_96368mvngr, &board_96368mvngr,
@@ -1510,6 +1582,9 @@ static struct of_device_id const bcm963x @@ -1511,6 +1583,9 @@ static struct of_device_id const bcm963x
{ .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, },
#endif #endif

View file

@ -32,7 +32,7 @@
&board_DV201AMR, &board_DV201AMR,
&board_96348gw_a, &board_96348gw_a,
&board_rta1025w_16, &board_rta1025w_16,
@@ -1556,6 +1574,7 @@ static struct of_device_id const bcm963x @@ -1557,6 +1575,7 @@ static struct of_device_id const bcm963x
{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
{ .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, },
{ .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, { .compatible = "sagem,f@st2404", .data = &board_FAST2404, },

View file

@ -112,7 +112,7 @@
&board_spw303v, &board_spw303v,
&board_DVAG3810BN, &board_DVAG3810BN,
#endif #endif
@@ -1788,6 +1879,9 @@ static struct of_device_id const bcm963x @@ -1789,6 +1880,9 @@ static struct of_device_id const bcm963x
{ .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, },
{ .compatible = "huawei,hg553", .data = &board_HW553, }, { .compatible = "huawei,hg553", .data = &board_HW553, },

View file

@ -58,7 +58,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6368 #ifdef CONFIG_BCM63XX_CPU_6368
@@ -1955,6 +1993,7 @@ static struct of_device_id const bcm963x @@ -1956,6 +1994,7 @@ static struct of_device_id const bcm963x
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6362 #ifdef CONFIG_BCM63XX_CPU_6362

View file

@ -75,7 +75,7 @@
&board_963269bhr, &board_963269bhr,
&board_vw6339gu, &board_vw6339gu,
#endif #endif
@@ -2137,6 +2198,7 @@ static struct of_device_id const bcm963x @@ -2138,6 +2199,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

View file

@ -84,7 +84,7 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
&board_963268bu_p300, &board_963268bu_p300,
@@ -2196,6 +2258,7 @@ static struct of_device_id const bcm963x @@ -2197,6 +2259,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

@ -69,7 +69,7 @@
&board_WAP5813n, &board_WAP5813n,
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
@@ -2258,6 +2313,7 @@ static struct of_device_id const bcm963x @@ -2259,6 +2314,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

@ -69,7 +69,7 @@
&board_WAP5813n, &board_WAP5813n,
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_63268 #ifdef CONFIG_BCM63XX_CPU_63268
@@ -2314,6 +2369,7 @@ static struct of_device_id const bcm963x @@ -2315,6 +2370,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

@ -58,7 +58,7 @@
&board_VR3025u, &board_VR3025u,
&board_VR3025un, &board_VR3025un,
&board_WAP5813n, &board_WAP5813n,
@@ -2371,6 +2415,7 @@ static struct of_device_id const bcm963x @@ -2372,6 +2416,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

@ -46,7 +46,7 @@
&board_HW553, &board_HW553,
&board_HW556_A, &board_HW556_A,
&board_HW556_B, &board_HW556_B,
@@ -2392,6 +2424,7 @@ static struct of_device_id const bcm963x @@ -2393,6 +2425,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

@ -57,7 +57,7 @@
&board_P870HW51A_V2, &board_P870HW51A_V2,
&board_VR3025u, &board_VR3025u,
&board_VR3025un, &board_VR3025un,
@@ -2630,6 +2673,7 @@ static struct of_device_id const bcm963x @@ -2631,6 +2674,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

@ -41,7 +41,7 @@
&board_HW520, &board_HW520,
&board_HW553, &board_HW553,
&board_HW556_A, &board_HW556_A,
@@ -2662,6 +2689,7 @@ static struct of_device_id const bcm963x @@ -2663,6 +2690,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

@ -15,6 +15,15 @@ define Profile/BTHOMEHUB2A/Description
endef endef
$(eval $(call Profile,BTHOMEHUB2A)) $(eval $(call Profile,BTHOMEHUB2A))
define Profile/BTV2110
NAME:=BT Voyager V2110
PACKAGES:=kmod-b43 wpad-mini
endef
define Profile/BTV2500V/Description
Package set optimized for BTV2110.
endef
$(eval $(call Profile,BTV2110))
define Profile/BTV2500V define Profile/BTV2500V
NAME:=BT Voyager V2500V NAME:=BT Voyager V2500V
PACKAGES:=kmod-b43 wpad-mini PACKAGES:=kmod-b43 wpad-mini