From patchwork Wed Oct 11 18:18:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VGFtw6FzIFN6xbFjcw==?= X-Patchwork-Id: 13417717 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ACFBDCDB474 for ; Wed, 11 Oct 2023 18:18:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:From:To :Date:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=9b7tmXxt67RevwhcOHSve0r0HmhtVXw14+26p43+EyA=; b=n+Cp5lm9z9COcn zeEpE7G+HWIkBwbjO4Y/00bk7a1V60nQW/MSFgGFWU4BIaMbIHXI7ypyV/ybuWjqIjj9NaC85VVAm 2e9MCDpMb7Pk0CO02YL6LHKhdq2G+BRg+Ck4cB4hTf/KLy4VkU3ONKY7vTAYTcAIJdBYUY0YuYou3 ISW8VVuKdELvfmm8IlJagfMWlCp2qMGf5GC52A+Rp5rwzvsIeuWBp4aFsW5bhnW18OuENk+nzm8Pd ABoSTzc0w94V/cD75PASAj3rEpXyCXFt3l3nxjBcewS0BjWuh7F8vw+qgFBbQoJet0Mjo3ld6mZrL OCvnQ16CCGwQieeUdPmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qqdmp-00GR3p-1n; Wed, 11 Oct 2023 18:18:23 +0000 Received: from mail-40133.protonmail.ch ([185.70.40.133]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqdmn-00GR1s-0V for linux-rockchip@lists.infradead.org; Wed, 11 Oct 2023 18:18:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.ch; s=protonmail3; t=1697048290; x=1697307490; bh=ynQ1glqOOY0YVbH7mWAv/jyhEaTBs+pK+QoCHGvfw0U=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=DkR2C1Omyrv0l6cXrVNpLQfKq6s6KpCFW1FRQpyN7/O8o9fm/bxkaVhK5b72BxQK7 aA5OJfPskfPEJs1K3b3nWxFIi0zHM56W17OzuUm6eTofIkKkRuWiVk0Hh6g3PKfgkm cpFKf0M+mb3+DmT64JQY3Igzmg2snv37v6Q43/taIzxjfIYhpss0mEdlH3sXIJnnFD AIYfVHeCk0P4jDoi1TcfSe9Lt3K3Oc8x9v9ur6WIUvHgAs2WSh6Slf6tfYaW+K7ugk bQ3EdylYP00NNGblRO8Y3lejV5NC1KRGjHRkipo61qoxRv5udSfTsBzcgeHddZvJmI EQbD+AxmwObbA== Date: Wed, 11 Oct 2023 18:18:05 +0000 To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Cristian Ciocaltea , Sebastian Reichel , Christopher Obbard , Shreeya Patel , =?utf-8?b?VGFtw6FzIFN6xbFjcw==?= , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org From: =?utf-8?b?VGFtw6FzIFN6xbFjcw==?= Subject: [PATCH] arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf from rock-5b Message-ID: <20231011181757.58047-1-tszucs@protonmail.ch> Feedback-ID: 53029:user:proton MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231011_111821_384216_557454F8 X-CRM114-Status: UNSURE ( 5.94 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Regulator for VCC3V3_WF has been added as vcc3v3_pcie2x1l0 first. Clean this up. Signed-off-by: Tamás Szűcs --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 8618887899d9..392ac783c3ad 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -114,21 +114,6 @@ vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { regulator-max-microvolt = <1100000>; vin-supply = <&vcc5v0_sys>; }; - - vcc3v3_wf: vcc3v3-wf-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_wf"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - enable-active-high; - gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&vcc3v3_wf_en>; - startup-delay-us = <50000>; - vin-supply = <&vcc5v0_sys>; - }; }; &combphy0_ps { @@ -335,12 +320,6 @@ vcc5v0_host_en: vcc5v0-host-en { rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - - m2e { - vcc3v3_wf_en: vcc3v3-wf-en { - rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; }; &pwm1 { @@ -391,7 +370,7 @@ &sdio { sd-uhs-sdr25; sd-uhs-sdr50; sd-uhs-sdr104; - vmmc-supply = <&vcc3v3_wf>; + vmmc-supply = <&vcc3v3_pcie2x1l0>; vqmmc-supply = <&vcc_1v8_s3>; pinctrl-names = "default"; pinctrl-0 = <&sdiom0_pins>;