From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aleix Roca Nonell Subject: [PATCH 3/6] arm64: dts: realtek: Move rtd1295 memreserve areas from the generic rtd129x to its specific dtsi Date: Sun, 7 Jul 2019 15:23:13 +0200 Message-ID: <20190707132313.GD13340@arks.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org To: Andreas =?utf-8?Q?F=C3=A4rber?= , Rob Herring , Mark Rutland , Thomas Gleixner , Jason Cooper , Marc Zyngier Cc: Matthias Brugger , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org There are two memreserve areas in the rtd1295x description that are not present in the RTD1296 SoC. This patch moves such areas to the rtd1295 device tree description. >>From the commit introducing such memreserves[1]: - 0x00030000 is undefined - 0x01b00000 is audio related [1] - commit 72a7786c0a0d65 ("ARM64: dts: Add Realtek RTD1295 and Zidoo X9S") Signed-off-by: Aleix Roca Nonell --- arch/arm64/boot/dts/realtek/rtd1295.dtsi | 3 +++ arch/arm64/boot/dts/realtek/rtd129x.dtsi | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/realtek/rtd1295.dtsi b/arch/arm64/boot/dts/realtek/rtd1295.dtsi index 41d7858da826..586cb1ee8cb8 100644 --- a/arch/arm64/boot/dts/realtek/rtd1295.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd1295.dtsi @@ -6,6 +6,9 @@ * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/memreserve/ 0x0000000000030000 0x00000000000d0000; +/memreserve/ 0x0000000001b00000 0x00000000004be000; + #include "rtd129x.dtsi" / { diff --git a/arch/arm64/boot/dts/realtek/rtd129x.dtsi b/arch/arm64/boot/dts/realtek/rtd129x.dtsi index b9cb92466fc7..9009db909fab 100644 --- a/arch/arm64/boot/dts/realtek/rtd129x.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd129x.dtsi @@ -8,8 +8,6 @@ /memreserve/ 0x0000000000000000 0x0000000000030000; /memreserve/ 0x000000000001f000 0x0000000000001000; -/memreserve/ 0x0000000000030000 0x00000000000d0000; -/memreserve/ 0x0000000001b00000 0x00000000004be000; /memreserve/ 0x0000000001ffe000 0x0000000000004000; #include -- 2.21.0