apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2014-03-08 22:09:23 -08:00
parent 014325e933 40dd8f3b90
commit 614cd4a4ac
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/sun4i-a10.dtsi
+1 -1
View File
@@ -426,7 +426,7 @@
}; };
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>;
}; };
arch/arm/boot/dts/sun5i-a10s.dtsi
+1 -1
View File
@@ -383,7 +383,7 @@
}; };
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>;
}; };
arch/arm/boot/dts/sun5i-a13.dtsi
+1 -1
View File
@@ -346,7 +346,7 @@
}; };
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>;
}; };
arch/arm/boot/dts/sun7i-a20.dtsi
+6 -6
View File
@@ -454,7 +454,7 @@
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 @@
}; };
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 @@
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>;
}; };