Re: [added to the 3.18 stable tree] ARM: dts: sunxi: Adjust touchscreen compatible for sun5i and later

[Hans de Goede <hdegoede@redhat.com>]

Hi,

On 13-07-15 15:44, Sasha Levin wrote:
> From: Hans de Goede <hdegoede@redhat.com>
>
> This patch has been added to the 3.18 stable tree. If you have any
> objections, please let us know.

This patch was only intended for 4.1, it is wrong for anything older,
please drop this from 3.18.

Regards,

Hans


>
> ===============
>
> [ Upstream commit 8bf1b9b3d90194a174493febc731f7783f2adf1a ]
>
> 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: Sasha Levin <sasha.levin@oracle.com>
> ---
>   arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +-
>   arch/arm/boot/dts/sun5i-a13.dtsi  | 2 +-
>   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 531272c..fd2bcd3 100644
> --- a/arch/arm/boot/dts/sun5i-a10s.dtsi
> +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
> @@ -526,7 +526,7 @@
>   		};
>
>   		rtp: rtp@01c25000 {
> -			compatible = "allwinner,sun4i-a10-ts";
> +			compatible = "allwinner,sun5i-a13-ts";
>   			reg = <0x01c25000 0x100>;
>   			interrupts = <29>;
>   		};
> diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
> index b131068..f9b01999 100644
> --- a/arch/arm/boot/dts/sun5i-a13.dtsi
> +++ b/arch/arm/boot/dts/sun5i-a13.dtsi
> @@ -474,7 +474,7 @@
>   		};
>
>   		rtp: rtp@01c25000 {
> -			compatible = "allwinner,sun4i-a10-ts";
> +			compatible = "allwinner,sun5i-a13-ts";
>   			reg = <0x01c25000 0x100>;
>   			interrupts = <29>;
>   		};
> diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
> index 82097c9..dcff778 100644
> --- a/arch/arm/boot/dts/sun7i-a20.dtsi
> +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
> @@ -896,7 +896,7 @@
>   		};
>
>   		rtp: rtp@01c25000 {
> -			compatible = "allwinner,sun4i-a10-ts";
> +			compatible = "allwinner,sun5i-a13-ts";
>   			reg = <0x01c25000 0x100>;
>   			interrupts = <0 29 4>;
>   		};
>