diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-01-30 11:22:57 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-01-30 11:34:41 +0100 |
commit | 2b3604e243134e0000340b34cae8233f382ff08c (patch) | |
tree | ccb3a24faca8c99c4e6855fdbde68a6e0e559cbc /arch/arm | |
parent | 91c577ef1eac03be257fbc206f8f0fd64caee3df (diff) | |
parent | e3966a766865da7ced1dece663697861dd5cf103 (diff) |
Merge tag 'davinci-fixes-for-v5.0-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/fixes
This fixes a long standing typo in device-tree for DA850 in interrupt
number for timer. It did not affect us so far because we use non-DT
timer driver within mach-davinci. This was caught while migrating to
clocksource driver.
* tag 'davinci-fixes-for-v5.0-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: dts: da850: fix interrupt numbers for clocksource
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/da850.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
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>; }; |