From patchwork Wed Dec 11 15:05:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 181245 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp918229och; Wed, 11 Dec 2019 07:24:04 -0800 (PST) X-Google-Smtp-Source: APXvYqx/JitarzS4Vty4vu3obYJsgeuntfdtmFIB1zxXunxEk6dSGQcGN6uyR/nPEzRVWoWDXVEx X-Received: by 2002:aca:cdd5:: with SMTP id d204mr3172119oig.134.1576077844530; Wed, 11 Dec 2019 07:24:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576077844; cv=none; d=google.com; s=arc-20160816; b=ocNYj9I9/I6ezEKGqA4qof4VWm1awKGV3wVlACmQwULKebYMxiI7SFKq+wV4H9EY9W skTSzfv2ELKvIYAvK/jxngmwi2UtT74EgBZ2/sdhf3GxqvFOv4+ErRF6DpD6meUOY7+W HatoTOVJtpRo7Emm4lOmIN5Dd18StdSbmbJHG58hNV0tp5kzNuGREdqhXJUpsXugack/ s0TU96hvNhCJfzcWdx1nsaX4ZTNxeZv0zHzPHqATYjkFJNRlMPe9PS5JW6RTnMMiDQh1 YIeBbZ0RqAd4eq3FfJz3/F9n/7PHBjQvwmfhYlkk7MKchEWiDfsvQS9VSnzwVC2V2Zx3 RJ/g== 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=xVxrRHHfIaJp88Y+vDnbY4A56bLQIhDjpSUP8M4sEHw=; b=PfhOZYIrSQqcyt/QhOLJdR1XGE+DpdPSm/9wFgMxxt8pyg46DYArrF/OLH1isx3Ae2 B+QbE2W5u24WR2WLgY4qOUiBsKsYJbL03g8UNIZQDVvlTUIYWypbW45zhD98bl22AZyv DOYGEMXNPjJ5YhkY/W+C6oSVWbFxgOODcTXQUg8ly+gcjlub9dYwEP8CoEfkVhJ2ZO0u QNZoE3cBwvaQ0g0RByoa66AScNG8dQJG4KPmgLAhZcWfnVY8SYRDGCYzkCJCVWbfnUhB zBgrwyk2Js1naK6HNDMX233gs5GQWbqtMsu5AeQoYaT2S8i97OSRbGACaAeNsweAFzJX MlOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1xA7Bgox; 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 i20si1107154otk.270.2019.12.11.07.24.03; Wed, 11 Dec 2019 07:24:04 -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=1xA7Bgox; 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 S1732420AbfLKPYC (ORCPT + 14 others); Wed, 11 Dec 2019 10:24:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:55234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731052AbfLKPYC (ORCPT ); Wed, 11 Dec 2019 10:24:02 -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 E08F42077B; Wed, 11 Dec 2019 15:24:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077841; bh=PFVwbF3UVf3POamPzm8tB9yZN5Lk4YJ4DVrIeQQMQmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1xA7BgoxC8aZzI9oYVX0ODUiCuFh+EILLPn5tWIG90UufrpXaFuPtM7WXJo+R0/Op rx4nkPE3jSMF9OFdhZHij70vadKX8yxJvUt/SclX2SaozHRVgz5LgT5q/Tdi8U4ysU iGbobum0k/jjlbtGzdn0hCtWo8eNit5hI3Xy6Zy4= 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.19 154/243] ARM: dts: realview-pbx: Fix duplicate regulator nodes Date: Wed, 11 Dec 2019 16:05:16 +0100 Message-Id: <20191211150349.565781731@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: 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 a5676697ff3b7..916a97734f84c 100644 --- a/arch/arm/boot/dts/arm-realview-pbx.dtsi +++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi @@ -44,7 +44,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>; @@ -52,7 +52,7 @@ regulator-boot-on; }; - veth: fixedregulator@0 { + veth: regulator-veth { compatible = "regulator-fixed"; regulator-name = "veth"; regulator-min-microvolt = <3300000>; @@ -567,4 +567,3 @@ }; }; }; -