summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFugang Duan <fugang.duan@nxp.com>2017-08-29 17:40:33 +0800
committerFugang Duan <fugang.duan@nxp.com>2017-08-29 18:29:14 +0800
commit963fea909ef5e42294cb2e656e5e3870a2171c01 (patch)
tree97fc5f5d0eae36d7d2a86d8b411e799567415fd4
parent8e85cfa29fa33b9a6c1335e9f1355290d0f0fab7 (diff)
MLK-15348-02 arm: dts: imx7ulp: add focaltech touch panel ft5246 support
Add focaltech new touch panel ft5246 support. Set the ft5426 as default panel for dts. If want to use the old panel, then it needs to boot with imx7ulp-evk-ft5416.dtb file. Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/boot/dts/imx7ulp-evk-ft5416.dts17
-rw-r--r--arch/arm/boot/dts/imx7ulp-evk.dts3
-rw-r--r--include/dt-bindings/input/input.h3
4 files changed, 23 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ebe067431787..5f9cf31dc0b8 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -581,6 +581,7 @@ dtb-$(CONFIG_SOC_IMX7ULP) += \
imx7ulp-evk.dtb \
imx7ulp-evk-emmc.dtb \
imx7ulp-evk-emmc-qspi.dtb \
+ imx7ulp-evk-ft5416.dtb \
imx7ulp-evk-sd1.dtb \
imx7ulp-evk-lpuart.dtb \
imx7ulp-evk-qspi.dtb \
diff --git a/arch/arm/boot/dts/imx7ulp-evk-ft5416.dts b/arch/arm/boot/dts/imx7ulp-evk-ft5416.dts
new file mode 100644
index 000000000000..2d86e33e1abb
--- /dev/null
+++ b/arch/arm/boot/dts/imx7ulp-evk-ft5416.dts
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2017 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx7ulp-evk.dts"
+
+&lpi2c7 {
+ focaltech@38 {
+ focaltech,panel-type = <FT5416>;
+ focaltech,swap-xy;
+ /delete-property/focaltech,scaling-down-half;
+ };
+};
diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts
index 48acc2685623..0ff23f42aa44 100644
--- a/arch/arm/boot/dts/imx7ulp-evk.dts
+++ b/arch/arm/boot/dts/imx7ulp-evk.dts
@@ -388,6 +388,7 @@
reg = <0x38>;
interrupt-parent = <&gpio3>;
interrupts = <0 0x02>;
+ focaltech,panel-type = <FT5426>;
focaltech,reset-gpio = <&gpio3 1 0x01>;
focaltech,irq-gpio = <&gpio3 0 0x02>;
focaltech,max-touch-number = <5>;
@@ -398,7 +399,7 @@
focaltech,keys = <139 102 158>;
focaltech,key-y-coord = <2000>;
focaltech,key-x-coords = <200 600 800>;
- focaltech,swap-xy;
+ focaltech,scaling-down-half;
};
};
diff --git a/include/dt-bindings/input/input.h b/include/dt-bindings/input/input.h
index a21413324a3f..14f91301f96f 100644
--- a/include/dt-bindings/input/input.h
+++ b/include/dt-bindings/input/input.h
@@ -14,4 +14,7 @@
#define MATRIX_KEY(row, col, code) \
((((row) & 0xFF) << 24) | (((col) & 0xFF) << 16) | ((code) & 0xFFFF))
+#define FT5416 0x54160002
+#define FT5426 0x54260002
+
#endif /* _DT_BINDINGS_INPUT_INPUT_H */