lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 023/477] arm64: dts: meson: fixup SCP sram nodes
    Date
    From: Neil Armstrong <narmstrong@baylibre.com>

    [ Upstream commit 9ecded10b4b6af238da0c86197b0418912e7513e ]

    The GX and AXG SCP sram nodes were using invalid compatible and
    node names for the sram entries.

    Fixup the sram entries node names, and use proper compatible for them.

    It notably fixes:
    sram@c8000000: 'scp-shmem@0', 'scp-shmem@200' do not match any of the regexes: '^([a-z]*-)?sram(-section)?@[a-f0-9]+$', 'pinctrl-[0-9]+'

    Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
    Signed-off-by: Kevin Hilman <khilman@baylibre.com>
    Link: https://lore.kernel.org/r/20200326165958.19274-3-narmstrong@baylibre.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 +++---
    arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 10 +++++-----
    2 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
    index aace3d32a3df2..8e6281c685fad 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
    +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
    @@ -1735,18 +1735,18 @@
    };

    sram: sram@fffc0000 {
    - compatible = "amlogic,meson-axg-sram", "mmio-sram";
    + compatible = "mmio-sram";
    reg = <0x0 0xfffc0000 0x0 0x20000>;
    #address-cells = <1>;
    #size-cells = <1>;
    ranges = <0 0x0 0xfffc0000 0x20000>;

    - cpu_scp_lpri: scp-shmem@13000 {
    + cpu_scp_lpri: scp-sram@13000 {
    compatible = "amlogic,meson-axg-scp-shmem";
    reg = <0x13000 0x400>;
    };

    - cpu_scp_hpri: scp-shmem@13400 {
    + cpu_scp_hpri: scp-sram@13400 {
    compatible = "amlogic,meson-axg-scp-shmem";
    reg = <0x13400 0x400>;
    };
    diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
    index 03f79fe045b7f..e2bb68ec85025 100644
    --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
    +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
    @@ -398,20 +398,20 @@
    };

    sram: sram@c8000000 {
    - compatible = "amlogic,meson-gx-sram", "amlogic,meson-gxbb-sram", "mmio-sram";
    + compatible = "mmio-sram";
    reg = <0x0 0xc8000000 0x0 0x14000>;

    #address-cells = <1>;
    #size-cells = <1>;
    ranges = <0 0x0 0xc8000000 0x14000>;

    - cpu_scp_lpri: scp-shmem@0 {
    - compatible = "amlogic,meson-gx-scp-shmem", "amlogic,meson-gxbb-scp-shmem";
    + cpu_scp_lpri: scp-sram@0 {
    + compatible = "amlogic,meson-gxbb-scp-shmem";
    reg = <0x13000 0x400>;
    };

    - cpu_scp_hpri: scp-shmem@200 {
    - compatible = "amlogic,meson-gx-scp-shmem", "amlogic,meson-gxbb-scp-shmem";
    + cpu_scp_hpri: scp-sram@200 {
    + compatible = "amlogic,meson-gxbb-scp-shmem";
    reg = <0x13400 0x400>;
    };
    };
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 23:48    [W:5.522 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site