From patchwork Fri Nov 30 01:05:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 152474 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3070004ljp; Thu, 29 Nov 2018 17:05:50 -0800 (PST) X-Google-Smtp-Source: AFSGD/XOavmdUmhNlpIAD0biJ67QLGW8colPz/zL8BKRJMLZUTlTM5td/wnq8qsJSSagY1JUo+JP X-Received: by 2002:a63:d70e:: with SMTP id d14mr3163607pgg.159.1543539950758; Thu, 29 Nov 2018 17:05:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543539950; cv=none; d=google.com; s=arc-20160816; b=eGYeSxRcVgazB+4XmXyo31hymMo+Rus/KCAdJSPFC3yvWM3mAGjFjA1zLmnAbqCH6c 35XC4BJUQ+ny99lqWElV8XISZyxKTkRWxVIxlGSegUuxerIsQJiOT9/yrDe6YeehQmDe 3XfFrB74zY0YOtpaBSteMNx+OeHiPEy0i6WZZWng6uAf8aV20krrodNjAO2VFNU36Snh KSstdDV+Wwuj8X2vNVh11+GKC7YVy0eSwLfe4jl17oDPocU0BWkJ5Xa8cfOgE8iavDqr g6Yig3NoZyWEzbcEHJqrTwQbOMIN3xXgUDkn+cexB2MMEYcgKknjtGI2GYUtjxvqAaiM WIcA== 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=5bq1A+7sN43Im2BAwgIO1cEPT8jUvdcCM6xL/pu12Uc=; b=HQ5c/S7IUR4Nu1Iu86VlcfJlQen5oDHBXwEVlw7/ai8tpggoU003E0mcrLN7Rg8jQM SpbBrXf3bDi11+uHOG8N0Q4sJi8csF4xlrB28x8VDeZ+WzxPZqcCO2q5nLDE9Li+IHuh j6tIFK2OA5Pq43A3/uMLKha5EboCW8tzFqw3ekKC/kd3naIAR7LXhWkdb8JsccGrXTpM 4YL61+pXrmfdlJsPNrYhM7iouxRGu2DMmkV3YyMU/3dgsbL5V+SYUv12dhyp0hVJMd59 YVtLPugNkCkz1RqyBh1tcGe7dsGH40A0jQJQ0ReZ+smFrTYbdVqDTmYpHKJjN3eOjBVl v5hA== 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 27si3543281pgp.135.2018.11.29.17.05.50; Thu, 29 Nov 2018 17:05:50 -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 S1726652AbeK3MNR (ORCPT + 6 others); Fri, 30 Nov 2018 07:13:17 -0500 Received: from mail-oi1-f196.google.com ([209.85.167.196]:44728 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726451AbeK3MNR (ORCPT ); Fri, 30 Nov 2018 07:13:17 -0500 Received: by mail-oi1-f196.google.com with SMTP id m6so3366069oig.11 for ; Thu, 29 Nov 2018 17:05:49 -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=5bq1A+7sN43Im2BAwgIO1cEPT8jUvdcCM6xL/pu12Uc=; b=nM8epoBB66Rr8MIgPuhp4FCyLKeaZ3VsFsuw/dVlB5mpbsxgQYmIycge2+U5N44vhS B4EZGBcSZrKeBpHT+Ng3oYxtj7OU9vVBJt2tEVtPYJB4ZenrukG4fY+OethKe6QiUqRM f+IVYLK17AFHXnwqoszko6uHnAcVSieicLde1SH+67Kpr/DKyyumtYfQU12+kaxK91nr by1Thtxyi3sd0Mf6L5qiA+Z/9WyBBnasKNWEoxma2I+LaXmkIe93KU1wDTFHwGIu94lV ggCroW94mWjotpQ+T+iPbqdApaaddJiy+Ee2oCXDnu5mh37N8ynmWT0KMdB5aQWzNeIq JEHQ== X-Gm-Message-State: AA+aEWb31PuxadqFpejs3RjvqrRX7VTnzOK0Cs/8uhFBNSDq1AffoXfB iO1Ngbhlqx3j6fgJz2vszQ== X-Received: by 2002:aca:b4c5:: with SMTP id d188mr2255428oif.309.1543539948677; Thu, 29 Nov 2018 17:05:48 -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 r9sm2556165otq.81.2018.11.29.17.05.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Nov 2018 17:05:48 -0800 (PST) From: Rob Herring To: Linus Walleij , arm@kernel.org Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH] ARM: dts: realview-pbx: Fix duplicate regulator nodes Date: Thu, 29 Nov 2018 19:05:47 -0600 Message-Id: <20181130010547.24757-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 There's a bug in dtc in checking for duplicate node names when there's another section (e.g. "/ { };"). In this case, skeleton.dtsi provides another section. Upon removal of skeleton.dtsi, the dtb fails to build due to a duplicate node 'fixedregulator@0'. As both nodes were pretty much the same 3.3V fixed regulator, it hasn't really mattered. Fix this by renaming the nodes to something unique. In the process, drop the unit-address which shouldn't be present wtihout reg property. Cc: Linus Walleij Signed-off-by: Rob Herring --- arch/arm/boot/dts/arm-realview-pbx.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.19.1 diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi index a5676697ff3b..916a97734f84 100644 --- a/arch/arm/boot/dts/arm-realview-pbx.dtsi +++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi @@ -44,7 +44,7 @@ }; /* The voltage to the MMC card is hardwired at 3.3V */ - vmmc: fixedregulator@0 { + vmmc: regulator-vmmc { compatible = "regulator-fixed"; regulator-name = "vmmc"; regulator-min-microvolt = <3300000>; @@ -52,7 +52,7 @@ regulator-boot-on; }; - veth: fixedregulator@0 { + veth: regulator-veth { compatible = "regulator-fixed"; regulator-name = "veth"; regulator-min-microvolt = <3300000>; @@ -567,4 +567,3 @@ }; }; }; -