aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2020-08-07 10:30:07 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2020-08-07 10:34:31 +0200
commit0c109df7f02723b3cc59700ef15c1d19e0bcd0f0 (patch)
treee0d7b13feb14ba748da32e06f07aa4c367c5a0a3 /target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
parenteddf8636504466c7e43497a1a59e4bc59dfdb8a7 (diff)
downloadupstream-0c109df7f02723b3cc59700ef15c1d19e0bcd0f0.tar.gz
upstream-0c109df7f02723b3cc59700ef15c1d19e0bcd0f0.tar.bz2
upstream-0c109df7f02723b3cc59700ef15c1d19e0bcd0f0.zip
bcm63xx: merge RTA770BW and RTA770W board patches
The only difference between both boards is the DSL annex. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch')
-rw-r--r--target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
index ae1a748ae7..570ace245c 100644
--- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
+++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2023,6 +2023,29 @@ static struct board_info __initdata boar
+@@ -2005,6 +2005,29 @@ static struct board_info __initdata boar
},
};
@@ -30,7 +30,7 @@
static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N",
.expected_cpu_id = 0x6368,
-@@ -2546,6 +2569,7 @@ static const struct board_info __initcon
+@@ -2527,6 +2550,7 @@ static const struct board_info __initcon
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
@@ -38,7 +38,7 @@
&board_VH4032N,
&board_VR3025u,
&board_VR3025un,
-@@ -2647,6 +2671,7 @@ static struct of_device_id const bcm963x
+@@ -2628,6 +2652,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6368