summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2020-08-20 18:09:30 -0700
committerOlof Johansson <olof@lixom.net>2020-08-20 18:09:30 -0700
commitcc3e43337557e660ca9a56ef54f22dc74f9460cc (patch)
treed44c742722e0e0a9a59958df831c4f6a90c34e2e
parent9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 (diff)
parent0ff5a4812be4ebd4782bbb555d369636eea164f7 (diff)
downloadlinux-stable-cc3e43337557e660ca9a56ef54f22dc74f9460cc.tar.gz
linux-stable-cc3e43337557e660ca9a56ef54f22dc74f9460cc.tar.bz2
linux-stable-cc3e43337557e660ca9a56ef54f22dc74f9460cc.zip
Merge tag 'socfpga_fix_for_v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into fixes
arm: dts: socfpga: fix for v5.9 - Fix incorrect timer3 reg entry for Arria10 * tag 'socfpga_fix_for_v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: ARM: dts: socfpga: fix register entry for timer3 on Arria10 Link: https://lore.kernel.org/r/20200817150827.15696-1-dinguyen@kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/boot/dts/socfpga_arria10.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
index fc4abef143a0..0013ec3463c4 100644
--- a/arch/arm/boot/dts/socfpga_arria10.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
@@ -821,7 +821,7 @@
timer3: timer3@ffd00100 {
compatible = "snps,dw-apb-timer";
interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>;
- reg = <0xffd01000 0x100>;
+ reg = <0xffd00100 0x100>;
clocks = <&l4_sys_free_clk>;
clock-names = "timer";
resets = <&rst L4SYSTIMER1_RESET>;