Commit 614cd4a4 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux into fixes

Allwinner fixes from Maxime Ripard:

Two fixes for device trees additions that got added in 3.14. One fixes the
interrupt types of some IPs, the other fixes up a compatible that got
introduced during 3.14

* tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux:
  ARM: sunxi: dt: Change the touchscreen compatibles
  ARM: sun7i: dt: Fix interrupt trigger types
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 014325e9 40dd8f3b
...@@ -426,7 +426,7 @@ sid: eeprom@01c23800 { ...@@ -426,7 +426,7 @@ sid: eeprom@01c23800 {
}; };
rtp: rtp@01c25000 { rtp: rtp@01c25000 {
compatible = "allwinner,sun4i-ts"; compatible = "allwinner,sun4i-a10-ts";
reg = <0x01c25000 0x100>; reg = <0x01c25000 0x100>;
interrupts = <29>; interrupts = <29>;
}; };
......
...@@ -383,7 +383,7 @@ sid: eeprom@01c23800 { ...@@ -383,7 +383,7 @@ sid: eeprom@01c23800 {
}; };
rtp: rtp@01c25000 { rtp: rtp@01c25000 {
compatible = "allwinner,sun4i-ts"; compatible = "allwinner,sun4i-a10-ts";
reg = <0x01c25000 0x100>; reg = <0x01c25000 0x100>;
interrupts = <29>; interrupts = <29>;
}; };
......
...@@ -346,7 +346,7 @@ sid: eeprom@01c23800 { ...@@ -346,7 +346,7 @@ sid: eeprom@01c23800 {
}; };
rtp: rtp@01c25000 { rtp: rtp@01c25000 {
compatible = "allwinner,sun4i-ts"; compatible = "allwinner,sun4i-a10-ts";
reg = <0x01c25000 0x100>; reg = <0x01c25000 0x100>;
interrupts = <29>; interrupts = <29>;
}; };
......
...@@ -454,7 +454,7 @@ wdt: watchdog@01c20c90 { ...@@ -454,7 +454,7 @@ wdt: watchdog@01c20c90 {
rtc: rtc@01c20d00 { rtc: rtc@01c20d00 {
compatible = "allwinner,sun7i-a20-rtc"; compatible = "allwinner,sun7i-a20-rtc";
reg = <0x01c20d00 0x20>; reg = <0x01c20d00 0x20>;
interrupts = <0 24 1>; interrupts = <0 24 4>;
}; };
sid: eeprom@01c23800 { sid: eeprom@01c23800 {
...@@ -463,7 +463,7 @@ sid: eeprom@01c23800 { ...@@ -463,7 +463,7 @@ sid: eeprom@01c23800 {
}; };
rtp: rtp@01c25000 { rtp: rtp@01c25000 {
compatible = "allwinner,sun4i-ts"; compatible = "allwinner,sun4i-a10-ts";
reg = <0x01c25000 0x100>; reg = <0x01c25000 0x100>;
interrupts = <0 29 4>; interrupts = <0 29 4>;
}; };
...@@ -596,10 +596,10 @@ i2c4: i2c@01c2bc00 { ...@@ -596,10 +596,10 @@ i2c4: i2c@01c2bc00 {
hstimer@01c60000 { hstimer@01c60000 {
compatible = "allwinner,sun7i-a20-hstimer"; compatible = "allwinner,sun7i-a20-hstimer";
reg = <0x01c60000 0x1000>; reg = <0x01c60000 0x1000>;
interrupts = <0 81 1>, interrupts = <0 81 4>,
<0 82 1>, <0 82 4>,
<0 83 1>, <0 83 4>,
<0 84 1>; <0 84 4>;
clocks = <&ahb_gates 28>; clocks = <&ahb_gates 28>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment