From db7f2d953122bdbfa8d072214450f5cfcc4fc686 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 2 Dec 2015 09:24:52 +0000 Subject: [PATCH] brcm47xx: add Netgear WN2500RP support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We generate V1 image only for now. We lack buttons support for V2. Signed-off-by: Rafał Miłecki SVN-Revision: 47682 --- .../base-files/lib/upgrade/platform.sh | 2 + target/linux/brcm47xx/image/Makefile | 1 + ...47XX-Devices-database-update-for-4.x.patch | 39 ++++++++++++++----- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh index cbadefbb359..cf05a847ee3 100644 --- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh @@ -17,6 +17,8 @@ platform_expected_image() { "Netgear WGR614 V8") echo "chk U12H072T00_NETGEAR"; return;; "Netgear WGR614 V9") echo "chk U12H094T00_NETGEAR"; return;; "Netgear WGR614 V10") echo "chk U12H139T01_NETGEAR"; return;; + "Netgear WN2500RP V1") echo "chk U12H197T00_NETGEAR"; return;; + "Netgear WN2500RP V2") echo "chk U12H294T00_NETGEAR"; return;; "Netgear WNDR3300") echo "chk U12H093T00_NETGEAR"; return;; "Netgear WNDR3400 V1") echo "chk U12H155T00_NETGEAR"; return;; "Netgear WNDR3400 V2") echo "chk U12H187T00_NETGEAR"; return;; diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile index 8063de0459f..c290f9a4fa8 100644 --- a/target/linux/brcm47xx/image/Makefile +++ b/target/linux/brcm47xx/image/Makefile @@ -323,6 +323,7 @@ ifeq ($(SUBTARGET),mips74k) $(eval $(call LinksysDevice,e4200-v1,4200,1.0.5)) $(eval $(call NetgearDevice,wgr614-v10_north-america,U12H139T01_NETGEAR,2)) $(eval $(call NetgearDevice,wgr614-v10_other-regions,U12H139T01_NETGEAR,1)) + $(eval $(call NetgearDevice,wn2500rp-v1,U12H197T00_NETGEAR,1)) $(eval $(call NetgearDevice,wndr3400-v1,U12H155T00_NETGEAR,2)) $(eval $(call NetgearDevice,wndr3400-v2,U12H187T00_NETGEAR,2)) $(eval $(call NetgearDevice,wndr3400-v3,U12H208T00_NETGEAR,1)) diff --git a/target/linux/brcm47xx/patches-4.1/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch b/target/linux/brcm47xx/patches-4.1/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch index 36d143593fb..68214c8452d 100644 --- a/target/linux/brcm47xx/patches-4.1/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch +++ b/target/linux/brcm47xx/patches-4.1/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch @@ -8,7 +8,7 @@ {{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"}, {{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"}, {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"}, -@@ -150,6 +151,7 @@ struct bcm47xx_board_type_list2 bcm47xx_ +@@ -150,9 +151,12 @@ struct bcm47xx_board_type_list2 bcm47xx_ static const struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = { {{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"}, @@ -16,7 +16,12 @@ {{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"}, {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"}, {{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"}, -@@ -162,6 +164,7 @@ struct bcm47xx_board_type_list1 bcm47xx_ ++ {{BCM47XX_BOARD_NETGEAR_WN2500RP_V1, "Netgear WN2500RP V1"}, "U12H197T00_NETGEAR"}, ++ {{BCM47XX_BOARD_NETGEAR_WN2500RP_V2, "Netgear WN2500RP V2"}, "U12H294T00_NETGEAR"}, + {{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR"}, + {{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR"}, + {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"}, +@@ -162,6 +166,7 @@ struct bcm47xx_board_type_list1 bcm47xx_ {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"}, {{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"}, {{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"}, @@ -58,7 +63,7 @@ bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = { BCM47XX_GPIO_KEY(5, KEY_WIMAX), BCM47XX_GPIO_KEY(6, KEY_RESTART), -@@ -333,6 +351,11 @@ bcm47xx_buttons_motorola_wr850gv2v3[] __ +@@ -333,6 +351,17 @@ bcm47xx_buttons_motorola_wr850gv2v3[] __ /* Netgear */ static const struct gpio_keys_button @@ -66,11 +71,17 @@ + BCM47XX_GPIO_KEY(6, KEY_RESTART), +}; + ++static const struct gpio_keys_button ++bcm47xx_buttons_netgear_wn2500rp_v1[] __initconst = { ++ BCM47XX_GPIO_KEY(12, KEY_RESTART), ++ BCM47XX_GPIO_KEY(31, KEY_WPS_BUTTON), ++}; ++ +static const struct gpio_keys_button bcm47xx_buttons_netgear_wndr3400v1[] __initconst = { BCM47XX_GPIO_KEY(4, KEY_RESTART), BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON), -@@ -360,6 +383,11 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i +@@ -360,6 +389,11 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i }; static const struct gpio_keys_button @@ -82,7 +93,7 @@ bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = { BCM47XX_GPIO_KEY(4, KEY_RESTART), BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON), -@@ -413,6 +441,9 @@ int __init bcm47xx_buttons_register(void +@@ -413,6 +447,9 @@ int __init bcm47xx_buttons_register(void int err; switch (board) { @@ -92,7 +103,7 @@ case BCM47XX_BOARD_ASUS_RTN12: err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12); break; -@@ -543,6 +574,12 @@ int __init bcm47xx_buttons_register(void +@@ -543,6 +580,12 @@ int __init bcm47xx_buttons_register(void case BCM47XX_BOARD_LINKSYS_WRT310NV1: err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1); break; @@ -105,17 +116,20 @@ case BCM47XX_BOARD_LINKSYS_WRT54G3GV2: err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2); break; -@@ -579,6 +616,9 @@ int __init bcm47xx_buttons_register(void +@@ -579,6 +622,12 @@ int __init bcm47xx_buttons_register(void err = bcm47xx_copy_bdata(bcm47xx_buttons_motorola_wr850gv2v3); break; + case BCM47XX_BOARD_NETGEAR_R6300_V1: + err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6300_v1); ++ break; ++ case BCM47XX_BOARD_NETGEAR_WN2500RP_V1: ++ err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wn2500rp_v1); + break; case BCM47XX_BOARD_NETGEAR_WNDR3400V1: err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1); break; -@@ -591,6 +631,9 @@ int __init bcm47xx_buttons_register(void +@@ -591,6 +640,9 @@ int __init bcm47xx_buttons_register(void case BCM47XX_BOARD_NETGEAR_WNDR4500V1: err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1); break; @@ -135,7 +149,7 @@ BCM47XX_BOARD_LINKSYS_WRT54G3GV2, BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101, BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467, -@@ -88,6 +89,7 @@ enum bcm47xx_board { +@@ -88,9 +89,12 @@ enum bcm47xx_board { BCM47XX_BOARD_MOTOROLA_WR850GP, BCM47XX_BOARD_MOTOROLA_WR850GV2V3, @@ -143,7 +157,12 @@ BCM47XX_BOARD_NETGEAR_WGR614V8, BCM47XX_BOARD_NETGEAR_WGR614V9, BCM47XX_BOARD_NETGEAR_WGR614_V10, -@@ -100,6 +102,7 @@ enum bcm47xx_board { ++ BCM47XX_BOARD_NETGEAR_WN2500RP_V1, ++ BCM47XX_BOARD_NETGEAR_WN2500RP_V2, + BCM47XX_BOARD_NETGEAR_WNDR3300, + BCM47XX_BOARD_NETGEAR_WNDR3400V1, + BCM47XX_BOARD_NETGEAR_WNDR3400V2, +@@ -100,6 +104,7 @@ enum bcm47xx_board { BCM47XX_BOARD_NETGEAR_WNDR4000, BCM47XX_BOARD_NETGEAR_WNDR4500V1, BCM47XX_BOARD_NETGEAR_WNDR4500V2, -- 2.30.2