From nobody Fri Jan 2 11:58:55 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5BB8CDB474 for ; Wed, 11 Oct 2023 18:18:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233196AbjJKSSU (ORCPT ); Wed, 11 Oct 2023 14:18:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235091AbjJKSSN (ORCPT ); Wed, 11 Oct 2023 14:18:13 -0400 Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C328E5 for ; Wed, 11 Oct 2023 11:18:12 -0700 (PDT) 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?Q?Tam=C3=A1s_Sz=C5=B1cs?= , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org From: =?utf-8?Q?Tam=C3=A1s_Sz=C5=B1cs?= 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Regulator for VCC3V3_WF has been added as vcc3v3_pcie2x1l0 first. Clean thi= s up. Signed-off-by: Tam=C3=A1s Sz=C5=B1cs --- .../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/b= oot/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 =3D <1100000>; vin-supply =3D <&vcc5v0_sys>; }; - - vcc3v3_wf: vcc3v3-wf-regulator { - compatible =3D "regulator-fixed"; - regulator-name =3D "vcc3v3_wf"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - enable-active-high; - gpios =3D <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&vcc3v3_wf_en>; - startup-delay-us =3D <50000>; - vin-supply =3D <&vcc5v0_sys>; - }; }; =20 &combphy0_ps { @@ -335,12 +320,6 @@ vcc5v0_host_en: vcc5v0-host-en { rockchip,pins =3D <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - - m2e { - vcc3v3_wf_en: vcc3v3-wf-en { - rockchip,pins =3D <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; }; =20 &pwm1 { @@ -391,7 +370,7 @@ &sdio { sd-uhs-sdr25; sd-uhs-sdr50; sd-uhs-sdr104; - vmmc-supply =3D <&vcc3v3_wf>; + vmmc-supply =3D <&vcc3v3_pcie2x1l0>; vqmmc-supply =3D <&vcc_1v8_s3>; pinctrl-names =3D "default"; pinctrl-0 =3D <&sdiom0_pins>; --=20 2.42.0