From patchwork Thu Dec 19 18:32:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182166 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp859102iln; Thu, 19 Dec 2019 10:44:13 -0800 (PST) X-Google-Smtp-Source: APXvYqxk1PAAAk9h+jHEljYXkAlTx33BmWhxawGidIiYdU3bzJNfwTBzLNdWQYxoAjpjSAfkx3RV X-Received: by 2002:a9d:7dc9:: with SMTP id k9mr10251187otn.117.1576781053624; Thu, 19 Dec 2019 10:44:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576781053; cv=none; d=google.com; s=arc-20160816; b=tNCMmeLSsTzyUNnzm8Ns0kLGy23qSKjdpsIj1YAkXT6CnkJoZJqAxwEodEjozi1R37 /whJbPDUrgchigE/QPKHIwiE+mlA0JH+oUJ0ZtuLnmH1+QGsU6NsUNPxP/oUDk/qRXYd YVlbOg6iSGRflyDRAWAIrLBLrTsi9shJT21EQzGARMHyybvlzRp6+49wFMRtdBu6iEgf UeIH4Z/dYYZGv1JX+x/LXCFHoy/3t/T7E04dNEfkWs4xri5KgZMlxZDax/5mP0DbYeEp hvknckbQAx9XpdVldpoIBClJZazXr7Dk3F30PkXETg88OxdA5CiJEznJMFjDePnnlT4q qlAg== 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=yT0vikx08MATXwOIX+VnXrthyJG4E5ULQ90E8NRu97Bxaz5qmjCx66HLwWpD3UnU79 dTyAVRSarb8F3dunmEedSFMPCtLLuI1BnPHsNIczvgqehRTckrmjhr2BGSbKXAa4YE+p Op2kaCjUDeMw0oMQpNahvHoGW4clHCOTXRxs6LMB2/ytgSojUIFhraPrcx7uLpiigqbg /3D5eusqqpgJ7OowWbhgd+s0Pb/HL1Tgh+ynldsZjO7IB0Hvo5Qj5rGHVnvhS2Y0Lrf+ PT/06Avmdvmtz3v6BFTqBEWohc9vn4lyi6xVy5/7AOeOENsbh0vng62Fu1npliOiNMZk 9DPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=b0lvAL1v; 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 g1si504602otj.115.2019.12.19.10.44.13; Thu, 19 Dec 2019 10:44:13 -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=b0lvAL1v; 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 S1728972AbfLSSoM (ORCPT + 27 others); Thu, 19 Dec 2019 13:44:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:36072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728306AbfLSSoJ (ORCPT ); Thu, 19 Dec 2019 13:44:09 -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 4252624672; Thu, 19 Dec 2019 18:44:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781048; bh=L1ZJnOukyG9pbLSqdTAzhSKY7W/Y+Cjvd9R5hzHLJUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b0lvAL1vaOrsk9hkWOMaNkubTosc7ZEFftfasXUt9Bhkn6XmwsDM3ONEvaHRG7Q06 76WjmoDSXVx8S0w9wsP2VdtVVnPOOKYD84AbcRVyK62vTb5G1VyrUgOlI2pHDUWjut hjYMt7wiEChuijVYobbQkth8lAOtQhcWr5pkD9aM= 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.9 061/199] ARM: dts: realview: Fix some more duplicate regulator nodes Date: Thu, 19 Dec 2019 19:32:23 +0100 Message-Id: <20191219183218.384297605@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 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>;