From patchwork Wed Jul 31 07:48:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 11067211 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 43FDA1395 for ; Wed, 31 Jul 2019 07:48:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 311B1288BA for ; Wed, 31 Jul 2019 07:48:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22653288B7; Wed, 31 Jul 2019 07:48:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BDBA8288B7 for ; Wed, 31 Jul 2019 07:48:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=2HUwzR/fsXx/IInC69qjRJCCpLNJY7563yL8GbnBGQw=; b=Vfy8mtWCzqPuFr8kTqovgUMsin G3eW2XAAzbVt9L4Pm0zWaYICZLJZjF3CTasDAis4v8kibghXIFFXayCZEBUysy2X9K+f6LrMk5uNK w4lR7M72UgY+UY5tCxSknK1kBHuLANEpN3wv7GLseQihrA3PnoxHjXYc6rqL2Tlr6FrwPyyGdXZyZ GP49J+F6VqSAkPBrxkeCiSx4recrreHSdo/jjqsHdBGa9amyFEDaj2acKBLr/hL4s0fDNH3qOSujs 8vZ78diXXB64dDHJajxRqTVU6nUgl8IcFnxF7h3p0KcVWUCks/xsCXvG1yGkYSBwrNu/JUWndithq hDJraexQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hsjLU-0000by-Sr; Wed, 31 Jul 2019 07:48:25 +0000 Received: from xavier.telenet-ops.be ([2a02:1800:120:4::f00:14]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hsjLI-0000bG-4L for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2019 07:48:13 +0000 Received: from ramsan ([84.194.98.4]) by xavier.telenet-ops.be with bizsmtp id jKo92000f05gfCL01Ko9gb; Wed, 31 Jul 2019 09:48:09 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1hsjLF-0006wj-Kh; Wed, 31 Jul 2019 09:48:09 +0200 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1hsjLF-0001Un-JA; Wed, 31 Jul 2019 09:48:09 +0200 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm , Laurent Pinchart Subject: [PATCH] arm64: dts: renesas: r8a77995: draak: Fix backlight regulator name Date: Wed, 31 Jul 2019 09:48:01 +0200 Message-Id: <20190731074801.5706-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190731073744.13963-1-geert+renesas@glider.be> References: <20190731073744.13963-1-geert+renesas@glider.be> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190731_004812_381034_CD04855C X-CRM114-Status: GOOD ( 11.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, Marek Vasut MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Currently there are two nodes named "regulator1" in the Draak DTS: a 3.3V regulator for the eMMC and the LVDS decoder, and a 12V regulator for the backlight. This causes the former to be overwritten by the latter. Fix this by renaming all regulators with numerical suffixes to use named suffixes, which are less likely to conflict. Fixes: 4fbd4158fe8967e9 ("arm64: dts: renesas: r8a77995: draak: Add backlight") Signed-off-by: Geert Uytterhoeven --- I guess this is a fix for v5.3? This fix takes a slightly different approach than commit 12105cec654cf906 ("arm64: dts: renesas: r8a77990: ebisu: Fix backlight regulator numbering"), which just fixed the conflicting numerical suffix. --- arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts index 0711170b26b1fe1c..3aa2564dfdc25fff 100644 --- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts +++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts @@ -97,7 +97,7 @@ reg = <0x0 0x48000000 0x0 0x18000000>; }; - reg_1p8v: regulator0 { + reg_1p8v: regulator-1p8v { compatible = "regulator-fixed"; regulator-name = "fixed-1.8V"; regulator-min-microvolt = <1800000>; @@ -106,7 +106,7 @@ regulator-always-on; }; - reg_3p3v: regulator1 { + reg_3p3v: regulator-3p3v { compatible = "regulator-fixed"; regulator-name = "fixed-3.3V"; regulator-min-microvolt = <3300000>; @@ -115,7 +115,7 @@ regulator-always-on; }; - reg_12p0v: regulator1 { + reg_12p0v: regulator-12p0v { compatible = "regulator-fixed"; regulator-name = "D12.0V"; regulator-min-microvolt = <12000000>;