| Message ID | 20220920042608.1865560-1-dmitry.torokhov@gmail.com |
|---|---|
| State | Accepted |
| Commit | a306d0696aa96f85a9d1a1fbed2bcbf19b474961 |
| Headers | show |
| Series | [1/4] ARM: dts: imx6qdl-sabre*: fix Egalax touchscreen properties | expand |
On Mon, Sep 19, 2022 at 09:26:05PM -0700, Dmitry Torokhov wrote: > This patch fixes interrupt trigger (should be level low as that is what the > driver is always using), the GPIO that is the interrupt source that is also > used to wake up chip by driving the line low. > > The proper polarity is be needed for converting the driver to gpiod API. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Looks good to me. Let me know if you want me to pick it up. Otherwise, Acked-by: Shawn Guo <shawnguo@kernel.org> Shawn > --- > arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 4 ++-- > arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi > index 1368a4762037..1883350d004e 100644 > --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi > @@ -451,8 +451,8 @@ touchscreen@4 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_egalax_int>; > interrupt-parent = <&gpio2>; > - interrupts = <28 IRQ_TYPE_EDGE_FALLING>; > - wakeup-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; > + interrupts = <28 IRQ_TYPE_LEVEL_LOW>; > + wakeup-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; > }; > }; > > diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi > index 37482a9023fc..09f4c2fa3ad6 100644 > --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi > @@ -311,8 +311,8 @@ touchscreen@4 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_i2c2_egalax_int>; > interrupt-parent = <&gpio6>; > - interrupts = <8 IRQ_TYPE_EDGE_FALLING>; > - wakeup-gpios = <&gpio6 8 GPIO_ACTIVE_HIGH>; > + interrupts = <8 IRQ_TYPE_LEVEL_LOW>; > + wakeup-gpios = <&gpio6 8 GPIO_ACTIVE_LOW>; > }; > > ov5640: camera@3c { > @@ -450,8 +450,8 @@ egalax_ts@4 { > compatible = "eeti,egalax_ts"; > reg = <0x04>; > interrupt-parent = <&gpio6>; > - interrupts = <7 2>; > - wakeup-gpios = <&gpio6 7 0>; > + interrupts = <7 IRQ_TYPE_LEVEL_LOW>; > + wakeup-gpios = <&gpio6 7 GPIO_ACTIVE_LOW>; > }; > > magnetometer@e { > -- > 2.37.3.968.ga6b4b080e4-goog >
On Sun, Oct 23, 2022 at 05:30:16PM +0800, Shawn Guo wrote: > On Mon, Sep 19, 2022 at 09:26:05PM -0700, Dmitry Torokhov wrote: > > This patch fixes interrupt trigger (should be level low as that is what the > > driver is always using), the GPIO that is the interrupt source that is also > > used to wake up chip by driving the line low. > > > > The proper polarity is be needed for converting the driver to gpiod API. > > > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > Looks good to me. Let me know if you want me to pick it up. Otherwise, > > Acked-by: Shawn Guo <shawnguo@kernel.org> Thank you, I merged it with the other 3 patches through my tree.
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 1368a4762037..1883350d004e 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -451,8 +451,8 @@ touchscreen@4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_egalax_int>; interrupt-parent = <&gpio2>; - interrupts = <28 IRQ_TYPE_EDGE_FALLING>; - wakeup-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; + interrupts = <28 IRQ_TYPE_LEVEL_LOW>; + wakeup-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; }; }; diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index 37482a9023fc..09f4c2fa3ad6 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -311,8 +311,8 @@ touchscreen@4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2_egalax_int>; interrupt-parent = <&gpio6>; - interrupts = <8 IRQ_TYPE_EDGE_FALLING>; - wakeup-gpios = <&gpio6 8 GPIO_ACTIVE_HIGH>; + interrupts = <8 IRQ_TYPE_LEVEL_LOW>; + wakeup-gpios = <&gpio6 8 GPIO_ACTIVE_LOW>; }; ov5640: camera@3c { @@ -450,8 +450,8 @@ egalax_ts@4 { compatible = "eeti,egalax_ts"; reg = <0x04>; interrupt-parent = <&gpio6>; - interrupts = <7 2>; - wakeup-gpios = <&gpio6 7 0>; + interrupts = <7 IRQ_TYPE_LEVEL_LOW>; + wakeup-gpios = <&gpio6 7 GPIO_ACTIVE_LOW>; }; magnetometer@e {
This patch fixes interrupt trigger (should be level low as that is what the driver is always using), the GPIO that is the interrupt source that is also used to wake up chip by driving the line low. The proper polarity is be needed for converting the driver to gpiod API. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 4 ++-- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)