aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-02-07 17:15:36 +0100
committerJonas Gorski <jonas.gorski@gmail.com>2017-02-09 14:30:44 +0100
commit0127c480bb709c38e6cd2b2c0deb6931606e709f (patch)
tree6681c4804d1094911bc4ee3d13a87a0b020a3d2f /target/linux/brcm63xx
parent8b741d5cd182be1ad830f43bbc0a412912ea84f8 (diff)
downloadupstream-0127c480bb709c38e6cd2b2c0deb6931606e709f.tar.gz
upstream-0127c480bb709c38e6cd2b2c0deb6931606e709f.tar.bz2
upstream-0127c480bb709c38e6cd2b2c0deb6931606e709f.zip
brcm63xx: Neufbox 6: fix switch by probing through DT
Probe the switch through DT instead of a platform device. This fixes probe, as GPIO offsets are now properly accounted for. Fixes the following issue: [ 0.802953] 8021q: 802.1Q VLAN Support v1.8 [ 0.810518] rtl8366_smi: gpio_request failed for 18, err=-517 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/dts/nb6-ser-r0.dts8
-rw-r--r--target/linux/brcm63xx/patches-4.4/302-extended-platform-devices.patch25
-rw-r--r--target/linux/brcm63xx/patches-4.4/303-spi-board-info.patch14
-rw-r--r--target/linux/brcm63xx/patches-4.4/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch4
-rw-r--r--target/linux/brcm63xx/patches-4.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch2
-rw-r--r--target/linux/brcm63xx/patches-4.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch2
-rw-r--r--target/linux/brcm63xx/patches-4.4/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch2
-rw-r--r--target/linux/brcm63xx/patches-4.4/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch2
-rw-r--r--target/linux/brcm63xx/patches-4.4/420-BCM63XX-add-endian-check-for-ath9k.patch2
-rw-r--r--target/linux/brcm63xx/patches-4.4/421-BCM63XX-add-led-pin-for-ath9k.patch2
-rw-r--r--target/linux/brcm63xx/patches-4.4/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch2
-rw-r--r--target/linux/brcm63xx/patches-4.4/528-board_nb6.patch60
-rw-r--r--target/linux/brcm63xx/patches-4.4/529-board_fast2604.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/530-board_A4001N1.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/531-board_AR-5387un.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/532-board_AR-5381u.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/533-board_rta770bw.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/534-board_hw556.patch10
-rw-r--r--target/linux/brcm63xx/patches-4.4/535-board_rta770w.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/536-board_fast2704.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/537-board_fast2504n.patch10
-rw-r--r--target/linux/brcm63xx/patches-4.4/550-MIPS-BCM63XX-remove-leds-and-buttons.patch20
-rw-r--r--target/linux/brcm63xx/patches-4.4/555-board_96318ref.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/556-board_96318ref_p300.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/557-board_bcm963269bhr.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/558-board_AR1004G.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/559-board_vw6339gu.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/560-board_963268gu_p300.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/561-board_WAP-5813n.patch11
-rw-r--r--target/linux/brcm63xx/patches-4.4/562-board_VR-3025u.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/563-board_VR-3025un.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/564-board_P870HW-51a_v2.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/565-board_hw520.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/566-board_A4001N.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/567-board_dsl-2751b_e1.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/568-board_DGND3700v1_3800B.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/569-board_homehub2a.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/570-board_HG655b.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/571-board_fast2704n.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/572-board_VR-3026e.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/573-board_R5010UNv2.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/574-board_HG622.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/575-board_EVG2000.patch6
-rw-r--r--target/linux/brcm63xx/patches-4.4/576-board_AV4202N.patch6
44 files changed, 136 insertions, 208 deletions
diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/nb6-ser-r0.dts
index d61c16ddae..78c17dd799 100644
--- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/nb6-ser-r0.dts
@@ -40,4 +40,12 @@
linux,code = <KEY_WPS_BUTTON>;
};
};
+
+ switch {
+ compatible = "realtek,rtl8367";
+ gpio-sda = <&gpio0 18 0>;
+ gpio-sck = <&gpio0 20 0>;
+
+ realtek,extif0 = <1 5 1 1 1 1 1 1 2>;
+ };
};
diff --git a/target/linux/brcm63xx/patches-4.4/302-extended-platform-devices.patch b/target/linux/brcm63xx/patches-4.4/302-extended-platform-devices.patch
deleted file mode 100644
index e519430545..0000000000
--- a/target/linux/brcm63xx/patches-4.4/302-extended-platform-devices.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_common.c
-+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -207,6 +207,9 @@ int __init board_register_devices(void)
-
- bcm63xx_hsspi_register();
-
-+ if (board.num_devs)
-+ platform_add_devices(board.devs, board.num_devs);
-+
- bcm63xx_flash_register();
-
- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -53,6 +53,10 @@ struct board_info {
-
- /* External PHY reset GPIO flags from gpio.h */
- unsigned long ephy_reset_gpio_flags;
-+
-+ /* Additional platform devices */
-+ struct platform_device **devs;
-+ unsigned int num_devs;
- };
-
- #endif /* ! BOARD_BCM963XX_H_ */
diff --git a/target/linux/brcm63xx/patches-4.4/303-spi-board-info.patch b/target/linux/brcm63xx/patches-4.4/303-spi-board-info.patch
index 77d82a46dc..667f9f399d 100644
--- a/target/linux/brcm63xx/patches-4.4/303-spi-board-info.patch
+++ b/target/linux/brcm63xx/patches-4.4/303-spi-board-info.patch
@@ -8,9 +8,9 @@
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
-@@ -210,6 +211,9 @@ int __init board_register_devices(void)
- if (board.num_devs)
- platform_add_devices(board.devs, board.num_devs);
+@@ -207,6 +208,9 @@ int __init board_register_devices(void)
+
+ bcm63xx_hsspi_register();
+ if (board.num_spis)
+ spi_register_board_info(board.spis, board.num_spis);
@@ -20,10 +20,10 @@
bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -57,6 +57,10 @@ struct board_info {
- /* Additional platform devices */
- struct platform_device **devs;
- unsigned int num_devs;
+@@ -53,6 +53,10 @@ struct board_info {
+
+ /* External PHY reset GPIO flags from gpio.h */
+ unsigned long ephy_reset_gpio_flags;
+
+ /* Additional platform devices */
+ struct spi_board_info *spis;
diff --git a/target/linux/brcm63xx/patches-4.4/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch b/target/linux/brcm63xx/patches-4.4/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch
index 9120b71182..cfa7d768b0 100644
--- a/target/linux/brcm63xx/patches-4.4/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch
+++ b/target/linux/brcm63xx/patches-4.4/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch
@@ -91,5 +91,5 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+ struct fallback_sprom_data fallback_sprom;
+
/* Additional platform devices */
- struct platform_device **devs;
- unsigned int num_devs;
+ struct spi_board_info *spis;
+ unsigned int num_spis;
diff --git a/target/linux/brcm63xx/patches-4.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch b/target/linux/brcm63xx/patches-4.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch
index 37327899ae..60e728c223 100644
--- a/target/linux/brcm63xx/patches-4.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch
+++ b/target/linux/brcm63xx/patches-4.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch
@@ -54,7 +54,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -250,3 +250,21 @@ int __init board_register_devices(void)
+@@ -247,3 +247,21 @@ int __init board_register_devices(void)
return 0;
}
diff --git a/target/linux/brcm63xx/patches-4.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch b/target/linux/brcm63xx/patches-4.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch
index 61a6056ed2..5bb18a440e 100644
--- a/target/linux/brcm63xx/patches-4.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch
+++ b/target/linux/brcm63xx/patches-4.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch
@@ -26,7 +26,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -258,9 +258,10 @@ int __init board_register_devices(void)
+@@ -255,9 +255,10 @@ int __init board_register_devices(void)
platform_device_register(&bcm63xx_gpio_leds);
diff --git a/target/linux/brcm63xx/patches-4.4/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-4.4/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
index 2d31f42836..b02ab44798 100644
--- a/target/linux/brcm63xx/patches-4.4/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
+++ b/target/linux/brcm63xx/patches-4.4/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
@@ -26,7 +26,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
#if CONFIG_OF
if (of_have_populated_dt()) {
-@@ -274,6 +276,10 @@ int __init board_register_devices(void)
+@@ -271,6 +273,10 @@ int __init board_register_devices(void)
board.ephy_reset_gpio_flags);
}
diff --git a/target/linux/brcm63xx/patches-4.4/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch b/target/linux/brcm63xx/patches-4.4/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
index a0b2bdc336..ccdcefd3e7 100644
--- a/target/linux/brcm63xx/patches-4.4/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
+++ b/target/linux/brcm63xx/patches-4.4/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
@@ -11,7 +11,7 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -264,7 +264,7 @@ int __init board_register_devices(void)
+@@ -261,7 +261,7 @@ int __init board_register_devices(void)
if (board.num_spis)
spi_register_board_info(board.spis, board.num_spis);
diff --git a/target/linux/brcm63xx/patches-4.4/420-BCM63XX-add-endian-check-for-ath9k.patch b/target/linux/brcm63xx/patches-4.4/420-BCM63XX-add-endian-check-for-ath9k.patch
index 6473c4d07f..9f1fcc336e 100644
--- a/target/linux/brcm63xx/patches-4.4/420-BCM63XX-add-endian-check-for-ath9k.patch
+++ b/target/linux/brcm63xx/patches-4.4/420-BCM63XX-add-endian-check-for-ath9k.patch
@@ -39,7 +39,7 @@
return;
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -278,7 +278,8 @@ int __init board_register_devices(void)
+@@ -275,7 +275,8 @@ int __init board_register_devices(void)
/* register any fixups */
for (i = 0; i < board.has_caldata; i++)
diff --git a/target/linux/brcm63xx/patches-4.4/421-BCM63XX-add-led-pin-for-ath9k.patch b/target/linux/brcm63xx/patches-4.4/421-BCM63XX-add-led-pin-for-ath9k.patch
index d3d16a1c31..d8dbcbe2a1 100644
--- a/target/linux/brcm63xx/patches-4.4/421-BCM63XX-add-led-pin-for-ath9k.patch
+++ b/target/linux/brcm63xx/patches-4.4/421-BCM63XX-add-led-pin-for-ath9k.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -279,7 +279,7 @@ int __init board_register_devices(void)
+@@ -276,7 +276,7 @@ int __init board_register_devices(void)
/* register any fixups */
for (i = 0; i < board.has_caldata; i++)
pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset,
diff --git a/target/linux/brcm63xx/patches-4.4/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch b/target/linux/brcm63xx/patches-4.4/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
index 2d4bb405b2..46ac60829f 100644
--- a/target/linux/brcm63xx/patches-4.4/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
+++ b/target/linux/brcm63xx/patches-4.4/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
@@ -36,7 +36,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
#include "board_common.h"
-@@ -277,9 +278,19 @@ int __init board_register_devices(void)
+@@ -274,9 +275,19 @@ int __init board_register_devices(void)
}
/* register any fixups */
diff --git a/target/linux/brcm63xx/patches-4.4/528-board_nb6.patch b/target/linux/brcm63xx/patches-4.4/528-board_nb6.patch
index 0f235093c3..5f1d47a150 100644
--- a/target/linux/brcm63xx/patches-4.4/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-4.4/528-board_nb6.patch
@@ -1,61 +1,10 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -12,6 +12,8 @@
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/string.h>
-+#include <linux/platform_device.h>
-+#include <linux/rtl8367.h>
- #include <asm/addrspace.h>
- #include <bcm63xx_board.h>
- #include <bcm63xx_cpu.h>
-@@ -27,6 +29,9 @@
-
- #define HCS_OFFSET_128K 0x20000
-
-+#define NB6_GPIO_RTL8367_SDA 18
-+#define NB6_GPIO_RTL8367_SCK 20
-+
- /*
- * known 3368 boards
- */
-@@ -1315,6 +1320,69 @@ static struct board_info __initdata boar
+@@ -1315,6 +1315,34 @@ static struct board_info __initdata boar
};
#endif /* CONFIG_BCM63XX_CPU_6358 */
+#ifdef CONFIG_BCM63XX_CPU_6362
-+static struct rtl8367_extif_config nb6_rtl8367_extif0_cfg = {
-+ .mode = RTL8367_EXTIF_MODE_RGMII,
-+ .txdelay = 1,
-+ .rxdelay = 5,
-+ .ability = {
-+ .force_mode = 1,
-+ .txpause = 1,
-+ .rxpause = 1,
-+ .link = 1,
-+ .duplex = 1,
-+ .speed = RTL8367_PORT_SPEED_1000,
-+ },
-+};
-+
-+static struct rtl8367_platform_data nb6_rtl8367_data = {
-+ .gpio_sda = NB6_GPIO_RTL8367_SDA,
-+ .gpio_sck = NB6_GPIO_RTL8367_SCK,
-+ .extif0_cfg = &nb6_rtl8367_extif0_cfg,
-+};
-+
-+static struct platform_device nb6_rtl8367_device = {
-+ .name = RTL8367_DRIVER_NAME,
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &nb6_rtl8367_data,
-+ }
-+};
-+
-+static struct platform_device * __initdata nb6_devices[] = {
-+ &nb6_rtl8367_device,
-+};
-+
+static struct board_info __initdata board_nb6 = {
+ .name = "NB6",
+ .expected_cpu_id = 0x6362,
@@ -80,16 +29,13 @@
+ },
+ },
+ },
-+
-+ .devs = nb6_devices,
-+ .num_devs = ARRAY_SIZE(nb6_devices),
+};
+#endif /* CONFIG_BCM63XX_CPU_6362 */
+
/*
* known 6368 boards
*/
-@@ -1466,6 +1534,10 @@ static const struct board_info __initcon
+@@ -1466,6 +1494,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
@@ -100,7 +46,7 @@
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -1534,6 +1606,9 @@ static struct of_device_id const bcm963x
+@@ -1534,6 +1566,9 @@ static struct of_device_id const bcm963x
{ .compatible = "t-com,spw303v", .data = &board_spw303v, },
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif
diff --git a/target/linux/brcm63xx/patches-4.4/529-board_fast2604.patch b/target/linux/brcm63xx/patches-4.4/529-board_fast2604.patch
index 480929c642..f5342567fd 100644
--- a/target/linux/brcm63xx/patches-4.4/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-4.4/529-board_fast2604.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -765,6 +765,23 @@ static struct board_info __initdata boar
+@@ -760,6 +760,23 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
@@ -24,7 +24,7 @@
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -1505,6 +1522,7 @@ static const struct board_info __initcon
+@@ -1465,6 +1482,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,
@@ -32,7 +32,7 @@
&board_DV201AMR,
&board_96348gw_a,
&board_rta1025w_16,
-@@ -1580,6 +1598,7 @@ static struct of_device_id const bcm963x
+@@ -1540,6 +1558,7 @@ static struct of_device_id const bcm963x
{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
{ .compatible = "netgear,dg834g-v4", .data = &board_96348W3, },
{ .compatible = "sagem,f@st2404", .data = &board_FAST2404, },
diff --git a/target/linux/brcm63xx/patches-4.4/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-4.4/530-board_A4001N1.patch
index 44962b212a..3366875e4f 100644
--- a/target/linux/brcm63xx/patches-4.4/530-board_A4001N1.patch
+++ b/target/linux/brcm63xx/patches-4.4/530-board_A4001N1.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -174,6 +174,50 @@ static struct board_info __initdata boar
+@@ -169,6 +169,50 @@ static struct board_info __initdata boar
},
};
@@ -51,7 +51,7 @@
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
-@@ -1503,6 +1547,7 @@ static const struct board_info __initcon
+@@ -1463,6 +1507,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
@@ -59,7 +59,7 @@
&board_dsl_274xb_f1,
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1568,6 +1613,7 @@ static struct of_device_id const bcm963x
+@@ -1528,6 +1573,7 @@ static struct of_device_id const bcm963x
{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
diff --git a/target/linux/brcm63xx/patches-4.4/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-4.4/531-board_AR-5387un.patch
index fb69b6b197..650db33e9e 100644
--- a/target/linux/brcm63xx/patches-4.4/531-board_AR-5387un.patch
+++ b/target/linux/brcm63xx/patches-4.4/531-board_AR-5387un.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -139,6 +139,79 @@ static struct board_info __initdata boar
+@@ -134,6 +134,79 @@ static struct board_info __initdata boar
},
};
@@ -80,7 +80,7 @@
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
-@@ -1546,6 +1619,7 @@ static const struct board_info __initcon
+@@ -1506,6 +1579,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
@@ -88,7 +88,7 @@
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
-@@ -1616,6 +1690,7 @@ static struct of_device_id const bcm963x
+@@ -1576,6 +1650,7 @@ static struct of_device_id const bcm963x
{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
{ .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
diff --git a/target/linux/brcm63xx/patches-4.4/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-4.4/532-board_AR-5381u.patch
index 1bd8521719..f9062fe58d 100644
--- a/target/linux/brcm63xx/patches-4.4/532-board_AR-5381u.patch
+++ b/target/linux/brcm63xx/patches-4.4/532-board_AR-5381u.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -139,6 +139,61 @@ static struct board_info __initdata boar
+@@ -134,6 +134,61 @@ static struct board_info __initdata boar
},
};
@@ -62,7 +62,7 @@
static struct sprom_fixup __initdata ar5387un_fixups[] = {
{ .offset = 2, .value = 0x05bb },
{ .offset = 65, .value = 0x1204 },
-@@ -1619,6 +1674,7 @@ static const struct board_info __initcon
+@@ -1579,6 +1634,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
@@ -70,7 +70,7 @@
&board_AR5387un,
&board_963281TAN,
&board_A4001N1,
-@@ -1690,6 +1746,7 @@ static struct of_device_id const bcm963x
+@@ -1650,6 +1706,7 @@ static struct of_device_id const bcm963x
{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
{ .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
diff --git a/target/linux/brcm63xx/patches-4.4/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-4.4/533-board_rta770bw.patch
index 0b8dbb7bb1..c7f9b50345 100644
--- a/target/linux/brcm63xx/patches-4.4/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-4.4/533-board_rta770bw.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -525,6 +525,22 @@ static struct board_info __initdata boar
+@@ -520,6 +520,22 @@ static struct board_info __initdata boar
.has_uart0 = 1,
};
@@ -23,7 +23,7 @@
#endif /* CONFIG_BCM63XX_CPU_6345 */
/*
-@@ -1688,6 +1704,7 @@ static const struct board_info __initcon
+@@ -1648,6 +1664,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
@@ -31,7 +31,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
-@@ -1758,6 +1775,7 @@ static struct of_device_id const bcm963x
+@@ -1718,6 +1735,7 @@ static struct of_device_id const bcm963x
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
diff --git a/target/linux/brcm63xx/patches-4.4/534-board_hw556.patch b/target/linux/brcm63xx/patches-4.4/534-board_hw556.patch
index 01d99d84b6..3da90f36be 100644
--- a/target/linux/brcm63xx/patches-4.4/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-4.4/534-board_hw556.patch
@@ -5,10 +5,10 @@
#include <linux/kernel.h>
#include <linux/string.h>
+#include <linux/pci_ids.h>
- #include <linux/platform_device.h>
- #include <linux/rtl8367.h>
#include <asm/addrspace.h>
-@@ -1479,6 +1480,95 @@ static struct board_info __initdata boar
+ #include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+@@ -1474,6 +1475,95 @@ static struct board_info __initdata boar
},
};
@@ -104,7 +104,7 @@
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -1740,6 +1830,9 @@ static const struct board_info __initcon
+@@ -1700,6 +1790,9 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_ct6373_1,
&board_HW553,
@@ -114,7 +114,7 @@
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -1812,6 +1905,9 @@ static struct of_device_id const bcm963x
+@@ -1772,6 +1865,9 @@ static struct of_device_id const bcm963x
{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
{ .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, },
{ .compatible = "huawei,hg553", .data = &board_HW553, },
diff --git a/target/linux/brcm63xx/patches-4.4/535-board_rta770w.patch b/target/linux/brcm63xx/patches-4.4/535-board_rta770w.patch
index 724c496aca..8088cda1af 100644
--- a/target/linux/brcm63xx/patches-4.4/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-4.4/535-board_rta770w.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -542,6 +542,27 @@ static struct board_info __initdata boar
+@@ -537,6 +537,27 @@ static struct board_info __initdata boar
.force_duplex_full = 1,
},
};
@@ -28,7 +28,7 @@
#endif /* CONFIG_BCM63XX_CPU_6345 */
/*
-@@ -1795,6 +1816,7 @@ static const struct board_info __initcon
+@@ -1755,6 +1776,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,
@@ -36,7 +36,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
-@@ -1869,6 +1891,7 @@ static struct of_device_id const bcm963x
+@@ -1829,6 +1851,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6345
{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
{ .compatible = "dynalink,rta770bw", .data = &board_rta770bw, },
diff --git a/target/linux/brcm63xx/patches-4.4/536-board_fast2704.patch b/target/linux/brcm63xx/patches-4.4/536-board_fast2704.patch
index a6631afb16..1b7eb1c35e 100644
--- a/target/linux/brcm63xx/patches-4.4/536-board_fast2704.patch
+++ b/target/linux/brcm63xx/patches-4.4/536-board_fast2704.patch
@@ -12,7 +12,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -392,6 +392,44 @@ static struct board_info __initdata boar
+@@ -387,6 +387,44 @@ static struct board_info __initdata boar
},
},
};
@@ -57,7 +57,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -1806,6 +1844,7 @@ static const struct board_info __initcon
+@@ -1766,6 +1804,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
@@ -65,7 +65,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -1881,6 +1920,7 @@ static struct of_device_id const bcm963x
+@@ -1841,6 +1880,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
{ .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },
diff --git a/target/linux/brcm63xx/patches-4.4/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-4.4/537-board_fast2504n.patch
index f3cf9ed33b..c77fa1787a 100644
--- a/target/linux/brcm63xx/patches-4.4/537-board_fast2504n.patch
+++ b/target/linux/brcm63xx/patches-4.4/537-board_fast2504n.patch
@@ -6,9 +6,9 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1735,6 +1735,43 @@ static struct board_info __initdata boar
- .devs = nb6_devices,
- .num_devs = ARRAY_SIZE(nb6_devices),
+@@ -1695,6 +1695,43 @@ static struct board_info __initdata boar
+ },
+ },
};
+
+static struct board_info __initdata board_fast2504n = {
@@ -50,7 +50,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
#endif /* CONFIG_BCM63XX_CPU_6362 */
/*
-@@ -1900,6 +1937,7 @@ static const struct board_info __initcon
+@@ -1860,6 +1897,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
@@ -58,7 +58,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1981,6 +2019,7 @@ static struct of_device_id const bcm963x
+@@ -1941,6 +1979,7 @@ static struct of_device_id const bcm963x
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6362
diff --git a/target/linux/brcm63xx/patches-4.4/550-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/brcm63xx/patches-4.4/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
index 35083af653..d4b14b4c31 100644
--- a/target/linux/brcm63xx/patches-4.4/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
+++ b/target/linux/brcm63xx/patches-4.4/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -52,14 +52,6 @@ static struct board_info __initdata boar
+@@ -47,14 +47,6 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
@@ -24,7 +24,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
.ephy_reset_gpio = 36,
.ephy_reset_gpio_flags = GPIO_ACTIVE_LOW,
};
-@@ -83,35 +75,6 @@ static struct board_info __initdata boar
+@@ -78,35 +70,6 @@ static struct board_info __initdata boar
.port_no = 0,
},
@@ -60,7 +60,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
.has_enetsw = 1,
.enetsw = {
-@@ -450,35 +413,6 @@ static struct board_info __initdata boar
+@@ -445,35 +408,6 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,
@@ -96,7 +96,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
};
static struct board_info __initdata board_96338w = {
-@@ -493,35 +427,6 @@ static struct board_info __initdata boar
+@@ -488,35 +422,6 @@ static struct board_info __initdata boar
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -132,7 +132,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
};
static struct board_info __initdata board_96338w2_e7t = {
-@@ -620,36 +525,6 @@ static struct board_info __initdata boar
+@@ -615,36 +520,6 @@ static struct board_info __initdata boar
.has_phy = 1,
.use_internal_phy = 1,
},
@@ -169,7 +169,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
};
static struct board_info __initdata board_96348gw_10 = {
-@@ -684,35 +559,6 @@ static struct board_info __initdata boar
+@@ -679,35 +554,6 @@ static struct board_info __initdata boar
.cs = 2,
.ext_irq = 2,
},
@@ -205,7 +205,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
};
static struct board_info __initdata board_96348gw_11 = {
-@@ -741,35 +587,6 @@ static struct board_info __initdata boar
+@@ -736,35 +582,6 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_pccard = 1,
.has_ehci0 = 1,
@@ -241,7 +241,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
};
-@@ -895,35 +712,6 @@ static struct board_info __initdata boar
+@@ -890,35 +707,6 @@ static struct board_info __initdata boar
.ext_irq = 2,
.cs = 2,
},
@@ -277,7 +277,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
};
static struct board_info __initdata board_gw6200 = {
-@@ -1260,33 +1048,6 @@ static struct board_info __initdata boar
+@@ -1255,33 +1043,6 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_pccard = 1,
.has_ehci0 = 1,
@@ -311,7 +311,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
};
static struct board_info __initdata board_96358vw2 = {
-@@ -1316,29 +1077,6 @@ static struct board_info __initdata boar
+@@ -1311,29 +1072,6 @@ static struct board_info __initdata boar
.has_pccard = 1,
.has_ehci0 = 1,
.num_usbh_ports = 2,
diff --git a/target/linux/brcm63xx/patches-4.4/555-board_96318ref.patch b/target/linux/brcm63xx/patches-4.4/555-board_96318ref.patch
index 64617733d0..d68b3c5f4c 100644
--- a/target/linux/brcm63xx/patches-4.4/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-4.4/555-board_96318ref.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -58,6 +58,56 @@ static struct board_info __initdata boar
+@@ -53,6 +53,56 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_3368 */
/*
@@ -57,7 +57,7 @@
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1612,6 +1662,9 @@ static const struct board_info __initcon
+@@ -1572,6 +1622,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
@@ -67,7 +67,7 @@
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_AR5381u,
-@@ -1689,6 +1742,9 @@ static struct of_device_id const bcm963x
+@@ -1649,6 +1702,9 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_3368
{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
#endif
diff --git a/target/linux/brcm63xx/patches-4.4/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-4.4/556-board_96318ref_p300.patch
index de3ec0504b..b17c9d5f5c 100644
--- a/target/linux/brcm63xx/patches-4.4/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-4.4/556-board_96318ref_p300.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -105,6 +105,51 @@ static struct board_info __initdata boar
+@@ -100,6 +100,51 @@ static struct board_info __initdata boar
},
},
};
@@ -52,7 +52,7 @@
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -1664,6 +1709,7 @@ static const struct board_info __initcon
+@@ -1624,6 +1669,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
@@ -60,7 +60,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -1744,6 +1790,7 @@ static struct of_device_id const bcm963x
+@@ -1704,6 +1750,7 @@ static struct of_device_id const bcm963x
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
diff --git a/target/linux/brcm63xx/patches-4.4/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-4.4/557-board_bcm963269bhr.patch
index c82fb86d8b..d6fc6a9c71 100644
--- a/target/linux/brcm63xx/patches-4.4/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-4.4/557-board_bcm963269bhr.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1701,6 +1701,52 @@ static struct board_info __initdata boar
+@@ -1661,6 +1661,52 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
@@ -53,7 +53,7 @@
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1781,6 +1827,9 @@ static const struct board_info __initcon
+@@ -1741,6 +1787,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
@@ -63,7 +63,7 @@
};
static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1868,6 +1917,7 @@ static struct of_device_id const bcm963x
+@@ -1828,6 +1877,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/brcm63xx/patches-4.4/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-4.4/558-board_AR1004G.patch
index 6eb7087462..774509b0c4 100644
--- a/target/linux/brcm63xx/patches-4.4/558-board_AR1004G.patch
+++ b/target/linux/brcm63xx/patches-4.4/558-board_AR1004G.patch
@@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -684,6 +684,22 @@ static struct board_info __initdata boar
+@@ -679,6 +679,22 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
@@ -31,7 +31,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
/* BT Voyager 2110 */
static struct board_info __initdata board_V2110 = {
-@@ -1798,6 +1814,7 @@ static const struct board_info __initcon
+@@ -1758,6 +1774,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,
@@ -39,7 +39,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1862,6 +1879,7 @@ static struct of_device_id const bcm963x
+@@ -1822,6 +1839,7 @@ static struct of_device_id const bcm963x
{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
diff --git a/target/linux/brcm63xx/patches-4.4/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-4.4/559-board_vw6339gu.patch
index fc6e96854a..601aea0d37 100644
--- a/target/linux/brcm63xx/patches-4.4/559-board_vw6339gu.patch
+++ b/target/linux/brcm63xx/patches-4.4/559-board_vw6339gu.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1760,6 +1760,53 @@ static struct board_info __initdata boar
+@@ -1720,6 +1720,53 @@ static struct board_info __initdata boar
},
},
};
@@ -54,7 +54,7 @@
#endif /* CONFIG_BCM63XX_CPU_63268 */
/*
-@@ -1846,6 +1893,7 @@ static const struct board_info __initcon
+@@ -1806,6 +1853,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
@@ -62,7 +62,7 @@
#endif
};
-@@ -1936,6 +1984,7 @@ static struct of_device_id const bcm963x
+@@ -1896,6 +1944,7 @@ static struct of_device_id const bcm963x
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
diff --git a/target/linux/brcm63xx/patches-4.4/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-4.4/560-board_963268gu_p300.patch
index cbe1197da0..a3b12b25c5 100644
--- a/target/linux/brcm63xx/patches-4.4/560-board_963268gu_p300.patch
+++ b/target/linux/brcm63xx/patches-4.4/560-board_963268gu_p300.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1720,6 +1720,66 @@ static struct board_info __initdata boar
+@@ -1680,6 +1680,66 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
@@ -67,7 +67,7 @@
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
-@@ -1892,6 +1952,7 @@ static const struct board_info __initcon
+@@ -1852,6 +1912,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
@@ -75,7 +75,7 @@
&board_963269bhr,
&board_vw6339gu,
#endif
-@@ -1983,6 +2044,7 @@ static struct of_device_id const bcm963x
+@@ -1943,6 +2004,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/brcm63xx/patches-4.4/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-4.4/561-board_WAP-5813n.patch
index 637f878b26..5e7402a3cc 100644
--- a/target/linux/brcm63xx/patches-4.4/561-board_WAP-5813n.patch
+++ b/target/linux/brcm63xx/patches-4.4/561-board_WAP-5813n.patch
@@ -1,16 +1,15 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -14,7 +14,9 @@
+@@ -13,6 +13,8 @@
+ #include <linux/kernel.h>
#include <linux/string.h>
#include <linux/pci_ids.h>
- #include <linux/platform_device.h>
+#include <linux/platform_data/b53.h>
- #include <linux/rtl8367.h>
+#include <linux/spi/spi.h>
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
-@@ -1714,6 +1716,65 @@ static struct board_info __initdata boar
+@@ -1674,6 +1676,65 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@@ -76,7 +75,7 @@
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
-@@ -1950,6 +2011,7 @@ static const struct board_info __initcon
+@@ -1910,6 +1971,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
@@ -84,7 +83,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963268bu_p300,
-@@ -2042,6 +2104,7 @@ static struct of_device_id const bcm963x
+@@ -2002,6 +2064,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6368
{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
diff --git a/target/linux/brcm63xx/patches-4.4/562-board_VR-3025u.patch b/target/linux/brcm63xx/patches-4.4/562-board_VR-3025u.patch
index b19f8da7cf..5e33598fc5 100644
--- a/target/linux/brcm63xx/patches-4.4/562-board_VR-3025u.patch
+++ b/target/linux/brcm63xx/patches-4.4/562-board_VR-3025u.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1717,6 +1717,60 @@ static struct board_info __initdata boar
+@@ -1677,6 +1677,60 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
@@ -61,7 +61,7 @@
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
-@@ -2011,6 +2065,7 @@ static const struct board_info __initcon
+@@ -1971,6 +2025,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
@@ -69,7 +69,7 @@
&board_WAP5813n,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2104,6 +2159,7 @@ static struct of_device_id const bcm963x
+@@ -2064,6 +2119,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6368
{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
diff --git a/target/linux/brcm63xx/patches-4.4/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-4.4/563-board_VR-3025un.patch
index 48270d907d..a0dd3685cb 100644
--- a/target/linux/brcm63xx/patches-4.4/563-board_VR-3025un.patch
+++ b/target/linux/brcm63xx/patches-4.4/563-board_VR-3025un.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1771,6 +1771,60 @@ static struct board_info __initdata boar
+@@ -1731,6 +1731,60 @@ static struct board_info __initdata boar
},
};
@@ -61,7 +61,7 @@
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
-@@ -2066,6 +2120,7 @@ static const struct board_info __initcon
+@@ -2026,6 +2080,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_VR3025u,
@@ -69,7 +69,7 @@
&board_WAP5813n,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2160,6 +2215,7 @@ static struct of_device_id const bcm963x
+@@ -2120,6 +2175,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
diff --git a/target/linux/brcm63xx/patches-4.4/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-4.4/564-board_P870HW-51a_v2.patch
index 08fcde608a..ce24b6c10b 100644
--- a/target/linux/brcm63xx/patches-4.4/564-board_P870HW-51a_v2.patch
+++ b/target/linux/brcm63xx/patches-4.4/564-board_P870HW-51a_v2.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1726,6 +1726,49 @@ static struct sprom_fixup __initdata vr3
+@@ -1686,6 +1686,49 @@ static struct sprom_fixup __initdata vr3
{ .offset = 115, .value = 0xfad9 },
};
@@ -50,7 +50,7 @@
static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N",
.expected_cpu_id = 0x6368,
-@@ -2119,6 +2162,7 @@ static const struct board_info __initcon
+@@ -2079,6 +2122,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
@@ -58,7 +58,7 @@
&board_VR3025u,
&board_VR3025un,
&board_WAP5813n,
-@@ -2217,6 +2261,7 @@ static struct of_device_id const bcm963x
+@@ -2177,6 +2221,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
diff --git a/target/linux/brcm63xx/patches-4.4/565-board_hw520.patch b/target/linux/brcm63xx/patches-4.4/565-board_hw520.patch
index a613276549..71ba896aaa 100644
--- a/target/linux/brcm63xx/patches-4.4/565-board_hw520.patch
+++ b/target/linux/brcm63xx/patches-4.4/565-board_hw520.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1362,6 +1362,37 @@ static struct board_info __initdata boar
+@@ -1357,6 +1357,37 @@ static struct board_info __initdata boar
},
};
@@ -38,7 +38,7 @@
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2146,6 +2177,7 @@ static const struct board_info __initcon
+@@ -2106,6 +2137,7 @@ static const struct board_info __initcon
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
&board_ct6373_1,
@@ -46,7 +46,7 @@
&board_HW553,
&board_HW556_A,
&board_HW556_B,
-@@ -2238,6 +2270,7 @@ static struct of_device_id const bcm963x
+@@ -2198,6 +2230,7 @@ static struct of_device_id const bcm963x
{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
{ .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, },
diff --git a/target/linux/brcm63xx/patches-4.4/566-board_A4001N.patch b/target/linux/brcm63xx/patches-4.4/566-board_A4001N.patch
index 3cd2e08634..6313cbb758 100644
--- a/target/linux/brcm63xx/patches-4.4/566-board_A4001N.patch
+++ b/target/linux/brcm63xx/patches-4.4/566-board_A4001N.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -363,6 +363,50 @@ static struct board_info __initdata boar
+@@ -358,6 +358,50 @@ static struct board_info __initdata boar
},
};
@@ -51,7 +51,7 @@
static struct board_info __initdata board_A4001N1 = {
.name = "963281T_TEF",
.expected_cpu_id = 0x6328,
-@@ -2128,6 +2172,7 @@ static const struct board_info __initcon
+@@ -2088,6 +2132,7 @@ static const struct board_info __initcon
&board_AR5381u,
&board_AR5387un,
&board_963281TAN,
@@ -59,7 +59,7 @@
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
-@@ -2216,6 +2261,7 @@ static struct of_device_id const bcm963x
+@@ -2176,6 +2221,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
diff --git a/target/linux/brcm63xx/patches-4.4/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-4.4/567-board_dsl-2751b_e1.patch
index 989ffae377..05c2fd4a9a 100644
--- a/target/linux/brcm63xx/patches-4.4/567-board_dsl-2751b_e1.patch
+++ b/target/linux/brcm63xx/patches-4.4/567-board_dsl-2751b_e1.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -152,6 +152,75 @@ static struct board_info __initdata boar
+@@ -147,6 +147,75 @@ static struct board_info __initdata boar
},
},
};
@@ -76,7 +76,7 @@
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -2166,6 +2235,7 @@ static const struct board_info __initcon
+@@ -2126,6 +2195,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
&board_96318ref_p300,
@@ -84,7 +84,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -2259,6 +2329,7 @@ static struct of_device_id const bcm963x
+@@ -2219,6 +2289,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6318
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
diff --git a/target/linux/brcm63xx/patches-4.4/568-board_DGND3700v1_3800B.patch b/target/linux/brcm63xx/patches-4.4/568-board_DGND3700v1_3800B.patch
index 157d15f3e6..866ea88e03 100644
--- a/target/linux/brcm63xx/patches-4.4/568-board_DGND3700v1_3800B.patch
+++ b/target/linux/brcm63xx/patches-4.4/568-board_DGND3700v1_3800B.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1861,6 +1861,48 @@ static struct board_info __initdata boar
+@@ -1821,6 +1821,48 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
@@ -49,7 +49,7 @@
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2309,6 +2351,7 @@ static const struct board_info __initcon
+@@ -2269,6 +2311,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
@@ -57,7 +57,7 @@
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
-@@ -2411,6 +2454,7 @@ static struct of_device_id const bcm963x
+@@ -2371,6 +2414,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
diff --git a/target/linux/brcm63xx/patches-4.4/569-board_homehub2a.patch b/target/linux/brcm63xx/patches-4.4/569-board_homehub2a.patch
index 98f2e13695..b51d6b07af 100644
--- a/target/linux/brcm63xx/patches-4.4/569-board_homehub2a.patch
+++ b/target/linux/brcm63xx/patches-4.4/569-board_homehub2a.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1475,6 +1475,32 @@ static struct board_info __initdata boar
+@@ -1470,6 +1470,32 @@ static struct board_info __initdata boar
},
};
@@ -33,7 +33,7 @@
static struct board_info __initdata board_HW520 = {
.name = "HW6358GW_B",
.expected_cpu_id = 0x6358,
-@@ -2334,6 +2360,7 @@ static const struct board_info __initcon
+@@ -2294,6 +2320,7 @@ static const struct board_info __initcon
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
&board_ct6373_1,
@@ -41,7 +41,7 @@
&board_HW520,
&board_HW553,
&board_HW556_A,
-@@ -2443,6 +2470,7 @@ static struct of_device_id const bcm963x
+@@ -2403,6 +2430,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
{ .compatible = "t-com,spw303v", .data = &board_spw303v, },
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
diff --git a/target/linux/brcm63xx/patches-4.4/570-board_HG655b.patch b/target/linux/brcm63xx/patches-4.4/570-board_HG655b.patch
index 2e3ef419f0..1a0aaaaeba 100644
--- a/target/linux/brcm63xx/patches-4.4/570-board_HG655b.patch
+++ b/target/linux/brcm63xx/patches-4.4/570-board_HG655b.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1929,6 +1929,53 @@ static struct board_info __initdata boar
+@@ -1889,6 +1889,53 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(DGND3700v1_3800B_spi_devices),
};
@@ -54,7 +54,7 @@
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2379,6 +2426,7 @@ static const struct board_info __initcon
+@@ -2339,6 +2386,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
@@ -62,7 +62,7 @@
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
-@@ -2482,6 +2530,7 @@ static struct of_device_id const bcm963x
+@@ -2442,6 +2490,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
diff --git a/target/linux/brcm63xx/patches-4.4/571-board_fast2704n.patch b/target/linux/brcm63xx/patches-4.4/571-board_fast2704n.patch
index 5b398c9a0c..249933acdb 100644
--- a/target/linux/brcm63xx/patches-4.4/571-board_fast2704n.patch
+++ b/target/linux/brcm63xx/patches-4.4/571-board_fast2704n.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -221,6 +221,46 @@ static struct board_info __initdata boar
+@@ -216,6 +216,46 @@ static struct board_info __initdata boar
.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
},
};
@@ -47,7 +47,7 @@
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -2351,6 +2391,7 @@ static const struct board_info __initcon
+@@ -2311,6 +2351,7 @@ static const struct board_info __initcon
&board_96318ref,
&board_96318ref_p300,
&board_dsl_2751b_d1,
@@ -55,7 +55,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -2448,6 +2489,7 @@ static struct of_device_id const bcm963x
+@@ -2408,6 +2449,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
{ .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, },
diff --git a/target/linux/brcm63xx/patches-4.4/572-board_VR-3026e.patch b/target/linux/brcm63xx/patches-4.4/572-board_VR-3026e.patch
index a51768c152..832728f094 100644
--- a/target/linux/brcm63xx/patches-4.4/572-board_VR-3026e.patch
+++ b/target/linux/brcm63xx/patches-4.4/572-board_VR-3026e.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2167,6 +2167,60 @@ static struct board_info __initdata boar
+@@ -2127,6 +2127,60 @@ static struct board_info __initdata boar
},
};
@@ -61,7 +61,7 @@
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
-@@ -2471,6 +2525,7 @@ static const struct board_info __initcon
+@@ -2431,6 +2485,7 @@ static const struct board_info __initcon
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
@@ -69,7 +69,7 @@
&board_WAP5813n,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2571,6 +2626,7 @@ static struct of_device_id const bcm963x
+@@ -2531,6 +2586,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
diff --git a/target/linux/brcm63xx/patches-4.4/573-board_R5010UNv2.patch b/target/linux/brcm63xx/patches-4.4/573-board_R5010UNv2.patch
index 58fec6580c..a148bb12b4 100644
--- a/target/linux/brcm63xx/patches-4.4/573-board_R5010UNv2.patch
+++ b/target/linux/brcm63xx/patches-4.4/573-board_R5010UNv2.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -643,6 +643,51 @@ static struct board_info __initdata boar
+@@ -638,6 +638,51 @@ static struct board_info __initdata boar
},
},
};
@@ -52,7 +52,7 @@
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -2456,6 +2501,7 @@ static const struct board_info __initcon
+@@ -2416,6 +2461,7 @@ static const struct board_info __initcon
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
@@ -60,7 +60,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -2554,6 +2600,7 @@ static struct of_device_id const bcm963x
+@@ -2514,6 +2560,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
{ .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },
diff --git a/target/linux/brcm63xx/patches-4.4/574-board_HG622.patch b/target/linux/brcm63xx/patches-4.4/574-board_HG622.patch
index badbe7fc21..837226fd38 100644
--- a/target/linux/brcm63xx/patches-4.4/574-board_HG622.patch
+++ b/target/linux/brcm63xx/patches-4.4/574-board_HG622.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2061,6 +2061,53 @@ static struct board_info __initdata boar
+@@ -2021,6 +2021,53 @@ static struct board_info __initdata boar
},
};
@@ -54,7 +54,7 @@
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2567,6 +2614,7 @@ static const struct board_info __initcon
+@@ -2527,6 +2574,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
@@ -62,7 +62,7 @@
&board_HG655b,
&board_P870HW51A_V2,
&board_VR3025u,
-@@ -2675,6 +2723,7 @@ static struct of_device_id const bcm963x
+@@ -2635,6 +2683,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
diff --git a/target/linux/brcm63xx/patches-4.4/575-board_EVG2000.patch b/target/linux/brcm63xx/patches-4.4/575-board_EVG2000.patch
index 361bd04d43..f5f75c80df 100644
--- a/target/linux/brcm63xx/patches-4.4/575-board_EVG2000.patch
+++ b/target/linux/brcm63xx/patches-4.4/575-board_EVG2000.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2014,6 +2014,43 @@ static struct board_info __initdata boar
+@@ -1974,6 +1974,43 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(DGND3700v1_3800B_spi_devices),
};
@@ -44,7 +44,7 @@
static struct board_info __initdata board_HG655b = {
.name = "HW65x",
.expected_cpu_id = 0x6368,
-@@ -2614,6 +2651,7 @@ static const struct board_info __initcon
+@@ -2574,6 +2611,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
@@ -52,7 +52,7 @@
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
-@@ -2726,6 +2764,7 @@ static struct of_device_id const bcm963x
+@@ -2686,6 +2724,7 @@ static struct of_device_id const bcm963x
{ .compatible = "huawei,hg622", .data = &board_HG622, },
{ .compatible = "huawei,hg655b", .data = &board_HG655b, },
{ .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, },
diff --git a/target/linux/brcm63xx/patches-4.4/576-board_AV4202N.patch b/target/linux/brcm63xx/patches-4.4/576-board_AV4202N.patch
index 814b2894c6..be91cd7332 100644
--- a/target/linux/brcm63xx/patches-4.4/576-board_AV4202N.patch
+++ b/target/linux/brcm63xx/patches-4.4/576-board_AV4202N.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1884,6 +1884,52 @@ static struct board_info __initdata boar
+@@ -1844,6 +1844,52 @@ static struct board_info __initdata boar
* known 6368 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6368
@@ -53,7 +53,7 @@
static struct board_info __initdata board_96368mvwg = {
.name = "96368MVWG",
.expected_cpu_id = 0x6368,
-@@ -2648,6 +2694,7 @@ static const struct board_info __initcon
+@@ -2608,6 +2654,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
@@ -61,7 +61,7 @@
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
-@@ -2755,6 +2802,7 @@ static struct of_device_id const bcm963x
+@@ -2715,6 +2762,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6368