From patchwork Sat Nov 30 00:40:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13889023 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 4159ED735E4 for ; Sat, 30 Nov 2024 00:41:37 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=CH/S+1VQAJq3Ag+/D8S5sB2ZG8waUEWzFN9hNCmEHo0=; b=1VOczZFrio8fNI 8oHdyrWJSmx1r+BjTUC4mvZrcyelCPn0kc9WZypm8vjuB5MpeGYT8M1eB2YMrl4yBpO6KY7O6W1n7 VsqlyUZG81MZz760TbCJvN5BQVC7JgjpTMiSub3EVw4VZnW25wYFLj4gvM14lhNMvMWgxUCjXptTe x10iPzdCKURKFomVCrPWeFMWNIODqVYUvSv1W//vizc4B3djtRh7Dbcds1OnpyYWDDF0E3XkaTyht cTpfTgOGW6D2y7MeN6ozUxIk6mbvoVAx10aL0R4shPMXZaecfx4k1sZyMRxvimtUGmfzkKUlX8ojR V1MEJJmBYARLtMU48J2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHBYB-00000001B97-1dwd; Sat, 30 Nov 2024 00:41:31 +0000 Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHBY5-00000001B5v-03rC for linux-rockchip@lists.infradead.org; Sat, 30 Nov 2024 00:41:29 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 4AU0f3BF024368; Sat, 30 Nov 2024 09:41:04 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH 1/6] arm64: dts: rockchip: fix regulators for Radxa ROCK 5B Date: Sat, 30 Nov 2024 00:40:52 +0000 Message-ID: <20241130004057.7432-2-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241130004057.7432-1-naoki@radxa.com> References: <20241130004057.7432-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241129_164125_260743_210AC016 X-CRM114-Status: UNSURE ( 8.81 ) 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: , Cc: robh@kernel.org, conor+dt@kernel.org, inindev@gmail.com, devicetree@vger.kernel.org, sebastian.reichel@collabora.com, linux-rockchip@lists.infradead.org, alchark@gmail.com, FUKAUMI Naoki , krzk+dt@kernel.org, dsimic@manjaro.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org fix regulator and pin names to match with schematic. regulator for USB ports are unnamed, so I referred schematic for Radxa ROCK 5B+. add missing "typec_vin" and "vcc4v0_sys" regulator, and add missing "phy-supply" for "pcie30phy" and "u2phy1_otg". remove now unused and non-existent "vcc3v3_pcie2x1l2" regulator. remove "regulator-always-on" and "regulator-boot-on" from regulators which is turned on by consumer. Signed-off-by: FUKAUMI Naoki --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 106 ++++++++++-------- 1 file changed, 57 insertions(+), 49 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index d597112f1d5b..727a5880d87a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -84,54 +84,59 @@ rfkill-bt { shutdown-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; }; - vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 { + typec_vin: regulator-typec-vin { compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pcie2_0_vcc3v3_en>; - regulator-name = "vcc3v3_pcie2x1l0"; + regulator-name = "typec_vin"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <50000>; - vin-supply = <&vcc5v0_sys>; }; - vcc3v3_pcie2x1l2: regulator-vcc3v3-pcie2x1l2 { + vcc3v3_wf: regulator-vcc3v3-wf { compatible = "regulator-fixed"; - regulator-name = "vcc3v3_pcie2x1l2"; + enable-active-high; + gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&ekey_en>; + regulator-name = "vcc3v3_wf"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - startup-delay-us = <5000>; - vin-supply = <&vcc_3v3_s3>; + startup-delay-us = <50000>; + vin-supply = <&vcc5v0_sys>; }; - vcc3v3_pcie30: regulator-vcc3v3-pcie30 { + /* pi6c pcie clock generator */ + vcc3v3_pi6c_05: vcc3v3_pcie30: regulator-vcc3v3-pi6c-05 { compatible = "regulator-fixed"; enable-active-high; gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&pcie3_vcc3v3_en>; - regulator-name = "vcc3v3_pcie30"; + pinctrl-0 = <&pcie30x4_pwren_h>; + regulator-name = "vcc3v3_pi6c_05"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; startup-delay-us = <5000>; vin-supply = <&vcc5v0_sys>; }; - vcc5v0_host: regulator-vcc5v0-host { + vcc4v0_sys: regulator-vcc4v0-sys { compatible = "regulator-fixed"; - regulator-name = "vcc5v0_host"; - regulator-boot-on; + regulator-name = "vcc4v0_sys"; regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <4000000>; + regulator-max-microvolt = <4000000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc5v_usb: regulator-vcc5v-usb { + compatible = "regulator-fixed"; + regulator-name = "vcc5v_usb"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&vcc5v0_host_en>; + pinctrl-0 = <&usb_host_pwren_h>; vin-supply = <&vcc5v0_sys>; }; @@ -142,6 +147,7 @@ vcc5v0_sys: regulator-vcc5v0-sys { regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; + vin-supply = <&typec_vin>; }; vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 { @@ -151,7 +157,7 @@ vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 { regulator-boot-on; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc4v0_sys>; }; }; @@ -239,7 +245,7 @@ vdd_cpu_big0_s0: regulator@42 { regulator-min-microvolt = <550000>; regulator-max-microvolt = <1050000>; regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc4v0_sys>; regulator-state-mem { regulator-off-in-suspend; @@ -256,7 +262,7 @@ vdd_cpu_big1_s0: regulator@43 { regulator-min-microvolt = <550000>; regulator-max-microvolt = <1050000>; regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc4v0_sys>; regulator-state-mem { regulator-off-in-suspend; @@ -350,27 +356,28 @@ map1 { &pcie2x1l0 { pinctrl-names = "default"; - pinctrl-0 = <&pcie2_0_rst>; + pinctrl-0 = <&pcie30x1_0_perstn_m1_l>; reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie2x1l0>; + vpcie3v3-supply = <&vcc3v3_wf>; status = "okay"; }; &pcie2x1l2 { pinctrl-names = "default"; - pinctrl-0 = <&pcie2_2_rst>; + pinctrl-0 = <&pcie_perst_l>; reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie2x1l2>; + vpcie3v3-supply = <&vcc_3v3_s3>; status = "okay"; }; &pcie30phy { + phy-supply = <&vcc3v3_pi6c_05>; status = "okay"; }; &pcie3x4 { pinctrl-names = "default"; - pinctrl-0 = <&pcie3_rst>; + pinctrl-0 = <&pcie30x4_perstn_m1_l>; reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie30>; status = "okay"; @@ -396,31 +403,31 @@ hp_detect: hp-detect { }; pcie2 { - pcie2_0_rst: pcie2-0-rst { + pcie30x1_0_perstn_m1_l: pcie30x1-0-perstn-m1-l { rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; }; - pcie2_0_vcc3v3_en: pcie2-0-vcc-en { + ekey_en: ekey-en { rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; }; - pcie2_2_rst: pcie2-2-rst { + pcie_perst_l: pcie-perst-l { rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; pcie3 { - pcie3_rst: pcie3-rst { + pcie30x4_perstn_m1_l: pcie30x4-perstn-m1-l { rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; }; - pcie3_vcc3v3_en: pcie3-vcc3v3-en { + pcie30x4_pwren_h: pcie30x4-pwren-h { rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; }; }; usb { - vcc5v0_host_en: vcc5v0-host-en { + usb_host_pwren_h: usb-host-pwren-h { rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -474,7 +481,7 @@ &sdio { sd-uhs-sdr25; sd-uhs-sdr50; sd-uhs-sdr104; - vmmc-supply = <&vcc3v3_pcie2x1l0>; + vmmc-supply = <&vcc3v3_wf>; vqmmc-supply = <&vcc_1v8_s3>; pinctrl-names = "default"; pinctrl-0 = <&sdiom0_pins>; @@ -523,21 +530,21 @@ pmic@0 { system-power-controller; - vcc1-supply = <&vcc5v0_sys>; - vcc2-supply = <&vcc5v0_sys>; - vcc3-supply = <&vcc5v0_sys>; - vcc4-supply = <&vcc5v0_sys>; - vcc5-supply = <&vcc5v0_sys>; - vcc6-supply = <&vcc5v0_sys>; - vcc7-supply = <&vcc5v0_sys>; - vcc8-supply = <&vcc5v0_sys>; - vcc9-supply = <&vcc5v0_sys>; - vcc10-supply = <&vcc5v0_sys>; + vcc1-supply = <&vcc4v0_sys>; + vcc2-supply = <&vcc4v0_sys>; + vcc3-supply = <&vcc4v0_sys>; + vcc4-supply = <&vcc4v0_sys>; + vcc5-supply = <&vcc4v0_sys>; + vcc6-supply = <&vcc4v0_sys>; + vcc7-supply = <&vcc4v0_sys>; + vcc8-supply = <&vcc4v0_sys>; + vcc9-supply = <&vcc4v0_sys>; + vcc10-supply = <&vcc4v0_sys>; vcc11-supply = <&vcc_2v0_pldo_s3>; - vcc12-supply = <&vcc5v0_sys>; + vcc12-supply = <&vcc4v0_sys>; vcc13-supply = <&vcc_1v1_nldo_s3>; vcc14-supply = <&vcc_1v1_nldo_s3>; - vcca-supply = <&vcc5v0_sys>; + vcca-supply = <&vcc4v0_sys>; gpio-controller; #gpio-cells = <2>; @@ -840,6 +847,7 @@ &u2phy1 { }; &u2phy1_otg { + phy-supply = <&vcc5v_usb>; status = "okay"; }; @@ -858,7 +866,7 @@ &u2phy3 { }; &u2phy3_host { - phy-supply = <&vcc5v0_host>; + phy-supply = <&vcc5v_usb>; status = "okay"; }; From patchwork Sat Nov 30 00:40:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13889028 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 AFECFD735EA for ; Sat, 30 Nov 2024 00:41:41 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=1unwV1KUNkiy0eVQszdPxtT7PM3cQZg25AOhP0sHsFk=; b=U0/2ivE/g/nBRw n/guwXBgrCQ7tVuOShjOI8aBZMXF9lNUur1cnfJGXF5Bqipjfymz3AjNQanwXNieuJhMt4pfImotq 132o4uMrRdh/ZBr4UJClzmwRpDoXP+JbwspaZnKQGgUWoj4O2XjdyDfoCwsMExjAxa+hLq81qxfJG usiLF4Vhe5rt+xjv1X4OeTpFFdlZ11jhe7A0Q4C4x0tdUJEmLsyLOb7LMAoprfE9UqCjT/Zya27GP gFd3IhnJoADMEqoyKEy5TOGM4MwbcUQzvEEv6uyEFvXerUCo57HCtU7IEOUSvbySUyj7DuV2qS/Zs H4bvGncsJcKBEqWDyPDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHBY9-00000001B8i-34CX; Sat, 30 Nov 2024 00:41:29 +0000 Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHBY4-00000001B5t-3ZlN for linux-rockchip@lists.infradead.org; Sat, 30 Nov 2024 00:41:28 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 4AU0f3BG024368; Sat, 30 Nov 2024 09:41:04 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH 2/6] arm64: dts: rockchip: add regulator for NPU for Radxa ROCK 5B Date: Sat, 30 Nov 2024 00:40:53 +0000 Message-ID: <20241130004057.7432-3-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241130004057.7432-1-naoki@radxa.com> References: <20241130004057.7432-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241129_164125_094646_F1130479 X-CRM114-Status: UNSURE ( 7.20 ) 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: , Cc: robh@kernel.org, conor+dt@kernel.org, inindev@gmail.com, devicetree@vger.kernel.org, sebastian.reichel@collabora.com, linux-rockchip@lists.infradead.org, alchark@gmail.com, FUKAUMI Naoki , krzk+dt@kernel.org, dsimic@manjaro.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org add "vdd_vpu_s0" regulator for NPU. Signed-off-by: FUKAUMI Naoki --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 727a5880d87a..3cd8c63151db 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -270,6 +270,29 @@ regulator-state-mem { }; }; +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1m2_xfer>; + status = "okay"; + + vdd_npu_s0: regulator@42 { + compatible = "rockchip,rk8602"; + reg = <0x42>; + fcs,suspend-voltage-selector = <1>; + regulator-name = "vdd_npu_s0"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <550000>; + regulator-max-microvolt = <950000>; + regulator-ramp-delay = <2300>; + vin-supply = <&vcc4v0_sys>; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; +}; + &i2c6 { status = "okay"; From patchwork Sat Nov 30 00:40:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13889029 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 3DF5ED735EB for ; Sat, 30 Nov 2024 00:41:42 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=REHhF+PXHah+gQLZai9+gdx4HSBArrhVO8MGkxqLL+M=; b=GLjNNZv2CdhVPt tAuHsqUTaKxRKdAUUKHjR/WOrE+1Pm0F5Q8AXkBb3tA5RNM7JXEefXdBFsfK9vVv/pz6azzZ5k24e /PyDEjIvPPUkuneU/qSWNHQFEDQEdMV1eVUieblPk0+1CrYFnRbGEK4JTMWNhG5Bg85oo5w4moprL 75WQhXMcwiXNUFx/pX7qKNMUxfpuH4IldSTN0SU6bYstQlIeEnwN3BZbUIchIGKJZzweKQq4l44o5 W4p+XbNZJLBa22DEtu/XDYMmyXA8HxzgfI1ftRLruXpWzzrQ1MmXbKhmwi7nh4cmkoSqdXxhgndye 5nNqN3ZdgHbDfP1PxHkg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHBYB-00000001B9P-3AkB; Sat, 30 Nov 2024 00:41:31 +0000 Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHBY5-00000001B64-2c07 for linux-rockchip@lists.infradead.org; Sat, 30 Nov 2024 00:41:29 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 4AU0f3BH024368; Sat, 30 Nov 2024 09:41:05 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH 3/6] arm64: dts: rockchip: fix pmic regulators for Radxa ROCK 5B Date: Sat, 30 Nov 2024 00:40:54 +0000 Message-ID: <20241130004057.7432-4-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241130004057.7432-1-naoki@radxa.com> References: <20241130004057.7432-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241129_164125_868620_116B991A X-CRM114-Status: UNSURE ( 7.76 ) 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: , Cc: robh@kernel.org, conor+dt@kernel.org, inindev@gmail.com, devicetree@vger.kernel.org, sebastian.reichel@collabora.com, linux-rockchip@lists.infradead.org, alchark@gmail.com, FUKAUMI Naoki , krzk+dt@kernel.org, dsimic@manjaro.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org fix regulator names to match with schematic. fix properties to match with vendor kernel. Signed-off-by: FUKAUMI Naoki --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 3cd8c63151db..95f2f4dbf12d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -461,7 +461,7 @@ &pwm1 { }; &saradc { - vref-supply = <&avcc_1v8_s0>; + vref-supply = <&vcca_1v8_s0>; status = "okay"; }; @@ -588,12 +588,12 @@ rk806_dvs3_null: dvs3-null-pins { }; regulators { - vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 { + vdd_gpu_s0: dcdc-reg1 { + regulator-name = "vdd_gpu_s0"; regulator-boot-on; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd_gpu_s0"; regulator-enable-ramp-delay = <400>; regulator-state-mem { @@ -601,13 +601,13 @@ regulator-state-mem { }; }; - vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 { + vdd_cpu_lit_s0: dcdc-reg2 { + regulator-name = "vdd_cpu_lit_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd_cpu_lit_s0"; regulator-state-mem { regulator-off-in-suspend; @@ -615,26 +615,26 @@ regulator-state-mem { }; vdd_log_s0: dcdc-reg3 { + regulator-name = "vdd_log_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <675000>; regulator-max-microvolt = <750000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd_log_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; regulator-suspend-microvolt = <750000>; }; }; - vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 { + vdd_vdenc_s0: dcdc-reg4 { + regulator-name = "vdd_vdenc_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd_vdenc_s0"; regulator-state-mem { regulator-off-in-suspend; @@ -642,12 +642,12 @@ regulator-state-mem { }; vdd_ddr_s0: dcdc-reg5 { + regulator-name = "vdd_ddr_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <675000>; regulator-max-microvolt = <900000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd_ddr_s0"; regulator-state-mem { regulator-off-in-suspend; @@ -656,9 +656,9 @@ regulator-state-mem { }; vdd2_ddr_s3: dcdc-reg6 { + regulator-name = "vdd2_ddr_s3"; regulator-always-on; regulator-boot-on; - regulator-name = "vdd2_ddr_s3"; regulator-state-mem { regulator-on-in-suspend; @@ -666,12 +666,11 @@ regulator-state-mem { }; vcc_2v0_pldo_s3: dcdc-reg7 { + regulator-name = "vcc_2v0_pldo_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; - regulator-ramp-delay = <12500>; - regulator-name = "vdd_2v0_pldo_s3"; regulator-state-mem { regulator-on-in-suspend; @@ -680,11 +679,11 @@ regulator-state-mem { }; vcc_3v3_s3: dcdc-reg8 { + regulator-name = "vcc_3v3_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-name = "vcc_3v3_s3"; regulator-state-mem { regulator-on-in-suspend; @@ -693,9 +692,9 @@ regulator-state-mem { }; vddq_ddr_s0: dcdc-reg9 { + regulator-name = "vddq_ddr_s0"; regulator-always-on; regulator-boot-on; - regulator-name = "vddq_ddr_s0"; regulator-state-mem { regulator-off-in-suspend; @@ -703,11 +702,11 @@ regulator-state-mem { }; vcc_1v8_s3: dcdc-reg10 { + regulator-name = "vcc_1v8_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "vcc_1v8_s3"; regulator-state-mem { regulator-on-in-suspend; @@ -715,63 +714,63 @@ regulator-state-mem { }; }; - avcc_1v8_s0: pldo-reg1 { + vcca_1v8_s0: pldo-reg1 { + regulator-name = "vcca_1v8_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "avcc_1v8_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; }; }; vcc_1v8_s0: pldo-reg2 { + regulator-name = "vcc_1v8_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "vcc_1v8_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; }; }; - avdd_1v2_s0: pldo-reg3 { + vdda_1v2_s0: pldo-reg3 { + regulator-name = "vdda_1v2_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; - regulator-name = "avdd_1v2_s0"; regulator-state-mem { regulator-off-in-suspend; }; }; - vcc_3v3_s0: pldo-reg4 { + vcca_3v3_s0: pldo-reg4 { + regulator-name = "vcca_3v3_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-ramp-delay = <12500>; - regulator-name = "vcc_3v3_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; }; }; vccio_sd_s0: pldo-reg5 { + regulator-name = "vccio_sd_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - regulator-ramp-delay = <12500>; - regulator-name = "vccio_sd_s0"; regulator-state-mem { regulator-off-in-suspend; @@ -779,11 +778,11 @@ regulator-state-mem { }; pldo6_s3: pldo-reg6 { + regulator-name = "pldo6_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "pldo6_s3"; regulator-state-mem { regulator-on-in-suspend; @@ -792,11 +791,11 @@ regulator-state-mem { }; vdd_0v75_s3: nldo-reg1 { + regulator-name = "vdd_0v75_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <750000>; regulator-max-microvolt = <750000>; - regulator-name = "vdd_0v75_s3"; regulator-state-mem { regulator-on-in-suspend; @@ -804,37 +803,38 @@ regulator-state-mem { }; }; - vdd_ddr_pll_s0: nldo-reg2 { + vdda_ddr_pll_s0: nldo-reg2 { + regulator-name = "vdda_ddr_pll_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <850000>; regulator-max-microvolt = <850000>; - regulator-name = "vdd_ddr_pll_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; regulator-suspend-microvolt = <850000>; }; }; - avdd_0v75_s0: nldo-reg3 { + vdda_0v75_s0: nldo-reg3 { + regulator-name = "vdda_0v75_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <750000>; regulator-max-microvolt = <750000>; - regulator-name = "avdd_0v75_s0"; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; + regulator-suspend-microvolt = <750000>; }; }; - vdd_0v85_s0: nldo-reg4 { + vdda_0v85_s0: nldo-reg4 { + regulator-name = "vdda_0v85_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <850000>; regulator-max-microvolt = <850000>; - regulator-name = "vdd_0v85_s0"; regulator-state-mem { regulator-off-in-suspend; @@ -842,11 +842,11 @@ regulator-state-mem { }; vdd_0v75_s0: nldo-reg5 { + regulator-name = "vdd_0v75_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <750000>; regulator-max-microvolt = <750000>; - regulator-name = "vdd_0v75_s0"; regulator-state-mem { regulator-off-in-suspend; From patchwork Sat Nov 30 00:40:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13889025 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 E2056D735EC for ; Sat, 30 Nov 2024 00:41:38 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=G2XMUJriqIcLlrUdBIaTs3IURKyOgLPkM8Ewps+M+nM=; b=4npL3JcJ/5pLIT BXboMaAa+HQ8QA4mETNsxIg9zjQIvxQxyjx8YvIjo5LHWNzkWSvEHuh2YHUj30c8OMI5/lbUmPtxT CRz4zXQqzHRvddyDyJdKdZQtBT38rsXRQ1CLvdKnn7q9CYWn7uy7Xxadc/YYoim+TfsmPk8I2/Pef S3d7c7G+fJKJyrFjjfySKX8wo6E3Uu8aCW3vHEqfRpONhdQFD/TyxenCkiQKS8LxtcsswzzjcRyoJ 8K5uOQtAwe6W9+bnOBNKWX31rP2jFAYWZZ3BtTWPKYIaoEj7C7NN+t6kCxe/f23zvIgV3idJhUaQU S97nlOYSxYVaZ/C2ky6Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHBYB-00000001B91-0Ecv; Sat, 30 Nov 2024 00:41:31 +0000 Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHBY4-00000001B5r-3tlE for linux-rockchip@lists.infradead.org; Sat, 30 Nov 2024 00:41:29 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 4AU0f3BI024368; Sat, 30 Nov 2024 09:41:05 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH 4/6] arm64: dts: rockchip: convert leds node to "pwm-led" for Radxa ROCK 5B Date: Sat, 30 Nov 2024 00:40:55 +0000 Message-ID: <20241130004057.7432-5-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241130004057.7432-1-naoki@radxa.com> References: <20241130004057.7432-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241129_164125_177060_7CDA8B9E X-CRM114-Status: UNSURE ( 7.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: , Cc: robh@kernel.org, conor+dt@kernel.org, inindev@gmail.com, devicetree@vger.kernel.org, sebastian.reichel@collabora.com, linux-rockchip@lists.infradead.org, alchark@gmail.com, FUKAUMI Naoki , krzk+dt@kernel.org, dsimic@manjaro.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org convert heartbeat LED to use "pwm-led" to control birghtness. also, define default-state = "on" to match with U-Boot. Signed-off-by: FUKAUMI Naoki --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 95f2f4dbf12d..7c8359fe712a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -50,15 +50,15 @@ hdmi0_con_in: endpoint { }; leds { - compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_rgb_b>; + compatible = "pwm-leds"; - led_rgb_b { - function = LED_FUNCTION_STATUS; + led-0 { color = ; - gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + default-state = "on"; + function = LED_FUNCTION_STATUS; linux,default-trigger = "heartbeat"; + pwms = <&pwm0 0 1000000 0>; + max-brightness = <255>; }; }; @@ -413,12 +413,6 @@ hym8563_int: hym8563-int { }; }; - leds { - led_rgb_b: led-rgb-b { - rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - sound { hp_detect: hp-detect { rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; @@ -456,6 +450,10 @@ usb_host_pwren_h: usb-host-pwren-h { }; }; +&pwm0 { + status = "okay"; +}; + &pwm1 { status = "okay"; }; From patchwork Sat Nov 30 00:40:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13889027 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 D9D6CD735E4 for ; Sat, 30 Nov 2024 00:41:41 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=poXeOlcvNQAaJG9JVYbqWrO14pnDdjUqPy3Y/UNuBhk=; b=y1uo/abb7mOwWJ 3SgO7/nj3CG61a8LCId1UAM6wFhr4N8NWxKRsQRG/YtRXP2ad4silmxrf0AYsFfVnHHRbgRsxc7mS VmTHpGXBhskVGkzHuU+8XHe8vxWo9UOPWYxkmXLtY/BwyDEgppXFH6vn9oyFTKb6Xsw8XxyT5H8UQ hAJsTgtkrt8QAmjP/ngBq8a536yN3Y1nG19XrTD5DjDZU3URs174zYhJW2RpKUXVn8e6Ig5elmTUd PFqTGiBKAImbRCzvtwIuFmiHsxBkLuJAvsz/w33WqbGWKbUDHgJ+ZSDGAdXacYgcCXa7/E95FiDRT zzm1zqBGhA6BVUS21ImQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHBYA-00000001B8q-1dUP; Sat, 30 Nov 2024 00:41:30 +0000 Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHBY4-00000001B5w-3jf1 for linux-rockchip@lists.infradead.org; Sat, 30 Nov 2024 00:41:29 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 4AU0f3BJ024368; Sat, 30 Nov 2024 09:41:05 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH 5/6] arm64: dts: rockchip: fix pwm-fan node for Radxa ROCK 5B Date: Sat, 30 Nov 2024 00:40:56 +0000 Message-ID: <20241130004057.7432-6-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241130004057.7432-1-naoki@radxa.com> References: <20241130004057.7432-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241129_164125_134727_55EEB35F X-CRM114-Status: UNSURE ( 7.80 ) 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: , Cc: robh@kernel.org, conor+dt@kernel.org, inindev@gmail.com, devicetree@vger.kernel.org, sebastian.reichel@collabora.com, linux-rockchip@lists.infradead.org, alchark@gmail.com, FUKAUMI Naoki , krzk+dt@kernel.org, dsimic@manjaro.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org fix properties to match with vendor kernel. Signed-off-by: FUKAUMI Naoki --- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 7c8359fe712a..6a02febaefb7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -64,10 +64,10 @@ led-0 { fan: pwm-fan { compatible = "pwm-fan"; - cooling-levels = <0 120 150 180 210 240 255>; - fan-supply = <&vcc5v0_sys>; - pwms = <&pwm1 0 50000 0>; #cooling-cells = <2>; + cooling-levels = <0 64 128 192 255>; + fan-supply = <&vcc5v0_sys>; + pwms = <&pwm1 0 60000 0>; }; rfkill { From patchwork Sat Nov 30 00:40:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13889026 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 7D838D735EB for ; Sat, 30 Nov 2024 00:41:37 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=xVXnPvtchAFYHfZQAbVnYDzEUp9OKtpXXakGMAzdjVs=; b=hYjjVR/1mK2ySt fJElRjLCqPvn8CidKHWJk5+p61wbro8+QbYbmC4/5dsf42aWaQXd24tyCGQjK+XrAJ4yfcf1h9jN2 4bHfJ+YAqu3oEaSrMrAWehU/+qrzHvCAZ+enJmQ3ypXB2s+PUKABrmIJBKJr197niBUFMXeIwqG6Z nz1V7I+aB2sp2P7vDEimh6tl6bEjFts+IAN/qK03rlAmn4Th5xWyPNlLWRDT3MBV+86iH6nr3PuuU XbkeAgicbUDpZSSIbI/XJ1ExMvTqIpxZqm226xbo0halrw1Un43asKBv0zOz/ASggKdDj5GqNXk2p EfHzelH+tpDsh4Nfig1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHBYA-00000001B8x-311u; Sat, 30 Nov 2024 00:41:30 +0000 Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHBY4-00000001B5u-41V8 for linux-rockchip@lists.infradead.org; Sat, 30 Nov 2024 00:41:29 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 4AU0f3BK024368; Sat, 30 Nov 2024 09:41:05 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH 6/6] arm64: dts: rockchip: fix rtc node for Radxa ROCK 5B Date: Sat, 30 Nov 2024 00:40:57 +0000 Message-ID: <20241130004057.7432-7-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241130004057.7432-1-naoki@radxa.com> References: <20241130004057.7432-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241129_164125_203507_72012D44 X-CRM114-Status: UNSURE ( 8.91 ) 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: , Cc: robh@kernel.org, conor+dt@kernel.org, inindev@gmail.com, devicetree@vger.kernel.org, sebastian.reichel@collabora.com, linux-rockchip@lists.infradead.org, alchark@gmail.com, FUKAUMI Naoki , krzk+dt@kernel.org, dsimic@manjaro.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org fix pin names to match with schematic. Signed-off-by: FUKAUMI Naoki --- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 6a02febaefb7..fbe231973b24 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -300,11 +300,11 @@ hym8563: rtc@51 { compatible = "haoyu,hym8563"; reg = <0x51>; #clock-cells = <0>; - clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&hym8563_int>; + clock-output-names = "32kout_wifi"; interrupt-parent = <&gpio0>; interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&rtc_int_l>; wakeup-source; }; }; @@ -407,8 +407,8 @@ &pcie3x4 { }; &pinctrl { - hym8563 { - hym8563_int: hym8563-int { + rtc { + rtc_int_l: rtc-int-l { rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; };