From patchwork Mon Dec 16 17:47:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 181759 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp4620022och; Mon, 16 Dec 2019 09:56:30 -0800 (PST) X-Google-Smtp-Source: APXvYqwMHlINubhiWKIWL5PQXb62vO3bZMJIBeKfqJI4KInYbjkQInmVKLw9Yc3mn5Da1fTPydRK X-Received: by 2002:a9d:7f11:: with SMTP id j17mr34344974otq.281.1576518990237; Mon, 16 Dec 2019 09:56:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576518990; cv=none; d=google.com; s=arc-20160816; b=kKr4dAg9+oy7BLTEfPyc5Xa+y06/m/b5Gc7Xua6OHB6DJ6nE1Wg5cF77pLbGPPCo7c Bw+zFwG+h/19387tFya+ihv96ufqpqwlX7FBjbijk1i6icXS1R9gGSG94BTkoOPUXB+N X9F7jUaqBiRi/2UaFCA8qR2m4snsSUF6FU6U2SSKRvTqfL6OLcAwk5tC7GCyhBcQ6Uq3 ETkeJgT3cp3U3EVNRrMdcK+0mUHXZpCKYTKRZ3BSp01xIGhe/+NVaSG3y7Z6Ja0/OQ1w 9iPKkf7cYsYEl8eC061xCCz7xph9WRJZ0bxuo6de/PNAwu/cGyl2XeziL/DREuaAuNyW JMkg== 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=pAnREPZiFocN+LVb2ESNQx2msHnu158DNR8yyEgOKWc=; b=lrcklxu94gc75bhkzSBukype8plXBP7XQ8ug7NKNKpWpjN7wyazOoE+nVvQ0mreUyC xjkxmODd7f3fdCb08iuvAsU9eD/L8pYZHxPEUnOLvL6Zkhoi5upiE7Hdoa66vzfaGWIr L+TcPCCvwtFUGUZbf1y3P3HT1dJ1O3I3lFZSVp4YSP33S5+IWjinanz1JAPESaNnS6A+ MN2Stq/K6Q6Cy8UG3Kk+j6A5THPto7JnXGpKyYY2zarMo6gnJQgxChmu+nHqDcwy5Ys8 bw0bVnCmd2NGZpOIowy+Eb4KLrPLylW8YnL6moCD3ojD6lBaS+OFMEEuPaw1Seu93nZG aClQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qVa+XKYQ; 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 u4si11218028oig.200.2019.12.16.09.56.29; Mon, 16 Dec 2019 09:56:30 -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=qVa+XKYQ; 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 S1728000AbfLPR42 (ORCPT + 27 others); Mon, 16 Dec 2019 12:56:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:54556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727790AbfLPR40 (ORCPT ); Mon, 16 Dec 2019 12:56:26 -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 A102B205ED; Mon, 16 Dec 2019 17:56:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576518986; bh=L1ZJnOukyG9pbLSqdTAzhSKY7W/Y+Cjvd9R5hzHLJUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qVa+XKYQZFgQE7ekcwnCd0Rx/iR5PahsrlnjAulFvuKgreEaHCxxDE0trVkOOUwRg 18u1YS01VMoygtlST0qQVdSmblasMaQvBLzqa8Xegnz3IJPt8V0Edc8ECPuwCveUjP Ie1G8tNEMjqSvieUtWqooiCABkTzl4iwFTSROcug= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Herring , Linus Walleij , Olof Johansson , Sasha Levin Subject: [PATCH 4.14 100/267] ARM: dts: realview: Fix some more duplicate regulator nodes Date: Mon, 16 Dec 2019 18:47:06 +0100 Message-Id: <20191216174902.196585623@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit f3b2f758ec1e6cdb13c925647cbd8ad4938b78fb ] 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. Signed-off-by: Rob Herring Reviewed-by: Linus Walleij Signed-off-by: Olof Johansson Signed-off-by: Sasha Levin --- 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.20.1 diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts index c1fd5615ddfe3..939c108c24a6c 100644 --- a/arch/arm/boot/dts/arm-realview-pb1176.dts +++ b/arch/arm/boot/dts/arm-realview-pb1176.dts @@ -45,7 +45,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>; @@ -53,7 +53,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 e306f1cceb4ec..95037c48182de 100644 --- a/arch/arm/boot/dts/arm-realview-pb11mp.dts +++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts @@ -145,7 +145,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>; @@ -153,7 +153,7 @@ regulator-boot-on; }; - veth: fixedregulator@0 { + veth: regulator-veth { compatible = "regulator-fixed"; regulator-name = "veth"; regulator-min-microvolt = <3300000>;