From b894fbdfe00fc5d413e95ab5e1551f7ad8601938 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 27 Feb 2023 06:30:58 +0000 Subject: [PATCH] bcm47xx: reorder MIPS BCM47XX patches MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki --- ...-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch} | 8 ++++---- ...-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch} | 8 ++++---- ...S-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch} | 4 ++-- ...4-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch} | 4 ++-- ...-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch} | 4 ++-- ...IPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch} | 8 ++++---- ...-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch} | 8 ++++---- ...-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch} | 8 ++++---- ...S-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch} | 4 ++-- ...4-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch} | 4 ++-- ...-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch} | 4 ++-- ...IPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch} | 8 ++++---- 12 files changed, 36 insertions(+), 36 deletions(-) rename target/linux/bcm47xx/{patches-5.15/325-v5.17-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch => patches-5.10/030-v5.17-0001-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch} (84%) rename target/linux/bcm47xx/patches-5.10/{320-v5.17-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch => 030-v5.17-0002-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch} (93%) rename target/linux/bcm47xx/{patches-5.15/324-v5.17-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch => patches-5.10/030-v5.17-0003-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch} (94%) rename target/linux/bcm47xx/{patches-5.15/321-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch => patches-5.10/030-v5.17-0004-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch} (95%) rename target/linux/bcm47xx/patches-5.10/{322-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch => 030-v5.17-0005-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch} (95%) rename target/linux/bcm47xx/{patches-5.15/323-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch => patches-5.10/031-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch} (94%) rename target/linux/bcm47xx/{patches-5.10/325-v5.17-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch => patches-5.15/030-v5.17-0001-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch} (84%) rename target/linux/bcm47xx/patches-5.15/{320-v5.17-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch => 030-v5.17-0002-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch} (93%) rename target/linux/bcm47xx/{patches-5.10/324-v5.17-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch => patches-5.15/030-v5.17-0003-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch} (94%) rename target/linux/bcm47xx/{patches-5.10/321-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch => patches-5.15/030-v5.17-0004-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch} (95%) rename target/linux/bcm47xx/patches-5.15/{322-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch => 030-v5.17-0005-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch} (95%) rename target/linux/bcm47xx/{patches-5.10/323-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch => patches-5.15/031-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch} (94%) diff --git a/target/linux/bcm47xx/patches-5.15/325-v5.17-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch b/target/linux/bcm47xx/patches-5.10/030-v5.17-0001-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch similarity index 84% rename from target/linux/bcm47xx/patches-5.15/325-v5.17-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch rename to target/linux/bcm47xx/patches-5.10/030-v5.17-0001-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch index 0c23e8aaf5..921825be5c 100644 --- a/target/linux/bcm47xx/patches-5.15/325-v5.17-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch +++ b/target/linux/bcm47xx/patches-5.10/030-v5.17-0001-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch @@ -15,7 +15,7 @@ Signed-off-by: Thomas Bogendoerfer --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -289,6 +289,12 @@ bcm47xx_buttons_linksys_wrt320n_v1[] __i +@@ -277,6 +277,12 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in }; static const struct gpio_keys_button @@ -28,9 +28,9 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = { BCM47XX_GPIO_KEY(5, KEY_WIMAX), BCM47XX_GPIO_KEY(6, KEY_RESTART), -@@ -644,6 +650,9 @@ int __init bcm47xx_buttons_register(void - case BCM47XX_BOARD_LINKSYS_WRT320N_V1: - err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1); +@@ -608,6 +614,9 @@ int __init bcm47xx_buttons_register(void + case BCM47XX_BOARD_LINKSYS_WRT310NV1: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1); break; + case BCM47XX_BOARD_LINKSYS_WRT310NV2: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2); diff --git a/target/linux/bcm47xx/patches-5.10/320-v5.17-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch b/target/linux/bcm47xx/patches-5.10/030-v5.17-0002-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch similarity index 93% rename from target/linux/bcm47xx/patches-5.10/320-v5.17-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch rename to target/linux/bcm47xx/patches-5.10/030-v5.17-0002-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch index f34336edd5..3fb013a585 100644 --- a/target/linux/bcm47xx/patches-5.10/320-v5.17-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch +++ b/target/linux/bcm47xx/patches-5.10/030-v5.17-0002-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch @@ -28,7 +28,7 @@ Signed-off-by: Thomas Bogendoerfer {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"}, --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -277,6 +277,12 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in +@@ -283,6 +283,12 @@ bcm47xx_buttons_linksys_wrt310n_v2[] __i }; static const struct gpio_keys_button @@ -41,9 +41,9 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = { BCM47XX_GPIO_KEY(5, KEY_WIMAX), BCM47XX_GPIO_KEY(6, KEY_RESTART), -@@ -608,6 +614,9 @@ int __init bcm47xx_buttons_register(void - case BCM47XX_BOARD_LINKSYS_WRT310NV1: - err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1); +@@ -617,6 +623,9 @@ int __init bcm47xx_buttons_register(void + case BCM47XX_BOARD_LINKSYS_WRT310NV2: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2); break; + case BCM47XX_BOARD_LINKSYS_WRT320N_V1: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1); diff --git a/target/linux/bcm47xx/patches-5.15/324-v5.17-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch b/target/linux/bcm47xx/patches-5.10/030-v5.17-0003-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch similarity index 94% rename from target/linux/bcm47xx/patches-5.15/324-v5.17-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch rename to target/linux/bcm47xx/patches-5.10/030-v5.17-0003-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch index 23d50ad902..c09140e99d 100644 --- a/target/linux/bcm47xx/patches-5.15/324-v5.17-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch +++ b/target/linux/bcm47xx/patches-5.10/030-v5.17-0003-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch @@ -28,7 +28,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_asus_rtn12[] __initconst = { BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON), BCM47XX_GPIO_KEY(1, KEY_RESTART), -@@ -502,6 +508,9 @@ int __init bcm47xx_buttons_register(void +@@ -490,6 +496,9 @@ int __init bcm47xx_buttons_register(void int err; switch (board) { @@ -55,7 +55,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_leds_asus_rtn12[] __initconst = { BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON), BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF), -@@ -571,6 +579,9 @@ void __init bcm47xx_leds_register(void) +@@ -563,6 +571,9 @@ void __init bcm47xx_leds_register(void) enum bcm47xx_board board = bcm47xx_board_get(); switch (board) { diff --git a/target/linux/bcm47xx/patches-5.15/321-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch b/target/linux/bcm47xx/patches-5.10/030-v5.17-0004-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch similarity index 95% rename from target/linux/bcm47xx/patches-5.15/321-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch rename to target/linux/bcm47xx/patches-5.10/030-v5.17-0004-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch index 6631e79048..8740942d6f 100644 --- a/target/linux/bcm47xx/patches-5.15/321-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch +++ b/target/linux/bcm47xx/patches-5.10/030-v5.17-0004-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch @@ -26,7 +26,7 @@ Signed-off-by: Thomas Bogendoerfer {{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"}, --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -398,6 +398,11 @@ bcm47xx_buttons_netgear_r6200_v1[] __ini +@@ -410,6 +410,11 @@ bcm47xx_buttons_netgear_r6200_v1[] __ini }; static const struct gpio_keys_button @@ -38,7 +38,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_netgear_wndr3400v1[] __initconst = { BCM47XX_GPIO_KEY(4, KEY_RESTART), BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON), -@@ -683,6 +688,9 @@ int __init bcm47xx_buttons_register(void +@@ -701,6 +706,9 @@ int __init bcm47xx_buttons_register(void case BCM47XX_BOARD_NETGEAR_R6200_V1: err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6200_v1); break; diff --git a/target/linux/bcm47xx/patches-5.10/322-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch b/target/linux/bcm47xx/patches-5.10/030-v5.17-0005-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch similarity index 95% rename from target/linux/bcm47xx/patches-5.10/322-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch rename to target/linux/bcm47xx/patches-5.10/030-v5.17-0005-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch index 8f66aee192..6975bce952 100644 --- a/target/linux/bcm47xx/patches-5.10/322-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch +++ b/target/linux/bcm47xx/patches-5.10/030-v5.17-0005-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch @@ -27,7 +27,7 @@ Signed-off-by: Thomas Bogendoerfer {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"}, --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -403,6 +403,12 @@ bcm47xx_buttons_netgear_r6300_v1[] __ini +@@ -415,6 +415,12 @@ bcm47xx_buttons_netgear_r6300_v1[] __ini }; static const struct gpio_keys_button @@ -40,7 +40,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_netgear_wndr3400v1[] __initconst = { BCM47XX_GPIO_KEY(4, KEY_RESTART), BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON), -@@ -691,6 +697,9 @@ int __init bcm47xx_buttons_register(void +@@ -709,6 +715,9 @@ int __init bcm47xx_buttons_register(void case BCM47XX_BOARD_NETGEAR_R6300_V1: err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6300_v1); break; diff --git a/target/linux/bcm47xx/patches-5.15/323-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch b/target/linux/bcm47xx/patches-5.10/031-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch similarity index 94% rename from target/linux/bcm47xx/patches-5.15/323-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch rename to target/linux/bcm47xx/patches-5.10/031-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch index 272a74933b..8c2233c804 100644 --- a/target/linux/bcm47xx/patches-5.15/323-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch +++ b/target/linux/bcm47xx/patches-5.10/031-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch @@ -36,7 +36,7 @@ Signed-off-by: Thomas Bogendoerfer {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708, "Linksys WRT54G/GS/GL"}, "0x0708", "42", "0x10"}, --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -448,6 +448,13 @@ bcm47xx_buttons_netgear_wnr3500lv1[] __i +@@ -460,6 +460,13 @@ bcm47xx_buttons_netgear_wnr3500lv1[] __i }; static const struct gpio_keys_button @@ -50,7 +50,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_netgear_wnr834bv2[] __initconst = { BCM47XX_GPIO_KEY(6, KEY_RESTART), }; -@@ -718,6 +725,9 @@ int __init bcm47xx_buttons_register(void +@@ -736,6 +743,9 @@ int __init bcm47xx_buttons_register(void case BCM47XX_BOARD_NETGEAR_WNR3500L: err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1); break; @@ -62,7 +62,7 @@ Signed-off-by: Thomas Bogendoerfer break; --- a/arch/mips/bcm47xx/leds.c +++ b/arch/mips/bcm47xx/leds.c -@@ -520,6 +520,14 @@ bcm47xx_leds_netgear_wnr3500lv1[] __init +@@ -528,6 +528,14 @@ bcm47xx_leds_netgear_wnr3500lv1[] __init }; static const struct gpio_led @@ -77,7 +77,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_leds_netgear_wnr834bv2[] __initconst = { BCM47XX_GPIO_LED(2, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON), BCM47XX_GPIO_LED(3, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF), -@@ -780,6 +788,9 @@ void __init bcm47xx_leds_register(void) +@@ -791,6 +799,9 @@ void __init bcm47xx_leds_register(void) case BCM47XX_BOARD_NETGEAR_WNR3500L: bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr3500lv1); break; diff --git a/target/linux/bcm47xx/patches-5.10/325-v5.17-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch b/target/linux/bcm47xx/patches-5.15/030-v5.17-0001-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch similarity index 84% rename from target/linux/bcm47xx/patches-5.10/325-v5.17-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch rename to target/linux/bcm47xx/patches-5.15/030-v5.17-0001-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch index 0c23e8aaf5..921825be5c 100644 --- a/target/linux/bcm47xx/patches-5.10/325-v5.17-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch +++ b/target/linux/bcm47xx/patches-5.15/030-v5.17-0001-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch @@ -15,7 +15,7 @@ Signed-off-by: Thomas Bogendoerfer --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -289,6 +289,12 @@ bcm47xx_buttons_linksys_wrt320n_v1[] __i +@@ -277,6 +277,12 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in }; static const struct gpio_keys_button @@ -28,9 +28,9 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = { BCM47XX_GPIO_KEY(5, KEY_WIMAX), BCM47XX_GPIO_KEY(6, KEY_RESTART), -@@ -644,6 +650,9 @@ int __init bcm47xx_buttons_register(void - case BCM47XX_BOARD_LINKSYS_WRT320N_V1: - err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1); +@@ -608,6 +614,9 @@ int __init bcm47xx_buttons_register(void + case BCM47XX_BOARD_LINKSYS_WRT310NV1: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1); break; + case BCM47XX_BOARD_LINKSYS_WRT310NV2: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2); diff --git a/target/linux/bcm47xx/patches-5.15/320-v5.17-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch b/target/linux/bcm47xx/patches-5.15/030-v5.17-0002-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch similarity index 93% rename from target/linux/bcm47xx/patches-5.15/320-v5.17-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch rename to target/linux/bcm47xx/patches-5.15/030-v5.17-0002-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch index f34336edd5..3fb013a585 100644 --- a/target/linux/bcm47xx/patches-5.15/320-v5.17-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch +++ b/target/linux/bcm47xx/patches-5.15/030-v5.17-0002-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch @@ -28,7 +28,7 @@ Signed-off-by: Thomas Bogendoerfer {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"}, --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -277,6 +277,12 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in +@@ -283,6 +283,12 @@ bcm47xx_buttons_linksys_wrt310n_v2[] __i }; static const struct gpio_keys_button @@ -41,9 +41,9 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = { BCM47XX_GPIO_KEY(5, KEY_WIMAX), BCM47XX_GPIO_KEY(6, KEY_RESTART), -@@ -608,6 +614,9 @@ int __init bcm47xx_buttons_register(void - case BCM47XX_BOARD_LINKSYS_WRT310NV1: - err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1); +@@ -617,6 +623,9 @@ int __init bcm47xx_buttons_register(void + case BCM47XX_BOARD_LINKSYS_WRT310NV2: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2); break; + case BCM47XX_BOARD_LINKSYS_WRT320N_V1: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1); diff --git a/target/linux/bcm47xx/patches-5.10/324-v5.17-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch b/target/linux/bcm47xx/patches-5.15/030-v5.17-0003-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch similarity index 94% rename from target/linux/bcm47xx/patches-5.10/324-v5.17-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch rename to target/linux/bcm47xx/patches-5.15/030-v5.17-0003-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch index 23d50ad902..c09140e99d 100644 --- a/target/linux/bcm47xx/patches-5.10/324-v5.17-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch +++ b/target/linux/bcm47xx/patches-5.15/030-v5.17-0003-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch @@ -28,7 +28,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_asus_rtn12[] __initconst = { BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON), BCM47XX_GPIO_KEY(1, KEY_RESTART), -@@ -502,6 +508,9 @@ int __init bcm47xx_buttons_register(void +@@ -490,6 +496,9 @@ int __init bcm47xx_buttons_register(void int err; switch (board) { @@ -55,7 +55,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_leds_asus_rtn12[] __initconst = { BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON), BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF), -@@ -571,6 +579,9 @@ void __init bcm47xx_leds_register(void) +@@ -563,6 +571,9 @@ void __init bcm47xx_leds_register(void) enum bcm47xx_board board = bcm47xx_board_get(); switch (board) { diff --git a/target/linux/bcm47xx/patches-5.10/321-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch b/target/linux/bcm47xx/patches-5.15/030-v5.17-0004-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch similarity index 95% rename from target/linux/bcm47xx/patches-5.10/321-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch rename to target/linux/bcm47xx/patches-5.15/030-v5.17-0004-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch index 6631e79048..8740942d6f 100644 --- a/target/linux/bcm47xx/patches-5.10/321-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch +++ b/target/linux/bcm47xx/patches-5.15/030-v5.17-0004-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch @@ -26,7 +26,7 @@ Signed-off-by: Thomas Bogendoerfer {{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"}, --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -398,6 +398,11 @@ bcm47xx_buttons_netgear_r6200_v1[] __ini +@@ -410,6 +410,11 @@ bcm47xx_buttons_netgear_r6200_v1[] __ini }; static const struct gpio_keys_button @@ -38,7 +38,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_netgear_wndr3400v1[] __initconst = { BCM47XX_GPIO_KEY(4, KEY_RESTART), BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON), -@@ -683,6 +688,9 @@ int __init bcm47xx_buttons_register(void +@@ -701,6 +706,9 @@ int __init bcm47xx_buttons_register(void case BCM47XX_BOARD_NETGEAR_R6200_V1: err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6200_v1); break; diff --git a/target/linux/bcm47xx/patches-5.15/322-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch b/target/linux/bcm47xx/patches-5.15/030-v5.17-0005-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch similarity index 95% rename from target/linux/bcm47xx/patches-5.15/322-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch rename to target/linux/bcm47xx/patches-5.15/030-v5.17-0005-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch index 8f66aee192..6975bce952 100644 --- a/target/linux/bcm47xx/patches-5.15/322-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch +++ b/target/linux/bcm47xx/patches-5.15/030-v5.17-0005-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch @@ -27,7 +27,7 @@ Signed-off-by: Thomas Bogendoerfer {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"}, --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -403,6 +403,12 @@ bcm47xx_buttons_netgear_r6300_v1[] __ini +@@ -415,6 +415,12 @@ bcm47xx_buttons_netgear_r6300_v1[] __ini }; static const struct gpio_keys_button @@ -40,7 +40,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_netgear_wndr3400v1[] __initconst = { BCM47XX_GPIO_KEY(4, KEY_RESTART), BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON), -@@ -691,6 +697,9 @@ int __init bcm47xx_buttons_register(void +@@ -709,6 +715,9 @@ int __init bcm47xx_buttons_register(void case BCM47XX_BOARD_NETGEAR_R6300_V1: err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6300_v1); break; diff --git a/target/linux/bcm47xx/patches-5.10/323-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch b/target/linux/bcm47xx/patches-5.15/031-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch similarity index 94% rename from target/linux/bcm47xx/patches-5.10/323-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch rename to target/linux/bcm47xx/patches-5.15/031-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch index 272a74933b..8c2233c804 100644 --- a/target/linux/bcm47xx/patches-5.10/323-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch +++ b/target/linux/bcm47xx/patches-5.15/031-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch @@ -36,7 +36,7 @@ Signed-off-by: Thomas Bogendoerfer {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708, "Linksys WRT54G/GS/GL"}, "0x0708", "42", "0x10"}, --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c -@@ -448,6 +448,13 @@ bcm47xx_buttons_netgear_wnr3500lv1[] __i +@@ -460,6 +460,13 @@ bcm47xx_buttons_netgear_wnr3500lv1[] __i }; static const struct gpio_keys_button @@ -50,7 +50,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_buttons_netgear_wnr834bv2[] __initconst = { BCM47XX_GPIO_KEY(6, KEY_RESTART), }; -@@ -718,6 +725,9 @@ int __init bcm47xx_buttons_register(void +@@ -736,6 +743,9 @@ int __init bcm47xx_buttons_register(void case BCM47XX_BOARD_NETGEAR_WNR3500L: err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1); break; @@ -62,7 +62,7 @@ Signed-off-by: Thomas Bogendoerfer break; --- a/arch/mips/bcm47xx/leds.c +++ b/arch/mips/bcm47xx/leds.c -@@ -520,6 +520,14 @@ bcm47xx_leds_netgear_wnr3500lv1[] __init +@@ -528,6 +528,14 @@ bcm47xx_leds_netgear_wnr3500lv1[] __init }; static const struct gpio_led @@ -77,7 +77,7 @@ Signed-off-by: Thomas Bogendoerfer bcm47xx_leds_netgear_wnr834bv2[] __initconst = { BCM47XX_GPIO_LED(2, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON), BCM47XX_GPIO_LED(3, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF), -@@ -780,6 +788,9 @@ void __init bcm47xx_leds_register(void) +@@ -791,6 +799,9 @@ void __init bcm47xx_leds_register(void) case BCM47XX_BOARD_NETGEAR_WNR3500L: bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr3500lv1); break; -- 2.30.2