[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-737-gb0d6bff
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-737-gb0d6bff
|
From: Sébastien S. <ss...@us...> - 2015-05-11 10:31:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b0d6bffb8ec6fb930b4f6b6fadbf8d42bf469c26 (commit)
via 8fe39d4e223c450ff241c5f4d9000aa2ba3862b8 (commit)
from aafc715325602f0e29aa1fad5bdae95c9f700f2d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b0d6bffb8ec6fb930b4f6b6fadbf8d42bf469c26
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon May 11 12:35:53 2015 +0200
[LINUX] apf6 legacy: backport touchscreen driver
commit 8fe39d4e223c450ff241c5f4d9000aa2ba3862b8
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu May 7 18:39:35 2015 +0200
[LINUX] 3.10 (legacy): apf6: dts: Update some muxing configs..
Done by Nicolas ;)
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf6/apf6legacy-linux-3.10.config | 1 +
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 154 +++++----
...upport-for-Semtech-SX8654-I2C-touchscreen.patch | 373 ++++++++++++++++++++
3 files changed, 456 insertions(+), 72 deletions(-)
create mode 100644 patches/linux/3.10.mx6_legacy/0451-Input-add-support-for-Semtech-SX8654-I2C-touchscreen.patch
diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
index 4af03b7..440ce94 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
@@ -140,6 +140,7 @@ CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_SX8654=y
CONFIG_INPUT_MISC=y
CONFIG_SERIO_SERPORT=m
CONFIG_VT_HW_CONSOLE_BINDING=y
diff --git a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 691c8ed..b6fa626 100644
--- a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -111,33 +111,33 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6.dt
+ apf6 {
+ pinctrl_enet: enetgrp {
+ fsl,pins = <
-+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
++ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b8b0
+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
++ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
++ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x130b0
++ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x130b0
+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030
+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030
+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030
+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030
+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030
+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030
-+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x13030
+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x13030
+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1f030
+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1f030
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
-+ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
-+ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x13030
+ >;
+ };
+
+ pinctrl_uart2: uart2grp {
+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b0
++ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b0
++ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b0
++ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b0
++ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x130b0 /* BT_EN */
+ >;
+ };
+
@@ -149,8 +149,8 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6.dt
+ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
+ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
+ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
-+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
-+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x1b0b0 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* WL_IRQ */
+ >;
+ };
+
@@ -174,7 +174,7 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
===================================================================
--- /dev/null
+++ linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,508 @@
+@@ -0,0 +1,518 @@
+/*
+ * Copyright 2015 Armadeus Systems
+ *
@@ -344,9 +344,9 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi1>;
+ fsl,spi-num-chipselects = <3>;
-+ cs-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>,
-+ <&gpio4 10 GPIO_ACTIVE_HIGH>,
-+ <&gpio4 11 GPIO_ACTIVE_HIGH>;
++ cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>,
++ <&gpio4 10 GPIO_ACTIVE_LOW>,
++ <&gpio4 11 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
+
@@ -372,6 +372,15 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+ clock-frequency = <100000>;
+ status = "okay";
+
++ touchscreen@48 {
++ compatible = "semtech,sx8654";
++ reg = <0x48>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_touchscreen>;
++ interrupt-parent = <&gpio6>;
++ interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
++ };
++
+ ov5640_mipi: ov5640_mipi@3c {
+ compatible = "ovti,ov5640_mipi";
+ pinctrl-names = "default";
@@ -504,10 +513,10 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+ apf6dev {
+ pinctrl_audmux: audmuxgrp {
+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x80000000
-+ MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x80000000
-+ MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x80000000
-+ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
++ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x1b0b0
+ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
+ >;
+ };
@@ -525,16 +534,16 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+ MX6QDL_PAD_KEY_COL1__ECSPI1_MISO 0x100b1
+ MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI 0x100b1
+ MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK 0x100b1
-+ MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x80000000
-+ MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x80000000
-+ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x80000000
++ MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x1b0b0
++ MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x1b0b0
++ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x1b0b0
+ >;
+ };
+
+ pinctrl_flexcan2: flexcan2grp {
+ fsl,pins = <
-+ MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x80000000
-+ MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x80000000
++ MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0
++ MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0
+ >;
+ };
+
@@ -543,30 +552,31 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0
+ >;
+ };
++
+ pinctrl_gpio_leds: gpioledsgrp {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x130b0
+ >;
+ };
+
+ pinctrl_gpios: gpiosgrp {
+ fsl,pins = <
-+ MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x80000000
-+ MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 0x80000000
-+ MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x80000000
-+ MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x80000000
-+ MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000
-+ MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16 0x80000000
-+ MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000
-+ MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x80000000
-+ MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x80000000
++ MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x100b1
++ MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 0x100b1
++ MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x100b1
++ MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x100b1
++ MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x100b1
++ MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16 0x100b1
++ MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x100b1
++ MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x100b1
++ MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x100b1
+ >;
+ };
+
+ pinctrl_gsm: gsmgrp {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000 /* GSM_POKIN */
-+ MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x80000000 /* GSM_PWR_EN */
++ MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x130b0 /* GSM_POKIN */
++ MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x130b0 /* GSM_PWR_EN */
+ >;
+ };
+
@@ -593,34 +603,34 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+
+ pinctrl_ipu1_disp1: ipu1disp1grp {
+ fsl,pins = <
-+ MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10
-+ MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x10
-+ MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x10
-+ MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x10
-+ MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x10
-+ MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x10
-+ MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x10
-+ MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x10
-+ MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x10
-+ MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x10
-+ MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x10
-+ MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x10
-+ MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x10
-+ MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x10
-+ MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x10
-+ MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x10
-+ MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x10
-+ MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x10
-+ MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x10
-+ MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x10
-+ MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x10
-+ MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x10
++ MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x100b1
++ MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x100b1
++ MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x100b1
++ MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x100b1
++ MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x100b1
++ MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x100b1
++ MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x100b1
++ MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x100b1
++ MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x100b1
++ MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x100b1
++ MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x100b1
++ MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x100b1
++ MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x100b1
++ MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x100b1
++ MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x100b1
++ MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x100b1
++ MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x100b1
++ MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x100b1
++ MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x100b1
++ MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x100b1
++ MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x100b1
++ MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x100b1
+ >;
+ };
+
+ pinctrl_pcie: pciegrp {
+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
++ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x130b0
+ >;
+ };
+
@@ -632,30 +642,30 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+
+ pinctrl_uart1: uart1grp {
+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b0
+ >;
+ };
+
+ pinctrl_uart3: uart3grp {
+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
-+ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
++ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b0
++ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b0
++ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b0
++ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b0
+ >;
+ };
+
+ pinctrl_uart4: uart4grp {
+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b0
+ >;
+ };
+
+ pinctrl_usbotg: usbotggrp {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
++ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x1b0b0
+ >;
+ };
+
@@ -678,7 +688,7 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+
+ pinctrl_touchscreen: touchscreengrp {
+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x80000000
++ MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x1b0b0
+ >;
+ };
+ };
diff --git a/patches/linux/3.10.mx6_legacy/0451-Input-add-support-for-Semtech-SX8654-I2C-touchscreen.patch b/patches/linux/3.10.mx6_legacy/0451-Input-add-support-for-Semtech-SX8654-I2C-touchscreen.patch
new file mode 100644
index 0000000..9fa7450
--- /dev/null
+++ b/patches/linux/3.10.mx6_legacy/0451-Input-add-support-for-Semtech-SX8654-I2C-touchscreen.patch
@@ -0,0 +1,373 @@
+From 902cb3afab8d4c924376de51ec5c02d171992914 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 6 Mar 2015 16:49:38 -0800
+Subject: [PATCH] Input: add support for Semtech SX8654 I2C touchscreen
+ controller
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+Signed-off-by: Dmitry Torokhov <dmi...@gm...>
+
+[added mainline fixes from Dmitry Torokhov and Dan Carpenter <dan...@or...>
+---
+ .../bindings/input/touchscreen/sx8654.txt | 16 ++
+ drivers/input/touchscreen/Kconfig | 11 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/sx8654.c | 286 +++++++++++++++++++++
+ 4 files changed, 314 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/sx8654.txt
+ create mode 100644 drivers/input/touchscreen/sx8654.c
+
+Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/Documentation/devicetree/bindings/input/touchscreen/sx8654.txt
+===================================================================
+--- /dev/null
++++ linux-wandboard_imx_3.10.31_1.1.0_beta2/Documentation/devicetree/bindings/input/touchscreen/sx8654.txt
+@@ -0,0 +1,16 @@
++* Semtech SX8654 I2C Touchscreen Controller
++
++Required properties:
++- compatible: must be "semtech,sx8654"
++- reg: i2c slave address
++- interrupt-parent: the phandle for the interrupt controller
++- interrupts: touch controller interrupt
++
++Example:
++
++ sx8654@48 {
++ compatible = "semtech,sx8654";
++ reg = <0x48>;
++ interrupt-parent = <&gpio6>;
++ interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
++ };
+Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/drivers/input/touchscreen/Kconfig
+===================================================================
+--- linux-wandboard_imx_3.10.31_1.1.0_beta2.orig/drivers/input/touchscreen/Kconfig
++++ linux-wandboard_imx_3.10.31_1.1.0_beta2/drivers/input/touchscreen/Kconfig
+@@ -897,6 +897,17 @@ config TOUCHSCREEN_STMPE
+ To compile this driver as a module, choose M here: the
+ module will be called stmpe-ts.
+
++config TOUCHSCREEN_SX8654
++ tristate "Semtech SX8654 touchscreen"
++ depends on I2C
++ help
++ Say Y here if you have a Semtech SX8654 touchscreen controller.
++
++ If unsure, say N
++
++ To compile this driver as a module, choose M here: the
++ module will be called sx8654.
++
+ config TOUCHSCREEN_TPS6507X
+ tristate "TPS6507x based touchscreens"
+ depends on I2C
+Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/drivers/input/touchscreen/Makefile
+===================================================================
+--- linux-wandboard_imx_3.10.31_1.1.0_beta2.orig/drivers/input/touchscreen/Makefile
++++ linux-wandboard_imx_3.10.31_1.1.0_beta2/drivers/input/touchscreen/Makefile
+@@ -72,5 +72,6 @@ obj-$(CONFIG_TOUCHSCREEN_WM97XX_ATMEL) +
+ obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o
+ obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE) += zylonite-wm97xx.o
+ obj-$(CONFIG_TOUCHSCREEN_W90X900) += w90p910_ts.o
++obj-$(CONFIG_TOUCHSCREEN_SX8654) += sx8654.o
+ obj-$(CONFIG_TOUCHSCREEN_TPS6507X) += tps6507x-ts.o
+ obj-$(CONFIG_TOUCHSCREEN_FUSION) += fusion_ts.o
+Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/drivers/input/touchscreen/sx8654.c
+===================================================================
+--- /dev/null
++++ linux-wandboard_imx_3.10.31_1.1.0_beta2/drivers/input/touchscreen/sx8654.c
+@@ -0,0 +1,291 @@
++/*
++ * Driver for Semtech SX8654 I2C touchscreen controller.
++ *
++ * Copyright (c) 2015 Armadeus Systems
++ * Sébastien Szymanski <seb...@ar...>
++ *
++ * Using code from:
++ * - sx865x.c
++ * Copyright (c) 2013 U-MoBo Srl
++ * Pierluigi Passaro <p.p...@u-...>
++ * - sx8650.c
++ * Copyright (c) 2009 Wayne Roberts
++ * - tsc2007.c
++ * Copyright (c) 2008 Kwangwoo Lee
++ * - ads7846.c
++ * Copyright (c) 2005 David Brownell
++ * Copyright (c) 2006 Nokia Corporation
++ * - corgi_ts.c
++ * Copyright (C) 2004-2005 Richard Purdie
++ * - omap_ts.[hc], ads7846.h, ts_osk.c
++ * Copyright (C) 2002 MontaVista Software
++ * Copyright (C) 2004 Texas Instruments
++ * Copyright (C) 2005 Dirk Behme
++ *
++ * 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 <linux/input.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/i2c.h>
++#include <linux/interrupt.h>
++#include <linux/irq.h>
++
++/* register addresses */
++#define I2C_REG_TOUCH0 0x00
++#define I2C_REG_TOUCH1 0x01
++#define I2C_REG_CHANMASK 0x04
++#define I2C_REG_IRQMASK 0x22
++#define I2C_REG_IRQSRC 0x23
++#define I2C_REG_SOFTRESET 0x3f
++
++/* commands */
++#define CMD_READ_REGISTER 0x40
++#define CMD_MANUAL 0xc0
++#define CMD_PENTRG 0xe0
++
++/* value for I2C_REG_SOFTRESET */
++#define SOFTRESET_VALUE 0xde
++
++/* bits for I2C_REG_IRQSRC */
++#define IRQ_PENTOUCH_TOUCHCONVDONE 0x08
++#define IRQ_PENRELEASE 0x04
++
++/* bits for RegTouch1 */
++#define CONDIRQ 0x20
++#define FILT_7SA 0x03
++
++/* bits for I2C_REG_CHANMASK */
++#define CONV_X 0x80
++#define CONV_Y 0x40
++
++/* coordinates rate: higher nibble of CTRL0 register */
++#define RATE_MANUAL 0x00
++#define RATE_5000CPS 0xf0
++
++/* power delay: lower nibble of CTRL0 register */
++#define POWDLY_1_1MS 0x0b
++
++#define MAX_12BIT ((1 << 12) - 1)
++
++struct sx8654 {
++ struct input_dev *input;
++ struct i2c_client *client;
++};
++
++static irqreturn_t sx8654_irq(int irq, void *handle)
++{
++ struct sx8654 *sx8654 = handle;
++ int irqsrc;
++ u8 data[4];
++ unsigned int x, y;
++ int retval;
++
++ irqsrc = i2c_smbus_read_byte_data(sx8654->client,
++ CMD_READ_REGISTER | I2C_REG_IRQSRC);
++ dev_dbg(&sx8654->client->dev, "irqsrc = 0x%x", irqsrc);
++
++ if (irqsrc < 0)
++ goto out;
++
++ if (irqsrc & IRQ_PENRELEASE) {
++ dev_dbg(&sx8654->client->dev, "pen release interrupt");
++
++ input_report_key(sx8654->input, BTN_TOUCH, 0);
++ input_sync(sx8654->input);
++ }
++
++ if (irqsrc & IRQ_PENTOUCH_TOUCHCONVDONE) {
++ dev_dbg(&sx8654->client->dev, "pen touch interrupt");
++
++ retval = i2c_master_recv(sx8654->client, data, sizeof(data));
++ if (retval != sizeof(data))
++ goto out;
++
++ /* invalid data */
++ if (unlikely(data[0] & 0x80 || data[2] & 0x80))
++ goto out;
++
++ x = ((data[0] & 0xf) << 8) | (data[1]);
++ y = ((data[2] & 0xf) << 8) | (data[3]);
++
++ input_report_abs(sx8654->input, ABS_X, x);
++ input_report_abs(sx8654->input, ABS_Y, y);
++ input_report_key(sx8654->input, BTN_TOUCH, 1);
++ input_sync(sx8654->input);
++
++ dev_dbg(&sx8654->client->dev, "point(%4d,%4d)\n", x, y);
++ }
++
++out:
++ return IRQ_HANDLED;
++}
++
++static int sx8654_open(struct input_dev *dev)
++{
++ struct sx8654 *sx8654 = input_get_drvdata(dev);
++ struct i2c_client *client = sx8654->client;
++ int error;
++
++ /* enable pen trigger mode */
++ error = i2c_smbus_write_byte_data(client, I2C_REG_TOUCH0,
++ RATE_5000CPS | POWDLY_1_1MS);
++ if (error) {
++ dev_err(&client->dev, "writing to I2C_REG_TOUCH0 failed");
++ return error;
++ }
++
++ error = i2c_smbus_write_byte(client, CMD_PENTRG);
++ if (error) {
++ dev_err(&client->dev, "writing command CMD_PENTRG failed");
++ return error;
++ }
++
++ enable_irq(client->irq);
++
++ return 0;
++}
++
++static void sx8654_close(struct input_dev *dev)
++{
++ struct sx8654 *sx8654 = input_get_drvdata(dev);
++ struct i2c_client *client = sx8654->client;
++ int error;
++
++ disable_irq(client->irq);
++
++ /* enable manual mode mode */
++ error = i2c_smbus_write_byte(client, CMD_MANUAL);
++ if (error) {
++ dev_err(&client->dev, "writing command CMD_MANUAL failed");
++ return;
++ }
++
++ error = i2c_smbus_write_byte_data(client, I2C_REG_TOUCH0, 0);
++ if (error) {
++ dev_err(&client->dev, "writing to I2C_REG_TOUCH0 failed");
++ return;
++ }
++}
++
++static int sx8654_probe(struct i2c_client *client,
++ const struct i2c_device_id *id)
++{
++ struct sx8654 *sx8654;
++ struct input_dev *input;
++ int error;
++
++ if (!i2c_check_functionality(client->adapter,
++ I2C_FUNC_SMBUS_READ_WORD_DATA))
++ return -ENXIO;
++
++ sx8654 = devm_kzalloc(&client->dev, sizeof(*sx8654), GFP_KERNEL);
++ if (!sx8654)
++ return -ENOMEM;
++
++ input = devm_input_allocate_device(&client->dev);
++ if (!input)
++ return -ENOMEM;
++
++ input->name = "SX8654 I2C Touchscreen";
++ input->id.bustype = BUS_I2C;
++ input->dev.parent = &client->dev;
++ input->open = sx8654_open;
++ input->close = sx8654_close;
++
++ __set_bit(EV_ABS, input->evbit);
++ __set_bit(EV_KEY, input->evbit);
++ __set_bit(BTN_TOUCH, input->keybit);
++ __set_bit(ABS_X, input->absbit);
++ __set_bit(ABS_Y, input->absbit);
++ __set_bit(INPUT_PROP_DIRECT, input->propbit);
++ input_set_capability(input, EV_KEY, BTN_TOUCH);
++ input_set_abs_params(input, ABS_X, 0, MAX_12BIT, 0, 0);
++ input_set_abs_params(input, ABS_Y, 0, MAX_12BIT, 0, 0);
++
++ sx8654->client = client;
++ sx8654->input = input;
++
++ input_set_drvdata(sx8654->input, sx8654);
++
++ error = i2c_smbus_write_byte_data(client, I2C_REG_SOFTRESET,
++ SOFTRESET_VALUE);
++ if (error) {
++ dev_err(&client->dev, "writing softreset value failed");
++ return error;
++ }
++
++ error = i2c_smbus_write_byte_data(client, I2C_REG_CHANMASK,
++ CONV_X | CONV_Y);
++ if (error) {
++ dev_err(&client->dev, "writing to I2C_REG_CHANMASK failed");
++ return error;
++ }
++
++ error = i2c_smbus_write_byte_data(client, I2C_REG_IRQMASK,
++ IRQ_PENTOUCH_TOUCHCONVDONE |
++ IRQ_PENRELEASE);
++ if (error) {
++ dev_err(&client->dev, "writing to I2C_REG_IRQMASK failed");
++ return error;
++ }
++
++ error = i2c_smbus_write_byte_data(client, I2C_REG_TOUCH1,
++ CONDIRQ | FILT_7SA);
++ if (error) {
++ dev_err(&client->dev, "writing to I2C_REG_TOUCH1 failed");
++ return error;
++ }
++
++ error = devm_request_threaded_irq(&client->dev, client->irq,
++ NULL, sx8654_irq,
++ IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
++ client->name, sx8654);
++ if (error) {
++ dev_err(&client->dev,
++ "Failed to enable IRQ %d, error: %d\n",
++ client->irq, error);
++ return error;
++ }
++
++ /* Disable the IRQ, we'll enable it in sx8654_open() */
++ disable_irq(client->irq);
++
++ error = input_register_device(sx8654->input);
++ if (error)
++ return error;
++
++ i2c_set_clientdata(client, sx8654);
++ return 0;
++}
++
++#ifdef CONFIG_OF
++static const struct of_device_id sx8654_of_match[] = {
++ { .compatible = "semtech,sx8654", },
++ { },
++};
++MODULE_DEVICE_TABLE(of, sx8654_of_match);
++#endif
++
++static const struct i2c_device_id sx8654_id_table[] = {
++ { "semtech_sx8654", 0 },
++ { },
++};
++MODULE_DEVICE_TABLE(i2c, sx8654_id_table);
++
++static struct i2c_driver sx8654_driver = {
++ .driver = {
++ .name = "sx8654",
++ .of_match_table = of_match_ptr(sx8654_of_match),
++ },
++ .id_table = sx8654_id_table,
++ .probe = sx8654_probe,
++};
++module_i2c_driver(sx8654_driver);
++
++MODULE_AUTHOR("Sébastien Szymanski <seb...@ar...>");
++MODULE_DESCRIPTION("Semtech SX8654 I2C Touchscreen Driver");
++MODULE_LICENSE("GPL");
hooks/post-receive
--
armadeus
|