ARM: dts: imx6qdl-gw5xxx: correct interrupt flags
Subsystems (2)
PATCH v2 2/4 arm64: dts: imx8mm: correct interrupt flags
In reply to Krzysztof KozlowskiGPIO_ACTIVE_x flags are not correct in the context of interrupt flags. These are simple defines so they could be used in DTS but they will not have the same meaning:
1. GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE
2. GPIO_ACTIVE_LOW = 1 = IRQ_TYPE_EDGE_RISING
Correct the interrupt flags, assuming the author of the code wanted same logical behavior behind the name "ACTIVE_xxx", this is:
ACTIVE_LOW => IRQ_TYPE_LEVEL_LOW
ACTIVE_HIGH => IRQ_TYPE_LEVEL_HIGH
In case of level low interrupts, enable also internal pull up. It is required at least on imx8mm-evk, according to schematics.
The schematics for Variscite imx8mm-var-som are not available and I was unable to get proper configuration from Variscite.
---
Changes since v1:
1. Correct title.
2. Enable pull ups.
--- arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi | 4 ++-- arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 4 ++-- arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dts | 2 +- arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 6 +++++- 4 files changed, 10 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi +2 -2
@@ -74,7 +74,7 @@ reg = <0x4b>; pinctrl-0 = <&pinctrl_pmic>; interrupt-parent = <&gpio1>; - interrupts = <3 GPIO_ACTIVE_LOW>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; rohm,reset-snvs-powered; regulators {
@@ -292,7 +292,7 @@ pinctrl_pmic: pmicirqgrp { fsl,pins = < - MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x41 + MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x141 >; };
arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi +2 -2
@@ -123,7 +123,7 @@ reg = <0x4b>; pinctrl-0 = <&pinctrl_pmic>; interrupt-parent = <&gpio1>; - interrupts = <3 GPIO_ACTIVE_LOW>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; rohm,reset-snvs-powered; #clock-cells = <0>;
@@ -392,7 +392,7 @@ pinctrl_pmic: pmicirqgrp { fsl,pins = < - MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x41 + MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x141 >; };
arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dts +1 -1
@@ -134,7 +134,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_captouch>; interrupt-parent = <&gpio5>; - interrupts = <4 GPIO_ACTIVE_HIGH>; + interrupts = <4 IRQ_TYPE_LEVEL_HIGH>; touchscreen-size-x = <800>; touchscreen-size-y = <480>;
arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi +5 -1
@@ -137,7 +137,11 @@ reg = <0x4b>; pinctrl-0 = <&pinctrl_pmic>; interrupt-parent = <&gpio2>; - interrupts = <8 GPIO_ACTIVE_LOW>; + /* + * The interrupt is not correct. It should be level low, + * however with internal pull up this causes IRQ storm. + */ + interrupts = <8 IRQ_TYPE_EDGE_RISING>; rohm,reset-snvs-powered; #clock-cells = <0>;
Signature · 1 line
2.17.1
PATCH v2 3/4 arm64: dts: imx8mn: correct interrupt flags
In reply to Krzysztof KozlowskiGPIO_ACTIVE_x flags are not correct in the context of interrupt flags. These are simple defines so they could be used in DTS but they will not have the same meaning:
1. GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE
2. GPIO_ACTIVE_LOW = 1 = IRQ_TYPE_EDGE_RISING
Correct the interrupt flags, assuming the author of the code wanted same logical behavior behind the name "ACTIVE_xxx", this is:
ACTIVE_LOW => IRQ_TYPE_LEVEL_LOW
For level low interrupts, enable also internal pull up. It is required at least on imx8mm-evk, according to schematics.
---
Not tested on HW.
Changes since v1:
1. Correct title.
2. Enable pull ups.
--- arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 4 ++-- arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 3 ++- arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts +2 -2
@@ -55,7 +55,7 @@ reg = <0x4b>; pinctrl-0 = <&pinctrl_pmic>; interrupt-parent = <&gpio1>; - interrupts = <3 GPIO_ACTIVE_LOW>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; rohm,reset-snvs-powered; regulators {
@@ -157,7 +157,7 @@ &iomuxc { pinctrl_pmic: pmicirqgrp { fsl,pins = < - MX8MN_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x41 + MX8MN_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x141 >; }; };
arch/arm64/boot/dts/freescale/imx8mn-evk.dts +2 -1
@@ -7,6 +7,7 @@ #include "imx8mn.dtsi" #include "imx8mn-evk.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> / { model = "NXP i.MX8MNano EVK board";
@@ -19,7 +20,7 @@ reg = <0x25>; pinctrl-0 = <&pinctrl_pmic>; interrupt-parent = <&gpio1>; - interrupts = <3 GPIO_ACTIVE_LOW>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; regulators { buck1: BUCK1{
arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi +1 -1
@@ -225,7 +225,7 @@ pinctrl_pmic: pmicirqgrp { fsl,pins = < - MX8MN_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x41 + MX8MN_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x141 >; };
Signature · 1 line
2.17.1
PATCH v2 4/4 arm64: dts: imx8mq: correct interrupt flags
In reply to Krzysztof KozlowskiGPIO_ACTIVE_x flags are not correct in the context of interrupt flags. These are simple defines so they could be used in DTS but they will not have the same meaning:
1. GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE
2. GPIO_ACTIVE_LOW = 1 = IRQ_TYPE_EDGE_RISING
Correct the interrupt flags, assuming the author of the code wanted same logical behavior behind the name "ACTIVE_xxx", this is:
ACTIVE_LOW => IRQ_TYPE_LEVEL_LOW
---
Not tested on HW.
Changes since v1:
1. Correct title
--- arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts | 5 +++-- arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 3 ++- arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts | 3 ++- arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts +3 -2
@@ -6,6 +6,7 @@ /dts-v1/; #include "dt-bindings/input/input.h" +#include <dt-bindings/interrupt-controller/irq.h> #include "dt-bindings/pwm/pwm.h" #include "dt-bindings/usb/pd.h" #include "imx8mq.dtsi"
@@ -60,7 +61,7 @@ label = "WWAN_WAKE"; gpios = <&gpio3 8 GPIO_ACTIVE_LOW>; interrupt-parent = <&gpio3>; - interrupts = <8 GPIO_ACTIVE_LOW>; + interrupts = <8 IRQ_TYPE_LEVEL_LOW>; wakeup-source; linux,code = <KEY_PHONE>; };
@@ -288,7 +289,7 @@ #clock-cells = <0>; clock-output-names = "pmic_clk"; interrupt-parent = <&gpio1>; - interrupts = <3 GPIO_ACTIVE_LOW>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; rohm,reset-snvs-powered; regulators {
arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi +2 -1
@@ -6,6 +6,7 @@ /dts-v1/; #include "dt-bindings/input/input.h" +#include <dt-bindings/interrupt-controller/irq.h> #include "dt-bindings/pwm/pwm.h" #include "dt-bindings/usb/pd.h" #include "imx8mq.dtsi"
@@ -640,7 +641,7 @@ clock-names = "osc"; clock-output-names = "pmic_clk"; interrupt-parent = <&gpio1>; - interrupts = <7 GPIO_ACTIVE_LOW>; + interrupts = <7 IRQ_TYPE_LEVEL_LOW>; rohm,reset-snvs-powered; regulators {
arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts +2 -1
@@ -6,6 +6,7 @@ /dts-v1/; #include "imx8mq.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> / { model = "Google i.MX8MQ Phanbell";
@@ -125,7 +126,7 @@ clocks = <&pmic_osc>; clock-output-names = "pmic_clk"; interrupt-parent = <&gpio1>; - interrupts = <3 GPIO_ACTIVE_LOW>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; regulators { buck1: BUCK1 {
arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts +2 -1
@@ -9,6 +9,7 @@ /dts-v1/; #include "imx8mq.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> / { model = "TechNexion PICO-PI-8M";
@@ -70,7 +71,7 @@ clock-names = "osc"; clock-output-names = "pmic_clk"; interrupt-parent = <&gpio1>; - interrupts = <3 GPIO_ACTIVE_LOW>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; interrupt-names = "irq"; regulators {
Signature · 1 line
2.17.1
PATCH v2 1/4 ARM: dts: imx6qdl-gw5xxx: correct interrupt flags
GPIO_ACTIVE_x flags are not correct in the context of interrupt flags. These are simple defines so they could be used in DTS but they will not have the same meaning:
1. GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE
2. GPIO_ACTIVE_LOW = 1 = IRQ_TYPE_EDGE_RISING
Correct the interrupt flags, assuming the author of the code wanted same logical behavior behind the name "ACTIVE_xxx", this is:
ACTIVE_LOW => IRQ_TYPE_LEVEL_LOW
---
Not tested on HW.
Changes since v1:
1. Correct title
--- arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5907.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 3 ++- 14 files changed, 28 insertions(+), 14 deletions(-)
arch/arm/boot/dts/imx6qdl-gw51xx.dtsi +2 -1
@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -152,7 +153,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +2 -1
@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -217,7 +218,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +2 -1
@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -210,7 +211,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +2 -1
@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/sound/fsl-imx-audmux.h> / {
@@ -247,7 +248,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #address-cells = <1>;
arch/arm/boot/dts/imx6qdl-gw551x.dtsi +2 -1
@@ -48,6 +48,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/media/tda1997x.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/sound/fsl-imx-audmux.h> / {
@@ -219,7 +220,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw552x.dtsi +2 -1
@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -144,7 +145,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw553x.dtsi +2 -1
@@ -47,6 +47,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -180,7 +181,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw560x.dtsi +2 -1
@@ -47,6 +47,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -294,7 +295,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw5903.dtsi +2 -1
@@ -47,6 +47,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { chosen {
@@ -235,7 +236,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw5904.dtsi +2 -1
@@ -47,6 +47,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -257,7 +258,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw5907.dtsi +2 -1
@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -154,7 +155,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw5910.dtsi +2 -1
@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -163,7 +164,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/imx6qdl-gw5912.dtsi +2 -1
@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -158,7 +159,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #address-cells = <1>;
arch/arm/boot/dts/imx6qdl-gw5913.dtsi +2 -1
@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */
@@ -139,7 +140,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.17.1
Quoted 331 lines · Krzysztof Kozlowski
GPIO_ACTIVE_xflags are not correct in the context of interrupt flags. These are simple defines so they could be used in DTS but they will not have the same meaning:
1.GPIO_ACTIVE_HIGH= 0 =IRQ_TYPE_NONE
2.GPIO_ACTIVE_LOW= 1 =IRQ_TYPE_EDGE_RISINGCorrect the interrupt flags, assuming the author of the code wanted same logical behavior behind the name "
ACTIVE_xxx", this is:
ACTIVE_LOW=>IRQ_TYPE_LEVEL_LOWSigned-off-by Krzysztof Kozlowski <[email protected]>---
Not tested on HW.
Changes since v1:
1. Correct title--- arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5907.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 3 ++- arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 3 ++- 14 files changed, 28 insertions(+), 14 deletions(-)arch/arm/boot/dts/imx6qdl-gw51xx.dtsi +2
-1@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -152,7 +153,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +2
-1@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -217,7 +218,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +2
-1@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -210,7 +211,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +2
-1@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/sound/fsl-imx-audmux.h> / {@@ -247,7 +248,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #address-cells = <1>;arch/arm/boot/dts/imx6qdl-gw551x.dtsi +2
-1@@ -48,6 +48,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/media/tda1997x.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/sound/fsl-imx-audmux.h> / {@@ -219,7 +220,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw552x.dtsi +2
-1@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -144,7 +145,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw553x.dtsi +2
-1@@ -47,6 +47,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -180,7 +181,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw560x.dtsi +2
-1@@ -47,6 +47,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -294,7 +295,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw5903.dtsi +2
-1@@ -47,6 +47,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { chosen {@@ -235,7 +236,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw5904.dtsi +2
-1@@ -47,6 +47,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -257,7 +258,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw5907.dtsi +2
-1@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -154,7 +155,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw5910.dtsi +2
-1@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -163,7 +164,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>;arch/arm/boot/dts/imx6qdl-gw5912.dtsi +2
-1@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -158,7 +159,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #address-cells = <1>;arch/arm/boot/dts/imx6qdl-gw5913.dtsi +2
-2@@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> / { /* these are used by bootloader for disabling nodes */@@ -139,7 +140,7 @@ compatible = "gw,gsc"; reg = <0x20>; interrupt-parent = <&gpio1>; - interrupts = <4 GPIO_ACTIVE_LOW>; + interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <1>; #size-cells = <0>; --
Quoted 2 lines
2.17.1
for series:
Thanks Krzysztof
Tim
Tim
Shawn Guo
AppliedQuoted 11 lines · Krzysztof Kozlowski
GPIO_ACTIVE_xflags are not correct in the context of interrupt flags. These are simple defines so they could be used in DTS but they will not have the same meaning:
1.GPIO_ACTIVE_HIGH= 0 =IRQ_TYPE_NONE
2.GPIO_ACTIVE_LOW= 1 =IRQ_TYPE_EDGE_RISINGCorrect the interrupt flags, assuming the author of the code wanted same logical behavior behind the name "
ACTIVE_xxx", this is:
ACTIVE_LOW=>IRQ_TYPE_LEVEL_LOWSigned-off-by Krzysztof Kozlowski <[email protected]>
Applied all, thanks.