Input: tsc2007: Add device tree support.
Subsystems (8)
PATCH v9 1/3 Input: tsc2007: Add device tree support.
---
ChangeLog v8->v9:
- Added Grant Likely in the Cc list.
- Removed the mention of the pinctrl properties in the documentation.
ChangeLog v7->v8:
- Fixed the lack of x and z fuzz properties.
- The pendown gpio is better documented.
- Added Shawn Guo in the cc list.
--- .../bindings/input/touchscreen/tsc2007.txt | 41 ++++ drivers/input/touchscreen/tsc2007.c | 204 ++++++++++++++++---- 2 files changed, 204 insertions(+), 41 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt
Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt new file +41 -0
@@ -0,0 +1,41 @@ +* Texas Instruments tsc2007 touchscreen controller + +Required properties: +- compatible: must be "ti,tsc2007". +- reg: I2C address of the chip. +- ti,x-plate-ohms: X-plate resistance in ohms. + +Optional properties: +- gpios: the interrupt gpio the chip is connected to (trough the penirq pin). + The penirq pin goes to low when the panel is touched. + (see GPIO binding[1] for more details). +- interrupt-parent: the phandle for the gpio controller + (see interrupt binding[0]). +- interrupts: (gpio) interrupt to which the chip is connected + (see interrupt binding[0]). +- ti,max-rt: maximum pressure. +- ti,fuzzx: specifies the absolute input fuzz x value. + If set, it will permit noise in the data up to +- the value given to the fuzz + parameter, that is used to filter noise from the event stream. +- ti,fuzzy: specifies the absolute input fuzz y value. +- ti,fuzzz: specifies the absolute input fuzz z value. +- ti,poll-period: how much time to wait(in millisecond) before reading again the + values from the tsc2007. + +[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt +[1]: Documentation/devicetree/bindings/gpio/gpio.txt + +Example: + &i2c1 { + /* ... */ + tsc2007 at 49 { + compatible = "ti,tsc2007"; + reg = <0x49>; + interrupt-parent = <&gpio4>; + interrupts = <0x0 0x8>; + gpios = <&gpio4 0 0>; + ti,x-plate-ohms = <180>; + }; + + /* ... */ + };
drivers/input/touchscreen/tsc2007.c +163 -41
311 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v9 2/3 ARM: dts: cpuimx51 Add touchscreen support.
---
ChangeLog v8->v9:
- Added Grant Likely in the Cc list.
- Adapted to the removal of the pinctrl properties in the tsc2007 documentation.
- Fixed the gpios property (before, it was set to active high by error).
ChangeLog v7->v8:
- Added Shawn Guo in the cc list.
--- arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi +13 -1
@@ -42,11 +42,23 @@ compatible = "nxp,pcf8563"; reg = <0x51>; }; + + tsc2007: tsc2007 at 49 { + compatible = "ti,tsc2007"; + reg = <0x49>; + interrupt-parent = <&gpio4>; + interrupts = <0x0 0x8>; + gpios = <&gpio4 0 1>; + ti,x-plate-ohms = <180>; + }; }; &iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + imx51-eukrea { - pinctrl_tsc2007_1: tsc2007grp-1 { + pinctrl_hog: hoggrp { fsl,pins = < MX51_PAD_GPIO_NAND__GPIO_NAND 0x1f5 MX51_PAD_NANDF_D8__GPIO4_0 0x1f5
Signature · 1 line
1.7.9.5
PATCH v9 2/3 ARM: dts: cpuimx51 Add touchscreen support.
Quoted 33 lines · Denis Carikli
Cc Rob Herring <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Stephen Warren <[email protected]>Cc Ian Campbell <[email protected]>Cc Grant Likely <[email protected]>Cc devicetree at vger.kernel.orgCc Dmitry Torokhov <[email protected]>Cc linux-input at vger.kernel.orgCc Sascha Hauer <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc Lothar Wa?mann <[email protected]>Cc Shawn Guo <[email protected]>Cc Eric B?nard <[email protected]>Signed-off-by Denis Carikli <[email protected]>---
ChangeLogv8->v9:
- Added Grant Likely in the Cc list.
- Adapted to the removal of the pinctrl properties in the tsc2007 documentation.
- Fixed the gpios property (before, it was set to active high by error).ChangeLog
v7->v8:
- Added Shawn Guo in the cc list.--- arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi +0
-0@@ -42,11 +42,23 @@ compatible = "nxp,pcf8563";
arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi line 52
Quoted 10 lines
arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi +8
-0reg = <0x51>; }; + + tsc2007: tsc2007 at 49 { + compatible = "ti,tsc2007"; + reg = <0x49>; + interrupt-parent = <&gpio4>; + interrupts = <0x0 0x8>; + gpios = <&gpio4 0 1>; + ti,x-plate-ohms = <180>;
as explain on the binding drop this gpios this is an IRQ not a gpio
NACK
Best Regards,
J.
Quoted 16 lines
arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi +5
-1+ }; }; &iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + imx51-eukrea { - pinctrl_tsc2007_1: tsc2007grp-1 { + pinctrl_hog: hoggrp { fsl,pins = < MX51_PAD_GPIO_NAND__GPIO_NAND 0x1f5 MX51_PAD_NANDF_D8__GPIO4_0 0x1f5Signature · 1 line
1.7.9.5
PATCH v9 3/3 ARM: dts: cpuimx35 Add touchscreen support.
In reply to Denis Carikli---
ChangeLog v8->v9:
- Added Grant Likely in the cc list.
- Adapted to the removal of the pinctrl properties in the tsc2007 documentation.
- Fixed the gpios property (before, it was set to active high by error).
ChangeLog v7->v8:
- Added Shawn Guo in the cc list.
--- arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi +21 -0
@@ -36,6 +36,27 @@ compatible = "nxp,pcf8563"; reg = <0x51>; }; + + tsc2007: tsc2007 at 48 { + compatible = "ti,tsc2007"; + reg = <0x48>; + interrupt-parent = <&gpio3>; + interrupts = <0x2 0x8>; + gpios = <&gpio3 2 1>; + ti,x-plate-ohms = <180>; + }; + +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + imx35-eukrea { + pinctrl_hog: hoggrp { + fsl,pins = <MX35_PAD_ATA_DA2__GPIO3_2 0x80000000>; + }; + }; }; &nfc {
Signature · 1 line
1.7.9.5
PATCH v9 3/3 ARM: dts: cpuimx35 Add touchscreen support.
Quoted 32 lines · Denis Carikli
Cc Rob Herring <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Stephen Warren <[email protected]>Cc Ian Campbell <[email protected]>Cc Grant Likely <[email protected]>Cc devicetree at vger.kernel.orgCc Dmitry Torokhov <[email protected]>Cc linux-input at vger.kernel.orgCc Sascha Hauer <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc Lothar Wa?mann <[email protected]>Cc Shawn Guo <[email protected]>Cc Eric B?nard <[email protected]>Signed-off-by Denis Carikli <[email protected]>---
ChangeLogv8->v9:
- Added Grant Likely in the cc list.
- Adapted to the removal of the pinctrl properties in the tsc2007 documentation.
- Fixed the gpios property (before, it was set to active high by error).ChangeLog
v7->v8:
- Added Shawn Guo in the cc list.--- arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi +0
-0
arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi line 45
Quoted 10 lines
arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi +7
-0@@ -36,6 +36,27 @@ compatible = "nxp,pcf8563"; reg = <0x51>; }; + + tsc2007: tsc2007 at 48 { + compatible = "ti,tsc2007"; + reg = <0x48>; + interrupt-parent = <&gpio3>; + interrupts = <0x2 0x8>; + gpios = <&gpio3 2 1>;
as explain on the binding drop this gpios this is an IRQ not a gpio
NACK
Best Regards,
J.
Quoted 20 lines
arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi +14
-0+ ti,x-plate-ohms = <180>; + }; + +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + imx35-eukrea { + pinctrl_hog: hoggrp { + fsl,pins = <MX35_PAD_ATA_DA2__GPIO3_2 0x80000000>; + }; + }; }; &nfc {Signature · 1 line
1.7.9.5
PATCH v9 3/3 ARM: dts: cpuimx35 Add touchscreen support.
Hi,
Quoted 45 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 32 lines · Denis Carikli
Cc Rob Herring <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Stephen Warren <[email protected]>Cc Ian Campbell <[email protected]>Cc Grant Likely <[email protected]>Cc devicetree at vger.kernel.orgCc Dmitry Torokhov <[email protected]>Cc linux-input at vger.kernel.orgCc Sascha Hauer <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc Lothar Wa?mann <[email protected]>Cc Shawn Guo <[email protected]>Cc Eric B?nard <[email protected]>Signed-off-by Denis Carikli <[email protected]>---
ChangeLogv8->v9:
- Added Grant Likely in the cc list.
- Adapted to the removal of the pinctrl properties in the tsc2007 documentation.
- Fixed the gpios property (before, it was set to active high by error).ChangeLog
v7->v8:
- Added Shawn Guo in the cc list.--- arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi +0
-0arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi line 45
Quoted 10 lines
arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi +7
-0@@ -36,6 +36,27 @@ compatible = "nxp,pcf8563"; reg = <0x51>; }; + + tsc2007: tsc2007 at 48 { + compatible = "ti,tsc2007"; + reg = <0x48>; + interrupt-parent = <&gpio3>; + interrupts = <0x2 0x8>; + gpios = <&gpio3 2 1>;as explain on the binding drop this gpios this is an IRQ not a gpio
Quoted 1 line
NACK
The driver needs an interrupt to get notified about pendown events and needs to poll the pendown signal to find out when the pen has been lifted. Both the interrupt and the pendown signal happen to be signalled on the same pin. Thus, IMO it is perfectly well to have the interrupt property as well as the gpios property here.
How would you tell the driver which pin to poll for detecting the pen up event?
Having a platform callback with hardcoded GPIO numbers is not an option.
Lothar Wa?mann
Signature · 9 lines
___________________________________________________________ Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10 Gesch?ftsf?hrer: Matthias Kaussen Handelsregistereintrag: Amtsgericht Aachen, HRB 4996 www.karo-electronics.de | info at karo-electronics.de ___________________________________________________________
PATCH v9 3/3 ARM: dts: cpuimx35 Add touchscreen support.
In reply to Jean-Christophe PLAGNIOL-VILLARDLe Thu, 21 Nov 2013 06:09:22 +0100,
Jean-Christophe PLAGNIOL-VILLARD <[email protected]> a ?crit :
Quoted 10 lines
arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi line 45
Quoted 6 lines
arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi +6
-0+ tsc2007: tsc2007 at 48 { + compatible = "ti,tsc2007"; + reg = <0x48>; + interrupt-parent = <&gpio3>; + interrupts = <0x2 0x8>; + gpios = <&gpio3 2 1>;as explain on the binding drop this gpios this is an IRQ not a gpio
NACK
please read the tsc2007's code, in the patch there is :
+static int tsc2007_get_pendown_state_dt(struct tsc2007 *ts) +{
+ return !gpio_get_value(ts->gpio);
+}
+
http://www.mail-archive.com/linux-input at vger.kernel.org/msg06765.html
Eric
Dmitry Torokhov
maintainerPATCH v9 1/3 Input: tsc2007: Add device tree support.
In reply to Denis CarikliHi Denis,
Quoted 20 lines · Denis Carikli
Cc Rob Herring <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Stephen Warren <[email protected]>Cc Ian Campbell <[email protected]>Cc Grant Likely <[email protected]>Cc devicetree at vger.kernel.orgCc Dmitry Torokhov <[email protected]>Cc linux-input at vger.kernel.orgCc Sascha Hauer <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc Lothar Wa?mann <[email protected]>Cc Shawn Guo <[email protected]>Cc Eric B?nard <[email protected]>Signed-off-by Denis Carikli <[email protected]>---
ChangeLogv8->v9:
- Added Grant Likely in the Cc list.
- Removed the mention of the pinctrl properties in the documentation.
Quoted 4 lines
ChangeLog
v7->v8:
- Fixed the lack of x and z fuzz properties.
- The pendown gpio is better documented.
- Added Shawn Guo in the cc list.
Does the device still work if you drop the patch below on top of yours?
Thanks!
Signature · 14 lines
Dmitry Input: tsc2007 misc fixes From: Dmitry Torokhov <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]> --- arch/arm/mach-imx/mach-cpuimx35.c | 2 - arch/arm/mach-imx/mach-cpuimx51sd.c | 2 - arch/sh/boards/mach-ecovec24/setup.c | 2 - drivers/input/touchscreen/tsc2007.c | 126 +++++++++++++--------------------- include/linux/i2c/tsc2007.h | 6 +- 5 files changed, 55 insertions(+), 83 deletions(-)
arch/arm/mach-imx/mach-cpuimx35.c +1 -1
@@ -53,7 +53,7 @@ static const struct imxi2c_platform_data };#define TSC2007_IRQGPIO IMX_GPIO_NR(3, 2) -static int tsc2007_get_pendown_state (void ) +static int tsc2007_get_pendown_state (struct device *dev) {return !gpio_get_value (TSC2007_IRQGPIO ); }
arch/arm/mach-imx/mach-cpuimx51sd.c +1 -1
@@ -121,7 +121,7 @@ static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, }; -static int tsc2007_get_pendown_state (void ) +static int tsc2007_get_pendown_state (struct device *dev) {if (mx51_revision () <IMX_CHIP_REVISION_3_0 )return !gpio_get_value (TSC2007_IRQGPIO_REV2 );
arch/sh/boards/mach-ecovec24/setup.c +1 -1
@@ -501,7 +501,7 @@ static struct platform_device keysc_device = {/* TouchScreen */ #define IRQ0 evt2irq(0x600) -static int ts_get_pendown_state (void ) +static int ts_get_pendown_state (struct device *dev) {int val =0 ;gpio_free (GPIO_FN_INTC_IRQ0 );
drivers/input/touchscreen/tsc2007.c +49 -77
240 lines not on this page · raw message
include/linux/i2c/tsc2007.h +3 -3
@@ -14,9 +14,9 @@ struct tsc2007_platform_data {int fuzzy;int fuzzz; -int (*get_pendown_state)(void ); -void (*clear_penirq)(void );/* If needed, clear 2nd level -interrupt source */ +int (*get_pendown_state)(struct device *); +/* If needed, clear 2nd level interrupt source */ +void (*clear_penirq)(void );int (*init_platform_hw)(void );void (*exit_platform_hw)(void ); };
PATCH v9 1/3 Input: tsc2007: Add device tree support.
Quoted 5 lines · Dmitry Torokhov
Input: tsc2007 misc fixes
From: Dmitry Torokhov <[email protected]>
Signed-off-by Dmitry Torokhov <[email protected]>
Denis.
PATCH v9 1/3 Input: tsc2007: Add device tree support.
In reply to Denis CarikliQuoted 36 lines · Denis Carikli
Cc Rob Herring <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Stephen Warren <[email protected]>Cc Ian Campbell <[email protected]>Cc Grant Likely <[email protected]>Cc devicetree at vger.kernel.orgCc Dmitry Torokhov <[email protected]>Cc linux-input at vger.kernel.orgCc Sascha Hauer <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc Lothar Wa?mann <[email protected]>Cc Shawn Guo <[email protected]>Cc Eric B?nard <[email protected]>Signed-off-by Denis Carikli <[email protected]>---
ChangeLogv8->v9:
- Added Grant Likely in the Cc list.
- Removed the mention of the pinctrl properties in the documentation.ChangeLog
v7->v8:
- Fixed the lack of x and z fuzz properties.
- The pendown gpio is better documented.
- Added Shawn Guo in the cc list.--- .../bindings/input/touchscreen/tsc2007.txt | 41 ++++ drivers/input/touchscreen/tsc2007.c | 204 ++++++++++++++++---- 2 files changed, 204 insertions(+), 41 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2007.txtDocumentation/devicetree/bindings/input/touchscreen/tsc2007.txt new file +0
-0
Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt line 9
Quoted 9 lines
Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt new file +9
-0@@ -0,0 +1,41 @@ +* Texas Instruments tsc2007 touchscreen controller + +Required properties: +- compatible: must be "ti,tsc2007". +- reg: I2C address of the chip. +- ti,x-plate-ohms: X-plate resistance in ohms. + +Optional properties: +- gpios: the interrupt gpio the chip is connected to (trough the penirq pin).
nack use interrupt property this a non-sense that we do today to pass irq via gpio property the should NEVER known it's a gpio just an irq
Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt line 21
Quoted 12 lines
Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt new file +12
-0+ The penirq pin goes to low when the panel is touched. + (see GPIO binding[1] for more details). +- interrupt-parent: the phandle for the gpio controller + (see interrupt binding[0]). +- interrupts: (gpio) interrupt to which the chip is connected + (see interrupt binding[0]). +- ti,max-rt: maximum pressure. +- ti,fuzzx: specifies the absolute input fuzz x value. + If set, it will permit noise in the data up to +- the value given to the fuzz + parameter, that is used to filter noise from the event stream. +- ti,fuzzy: specifies the absolute input fuzz y value. +- ti,fuzzz: specifies the absolute input fuzz z value.
fuzz{x,y,z} look a weird name
Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt line 23
Quoted 2 lines
Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt new file +2
-0+- ti,poll-period: how much time to wait(in millisecond) before reading again the + values from the tsc2007.
so put -ms in the binding to de clear and does not requiere to read the doc
Best Regards,
J.
Quoted 348 lines
Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt new file +18
-0+ +[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt +[1]: Documentation/devicetree/bindings/gpio/gpio.txt + +Example: + &i2c1 { + /* ... */ + tsc2007 at 49 { + compatible = "ti,tsc2007"; + reg = <0x49>; + interrupt-parent = <&gpio4>; + interrupts = <0x0 0x8>; + gpios = <&gpio4 0 0>; + ti,x-plate-ohms = <180>; + }; + + /* ... */ + };drivers/input/touchscreen/tsc2007.c +163
-41@@ -26,6 +26,9 @@#include <linux/interrupt.h> #include <linux/i2c.h> #include <linux/i2c/tsc2007.h> +#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/of_gpio.h> #define TSC2007_MEASURE_TEMP0 (0x0 << 4)#define TSC2007_MEASURE_AUX (0x2 << 4)@@ -74,7 +77,12 @@ struct tsc2007 {u16 max_rt;unsigned long poll_delay;unsigned long poll_period; +int fuzzx; +int fuzzy; +int fuzzz; +char of; +unsigned gpio;int irq;wait_queue_head_t wait;@@ -84,6 +92,11 @@ struct tsc2007 {void (*clear_penirq)(void ); }; +static int tsc2007_get_pendown_state_dt (struct tsc2007 *ts) +{ +return !gpio_get_value (ts->gpio); +} +static inline int tsc2007_xfer (struct tsc2007 *tsc,u8 cmd) {s32 data;@@ -142,6 +155,14 @@ static u32 tsc2007_calculate_pressure(struct tsc2007 *tsc, struct ts_event *tc)return rt; } +static bool tsc2007_is_pen_down_valid (struct tsc2007 *ts) +{ +if (ts->of) +return gpio_is_valid (ts->gpio); +else +return ts->get_pendown_state ? true : false; +} +static bool tsc2007_is_pen_down (struct tsc2007 *ts) {/* @@ -158,10 +179,13 @@ static bool tsc2007_is_pen_down(struct tsc2007 *ts)* to fall back on the pressure reading. */ -if (!ts->get_pendown_state) +if (!tsc2007_is_pen_down_valid (ts))return true; -return ts->get_pendown_state (); +if (ts->of) +return tsc2007_get_pendown_state_dt (ts); +else +return ts->get_pendown_state (); }static irqreturn_t tsc2007_soft_irq (int irq,void *handle)@@ -178,7 +202,7 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle) rt =tsc2007_calculate_pressure (ts, &tc); -if (rt ==0 && !ts->get_pendown_state) { +if (!rt && !tsc2007_is_pen_down_valid (ts)) {/* * If pressure reported is 0 and we don't have * callback to check pendown state, we have to @@ -228,7 +252,7 @@ static irqreturn_t tsc2007_hard_irq(int irq, void *handle) {struct tsc2007 *ts = handle; -if (!ts->get_pendown_state ||likely (ts->get_pendown_state ())) +if (tsc2007_is_pen_down (ts))return IRQ_WAKE_THREAD ;if (ts->clear_penirq)@@ -273,34 +297,71 @@ static void tsc2007_close(struct input_dev *input_dev)tsc2007_stop (ts); } -static int tsc2007_probe (struct i2c_client *client, -const struct i2c_device_id *id) +#ifdef CONFIG_OF +static int tsc2007_probe_dt (struct i2c_client *client,struct tsc2007 *ts, +struct device_node *np) { -struct tsc2007 *ts; -struct tsc2007_platform_data *pdata = client->dev.platform_data; -struct input_dev *input_dev; -int err; - -if (!pdata) { -dev_err (&client->dev,"platform data is required!\n" ); +int err =0 ; +u32 val32; +u64 val64; + +if (!of_property_read_u32 (np,"ti,max-rt" , &val32)) + ts->max_rt = val32; +else + ts->max_rt =MAX_12BIT ; + +if (!of_property_read_u32 (np,"ti,fuzzx" , &val32)) + ts->fuzzx = val32; + +if (!of_property_read_u32 (np,"ti,fuzzy" , &val32)) + ts->fuzzy = val32; + +if (!of_property_read_u32 (np,"ti,fuzzz" , &val32)) + ts->fuzzz = val32; + +if (!of_property_read_u64 (np,"ti,poll-period" , &val64)) + ts->poll_period = val64; +else + ts->poll_period =1 ; + +if (!of_property_read_u32 (np,"ti,x-plate-ohms" , &val32)) { + ts->x_plate_ohms = val32; + }else { +dev_err (&client->dev, +"Error: lacking ti,x-plate-ohms devicetree property. (err %d)." , + err);return -EINVAL ; } -if (!i2c_check_functionality (client->adapter, -I2C_FUNC_SMBUS_READ_WORD_DATA )) -return -EIO ; + ts->gpio =of_get_gpio (np,0 ); +if (!gpio_is_valid (ts->gpio)) +dev_err (&client->dev, +"GPIO not found (of_get_gpio returned %d)\n" , + ts->gpio); - ts =kzalloc (sizeof (struct tsc2007 ),GFP_KERNEL ); - input_dev =input_allocate_device (); -if (!ts || !input_dev) { - err = -ENOMEM ; - goto err_free_mem; - } +/* Used to detect if it is probed trough the device tree, +* in order to be able to use that information in the IRQ handler. +*/ + ts->of =1 ; - ts->client = client; - ts->irq = client->irq; - ts->input = input_dev; -init_waitqueue_head (&ts->wait); +return 0 ; +} +#else +static int tsc2007_probe_dt (struct i2c_client *client,struct tsc2007 *ts, +struct device_node *np) +{ +return -ENODEV ; +} +#endif + +static int tsc2007_probe_pdev (struct i2c_client *client,struct tsc2007 *ts, +struct tsc2007_platform_data *pdata, +const struct i2c_device_id *id) +{ +if (!pdata) { +dev_err (&client->dev,"platform data is required!\n" ); +return -EINVAL ; + } ts->model = pdata->model; ts->x_plate_ohms = pdata->x_plate_ohms;@@ -309,13 +370,59 @@ static int tsc2007_probe(struct i2c_client *client, ts->poll_period = pdata->poll_period ? :1 ; ts->get_pendown_state = pdata->get_pendown_state; ts->clear_penirq = pdata->clear_penirq; + ts->fuzzx = pdata->fuzzx; + ts->fuzzy = pdata->fuzzy; + ts->fuzzz = pdata->fuzzz;if (pdata->x_plate_ohms ==0 ) {dev_err (&client->dev,"x_plate_ohms is not set up in platform data" ); - err = -EINVAL ; - goto err_free_mem; +return -EINVAL ; } +/* Used to detect if it is probed trough the device tree, +* in order to be able to use that information in the IRQ handler. +*/ + ts->of =0 ; + +return 0 ; +} + +static int tsc2007_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct device_node *np = client->dev.of_node; +struct tsc2007_platform_data *pdata = client->dev.platform_data; +struct tsc2007 *ts; +struct input_dev *input_dev; +int err =0 ; + + ts =devm_kzalloc (&client->dev,sizeof (struct tsc2007 ),GFP_KERNEL ); +if (!ts) +return -ENOMEM ; + +if (np) + err =tsc2007_probe_dt (client, ts, np); +else + err =tsc2007_probe_pdev (client, ts, pdata, id); + +if (err) +return err; + +if (!i2c_check_functionality (client->adapter, +I2C_FUNC_SMBUS_READ_WORD_DATA )) +return -EIO ; + + input_dev =input_allocate_device (); +if (!input_dev) { + err = -ENOMEM ; + goto err_free_input; + }; + + ts->client = client; + ts->irq = client->irq; + ts->input = input_dev; +init_waitqueue_head (&ts->wait); +snprintf (ts->phys,sizeof (ts->phys),"%s/input0" ,dev_name (&client->dev));@@ -331,19 +438,21 @@ static int tsc2007_probe(struct i2c_client *client, input_dev->evbit[0 ] =BIT_MASK (EV_KEY ) |BIT_MASK (EV_ABS ); input_dev->keybit[BIT_WORD (BTN_TOUCH )] =BIT_MASK (BTN_TOUCH ); -input_set_abs_params (input_dev,ABS_X ,0 ,MAX_12BIT , pdata->fuzzx,0 ); -input_set_abs_params (input_dev,ABS_Y ,0 ,MAX_12BIT , pdata->fuzzy,0 ); +input_set_abs_params (input_dev,ABS_X ,0 ,MAX_12BIT , ts->fuzzx,0 ); +input_set_abs_params (input_dev,ABS_Y ,0 ,MAX_12BIT , ts->fuzzy,0 );input_set_abs_params (input_dev,ABS_PRESSURE ,0 ,MAX_12BIT , - pdata->fuzzz,0 ); + ts->fuzzz,0 ); -if (pdata->init_platform_hw) - pdata->init_platform_hw (); +if (!np) { +if (pdata->init_platform_hw) + pdata->init_platform_hw (); + } err =request_threaded_irq (ts->irq, tsc2007_hard_irq, tsc2007_soft_irq,IRQF_ONESHOT , client->dev.driver->name, ts);if (err <0 ) {dev_err (&client->dev,"irq %d busy?\n" , ts->irq); - goto err_free_mem; + goto err_free_input; }tsc2007_stop (ts);@@ -358,23 +467,27 @@ static int tsc2007_probe(struct i2c_client *client, err_free_irq:free_irq (ts->irq, ts); -if (pdata->exit_platform_hw) - pdata->exit_platform_hw (); - err_free_mem: +if (!np) { +if (pdata->exit_platform_hw) + pdata->exit_platform_hw (); + } + err_free_input:input_free_device (input_dev); -kfree (ts);return err; }static int tsc2007_remove (struct i2c_client *client) { +struct device_node *np = client->dev.of_node;struct tsc2007 *ts =i2c_get_clientdata (client);struct tsc2007_platform_data *pdata = client->dev.platform_data;free_irq (ts->irq, ts); -if (pdata->exit_platform_hw) - pdata->exit_platform_hw (); +if (!np) { +if (pdata->exit_platform_hw) + pdata->exit_platform_hw (); + }input_unregister_device (ts->input);kfree (ts);@@ -389,10 +502,19 @@ static const struct i2c_device_id tsc2007_idtable[] = {MODULE_DEVICE_TABLE (i2c, tsc2007_idtable); +#ifdef CONFIG_OF +static const struct of_device_id tsc2007_of_match[] = { + { .compatible ="ti,tsc2007" }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (of, tsc2007_of_match); +#endif +static struct i2c_driver tsc2007_driver = { .driver = { .owner =THIS_MODULE , - .name ="tsc2007" + .name ="tsc2007" , + .of_match_table =of_match_ptr (tsc2007_of_match), }, .id_table = tsc2007_idtable, .probe = tsc2007_probe,Signature · 1 line
1.7.9.5
PATCH v9 1/3 Input: tsc2007: Add device tree support.
Hi Jean Christophe,
Le Thu, 21 Nov 2013 06:05:44 +0100,
Jean-Christophe PLAGNIOL-VILLARD <[email protected]> a ?crit :
Quoted 4 lines
Quoted 2 lines
+Optional properties:
+- gpios: the interrupt gpio the chip is connected to (trough the penirq pin).nack use interrupt property this a non-sense that we do today to pass irq via gpio property the should NEVER known it's a gpio just an irq
read previous email and you will see the GPIO is used to get the signal level on the pin and not the IRQ.
Eric