diff options
author | Hans de Goede <hdegoede@redhat.com> | 2015-03-08 16:53:42 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-10 12:49:27 -0400 |
commit | 9bdbb8968e9e7e6b9619076d1867da1c0cfec2c7 (patch) | |
tree | 87bfa25e047bcb1a29fa26e3f32634a1a126c538 /arch | |
parent | 6a010c0abd49388a49af3d5a5bfc00e0d5767607 (diff) |
ARM: dts: sunxi: Adjust touchscreen compatible for sun5i and later
commit 8bf1b9b3d90194a174493febc731f7783f2adf1a upstream.
The touchscreen controller in the A13 and later has a different temperature
curve than the one in the original A10, change the compatible for the A13 and
later so that the kernel will use the correct curve.
Reported-by: Tong Zhang <lovewilliam@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/sun5i-a10s.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/sun5i-a13.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/sun7i-a20.dtsi | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index 2fd8988f310c..3794ca16499d 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi | |||
@@ -573,7 +573,7 @@ | |||
573 | }; | 573 | }; |
574 | 574 | ||
575 | rtp: rtp@01c25000 { | 575 | rtp: rtp@01c25000 { |
576 | compatible = "allwinner,sun4i-a10-ts"; | 576 | compatible = "allwinner,sun5i-a13-ts"; |
577 | reg = <0x01c25000 0x100>; | 577 | reg = <0x01c25000 0x100>; |
578 | interrupts = <29>; | 578 | interrupts = <29>; |
579 | #thermal-sensor-cells = <0>; | 579 | #thermal-sensor-cells = <0>; |
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 883cb4873688..5098185abde6 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi | |||
@@ -555,7 +555,7 @@ | |||
555 | }; | 555 | }; |
556 | 556 | ||
557 | rtp: rtp@01c25000 { | 557 | rtp: rtp@01c25000 { |
558 | compatible = "allwinner,sun4i-a10-ts"; | 558 | compatible = "allwinner,sun5i-a13-ts"; |
559 | reg = <0x01c25000 0x100>; | 559 | reg = <0x01c25000 0x100>; |
560 | interrupts = <29>; | 560 | interrupts = <29>; |
561 | #thermal-sensor-cells = <0>; | 561 | #thermal-sensor-cells = <0>; |
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index fdd181792b4b..2b4847c7cbd4 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi | |||
@@ -1042,7 +1042,7 @@ | |||
1042 | }; | 1042 | }; |
1043 | 1043 | ||
1044 | rtp: rtp@01c25000 { | 1044 | rtp: rtp@01c25000 { |
1045 | compatible = "allwinner,sun4i-a10-ts"; | 1045 | compatible = "allwinner,sun5i-a13-ts"; |
1046 | reg = <0x01c25000 0x100>; | 1046 | reg = <0x01c25000 0x100>; |
1047 | interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; | 1047 | interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; |
1048 | #thermal-sensor-cells = <0>; | 1048 | #thermal-sensor-cells = <0>; |