aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-17 10:22:04 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-17 10:22:04 +0000
commitb9c13dc540403877ee43369ce0027f43c7cab928 (patch)
treedec25a80e17d7c6d67b6daf822c22f5d10db3dd5 /target/linux/brcm63xx
parent966f1ab30128279f7b07acda088f4f3399718867 (diff)
downloadupstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.gz
upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.bz2
upstream-b9c13dc540403877ee43369ce0027f43c7cab928.zip
kernel: update 3.18 to 3.18.16
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16 Signed-off-by: Jonas Gorski <jogo@openwrt.org> Backport of r46011. git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46015 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/patches-3.18/570-board_HG655b.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/brcm63xx/patches-3.18/570-board_HG655b.patch b/target/linux/brcm63xx/patches-3.18/570-board_HG655b.patch
index 903068a842..7c667bf454 100644
--- a/target/linux/brcm63xx/patches-3.18/570-board_HG655b.patch
+++ b/target/linux/brcm63xx/patches-3.18/570-board_HG655b.patch
@@ -1,11 +1,9 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1928,6 +1928,53 @@
-
- .spis = DGND3700v1_3800B_spi_devices,
+@@ -1930,6 +1930,53 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(DGND3700v1_3800B_spi_devices),
-+};
-+
+ };
+
+static struct board_info __initdata board_HG655b = {
+ .name = "HW65x",
+ .expected_cpu_id = 0x6368,
@@ -51,10 +49,12 @@
+ },
+ },
+ },
- };
-
++};
++
static struct sprom_fixup __initdata vr3025u_fixups[] = {
-@@ -2380,6 +2427,7 @@
+ { .offset = 97, .value = 0xfeb3 },
+ { .offset = 98, .value = 0x1618 },
+@@ -2380,6 +2427,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,
-@@ -2483,6 +2531,7 @@
+@@ -2483,6 +2531,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, },