aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-07-31 21:44:41 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-07-31 21:44:41 +0000
commit69c403c234c1c9e1a06c719135e9396815a3b756 (patch)
tree48eb19158cb134a80bec52e00f3283235bddfcb8 /target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch
parent350765676e657e8b2fb7e8cd794cbfa88dad52dc (diff)
downloadupstream-69c403c234c1c9e1a06c719135e9396815a3b756.tar.gz
upstream-69c403c234c1c9e1a06c719135e9396815a3b756.tar.bz2
upstream-69c403c234c1c9e1a06c719135e9396815a3b756.zip
bcm53xx: update to kernel 3.14
Use kernel 3.14 by default and refresh the patches Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 41913
Diffstat (limited to 'target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch')
-rw-r--r--target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch b/target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch
index 7fdbaa3853..46464dc042 100644
--- a/target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch
+++ b/target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch
@@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
arch/arm/mach-bcm/bcm_5301x.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
-diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c
-index edff697..e349897 100644
--- a/arch/arm/mach-bcm/bcm_5301x.c
+++ b/arch/arm/mach-bcm/bcm_5301x.c
@@ -12,9 +12,26 @@
@@ -42,7 +40,7 @@ index edff697..e349897 100644
static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr,
struct pt_regs *regs)
{
-@@ -49,6 +66,19 @@ static void __init bcm5301x_dt_init(void)
+@@ -49,6 +66,19 @@ static void __init bcm5301x_dt_init(void
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
@@ -62,13 +60,10 @@ index edff697..e349897 100644
static const char __initconst *bcm5301x_dt_compat[] = {
"brcm,bcm4708",
NULL,
-@@ -57,5 +87,6 @@ static const char __initconst *bcm5301x_dt_compat[] = {
+@@ -57,5 +87,6 @@ static const char __initconst *bcm5301x_
DT_MACHINE_START(BCM5301X, "BCM5301X")
.init_early = bcm5301x_init_early,
.init_machine = bcm5301x_dt_init,
+ .restart = bcm5301x_restart,
.dt_compat = bcm5301x_dt_compat,
MACHINE_END
---
-1.8.4.5
-