| Message ID | 2adcbfd1d5b237598d37edcbeec4a8dbd443f36f.1442079408.git.dmitry.torokhov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Sep 12, 2015 at 10:45:51AM -0700, Dmitry Torokhov wrote: > Now that the driver respects IRQ trigger settings from device tree, let's > fix them up in individual DTSes (note that the driver is still compatible > with older DTSes). > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- > arch/arm/boot/dts/imx28-tx28.dts | 3 ++- > arch/arm/boot/dts/imx53-tx53-x03x.dts | 3 ++- > arch/arm/boot/dts/imx6qdl-tx6.dtsi | 3 ++- > 4 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts > index c17097d..d83fdcd 100644 > --- a/arch/arm/boot/dts/am437x-sk-evm.dts > +++ b/arch/arm/boot/dts/am437x-sk-evm.dts > @@ -471,7 +471,7 @@ > > reg = <0x38>; > interrupt-parent = <&gpio0>; > - interrupts = <31 0>; > + interrupts = <31 IRQ_TYPE_EDGE_FALLING>; for AM437x SK: Acked-by: Felipe Balbi <balbi@ti.com> Seems like there are no changes considering driver was always using IRQF_TRIGGER_FALLING.
* Felipe Balbi <balbi@ti.com> [150914 14:28]: > On Sat, Sep 12, 2015 at 10:45:51AM -0700, Dmitry Torokhov wrote: > > Now that the driver respects IRQ trigger settings from device tree, let's > > fix them up in individual DTSes (note that the driver is still compatible > > with older DTSes). > > > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > --- > > arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- > > arch/arm/boot/dts/imx28-tx28.dts | 3 ++- > > arch/arm/boot/dts/imx53-tx53-x03x.dts | 3 ++- > > arch/arm/boot/dts/imx6qdl-tx6.dtsi | 3 ++- > > 4 files changed, 7 insertions(+), 4 deletions(-) > > > > diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts > > index c17097d..d83fdcd 100644 > > --- a/arch/arm/boot/dts/am437x-sk-evm.dts > > +++ b/arch/arm/boot/dts/am437x-sk-evm.dts > > @@ -471,7 +471,7 @@ > > > > reg = <0x38>; > > interrupt-parent = <&gpio0>; > > - interrupts = <31 0>; > > + interrupts = <31 IRQ_TYPE_EDGE_FALLING>; > > for AM437x SK: > > Acked-by: Felipe Balbi <balbi@ti.com> > > Seems like there are no changes considering driver was always using > IRQF_TRIGGER_FALLING. Should not cause merge conflicts AFAIK: Acked-by: Tony Lindgren <tony@atomide.com>
On Sat, Sep 12, 2015 at 10:45:51AM -0700, Dmitry Torokhov wrote: > Now that the driver respects IRQ trigger settings from device tree, let's > fix them up in individual DTSes (note that the driver is still compatible > with older DTSes). > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- ... > arch/arm/boot/dts/imx28-tx28.dts | 3 ++- > arch/arm/boot/dts/imx53-tx53-x03x.dts | 3 ++- > arch/arm/boot/dts/imx6qdl-tx6.dtsi | 3 ++- Acked-by: Shawn Guo <shawnguo@kernel.org>
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts index c17097d..d83fdcd 100644 --- a/arch/arm/boot/dts/am437x-sk-evm.dts +++ b/arch/arm/boot/dts/am437x-sk-evm.dts @@ -471,7 +471,7 @@ reg = <0x38>; interrupt-parent = <&gpio0>; - interrupts = <31 0>; + interrupts = <31 IRQ_TYPE_EDGE_FALLING>; reset-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts index a5b27c8..4ea8934 100644 --- a/arch/arm/boot/dts/imx28-tx28.dts +++ b/arch/arm/boot/dts/imx28-tx28.dts @@ -13,6 +13,7 @@ /dts-v1/; #include "imx28.dtsi" #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> / { model = "Ka-Ro electronics TX28 module"; @@ -324,7 +325,7 @@ pinctrl-names = "default"; pinctrl-0 = <&tx28_edt_ft5x06_pins>; interrupt-parent = <&gpio2>; - interrupts = <5 0>; + interrupts = <5 IRQ_TYPE_EDGE_FALLING>; reset-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; wake-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts index 3b73e81..13e842b 100644 --- a/arch/arm/boot/dts/imx53-tx53-x03x.dts +++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts @@ -12,6 +12,7 @@ /dts-v1/; #include "imx53-tx53.dtsi" #include <dt-bindings/input/input.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pwm/pwm.h> / { @@ -216,7 +217,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_edt_ft5x06_1>; interrupt-parent = <&gpio6>; - interrupts = <15 0>; + interrupts = <15 IRQ_TYPE_EDGE_FALLING>; reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi index da08de3..13cb7cc 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi @@ -11,6 +11,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pwm/pwm.h> / { @@ -272,7 +273,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_edt_ft5x06>; interrupt-parent = <&gpio6>; - interrupts = <15 0>; + interrupts = <15 IRQ_TYPE_EDGE_FALLING>; reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; linux,wakeup;
Now that the driver respects IRQ trigger settings from device tree, let's fix them up in individual DTSes (note that the driver is still compatible with older DTSes). Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- arch/arm/boot/dts/imx28-tx28.dts | 3 ++- arch/arm/boot/dts/imx53-tx53-x03x.dts | 3 ++- arch/arm/boot/dts/imx6qdl-tx6.dtsi | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-)