lkml.org 
[lkml]   [2020]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/8] arm64: dts: imx8mq: Correct interrupt flags in examples
    Date
    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 some
    logical behavior behind the name "ACTIVE_xxx", this is:
    ACTIVE_LOW => IRQ_TYPE_LEVEL_LOW

    Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

    ---

    Not tested on HW.
    ---
    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(-)

    diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts
    index a80e53428c2f..7f728dea32ca 100644
    --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts
    +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts
    @@ -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>;
    interrupt-names = "irq";
    rohm,reset-snvs-powered;

    diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
    index c3e290703fe8..3c389c7ffb2c 100644
    --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
    +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
    @@ -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"
    @@ -639,7 +640,7 @@
    clock-names = "osc";
    clock-output-names = "pmic_clk";
    interrupt-parent = <&gpio1>;
    - interrupts = <7 GPIO_ACTIVE_LOW>;
    + interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
    interrupt-names = "irq";
    rohm,reset-snvs-powered;

    diff --git a/arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts b/arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts
    index 3f541ddf0768..05fcea2fb402 100644
    --- a/arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts
    +++ b/arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts
    @@ -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 {
    diff --git a/arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts b/arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts
    index 59da96b7143f..84c3a143d87b 100644
    --- a/arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts
    +++ b/arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts
    @@ -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 {
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-09-08 19:28    [W:4.483 / U:0.776 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site