summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-12 12:35:34 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-12 12:35:34 -0400
commitc49a4be2cc2cef7db98f482313fce5d38db92fa2 (patch)
tree14f9ebf8ecd7f9ddf93e54b1a05c2664e17f0a05
parentbe36fb8322e9e87c56ade35c04201aeb6afbd477 (diff)
downloadlongterm-queue-4.8-c49a4be2cc2cef7db98f482313fce5d38db92fa2.tar.gz
MIPS: context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/MIPS-Lantiq-fix-missing-xbar-kernel-panic.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/queue/MIPS-Lantiq-fix-missing-xbar-kernel-panic.patch b/queue/MIPS-Lantiq-fix-missing-xbar-kernel-panic.patch
index 3cf855b..8b651ea 100644
--- a/queue/MIPS-Lantiq-fix-missing-xbar-kernel-panic.patch
+++ b/queue/MIPS-Lantiq-fix-missing-xbar-kernel-panic.patch
@@ -1,4 +1,4 @@
-From 6ef90877eee63a0d03e83183bb44b64229b624e6 Mon Sep 17 00:00:00 2001
+From a9c60674853ca9b58b06f62f60dffdec11ee2197 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 15 Mar 2017 23:26:42 +0100
Subject: [PATCH] MIPS: Lantiq: fix missing xbar kernel panic
@@ -25,9 +25,10 @@ Cc: <stable@vger.kernel.org> # 4.4.x-
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/15751
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
-index 3c3aa05891dd..95bec460b651 100644
+index 9a61671c00a7..90565477dfbd 100644
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -467,7 +467,7 @@ void __init ltq_soc_init(void)
@@ -37,8 +38,8 @@ index 3c3aa05891dd..95bec460b651 100644
- if (of_address_to_resource(np_pmu, 0, &res_xbar))
+ if (of_address_to_resource(np_xbar, 0, &res_xbar))
panic("Failed to get xbar resources");
- if (!request_mem_region(res_xbar.start, resource_size(&res_xbar),
- res_xbar.name))
+ if (request_mem_region(res_xbar.start, resource_size(&res_xbar),
+ res_xbar.name) < 0)
--
2.12.0