From patchwork Fri Nov 30 01:52:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 152477 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3104548ljp; Thu, 29 Nov 2018 17:52:55 -0800 (PST) X-Google-Smtp-Source: AFSGD/USuudxbMZ24WWGAwuAmPsbO/qeZTptCfzAapcyWwJSaRYLFcPoFecN3KVKeG8BZWqUj5yZ X-Received: by 2002:a17:902:380c:: with SMTP id l12mr3695374plc.326.1543542775741; Thu, 29 Nov 2018 17:52:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543542775; cv=none; d=google.com; s=arc-20160816; b=VHmDBerheup29j9ke8h0MCeLWsxHXhOUl1smr/x+J9XbLOmLWzEkLqKmNLQHfqRj4d ZaMsy5AKrbMBse6cV54lcJnJZehZpuHHQ+Kd1Y/Sen5te78MJNchMN7QM2IsGduW94Vj sl3DLNk6/6uj4BtTmirMqEUcPS6DkoD7cgXCZPd4MB7VaItUETurxXqX5kXlnhkE9K3N qZxia/ypV/tPsvrjK3OWc5KMd5LrchBMiVenH9h3S//He9VLfhIm4CgnndLfZ/pkXTGE CTMteRJIilx95Eb+SVZL6s9fDJNb7JvvUpQuzSkPFZhzBNXVcj2wwQiQ2SEqMMLRIWaS /z9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=uJUqz58s799CBzh2ovgyr4IApyWOepMYO5pBXpfJtiw=; b=DceHfnF+xCz242MBI+pbgg4uNcH/9J35+G8CPm/fiEpdBe2/gfOEg21mNUOgPR9DO0 g1+GB9r2TNQPfKQ7T7mh9hYQszwJAhR2yBfXoZNagfLa8SLLCIbkEciS22LhOKoUntza ozqx0DtP/yII/5AetkP0uFj2zc2rVQ91eUjWCni81wrsWTdc5wJfowsDtHKtoOzmITEs i2L6AlPs8sxhz6UNJOmt3G4/qwh0BWkToYPcnSMPZC8HldhuFVrQNkl5AY11SteOX89N eeSWxfUfzNRIxfNJklrPNYzRhsXkVFNifu4onREFhZAMinRPeEM9hTFLvSMui24FINNT zMLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bj7-v6si3662630plb.193.2018.11.29.17.52.55; Thu, 29 Nov 2018 17:52:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726549AbeK3NA3 (ORCPT + 6 others); Fri, 30 Nov 2018 08:00:29 -0500 Received: from mail-ot1-f68.google.com ([209.85.210.68]:33393 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726332AbeK3NA3 (ORCPT ); Fri, 30 Nov 2018 08:00:29 -0500 Received: by mail-ot1-f68.google.com with SMTP id i20so3770306otl.0 for ; Thu, 29 Nov 2018 17:52:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uJUqz58s799CBzh2ovgyr4IApyWOepMYO5pBXpfJtiw=; b=B+bm7U3SkBonbCkUHPuC35DHEMG90/r7QX5VKqHwm250MRmjQQV676T94uyo6nNJ0p 1+VhAiSh/6QAAOTgim3fndp5BGuNoBHzPe3RfG5iiOmBpQOTQbSZPLptph8oY90bFSoK FloGDNLMgpJGPNNTAvO89kWYIA/CbI4ZDq+NZeb8vjt09b3FLdE0mt9K7VAzoZ79POeB BFnF8rvibUAVCxFhkLMBW3dhz8BsdAKAwEtdmQithMRyND/fCw9nddZfPsGg+MEbtgfK id7mr3c+Rd9SbmhwYbBAEhu9H8DY/Oxe7jry06H3fqFlifbDvhheKon4Ce4liWC00QnI QBUg== X-Gm-Message-State: AA+aEWaYJ48MBZY40DRYEzb22jhr3KvTtrnUnP//wZz7kBkK3aUzPU0Q m1kSFqZ+nUngGB2oFW6lD8XbTrQ= X-Received: by 2002:a9d:4c84:: with SMTP id m4mr1122671otf.124.1543542773349; Thu, 29 Nov 2018 17:52:53 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id g38sm1320736otb.77.2018.11.29.17.52.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Nov 2018 17:52:52 -0800 (PST) From: Rob Herring To: arm@kernel.org, Joel Stanley , Andrew Jeffery Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH] ARM: dts: aspeed: add missing memory unit-address Date: Thu, 29 Nov 2018 19:52:51 -0600 Message-Id: <20181130015251.20754-1-robh@kernel.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The base aspeed-g5.dtsi already defines a '/memory@80000000' node, so '/memory' in the board files create a duplicate node. We're probably getting lucky that the bootloader fixes up the memory node that the kernel ends up using. Add the unit-address so it's merged with the base node. Found with DT json-schema checks. Cc: Joel Stanley Cc: Andrew Jeffery Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-aspeed@lists.ozlabs.org Signed-off-by: Rob Herring --- Might be better to just remove the node altogether from the SoC dtsi file. It's only saving the device_type definition. arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +-- arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) -- 2.19.1 diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts index df1227613d48..c2ece0b91885 100644 --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts +++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts @@ -13,7 +13,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory@80000000 { reg = <0x80000000 0x40000000>; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts index 7a291de02543..22dade6393d0 100644 --- a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts +++ b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts @@ -13,7 +13,7 @@ bootargs = "earlyprintk"; }; - memory { + memory@80000000 { reg = <0x80000000 0x20000000>; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts index d598b6391362..024e52a6cd0f 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts @@ -14,7 +14,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory@80000000 { reg = <0x80000000 0x40000000>; }; @@ -322,4 +322,3 @@ &adc { status = "okay"; }; - diff --git a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts b/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts index 43ed13963d35..33d704541de6 100644 --- a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts +++ b/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts @@ -17,7 +17,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory@80000000 { reg = <0x80000000 0x20000000>; };