The standard touch screen bindings [1] replace the private ti,swap-xy
with touchscreen-swaped-x-y. And for the Openpandora we use
touchscreen-size etc. to match the LCD screen size.

[1]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt

Tested with OpenPandora.

Signed-off-by: H. Nikolaus Schaller <h...@goldelico.com>
---
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi              |  2 +-
 arch/arm/boot/dts/omap3-pandora-common.dtsi          | 17 +++++++++++++----
 arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi |  3 ++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi 
b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index fa611a5..b8b3864 100644
--- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -325,7 +325,7 @@
                ti,y-max = /bits/ 16 <3600>;
                ti,x-plate-ohms = /bits/ 16 <80>;
                ti,pressure-max = /bits/ 16 <255>;
-               ti,swap-xy;
+               touchscreen-swapped-x-y;
 
                wakeup-source;
        };
diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi 
b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index b0d1551..d12008a 100644
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -700,10 +700,19 @@
                pendown-gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>;
                vcc-supply = <&vaux4>;
 
-               ti,x-min = /bits/ 16 <0>;
-               ti,x-max = /bits/ 16 <8000>;
-               ti,y-min = /bits/ 16 <0>;
-               ti,y-max = /bits/ 16 <4800>;
+               touchscreen-size-x = <800>;
+               touchscreen-size-y = <480>;
+               touchscreen-max-pressure = <1000>;
+               touchscreen-fuzz-x = <16>;
+               touchscreen-fuzz-y = <16>;
+               touchscreen-fuzz-pressure = <10>;
+               touchscreen-inverted-x;
+               touchscreen-inverted-y;
+
+               ti,x-min = /bits/ 16 <160>;
+               ti,x-max = /bits/ 16 <3900>;
+               ti,y-min = /bits/ 16 <220>;
+               ti,y-max = /bits/ 16 <3750>;
                ti,x-plate-ohms = /bits/ 16 <40>;
                ti,pressure-max = /bits/ 16 <255>;
 
diff --git a/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi 
b/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
index 157345b..3627a63 100644
--- a/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
+++ b/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
@@ -66,6 +66,7 @@
                ti,x-plate-ohms = /bits/ 16 <40>;
                ti,pressure-max = /bits/ 16 <255>;
                ti,swap-xy;
-               wakeup-source;
+               touchscreen-swapped-x-y;
+               linux,wakeup;
        };
 };
-- 
2.7.3

Reply via email to