From patchwork Mon Dec 3 19:12:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 152728 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp7182426ljp; Mon, 3 Dec 2018 11:12:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/XF8EXVHo27XTGvVZIhffKKlI/9wXGu2NTbx53TzyM1vlxD+MVAkuymcJrMp/DDiq8k5Omx X-Received: by 2002:a17:902:aa0a:: with SMTP id be10mr16845540plb.266.1543864373164; Mon, 03 Dec 2018 11:12:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543864373; cv=none; d=google.com; s=arc-20160816; b=F8z0dNrTEioOXTwA8o3f5UVPnzZocWwKwWft8NDj/j9qHN7ALqYNpQkQX8Vls6lOHz QF+sBIRvG2E5y+wM0tYYFtLwHL6uck6sBZps7Sf8Hd5BvlNL1McHT3uiu0euvIiIroRt Udptr2PMl53n6fSxFXkTleBh+OvZFpdyt7So4eFo7bXmEJTheSoMTYHtdSgVMb8ze9w4 sW/gO3ZHjVy5OWZmcvd+kT04HAZZd0Gtp75Gm4LPzs0ahmIArKkQbItgDDqSWBKFi958 OzXVdJm3gkg3qu2f3aCBSpeK3ow+FOXDTRAP2BqqM/tYnIiFUL1sGNA1YewspsdLl8Gk 2qog== 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=QbOFnvhZe3gfLOZmKzIKK9fE7VaSspuz5hn1yiZBxQ8=; b=EvD11wg9engUP4dctYRxdpCsf5dIRV+8o+rk5ODxmVfROg6IHNLyUtH3k05lwWxYdu 0obe3lqdOUWb+hcRDuPIVUHzyiDzqZ4tFLF9/x3WHKSGBipIVxM0yDqlVPf+XJd/2iSL Ez5HQWTQ44bdiEqfxao+UBbjWObeQtLF2XQOxPbCKlqP+JNmpSk2r+5vDcZZqXobyQRU 9wf5hmhuHU1fC1WQ1RvaoO6ZkuU2nhcRC6rNZvxfEAlNOpm4LaJ7aTwx4dpagWnDM9Z8 sOjgKBLBM4OIBhPHwqLpIh9bz+CPPQLLhv9UjiRevBGPpCPrjtuff+BBEUMZzrq0Jbxt V1tw== 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 a34si12793352pgb.458.2018.12.03.11.12.52; Mon, 03 Dec 2018 11:12:53 -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 S1725905AbeLCTMy (ORCPT + 6 others); Mon, 3 Dec 2018 14:12:54 -0500 Received: from mail-oi1-f194.google.com ([209.85.167.194]:34189 "EHLO mail-oi1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725912AbeLCTMy (ORCPT ); Mon, 3 Dec 2018 14:12:54 -0500 Received: by mail-oi1-f194.google.com with SMTP id h25so11995445oig.1 for ; Mon, 03 Dec 2018 11:12:50 -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=QbOFnvhZe3gfLOZmKzIKK9fE7VaSspuz5hn1yiZBxQ8=; b=mMD8zkNRrg5GnJcoWTfTHAQckvafjx+4F0wyOpIen2kVDTeARN8fpGcYs1UAhe9Ya9 73Srju4bs1wv6aB7vtDR+Tjm8gwZ++bbhcpxUeMlikbkQhL4RQKlfINhZfr0eqtpBY4U KjdHOiczrysy5fCykeb4T8KX4tvoJN9IZKP/Ye1GS02RUDRHVRKfTL+wyV47gGSgnMqG kWs+rm4oO+td+yVTZk+vZQW1vg4e/DGh4dJrrXbCv2buAuqFBhaTh0HEbksfJvZ0zzlO 7DbYemz/O9rAXN96rm0mssUsy0Rp1XhPnKLwe1dO+rFHvhQdPpIHxzZq9iaP/KR8D2qW /Kaw== X-Gm-Message-State: AA+aEWa3l0C570oBuNU9xgIZYu0WpaQkp4H7qCwgoGUdQRsx6dqip/MI TqrMZAEZsQZhvuiT3zvKQQ== X-Received: by 2002:aca:fcd7:: with SMTP id a206mr11472238oii.56.1543864370213; Mon, 03 Dec 2018 11:12:50 -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 g138sm10005431oib.26.2018.12.03.11.12.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Dec 2018 11:12:49 -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: Fix some more duplicate regulator nodes Date: Mon, 3 Dec 2018 13:12:48 -0600 Message-Id: <20181203191248.13067-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 --- Sigh, not sure what happened, but I missed these 2 cases. arch/arm/boot/dts/arm-realview-pb1176.dts | 4 ++-- arch/arm/boot/dts/arm-realview-pb11mp.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.19.1 Reviewed-by: Linus Walleij diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts index cee2d7aab203..cbbb8878daa3 100644 --- a/arch/arm/boot/dts/arm-realview-pb1176.dts +++ b/arch/arm/boot/dts/arm-realview-pb1176.dts @@ -47,7 +47,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>; @@ -55,7 +55,7 @@ regulator-boot-on; }; - veth: fixedregulator@0 { + veth: regulator-veth { compatible = "regulator-fixed"; regulator-name = "veth"; regulator-min-microvolt = <3300000>; diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts index 63d71a1d8282..2015619ca22c 100644 --- a/arch/arm/boot/dts/arm-realview-pb11mp.dts +++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts @@ -147,7 +147,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>; @@ -155,7 +155,7 @@ regulator-boot-on; }; - veth: fixedregulator@0 { + veth: regulator-veth { compatible = "regulator-fixed"; regulator-name = "veth"; regulator-min-microvolt = <3300000>;