From patchwork Wed Dec 11 15:05:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 181240 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp916999och; Wed, 11 Dec 2019 07:23:05 -0800 (PST) X-Google-Smtp-Source: APXvYqwIc5Vd/EnEg7KBls+Cp2DXGwawVNaeemxHpbe4xdbqm+CHWPNhE3FcfkjVhTRzBIczFe0T X-Received: by 2002:a05:6830:1251:: with SMTP id s17mr2601466otp.108.1576077784924; Wed, 11 Dec 2019 07:23:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576077784; cv=none; d=google.com; s=arc-20160816; b=Oxs8WuRoG0K36UzpdNFgCeJtngi3lWHTM3jKNe5XgexIcqgHdTcICRRaqVQ6PvVH2w UCFHD1WY5dj2ERhXuTPHJqUbJBBym61GTSbRnW9i9NxALnXBZpmSGgRmdM1HAll9K12M b71osEZIqpwjLx3HFH32W6uhXktqKoFe3Zd5uUwyNl0sOntJH+MKPbu76DVM6pfybEJb bRZT+t+Bnqe6YQcjuARs7PGGrztYpCOpmQoS/bQdvgM9cdXNnAbOyjSlff4ktvxm8n/j MII7Q3ow1Z68IDgLvDnN4y7sv2iMulXlCDUgs55XkUJ0xoX3PffbLMDnOnCAeIQPVcZr kaJw== 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=XQhPlQSj1kHXbmdVSlSjLO3yN5hUI6SNn6kEcjoZHoc=; b=oozP6leSJxxXlCWXFqZkmN684qGZuXsVKOHACt0jUAHyRJQw51heDaSmrsQEih0BBp XT3iNuv7A1DwP+ELpAm4Z63wScXYjZWRLoqL1S2OCKe50oYW43BzW7b/wFy4Wmu81Yzg mhZXJh62Sc69GIi+W4ZwXR354+dlXkIXUiC2vLhJ+C1P/42xfOrQZVXXSo/rkQS4fCAh byUlUZJRiW+rRTxtW+Fmzllsjm6jC49NLNncFosUzWBnxv1FJZkKfRHCACyqWvOq6VAP MygfGfMpV3Yu+ebj8ouo1sNZDhd/OD9xqo7leaSfy6Squ9T9TcpP8P/KuphlfZBmnipe Eepw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tdEq6xDJ; 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 f3si1354253oia.264.2019.12.11.07.23.04; Wed, 11 Dec 2019 07:23:04 -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=tdEq6xDJ; 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 S1732661AbfLKPXC (ORCPT + 27 others); Wed, 11 Dec 2019 10:23:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:53726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732373AbfLKPWx (ORCPT ); Wed, 11 Dec 2019 10:22:53 -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 0F20B2077B; Wed, 11 Dec 2019 15:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077773; bh=GV1g4sMqmTSGFJASFaRg3b/yajlyg7qgx76zRdLk9gM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tdEq6xDJM4xnJx1R0twKPE7OVIMYaCx9zkfi8BbJ51XlISgimexWDcleAdw6q425+ lLvCj7x8ILu7CvZYea7r56G6sn2N8fAViqa67vskgdiMabMIR/Jvx+ZFxMohg6UO6j bC5DTksCUXF7TfClNXoL/48cjvIfeFW2CzieCHzQ= 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.19 166/243] ARM: dts: realview: Fix some more duplicate regulator nodes Date: Wed, 11 Dec 2019 16:05:28 +0100 Message-Id: <20191211150350.374909288@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@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 f2a1d25eb6cf3..83e0fbc4a1a10 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 7f9cbdf33a510..2f6aa24a0b67c 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>;