ARM: tegra: Use proper IRQ type definitions

This switches a few interrupt definitions that were using either
GPIO_ACTIVE_HIGH or GPIO_ACTIVE_LOW as IRQ type, which is invalid.

This is mostly a cosmetic change, that doesn't affect any driver.

Analogous to Paul's commit 38333641b6dd ("ARM: tegra: nyan: Use proper
IRQ type definitions").

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index acd6cf51b15ba471fa258cd49091be6185448cf1..eafff16765b4ae6be20f0c77a1454c4d02c00f09 100644 (file)
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -780,7 +780,7 @@
                        compatible = "realtek,rt5640";
                        reg = <0x1c>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_HIGH>;
+                       interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_FALLING>;
                        realtek,ldo1-en-gpios =
                                <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index d112f85e66ed530b14f66ed6d0c50f107d4f2a65..6dbcf84dafbc1cb6d845d7cb53adb288758abc2b 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1418,7 +1418,7 @@
                        compatible = "realtek,rt5639";
                        reg = <0x1c>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>;
+                       interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>;
                        realtek,ldo1-en-gpios =
                                <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 32d9079f025bf2d9fbcb067f4fb80f8dcca38c04..c0469ea149d2bdaa660b0d09907f63139e837294 100644 (file)
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -613,7 +613,7 @@
                        compatible = "maxim,max98090";
                        reg = <0x10>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>;
+                       interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>;
                };
        };
 
@@ -859,7 +859,7 @@
                                        reg = <0x9>;
                                        interrupt-parent = <&gpio>;
                                        interrupts = <TEGRA_GPIO(J, 0)
-                                                       GPIO_ACTIVE_HIGH>;
+                                                       IRQ_TYPE_EDGE_BOTH>;
                                        ti,ac-detect-gpios = <&gpio
                                                        TEGRA_GPIO(J, 0)
                                                        GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index faa8cd2914e8b13f54ff8ece5ef66469e3b20dc5..bfb7913c0657fb8940f600520f8dcb8140b6089b 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -657,7 +657,7 @@
                        reg = <1>;
                        clocks = <&clk16m>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_LOW>;
+                       interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_RISING>;
                        spi-max-frequency = <10000000>;
                };
        };
@@ -672,7 +672,7 @@
                        reg = <0>;
                        clocks = <&clk16m>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
+                       interrupts = <TEGRA_GPIO(W, 2) IRQ_TYPE_EDGE_RISING>;
                        spi-max-frequency = <10000000>;
                };
        };

diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 5331a8f7dcf894815350634ecb599ee73d988382..36b85a0ab0eb9a7cbd42445d077a4fa2185ce100 100644 (file)
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -1762,7 +1762,7 @@
                        compatible = "realtek,rt5640";
                        reg = <0x1c>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_GPIO(X, 3) GPIO_ACTIVE_HIGH>;
+                       interrupts = <TEGRA_GPIO(X, 3) IRQ_TYPE_EDGE_FALLING>;
                        realtek,ldo1-en-gpios =
                                <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
index 3c5fb243021207fad7d85033ac5688fe10f72f39..b307feb7c330b5d75693588422ff47dfd6d9754f 100644 (file)
--- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
@@ -79,7 +79,7 @@
                        reg = <0>;
                        clocks = <&clk16m>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_GPIO(S, 0) GPIO_ACTIVE_LOW>;
+                       interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_RISING>;
                        spi-max-frequency = <10000000>;
                };
                spidev0: spi@1 {