lkml.org 
[lkml]   [2021]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH devicetree 02/10] Revert "arm64: dts: freescale: Fix 'interrupt-map' parent address cells"
    Date
    This reverts commit 869f0ec048dc8fd88c0b2003373bd985795179fb. That
    updated the expected device tree binding format for the ls-extirq
    driver, without also updating the parsing code to the new format.

    While the fsl-extirq driver may have a non-standard format (one that
    doesn't take into consideration the #address-cells of the interrupt
    parent), it also has no business in making use of the "interrupt-map"
    property in the first place. So the argument for the blamed patch was
    kind of moot in the first place.

    This change restores LS1088A, LS2088A/LS2085A and LX2160A to their
    previous bindings. A follow-up change will also rename "interrupt-map"
    to "fsl,extirq-map" to prevent any further automatic conversions from
    causing breakage. Keeping the revert as a separate change allows those
    renaming changes to look the same on kernels that include the reverted
    patch as on kernels that don't.

    Fixes: 869f0ec048dc ("arm64: dts: freescale: Fix 'interrupt-map' parent address cells")
    Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
    ---
    .../arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 24 +++++++++----------
    .../arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 24 +++++++++----------
    .../arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 24 +++++++++----------
    3 files changed, 36 insertions(+), 36 deletions(-)

    diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
    index f891ef6a3754..605072317243 100644
    --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
    +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
    @@ -241,18 +241,18 @@ extirq: interrupt-controller@14 {
    interrupt-controller;
    reg = <0x14 4>;
    interrupt-map =
    - <0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
    - <1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
    - <2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
    - <3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
    - <4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
    - <5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
    - <6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
    - <7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
    - <8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
    - <9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
    - <10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
    - <11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
    + <0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
    + <1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
    + <2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
    + <3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
    + <4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
    + <5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
    + <6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
    + <7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
    + <8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
    + <9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
    + <10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
    + <11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
    interrupt-map-mask = <0xffffffff 0x0>;
    };
    };
    diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
    index 3cb9c21d2775..1282b61da8a5 100644
    --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
    +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
    @@ -293,18 +293,18 @@ extirq: interrupt-controller@14 {
    interrupt-controller;
    reg = <0x14 4>;
    interrupt-map =
    - <0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
    - <1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
    - <2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
    - <3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
    - <4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
    - <5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
    - <6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
    - <7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
    - <8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
    - <9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
    - <10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
    - <11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
    + <0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
    + <1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
    + <2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
    + <3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
    + <4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
    + <5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
    + <6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
    + <7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
    + <8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
    + <9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
    + <10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
    + <11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
    interrupt-map-mask = <0xffffffff 0x0>;
    };
    };
    diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
    index dc8661ebd1f6..c4b1a59ba424 100644
    --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
    +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
    @@ -680,18 +680,18 @@ extirq: interrupt-controller@14 {
    interrupt-controller;
    reg = <0x14 4>;
    interrupt-map =
    - <0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
    - <1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
    - <2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
    - <3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
    - <4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
    - <5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
    - <6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
    - <7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
    - <8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
    - <9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
    - <10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
    - <11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
    + <0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
    + <1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
    + <2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
    + <3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
    + <4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
    + <5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
    + <6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
    + <7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
    + <8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
    + <9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
    + <10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
    + <11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
    interrupt-map-mask = <0xffffffff 0x0>;
    };
    };
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-12-14 02:39    [W:3.712 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site