bcm47xx: reorder MIPS BCM47XX patches

Signed-off-by: Rafał Miłecki <[email protected]>

target/linux/bcm47xx/patches-5.15/325-v5.17-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch → 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 <[email protected]>
 
 --- 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 <[email protected]>
  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);

target/linux/bcm47xx/patches-5.10/320-v5.17-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch → 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 <[email protected]>
  	{{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 <[email protected]>
  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);

target/linux/bcm47xx/patches-5.15/324-v5.17-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch → 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 <[email protected]>
  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 <[email protected]>
  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) {

target/linux/bcm47xx/patches-5.15/321-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch → 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 <[email protected]>
  	{{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 <[email protected]>
  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;

target/linux/bcm47xx/patches-5.10/322-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch → 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 <[email protected]>
  	{{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 <[email protected]>
  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;

target/linux/bcm47xx/patches-5.15/323-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch → 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 <[email protected]>
  	{{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 <[email protected]>
  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 <[email protected]>
  		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 <[email protected]>
  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;

target/linux/bcm47xx/patches-5.10/325-v5.17-MIPS-BCM47XX-Define-Linksys-WRT310N-V2-buttons.patch → 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 <[email protected]>
 
 --- 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 <[email protected]>
  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);

target/linux/bcm47xx/patches-5.15/320-v5.17-MIPS-BCM47XX-Add-board-entry-for-Linksys-WRT320N-v1.patch → 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 <[email protected]>
  	{{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 <[email protected]>
  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);

target/linux/bcm47xx/patches-5.10/324-v5.17-MIPS-BCM47XX-Add-LEDs-and-buttons-for-Asus-RTN-10U.patch → 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 <[email protected]>
  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 <[email protected]>
  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) {

target/linux/bcm47xx/patches-5.10/321-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-R6300-v1.patch → 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 <[email protected]>
  	{{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 <[email protected]>
  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;

target/linux/bcm47xx/patches-5.15/322-v5.17-MIPS-BCM47XX-Add-support-for-Netgear-WN2500RP-v1-v2.patch → 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 <[email protected]>
  	{{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 <[email protected]>
  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;

target/linux/bcm47xx/patches-5.10/323-v6.0-MIPS-BCM47XX-Add-support-for-Netgear-WNR3500L-v2.patch → 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 <[email protected]>
  	{{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 <[email protected]>
  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 <[email protected]>
  		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 <[email protected]>
  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;