diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-14 09:05:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-14 09:05:20 -0400 |
| commit | 6070ef409c1018860e8dd1f077297546d9d80115 (patch) | |
| tree | ff914035d376420d37fd2d3d1ad0877220eed9c6 /arch/arm/dts/da850.dtsi | |
| parent | a9758ece08bceb60634145c2126582e5d282bd09 (diff) | |
| parent | ae8d23a668755d804748a1cf848426b28338b3d5 (diff) | |
Merge branch '2019-07-12-master-imports'
- First round of TI Davinci updates
- Some OMAP3 DM updates
- Other misc updates
Diffstat (limited to 'arch/arm/dts/da850.dtsi')
| -rw-r--r-- | arch/arm/dts/da850.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/da850.dtsi b/arch/arm/dts/da850.dtsi index 47aa53ba6b..559659b399 100644 --- a/arch/arm/dts/da850.dtsi +++ b/arch/arm/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>; }; |