lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 151/639] arm64: dts: allwinner: h6: Move GIC device node fix base address ordering
    Date
    From: Chen-Yu Tsai <wens@csie.org>

    [ Upstream commit 52d9bcb3d0de3fa1e07aff3800f857836d30410d ]

    The GIC device node was placed out of order in the initial device tree
    submission. Move it so the nodes are correctly sorted by base address
    again.

    Fixes: e54be32d0273 ("arm64: allwinner: h6: add the basical Allwinner H6 DTSI file")
    Signed-off-by: Chen-Yu Tsai <wens@csie.org>
    Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 22 ++++++++++----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
    index cfa5fffcf62b4..72813e7aefb8a 100644
    --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
    +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
    @@ -101,17 +101,6 @@
    #reset-cells = <1>;
    };

    - gic: interrupt-controller@3021000 {
    - compatible = "arm,gic-400";
    - reg = <0x03021000 0x1000>,
    - <0x03022000 0x2000>,
    - <0x03024000 0x2000>,
    - <0x03026000 0x2000>;
    - interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
    - interrupt-controller;
    - #interrupt-cells = <3>;
    - };
    -
    pio: pinctrl@300b000 {
    compatible = "allwinner,sun50i-h6-pinctrl";
    reg = <0x0300b000 0x400>;
    @@ -149,6 +138,17 @@
    };
    };

    + gic: interrupt-controller@3021000 {
    + compatible = "arm,gic-400";
    + reg = <0x03021000 0x1000>,
    + <0x03022000 0x2000>,
    + <0x03024000 0x2000>,
    + <0x03026000 0x2000>;
    + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
    + interrupt-controller;
    + #interrupt-cells = <3>;
    + };
    +
    mmc0: mmc@4020000 {
    compatible = "allwinner,sun50i-h6-mmc",
    "allwinner,sun50i-a64-mmc";
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:44    [W:2.143 / U:5.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site