From patchwork Mon Dec 23 01:39:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13918350 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 582EAE77188 for ; Mon, 23 Dec 2024 01:39:52 +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:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=o/Eo6WPldUSvXYQSSu2hIX9OKZbPPiBAXUDlG7gViuA=; b=hvNN8nLs+1Nt++ OfepTZB6Nw3RuQeoSqaTZJ5j/E2LY0cUjAmU/Ppb384ZjD6myjkOcafjH+FcLbqP8qusy1QmKXeWV l/E9+Z2gJOCvlFJYSLuoHT8F0za/Xlx+jXE5uHZoqAQotOoZGg2hU+6xs38f/Gki24Flsep2njIkj PoT0q9kyrBGPs7NGAf73Co56xBNdO0rwjg0U1JVi/jJaNelUsQHs4RHY6t8ipKNybrAUERTVimkPC VXljr+cMrfQpryEXZMJeD5GSufPRdILoqKPrgE4lA2adxVa/aV8Jo+jbRPtykF3ozJuiANAFH+KL8 W15ekKvv66QQTtWo0DsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tPXQA-000000095dj-312H; Mon, 23 Dec 2024 01:39:46 +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 1tPXQ7-000000095b3-0cGX for linux-rockchip@lists.infradead.org; Mon, 23 Dec 2024 01:39:45 +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 4BN1dW70024519; Mon, 23 Dec 2024 10:39:33 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, dsimic@manjaro.org, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH v6 1/7] arm64: dts: rockchip: Change the function of the blue LED for Radxa ROCK 5C Date: Mon, 23 Dec 2024 01:39:20 +0000 Message-ID: <20241223013926.1134-2-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241223013926.1134-1-naoki@radxa.com> References: <20241223013926.1134-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241222_173943_436484_DE12BA9C X-CRM114-Status: UNSURE ( 9.83 ) 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 Radxa ROCK 5C is an updated version of Radxa ROCK 5A so everything should be as compatible as possible. Change the function of the blue LED from HEARTBEAT to STATUS. Fixes: 3ddf5cdb77e6 ("arm64: dts: rockchip: add Radxa ROCK 5C") Signed-off-by: FUKAUMI Naoki --- Changes in v6 - Reword commit message Changes in v5 - Reword commit message Changes in v4 - new --- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts index 9b14d5383cdc..23e9b447b6f0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts @@ -62,7 +62,7 @@ led-0 { led-1 { color = ; default-state = "on"; - function = LED_FUNCTION_HEARTBEAT; + function = LED_FUNCTION_STATUS; gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; From patchwork Mon Dec 23 01:39:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13918353 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 F324EE77190 for ; Mon, 23 Dec 2024 01:39:53 +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:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LAV0wZT44X1bUyN63NDne6OWMm3MxZcUqvTkUiPIRUE=; b=3iQ/KGMDY7TIpB T4HHeNGirerFg0X9GvhmX6QgUA+JYc/PmfNtpLQHbsC6LyNLr1WBwtnpkkNavjaeycjcbUyGx+sz3 5kFYtc+/Od890R8rLS84NbUdvXqFJ4l2uOT43QdnugkFTeEIExhV6Zl8Cp12NqLT2YSpic4MY8TN0 717V2YmY+ZVAgUyOw42Pov8oiDPQB5Dk+g1FEFuD1L4KqLmmZ3WDl3AV3fWJ47CIKEC0B9wp71TUN u3fIbEnK6LTT6byWb9EHHRdiuEuoeOmeHUtKWs5c9UqK5PGvp0UNaOrjiABo4O8Yy0gYVL2ll8tNv +rUVnD1J6AL/glqRxObg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tPXQD-000000095gL-4A5z; Mon, 23 Dec 2024 01:39:49 +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 1tPXQ7-000000095b6-1BIe for linux-rockchip@lists.infradead.org; Mon, 23 Dec 2024 01:39:46 +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 4BN1dW71024519; Mon, 23 Dec 2024 10:39:33 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, dsimic@manjaro.org, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH v6 2/7] arm64: dts: rockchip: Use a longer PWM period for the fan on Radxa ROCK 5C Date: Mon, 23 Dec 2024 01:39:21 +0000 Message-ID: <20241223013926.1134-3-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241223013926.1134-1-naoki@radxa.com> References: <20241223013926.1134-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241222_173943_539754_EC67799C X-CRM114-Status: UNSURE ( 9.04 ) 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 The fan on Radxa ROCK 5C is driven via an AO3416 MOSFET, which has a total switch-on time of 0,6us and a total switch-off time of 6us [1], meaning that the current PWM period of just 10us is too short for fine-grained fan speed control. Increase the PWM period to 60us, so that the switch-on and switch-off time of the MOSFET fall within a more reasonable ~10% of the full period, thus making lower PWM duty cycles meaningful. [1] https://www.aosmd.com/pdfs/datasheet/AO3416.pdf Fixes: 3ddf5cdb77e6 ("arm64: dts: rockchip: add Radxa ROCK 5C") Signed-off-by: FUKAUMI Naoki --- Changes in v6: - none Changes in v5: - Reword commit message (Alexey Charkov) Changes in v4: - none Changes in v3: - none Changes in v2: - Reword commit message --- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts index 23e9b447b6f0..910ec67bd4eb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts @@ -73,7 +73,7 @@ fan { #cooling-cells = <2>; cooling-levels = <0 64 128 192 255>; fan-supply = <&vcc_5v0>; - pwms = <&pwm3 0 10000 0>; + pwms = <&pwm3 0 60000 0>; }; pcie2x1l2_3v3: regulator-pcie2x1l2-3v3 { From patchwork Mon Dec 23 01:39:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13918356 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 258D9E7718D for ; Mon, 23 Dec 2024 01:39:58 +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:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NApmNBEngo3CrW7SEBl2JPHMgBW3SC0cIUXPepjecyI=; b=UxrncYUa9+dcY8 hxFYdBwhSpCQLKjag6X2O6lhtC0K8bFxZHimVsPQidaVg/u/LAw1gNM9tWd+Dx8ZSHSuYrGCOIoh9 zYxFsRdhdcQgSP4Cpmdmf2UsJl8nRhtwsoylWBjNUC+jHMmphgwIADRNyqGsqxpFILjZPFa0VvqxL jBUGKPO5A7K+q0F740P+pSQk1X+fSE67l7MedHj+FI5Jr+6FfHGA7LeQ6v5OVZcchtdG80wn/jg1U ys8isti7vRcCiLg+MjBMW/3pZzz4O7B0YdX0Xwib27A4fxokzeMa6ebIYnWgZlQav5KMg7WdUOwy0 r+JOjDbehvwx8cs+HWlg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tPXQI-000000095jt-19N4; Mon, 23 Dec 2024 01:39:54 +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 1tPXQ7-000000095b8-3dxz for linux-rockchip@lists.infradead.org; Mon, 23 Dec 2024 01:39:47 +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 4BN1dW72024519; Mon, 23 Dec 2024 10:39:33 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, dsimic@manjaro.org, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH v6 3/7] arm64: dts: rockchip: Remove the RTC and related nodes for Radxa ROCK 5C Date: Mon, 23 Dec 2024 01:39:22 +0000 Message-ID: <20241223013926.1134-4-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241223013926.1134-1-naoki@radxa.com> References: <20241223013926.1134-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241222_173944_124422_8C750165 X-CRM114-Status: UNSURE ( 6.85 ) 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 There is no RTC on the actual board, so remove it. Fixes: 3ddf5cdb77e6 ("arm64: dts: rockchip: add Radxa ROCK 5C") Signed-off-by: FUKAUMI Naoki --- Changes in v6: - Reword commit message Changes in v5: - Reword commit message Changes in v4: - none Changes in v3: - none Changes in v2: - new --- .../boot/dts/rockchip/rk3588s-rock-5c.dts | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts index 910ec67bd4eb..8b7bb382a20c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts @@ -350,23 +350,6 @@ regulator-state-mem { }; }; -&i2c5 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c5m2_xfer>; - status = "okay"; - - rtc@51 { - compatible = "haoyu,hym8563"; - reg = <0x51>; - #clock-cells = <0>; - clock-output-names = "rtcic_32kout"; - interrupt-parent = <&gpio0>; - interrupts = ; - pinctrl-names = "default"; - pinctrl-0 = <&rtc_int_l>; - }; -}; - &i2c7 { status = "okay"; @@ -449,12 +432,6 @@ pow_en: pow-en { }; }; - rtc { - rtc_int_l: rtc-int-l { - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - usb { usb_host_pwren_h: usb-host-pwren-h { rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; From patchwork Mon Dec 23 01:39:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13918352 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 113CDE77192 for ; Mon, 23 Dec 2024 01:39:54 +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:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BaVppJGRxm5SYxuD5Gwd+uAAhsNyslNXurjxShBCmjU=; b=NI7H5NvjrMhdEp m24hXBaatTUdHV6lKUL5zivW9ohBgg+NUYXOJ38cM/si6H28/JJloZsdFPwr9TpQTibvOgfCz6H5E 2AaEMRbFdV9ZI3FHtk9ybS/i+phHp6W2ndW+SPeVfSBKviYcWVOUcQ2c1p2epTKQMf+1tuVXbvyw6 /Iv7dWj+H5JcF6a0SDt5/v5mSRV1It8A4SpfB1B7U7PYeMO3rXWx2X1Rhi5E2PYjxYFOByLbiWPOL FVZCxQUzYqhNe7GGMdga73VAWy+FeSbS7YkSh7ekRDSaUYH69aovs1rxVipLCj3T2uCWxx9opiNLH e3GzhmHJXnzuBLKzmA9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tPXQB-000000095e5-0bqj; Mon, 23 Dec 2024 01:39:47 +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 1tPXQ7-000000095au-0c21 for linux-rockchip@lists.infradead.org; Mon, 23 Dec 2024 01:39:45 +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 4BN1dW73024519; Mon, 23 Dec 2024 10:39:33 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, dsimic@manjaro.org, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH v6 4/7] arm64: dts: rockchip: Add cd-gpios for sdmmc for Radxa ROCK 5C Date: Mon, 23 Dec 2024 01:39:23 +0000 Message-ID: <20241223013926.1134-5-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241223013926.1134-1-naoki@radxa.com> References: <20241223013926.1134-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241222_173943_426311_23AA90BA X-CRM114-Status: UNSURE ( 7.52 ) 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 Due to the discussion about cd-gpios and sdmmmc_det pin functionality[1], it would be better to add cd-gpios for now. [1] https://lore.kernel.org/linux-rockchip/4920950.GXAFRqVoOG@diego/T/#u Fixes: 3ddf5cdb77e6 ("arm64: dts: rockchip: add Radxa ROCK 5C") Signed-off-by: FUKAUMI Naoki --- Changes in v6: - Reword commit message Changes in v5: - Reword commit message Changes in v4: - none Changes in v3: - none Changes in v2: - none --- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts index 8b7bb382a20c..8379bc97705c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts @@ -476,6 +476,7 @@ &sdmmc { bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; + cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; disable-wp; no-sdio; no-mmc; From patchwork Mon Dec 23 01:39:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13918349 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 70CE2E7718D for ; Mon, 23 Dec 2024 01:39:52 +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:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=L5LOnFVgtl8d6vX/53KMjwz6Mw54pSgksVZnUHraFmE=; b=m36IGywRavJqcJ KUbz37vPWw5TI83jmXUTz8PmM2zXmpeoeDZK3BpE5QlC2eGds/uTjY4EPqn69JGcBK7a4rJsBwD1U Ocjs3wIDbA7zsy/6JW79bnJ3UVmhTo9j2BAZfNE/IjbHsajPeElCzAhDruRHtf0P7axjNWgpdnOi9 3qLFI8V53ZhqJRXbvuFk/cQwnO7UDxZTy8VgMmsaUOzbK968FMMNKOnnHdQr0ycLcB2TN+NIeVqAP Kg0lr/sAd4xaYdcfNtYOzjMjfqQMDQUuHfpsoudbF2LCfHtVdSO45dprlTrk2kQV25I3RuGFu9dAj Hj9Aq/z/uMutPTZ7jgrQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tPXQC-000000095eS-0esv; Mon, 23 Dec 2024 01:39:48 +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 1tPXQ7-000000095b0-0cRJ for linux-rockchip@lists.infradead.org; Mon, 23 Dec 2024 01:39:46 +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 4BN1dW74024519; Mon, 23 Dec 2024 10:39:34 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, dsimic@manjaro.org, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH v6 5/7] arm64: dts: rockchip: Fix the properties of the PMIC regulators for Radxa ROCK 5C Date: Mon, 23 Dec 2024 01:39:24 +0000 Message-ID: <20241223013926.1134-6-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241223013926.1134-1-naoki@radxa.com> References: <20241223013926.1134-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241222_173943_438422_E55316D6 X-CRM114-Status: UNSURE ( 9.06 ) 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 Fix mistakes(copy-pasto) in the previous commit. Fixes: 3ddf5cdb77e6 ("arm64: dts: rockchip: add Radxa ROCK 5C") Signed-off-by: FUKAUMI Naoki --- Changes in v6: - Reword commit message Changes in v5: - Reword commit message Changes in v4: - none Changes in v3: - none Changes in v2: - split from "arm64: dts: rockchip: fix pmic properties for Radxa ROCK 5C" --- arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts index 8379bc97705c..9ce69ffad125 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts @@ -635,7 +635,6 @@ vcc_2v0_pldo_s3: dcdc-reg7 { regulator-boot-on; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; - regulator-ramp-delay = <12500>; regulator-state-mem { regulator-on-in-suspend; @@ -789,7 +788,8 @@ vdda_0v75_s0: nldo-reg3 { regulator-max-microvolt = <750000>; regulator-state-mem { - regulator-off-in-suspend; + regulator-on-in-suspend; + regulator-suspend-microvolt = <750000>; }; }; From patchwork Mon Dec 23 01:39:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13918354 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 7E51BE7718E for ; Mon, 23 Dec 2024 01:39:53 +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:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=p8VC1UDC/JW/kkGc27wdc5Fyyhobr2NRCGL14I1xB9w=; b=CsjlBaZXbirEOn R2A51qDPC8IoD56uGOkoZLuAw81LVh7exVkIpiJegdLPpTzvQMP9u36Hm+kZSA4EJj7MsUACeAbW7 Ejp82nk45fPQRL3TvSzsFTGClF4aa1ClzOz5FcL4dzdy7we07eHlAsaQHLANB95/p6IwE4o8dO8+g 7PhQvhSQ569hYc6kupZ+LfJeighgpAJmCKpZnJU4isSv4G9+LbFWXGTPg8lXFXY12D9hiiralS+4H kw0c2pDb/qTTfu8OqDf3JuRF5FiWjXAs8gFbkwgCmOq15KeyB1nzhVtNmgu988CbohCYbQtPau5Ia PLmjuETDkMc4u2ulwOAw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tPXQC-000000095f5-3zUd; Mon, 23 Dec 2024 01:39:48 +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 1tPXQ7-000000095aw-0cBP for linux-rockchip@lists.infradead.org; Mon, 23 Dec 2024 01:39:46 +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 4BN1dW75024519; Mon, 23 Dec 2024 10:39:34 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, dsimic@manjaro.org, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH v6 6/7] arm64: dts: rockchip: Trivial changes for Radxa ROCK 5C Date: Mon, 23 Dec 2024 01:39:25 +0000 Message-ID: <20241223013926.1134-7-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241223013926.1134-1-naoki@radxa.com> References: <20241223013926.1134-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241222_173943_436519_2470E448 X-CRM114-Status: UNSURE ( 7.60 ) 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 No functional change. Signed-off-by: FUKAUMI Naoki --- Changes in v6: - New --- .../boot/dts/rockchip/rk3588s-rock-5c.dts | 79 +++++++++---------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts index 9ce69ffad125..419730f06f8f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts @@ -25,7 +25,7 @@ chosen { stdout-path = "serial2:1500000n8"; }; - analog-sound { + sound { compatible = "audio-graph-card"; label = "rk3588-es8316"; dais = <&i2s0_8ch_p0>; @@ -50,7 +50,7 @@ hdmi0_con_in: endpoint { leds { compatible = "gpio-leds"; pinctrl-names = "default"; - pinctrl-0 = <&led_pins>; + pinctrl-0 = <&led_0 &led_1>; led-0 { color = ; @@ -76,28 +76,19 @@ fan { pwms = <&pwm3 0 60000 0>; }; - pcie2x1l2_3v3: regulator-pcie2x1l2-3v3 { + vcc3v3_pcie2x1l2: regulator-3v3-0 { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pow_en>; - regulator-name = "pcie2x1l2_3v3"; + regulator-name = "vcc3v3_pcie2x1l2"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; vin-supply = <&vcc_sysin>; }; - vcc5v_dcin: regulator-vcc5v-dcin { - compatible = "regulator-fixed"; - regulator-name = "vcc5v_dcin"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - - vcc5v0_usb_host: regulator-vcc5v0-usb-host { + vcc5v0_usb_host: regulator-5v0-0 { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>; @@ -109,7 +100,7 @@ vcc5v0_usb_host: regulator-vcc5v0-usb-host { vin-supply = <&vcc_sysin>; }; - vcc5v0_usb_otg0: regulator-vcc5v0-usb-otg0 { + vcc5v0_usb_otg0: regulator-5v0-1 { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; @@ -121,7 +112,7 @@ vcc5v0_usb_otg0: regulator-vcc5v0-usb-otg0 { vin-supply = <&vcc_sysin>; }; - vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 { + vcc_1v1_nldo_s3: regulator-1v1 { compatible = "regulator-fixed"; regulator-name = "vcc_1v1_nldo_s3"; regulator-always-on; @@ -131,7 +122,7 @@ vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 { vin-supply = <&vcc_sysin>; }; - vcc_3v3_pmu: regulator-vcc-3v3-pmu { + vcc_3v3_pmu: regulator-3v3-1 { compatible = "regulator-fixed"; regulator-name = "vcc_3v3_pmu"; regulator-always-on; @@ -141,17 +132,17 @@ vcc_3v3_pmu: regulator-vcc-3v3-pmu { vin-supply = <&vcc_3v3_s3>; }; - vcc_3v3_s0: regulator-vcc-3v3-s0 { + vcc_3v3_s0: regulator-3v3-2 { compatible = "regulator-fixed"; regulator-name = "vcc_3v3_s0"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_1v8_s0>; + vin-supply = <&vcc_3v3_s3>; }; - vcc_5v0: regulator-vcc-5v0 { + vcc_5v0: regulator-5v0-2 { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>; @@ -163,17 +154,16 @@ vcc_5v0: regulator-vcc-5v0 { vin-supply = <&vcc_sysin>; }; - vcc_sysin: regulator-vcc-sysin { + vcc_sysin: regulator-5v0-3 { compatible = "regulator-fixed"; regulator-name = "vcc_sysin"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v_dcin>; }; - vcca: regulator-vcca { + vcca: regulator-4v0 { compatible = "regulator-fixed"; regulator-name = "vcca"; regulator-always-on; @@ -183,7 +173,7 @@ vcca: regulator-vcca { vin-supply = <&vcc_sysin>; }; - vdd_3v3: regulator-vdd-3v3 { + vdd_3v3: regulator-3v3-3 { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; @@ -404,48 +394,53 @@ &pcie2x1l2 { pinctrl-names = "default"; pinctrl-0 = <&pcie20x1_2_perstn_m0>; reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&pcie2x1l2_3v3>; + vpcie3v3-supply = <&vcc3v3_pcie2x1l2>; status = "okay"; }; &pinctrl { leds { - led_pins: led-pins { - rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>, - <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; + led_0: led-0 { + rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + led_1: led-1 { + rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - mdio { - gmac1_rstn: gmac1-rstn { + ethernet-phy { + gmac1_rstn: ethernet-phy-0 { rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; }; }; pcie { - pcie20x1_2_perstn_m0: pcie20x1-2-perstn-m0 { + pcie20x1_2_perstn_m0: pcie-0 { rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; }; - pow_en: pow-en { + pow_en: regulator-3v3-0 { rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; usb { - usb_host_pwren_h: usb-host-pwren-h { + usb_host_pwren_h: regulator-5v0-0 { rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; }; - usb_otg_pwren_h: usb-otg-pwren-h { + usb_otg_pwren_h: regulator-5v0-1 { rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; }; - usb_wifi_pwr: usb-wifi-pwr { + usb_wifi_pwr: regulator-3v3-3 { rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; + }; - vcc_5v0_pwren_h: vcc-5v0-pwren-h { + regulators { + vcc_5v0_pwren_h: regulator-5v0-2 { rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -464,11 +459,14 @@ &saradc { &sdhci { bus-width = <8>; + cap-mmc-highspeed; mmc-hs400-1_8v; mmc-hs400-enhanced-strobe; - no-sdio; no-sd; + no-sdio; non-removable; + vmmc-supply = <&vcc_3v3_s0>; + vqmmc-supply = <&vcc_1v8_s3>; status = "okay"; }; @@ -479,7 +477,6 @@ &sdmmc { cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; disable-wp; no-sdio; - no-mmc; sd-uhs-sdr104; vmmc-supply = <&vcc_3v3_s3>; vqmmc-supply = <&vccio_sd_s0>; @@ -630,7 +627,7 @@ regulator-state-mem { }; vcc_2v0_pldo_s3: dcdc-reg7 { - regulator-name = "vdd_2v0_pldo_s3"; + regulator-name = "vcc_2v0_pldo_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <2000000>; @@ -665,8 +662,8 @@ regulator-state-mem { }; }; - vcc1v8_pmu_ddr_s3: dcdc-reg10 { - regulator-name = "vcc1v8_pmu_ddr_s3"; + vcc_1v8_s3: dcdc-reg10 { + regulator-name = "vcc_1v8_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; From patchwork Mon Dec 23 01:39:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13918355 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 1D18DE77188 for ; Mon, 23 Dec 2024 01:39:56 +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:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2rCaAEB7ucxcpajpry+8ebk6YinELV4PEfIjlbshFAM=; b=AyXoTW7Y522CS0 Fuw9iKH0u5Ti7WVRJifUVpo9yeFQdFm61fY3nnc+kiYi0rsnqQ2JXPykPxHBwkZ4ObK0QaYk8iQws crT6Q/ZWqVC8JYkfAqwzfFm1Ztq2ad1PD3tMBPj0sBK9DcSly2ZUVTg5p4PPQT0Lt5B4X168bF1U4 FKeL/WeCLOsBrcaVRpSsE/TVb/cCnXydSWCwBGb7tuj4S1h658HsE8zmMo/NE/+6S0vG32Eze54Lb XQsdyiORXT8LPE2n6ELXHays96XQUQGAPGyTe7SnxrX06bSOH1f/nrVI1XNDXLVeDLE0o1iVPzFjw 02DwRfQ/ncAOQ0NJ3c5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tPXQD-000000095fR-1oXW; Mon, 23 Dec 2024 01:39:49 +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 1tPXQ7-000000095b4-0cMK for linux-rockchip@lists.infradead.org; Mon, 23 Dec 2024 01:39:46 +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 4BN1dW76024519; Mon, 23 Dec 2024 10:39:34 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, dsimic@manjaro.org, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH v6 7/7] arm64: dts: rockchip: Sort nodes for Radxa ROCK 5C Date: Mon, 23 Dec 2024 01:39:26 +0000 Message-ID: <20241223013926.1134-8-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241223013926.1134-1-naoki@radxa.com> References: <20241223013926.1134-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241222_173943_440755_CC916321 X-CRM114-Status: UNSURE ( 7.46 ) 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 Sort nodes alphanumerically. No functional change. Signed-off-by: FUKAUMI Naoki --- Changes in v6: - Reflect other commits, no functional change Changes in v5: - Reword commit message Changes in v4: - Reflect other commits, no functional change Changes in v3: - none Changes in v2: - new --- .../boot/dts/rockchip/rk3588s-rock-5c.dts | 176 +++++++++--------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts index 419730f06f8f..a3deae077233 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts @@ -25,15 +25,12 @@ chosen { stdout-path = "serial2:1500000n8"; }; - sound { - compatible = "audio-graph-card"; - label = "rk3588-es8316"; - dais = <&i2s0_8ch_p0>; - routing = "MIC2", "Mic Jack", - "Headphones", "HPOL", - "Headphones", "HPOR"; - widgets = "Microphone", "Mic Jack", - "Headphone", "Headphones"; + fan { + compatible = "pwm-fan"; + #cooling-cells = <2>; + cooling-levels = <0 64 128 192 255>; + fan-supply = <&vcc_5v0>; + pwms = <&pwm3 0 60000 0>; }; hdmi0-con { @@ -68,12 +65,14 @@ led-1 { }; }; - fan { - compatible = "pwm-fan"; - #cooling-cells = <2>; - cooling-levels = <0 64 128 192 255>; - fan-supply = <&vcc_5v0>; - pwms = <&pwm3 0 60000 0>; + vcc_1v1_nldo_s3: regulator-1v1 { + compatible = "regulator-fixed"; + regulator-name = "vcc_1v1_nldo_s3"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1100000>; + vin-supply = <&vcc_sysin>; }; vcc3v3_pcie2x1l2: regulator-3v3-0 { @@ -88,6 +87,50 @@ vcc3v3_pcie2x1l2: regulator-3v3-0 { vin-supply = <&vcc_sysin>; }; + vcc_3v3_pmu: regulator-3v3-1 { + compatible = "regulator-fixed"; + regulator-name = "vcc_3v3_pmu"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_3v3_s3>; + }; + + vcc_3v3_s0: regulator-3v3-2 { + compatible = "regulator-fixed"; + regulator-name = "vcc_3v3_s0"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_3v3_s3>; + }; + + vdd_3v3: regulator-3v3-3 { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_wifi_pwr>; + regulator-name = "vdd_3v3"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_3v3_s3>; + }; + + vcca: regulator-4v0 { + compatible = "regulator-fixed"; + regulator-name = "vcca"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <4000000>; + regulator-max-microvolt = <4000000>; + vin-supply = <&vcc_sysin>; + }; + vcc5v0_usb_host: regulator-5v0-0 { compatible = "regulator-fixed"; enable-active-high; @@ -112,36 +155,6 @@ vcc5v0_usb_otg0: regulator-5v0-1 { vin-supply = <&vcc_sysin>; }; - vcc_1v1_nldo_s3: regulator-1v1 { - compatible = "regulator-fixed"; - regulator-name = "vcc_1v1_nldo_s3"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; - vin-supply = <&vcc_sysin>; - }; - - vcc_3v3_pmu: regulator-3v3-1 { - compatible = "regulator-fixed"; - regulator-name = "vcc_3v3_pmu"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_3v3_s3>; - }; - - vcc_3v3_s0: regulator-3v3-2 { - compatible = "regulator-fixed"; - regulator-name = "vcc_3v3_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_3v3_s3>; - }; - vcc_5v0: regulator-5v0-2 { compatible = "regulator-fixed"; enable-active-high; @@ -163,28 +176,15 @@ vcc_sysin: regulator-5v0-3 { regulator-max-microvolt = <5000000>; }; - vcca: regulator-4v0 { - compatible = "regulator-fixed"; - regulator-name = "vcca"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <4000000>; - regulator-max-microvolt = <4000000>; - vin-supply = <&vcc_sysin>; - }; - - vdd_3v3: regulator-3v3-3 { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&usb_wifi_pwr>; - regulator-name = "vdd_3v3"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_3v3_s3>; + sound { + compatible = "audio-graph-card"; + label = "rk3588-es8316"; + dais = <&i2s0_8ch_p0>; + routing = "MIC2", "Mic Jack", + "Headphones", "HPOL", + "Headphones", "HPOR"; + widgets = "Microphone", "Mic Jack", + "Headphone", "Headphones"; }; }; @@ -399,6 +399,12 @@ &pcie2x1l2 { }; &pinctrl { + ethernet-phy { + gmac1_rstn: ethernet-phy-0 { + rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + leds { led_0: led-0 { rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; @@ -409,12 +415,6 @@ led_1: led-1 { }; }; - ethernet-phy { - gmac1_rstn: ethernet-phy-0 { - rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pcie { pcie20x1_2_perstn_m0: pcie-0 { rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; @@ -425,7 +425,17 @@ pow_en: regulator-3v3-0 { }; }; + regulators { + vcc_5v0_pwren_h: regulator-5v0-2 { + rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + usb { + usb_wifi_pwr: regulator-3v3-3 { + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + usb_host_pwren_h: regulator-5v0-0 { rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -433,16 +443,6 @@ usb_host_pwren_h: regulator-5v0-0 { usb_otg_pwren_h: regulator-5v0-1 { rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; }; - - usb_wifi_pwr: regulator-3v3-3 { - rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - regulators { - vcc_5v0_pwren_h: regulator-5v0-2 { - rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; - }; }; }; @@ -854,10 +854,6 @@ &uart2 { status = "okay"; }; -&usbdp_phy0 { - status = "okay"; -}; - &usb_host0_ehci { status = "okay"; }; @@ -879,7 +875,7 @@ &usb_host2_xhci { status = "okay"; }; -&vop_mmu { +&usbdp_phy0 { status = "okay"; }; @@ -887,6 +883,10 @@ &vop { status = "okay"; }; +&vop_mmu { + status = "okay"; +}; + &vp0 { vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { reg = ;