From dc77dad92c34ba54faf035d6cf839bf2716ae4ec Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 2 Aug 2024 15:24:32 +0800 Subject: [PATCH] ARM: dts: rockchip: rk3506-amp: Use reserved_memory label Change-Id: I971e00e43636509d05fb2aeadbfbf54f1bf78ed6 Signed-off-by: Tao Huang --- arch/arm/boot/dts/rk3506-amp.dtsi | 54 ++++++++++++++----------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/arch/arm/boot/dts/rk3506-amp.dtsi b/arch/arm/boot/dts/rk3506-amp.dtsi index 17b7b8f36c3a..bfbf5bbef7e9 100644 --- a/arch/arm/boot/dts/rk3506-amp.dtsi +++ b/arch/arm/boot/dts/rk3506-amp.dtsi @@ -37,35 +37,6 @@ status = "okay"; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - /* remote amp core address */ - amp_shmem_reserved: amp-shmem@3b00000 { - reg = <0x03b00000 0x100000>; - no-map; - }; - - rpmsg_reserved: rpmsg@3c00000 { - reg = <0x03c00000 0x100000>; - no-map; - }; - - rpmsg_dma_reserved: rpmsg-dma@3d00000 { - compatible = "shared-dma-pool"; - reg = <0x03d00000 0x100000>; - no-map; - }; - - /* mcu address */ - mcu_reserved: mcu@fff80000 { - reg = <0xfff80000 0xc000>; - no-map; - }; - }; - rpmsg: rpmsg@3c00000 { compatible = "rockchip,rpmsg"; mbox-names = "rpmsg-rx", "rpmsg-tx"; @@ -87,3 +58,28 @@ rockchip,txpoll-period-ms = <1>; status = "okay"; }; + +&reserved_memory { + /* remote amp core address */ + amp_shmem_reserved: amp-shmem@3b00000 { + reg = <0x03b00000 0x100000>; + no-map; + }; + + rpmsg_reserved: rpmsg@3c00000 { + reg = <0x03c00000 0x100000>; + no-map; + }; + + rpmsg_dma_reserved: rpmsg-dma@3d00000 { + compatible = "shared-dma-pool"; + reg = <0x03d00000 0x100000>; + no-map; + }; + + /* mcu address */ + mcu_reserved: mcu@fff80000 { + reg = <0xfff80000 0xc000>; + no-map; + }; +};