From patchwork Mon Dec 16 17:46:57 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: 181790 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4700939ile; Mon, 16 Dec 2019 10:48:35 -0800 (PST) X-Google-Smtp-Source: APXvYqyPtZiGURt9/1cJaLIewTaUXSTnlovj/HvP7jBCLMI1rg/wHAWiT/GCoAPnd/g5W1Ha2jvH X-Received: by 2002:a9d:768b:: with SMTP id j11mr33305324otl.116.1576522115640; Mon, 16 Dec 2019 10:48:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576522115; cv=none; d=google.com; s=arc-20160816; b=fsrdDC9CYFbqTpkrGEKIOhcDgmuJRxmOV/CVSdK8OVTC2EfQgLgIydSLb/bWi7BUiQ Ub5f+ZeW5yKAVeZ12t4Vsqtb2QGCTJZN1oBynYWO/DJPrWnEGpBfwcAndvoDM8UrHv6S q8+RSKMO9okIM+5UtsvFYqT44WEcdnFo6XVfeouwA7H1x5FEpQhg9b0ofAfLsgxsgpeO wc2mLTCC2ooPdreq0bgb/CIZRyKb/wEvx2hjzBw1MnD1OUhblRq/eiU51sVjDT58fQb/ LRuNPihiqRA9L13mP05H5r8CCm0KexQNcwFv5XTJdwkjLXrqvkvMCy7l5yLIZxdYMLCn 2X7w== 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=Rw1femHmmZ4bm6bfY9Ojsx4uZtDvAcSrJyVZ5ww9cNCWuj++2EweM7fHF5odWt1u9M 3wceEJqiBhe3h3EbYWrxzGvbbDtlEHzlBR+1b/gsmK9sNG5Et58fgh1LyNr2Bws6cVKp ShpgawTehn8E6uSYfRWL0tKmgIMp25sporg1CZsatLcFsd0wpngos8MguUMsJQShkvj/ 0cYGgv3fCZbYt6pnKzxK8Xio6pYtUvQ0suHtLXH87A7NdGUgZpK06N2wIWihxnCHWCpp MkU5CW/iym6q8d81sqQfui4FMFdTsyVA67Pcd/wXmy8Fl7nBdlt+W1RXr1XOscJzdoIQ /Vlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DI1xas5Z; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 r1si10625854otp.251.2019.12.16.10.48.35; Mon, 16 Dec 2019 10:48:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=DI1xas5Z; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727394AbfLPSse (ORCPT + 14 others); Mon, 16 Dec 2019 13:48:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:49594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727868AbfLPRyK (ORCPT ); Mon, 16 Dec 2019 12:54:10 -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 73C2121582; Mon, 16 Dec 2019 17:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576518849; bh=VSBIhfZCukb3KkAC7X5bF+mpEdHCaVQdLhX+frrXC4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DI1xas5ZLsoy5oAAfG3MdNUndP6SDYyQi398kFtrMHHz+qdEFnT+1fn//VIo3HP3Y /aZcBcB0WdpBXs7Ot5te+Iea/yIJeR0wNWWlhsZo3Ny2qzj2DfqfTrhk3ai8Eg9T0M u0Ar6BnaJT8JUuIXV3lK3Ot057A/NFrVwcgoiv20= 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.14 091/267] ARM: dts: realview-pbx: Fix duplicate regulator nodes Date: Mon, 16 Dec 2019 18:46:57 +0100 Message-Id: <20191216174858.071865771@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174848.701533383@linuxfoundation.org> References: <20191216174848.701533383@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ }; }; }; -