Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:24:07 +0100
commit649e3ff9d6c587f1eb1618d1707766836ea47b13 (patch)
treee48af55939e573780d644b775c291408a48a3086
parent63fa1c986c2105a23204ef558f83f1ab5e695dae (diff)
ARM: dts: da850: fix interrupt numbers for clocksource
-rw-r--r--patches.kernel.org/4.20.9-031-ARM-dts-da850-fix-interrupt-numbers-for-clocks.patch42
-rw-r--r--series.conf1
2 files changed, 43 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-031-ARM-dts-da850-fix-interrupt-numbers-for-clocks.patch b/patches.kernel.org/4.20.9-031-ARM-dts-da850-fix-interrupt-numbers-for-clocks.patch
new file mode 100644
index 0000000000..9d516a4d25
--- /dev/null
+++ b/patches.kernel.org/4.20.9-031-ARM-dts-da850-fix-interrupt-numbers-for-clocks.patch
@@ -0,0 +1,42 @@
+From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Date: Fri, 11 Jan 2019 18:21:18 +0100
+Subject: [PATCH] ARM: dts: da850: fix interrupt numbers for clocksource
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: e3966a766865da7ced1dece663697861dd5cf103
+
+commit e3966a766865da7ced1dece663697861dd5cf103 upstream.
+
+The timer interrupts specified in commit 3652e2741f42 ("ARM: dts:
+da850: Add clocks") are wrong but since the current timer code
+hard-codes them, the bug was never spotted.
+
+This patch must go into stable since, once we introduce a proper
+clocksource driver, devices with buggy device tree will stop booting.
+
+Fixes: 3652e2741f42 ("ARM: dts: da850: Add clocks")
+Cc: stable@vger.kernel.org
+Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Signed-off-by: Sekhar Nori <nsekhar@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ arch/arm/boot/dts/da850.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
+index 47aa53ba6b92..559659b399d0 100644
+--- a/arch/arm/boot/dts/da850.dtsi
++++ b/arch/arm/boot/dts/da850.dtsi
+@@ -476,7 +476,7 @@
+ clocksource: timer@20000 {
+ compatible = "ti,da830-timer";
+ reg = <0x20000 0x1000>;
+- interrupts = <12>, <13>;
++ interrupts = <21>, <22>;
+ interrupt-names = "tint12", "tint34";
+ clocks = <&pll0_auxclk>;
+ };
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 297af7442f..1142cd656b 100644
--- a/series.conf
+++ b/series.conf
@@ -1113,6 +1113,7 @@
patches.kernel.org/4.20.9-028-MIPS-VDSO-Include-ccflags-vdso-in-o32-n32-.lds.patch
patches.kernel.org/4.20.9-029-ARM-iop32x-n2100-fix-PCI-IRQ-mapping.patch
patches.kernel.org/4.20.9-030-ARM-tango-Improve-ARCH_MULTIPLATFORM-compatibi.patch
+ patches.kernel.org/4.20.9-031-ARM-dts-da850-fix-interrupt-numbers-for-clocks.patch
########################################################
# Build fixes that apply to the vanilla kernel too.