From patchwork Thu Dec 19 18:32:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 182164 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp858721iln; Thu, 19 Dec 2019 10:43:53 -0800 (PST) X-Google-Smtp-Source: APXvYqzogTvWPAmCKJ/nwROGKJCnDdcCbErJ79w6A/Dqmc2yJC3BAwmAsarW6Sjd1LzhN9RYk+9X X-Received: by 2002:a9d:6a8f:: with SMTP id l15mr10028150otq.59.1576781033552; Thu, 19 Dec 2019 10:43:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576781033; cv=none; d=google.com; s=arc-20160816; b=yquZchxwxXLGnAQMrx+L80A1+akoDdRPaaSB7OKGgaU6MKIeQXmiCmjltEA4kR+TJq TqQH292ayhUlUDlDQwsz2tsDQVNcr4La9Up9qqAae570cGJXdwVff9ikPjzwOIA3bqYQ rl11rH3+mQXZoRsbloOjnEOHgcgOq0p/D25EDPe1fYuuvs7dGbdGBKy+hn5mpBanxscc ZI5aAeMlHLKBdb4e7jSX/Bn6rbDrJt/IfxhlYDebqhScjJc+0oChtV5MhCtUNICaHTmr 9sgqtpfvqxYwhPm5VN0/9hwjKgk6lOINlz+sja1Fnx8b42nh9rrEQvAlkXAjmcnOFakB 3YNg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FmsVIokvUsqDPDOtukA1LV7Vb2MNWemk/XjW4dLRrJA=; b=CgShVYA1LF/h2OcKMdkhsDEgSIm/jRk0OaP21Ko+DyRfj7NYld/NUhRJZMO2KlLILh NTDONBa4SbOpwwOBT80sFYCz7TZkZ2zObMDST0FUkbgzDueVC0/cnVh4s4KNrNcN21Ay 1GRCz3rKb6wKQomOU4dsHkQXuBTFRNykwujQvMZVYw2vZ7Qo5sw5+HqHq7ut6HurMCTS NqAhoMi4UZBWdno3F8oEdo/1Qj7US2A5JT2l10Dm5aosocfChgAwVVIvqyG9GcZigojN UGyckd1p23HYeP41u3XKxCLK/fD81CsJ86SZ6zXgGguH+QP0kpTF699VzmHLLNArucQR mpOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bC5pC1wM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s22si3729952otq.10.2019.12.19.10.43.53; Thu, 19 Dec 2019 10:43:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bC5pC1wM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728917AbfLSSnw (ORCPT + 27 others); Thu, 19 Dec 2019 13:43:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:35560 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728865AbfLSSnr (ORCPT ); Thu, 19 Dec 2019 13:43:47 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 34C6D24672; Thu, 19 Dec 2019 18:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781026; bh=VSBIhfZCukb3KkAC7X5bF+mpEdHCaVQdLhX+frrXC4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bC5pC1wMBS9hH3vdfadh96lQ9OhzpygtI8szRUGWRm/zgSKkmkC8tzg7s08va7/EZ K9Q8Q9ROBTqbEtdCuB94hBh6vDy7r419QLqnb+FSZJC0RfH2rGomoeAl/L+m0kT+U+ 8ErceuFzVs+BXPBHpZYTLKbzZx8hKZQBd+cKw3+w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Rob Herring , Olof Johansson , Sasha Levin Subject: [PATCH 4.9 053/199] ARM: dts: realview-pbx: Fix duplicate regulator nodes Date: Thu, 19 Dec 2019 19:32:15 +0100 Message-Id: <20191219183217.894949173@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183214.629503389@linuxfoundation.org> References: <20191219183214.629503389@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 7f4b001b7f6e0480b5bdab9cd8ce1711e43e5cb5 ] 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 Signed-off-by: Olof Johansson Signed-off-by: Sasha Levin --- arch/arm/boot/dts/arm-realview-pbx.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi index 2bf3958b2e6b9..068293254fbb8 100644 --- a/arch/arm/boot/dts/arm-realview-pbx.dtsi +++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi @@ -43,7 +43,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>; @@ -51,7 +51,7 @@ regulator-boot-on; }; - veth: fixedregulator@0 { + veth: regulator-veth { compatible = "regulator-fixed"; regulator-name = "veth"; regulator-min-microvolt = <3300000>; @@ -539,4 +539,3 @@ }; }; }; -