Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754595AbdLTD1Y (ORCPT ); Tue, 19 Dec 2017 22:27:24 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:38295 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754300AbdLTD1S (ORCPT ); Tue, 19 Dec 2017 22:27:18 -0500 X-Google-Smtp-Source: ACJfBotrINvabZUmRiOEhgCsLaSH/2KBoanq4I8+bBeRY89zMN/vFIABOPM6dEUaEOSb7nJOMZrOlw== From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v3 19/20] ARM: dts: aspeed-plametto: Add flash layout and fix memory node Date: Wed, 20 Dec 2017 13:53:27 +1030 Message-Id: <20171220032328.30584-20-joel@jms.id.au> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171220032328.30584-1-joel@jms.id.au> References: <20171220032328.30584-1-joel@jms.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 891 Lines: 36 The OpenBMC flash layout is used by Palmetto systems. Add the unit name to the memory node to fix a warning with W=1. Reviewed-by: Cédric Le Goater Signed-off-by: Joel Stanley --- v3: - Added memory node unit name --- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts index a8f0c046e83e..4379d09a261f 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts @@ -12,7 +12,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory@40000000 { reg = <0x40000000 0x20000000>; }; @@ -34,6 +34,7 @@ status = "okay"; m25p,fast-read; label = "bmc"; +#include "openbmc-flash-layout.dtsi" }; }; -- 2.15.1