From c224d20db77b944a7aed1c4f8723508ee409af48 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 26 Aug 2016 16:42:26 +0200 Subject: [PATCH] ARM: dts: sun8i: Rename reference-design-tablet touchscreen node Rename the reference-design-tablet touchscreen node from gsl1680 to touchscreen, all? tablets seem to use the same power and interrupt gpio-s, but not all tablets use a gsl1680 controller making the gsl1680 name somewhat misleading. Also move the reg and compatible property to the actual tablet dts as they may differ per tablet. Signed-off-by: Hans de Goede Signed-off-by: Maxime Ripard --- arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi index f29897c40ae8..08cd00143635 100644 --- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi +++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi @@ -71,15 +71,13 @@ */ clock-frequency = <400000>; - gsl1680: touchscreen@40 { - compatible = "silead,gsl1680"; - reg = <0x40>; + touchscreen: touchscreen@0 { interrupt-parent = <&pio>; interrupts = <1 5 IRQ_TYPE_EDGE_FALLING>; /* PB5 */ pinctrl-names = "default"; pinctrl-0 = <&ts_power_pin>; power-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ - /* Most tablets use this touchscreen, but not all */ + /* Tablet dts must provide reg and compatible */ status = "disabled"; }; }; -- 2.20.1