From patchwork Mon Dec 2 02:32: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: 13889819 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 2ABACD49794 for ; Mon, 2 Dec 2024 02:34:23 +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=ZLwTGM/zGbJ9NlN1B8q0nBe9OzqMZFZ1LFQs3SgHaAo=; b=FBRMxeWId0d57P 4//JtM74kOti+lJ9nJyj2VTaGIBrQwGM1s7Vc7sItuN8CYzpUbwNKxksTBJfIY91zTgIwKqowd6ft DNukDIT91niDwUVumzMbD+NxGFZ3CegTzPqeXMPnK9TJFJOmY5EGBCrb00a7kNhm58BBFiFtKlfVK xDJUV6VjLkQRJLiC1bHeRhl7PaL7Rkgf5uPVPNk3Y/jf72XgUCEN+osF5vsmwn0/pmY2MOy60EIZa CYlUnew2BWBvTlcQXSOnRF+cmwReTOn1qWkqsmPown/uZj0SFXKXGrL9phyIC3lnWaYybDq9iIUgn eIKzqanSFS0tr0XmnGFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGQ-00000004oiU-156U; Mon, 02 Dec 2024 02:34:18 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGP-00000004oi7-2pUq for linux-rockchip@bombadil.infradead.org; Mon, 02 Dec 2024 02:34:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=CYXq3kz/5nEXVi8u+QTTwWboGhDQiPnmYwsjX+GyjXQ=; b=NjbMW17eu3vQpJ6trKuCjlvjgl y7ZPh6xqBIzFkt5l8f5C3oD0feDziryyamO25HZoV0XoF8VcKCfLuLErrNBCvYqv73LZG/PAsftOf Jd4h/wSsGdAgEn6I09hlZnHvjcdYdkcOTmlxRewsFRYMzHVgvb0wMa6uOL+Na/RvMq3/ESg4zw1N0 J4nrnr/AHDCuzu46xMCRULslFDEwC/atQ/9QY4mbAYzVz5WMe6TKYTH69lKTg+0DuQpuYxy5+FwSz CezpC1pjefKrpyuUySFYqMeRhGAXDkHlHrP7wFrl47C+rknYXMqjwQk3D5SVXVXXOA4DuaSz4lPYS FV9L3fjQ==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGJ-00000007Nto-0h8l for linux-rockchip@lists.infradead.org; Mon, 02 Dec 2024 02:34:16 +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 4B22XVDe000375; Mon, 2 Dec 2024 11:33:34 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH v2 1/4] arm64: dts: rockchip: sort nodes in .dts for Radxa ROCK 5B Date: Mon, 2 Dec 2024 02:32:24 +0000 Message-ID: <20241202023227.2671-2-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241202023227.2671-1-naoki@radxa.com> References: <20241202023227.2671-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241202_023413_136552_90407337 X-CRM114-Status: UNSURE ( 6.11 ) 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 sort alphanumerically. Signed-off-by: FUKAUMI Naoki --- Changes in v2: - none --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index fbe231973b24..08f5efeeac9c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -473,21 +473,6 @@ &sdhci { status = "okay"; }; -&sdmmc { - max-frequency = <200000000>; - no-sdio; - no-mmc; - bus-width = <4>; - cap-mmc-highspeed; - cap-sd-highspeed; - cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; - disable-wp; - sd-uhs-sdr104; - vmmc-supply = <&vcc_3v3_s3>; - vqmmc-supply = <&vccio_sd_s0>; - status = "okay"; -}; - &sdio { max-frequency = <200000000>; no-sd; @@ -509,6 +494,21 @@ &sdio { status = "okay"; }; +&sdmmc { + max-frequency = <200000000>; + no-sdio; + no-mmc; + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; + disable-wp; + sd-uhs-sdr104; + vmmc-supply = <&vcc_3v3_s3>; + vqmmc-supply = <&vccio_sd_s0>; + status = "okay"; +}; + &sfc { pinctrl-names = "default"; pinctrl-0 = <&fspim2_pins>; @@ -523,12 +523,6 @@ flash@0 { }; }; -&uart6 { - pinctrl-names = "default"; - pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>; - status = "okay"; -}; - &spi2 { status = "okay"; assigned-clocks = <&cru CLK_SPI2>; @@ -858,11 +852,6 @@ &tsadc { status = "okay"; }; -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; -}; - &u2phy1 { status = "okay"; }; @@ -891,7 +880,14 @@ &u2phy3_host { status = "okay"; }; -&usbdp_phy1 { +&uart2 { + pinctrl-0 = <&uart2m0_xfer>; + status = "okay"; +}; + +&uart6 { + pinctrl-names = "default"; + pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>; status = "okay"; }; @@ -920,7 +916,7 @@ &usb_host2_xhci { status = "okay"; }; -&vop_mmu { +&usbdp_phy1 { status = "okay"; }; @@ -928,6 +924,10 @@ &vop { status = "okay"; }; +&vop_mmu { + status = "okay"; +}; + &vp0 { vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { reg = ; From patchwork Mon Dec 2 02:32: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: 13889821 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 7ACC9D49792 for ; Mon, 2 Dec 2024 02:34:24 +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=0aGvvBni5yhWnUaSRyZpO5zEBUR+FAr1r2YL98m9Fqc=; b=fz8OtGUBl1l49l cn1wLhfB4VcdcCkmuGRb9yOXh7i0X9rxXY3GI0rFuiXmsquZRVHO6H7yFO6iT7OEgTMWSjPg0cVbG KzPP1L+V045UwzY5on3LeG8Qmqp7nZ2hYjzi/zNWsrxVrUjN1ZR/n5Kye3cSps+7lamaf2qemRki3 dOb+CB3xt0ULtS2pnBfVqXukloQ7er0AWGE8UB0V1QaPqJVy0do+8OuuAulBj4ECM/RHcmno6MVYX 8D0m6ut042Tw3jkZXrQ1Y73PB+DSWnWyF7QlwTmke7TvkmyoVszpwURve6SCt2ug6qN1YL3vhZslI Z5NiSGdQLFHU84pcym0Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGT-00000004okm-2mIA; Mon, 02 Dec 2024 02:34:21 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGR-00000004oid-0r3L for linux-rockchip@bombadil.infradead.org; Mon, 02 Dec 2024 02:34:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=CQOD0RFwtniYvfmvL9kr2sp5W1ZX9xos9iYKxvzbcQk=; b=hCinhgEElHHlWkNGLE2g4E7elr hd/AVfv7YbK+swJAV22H3mwQV4sMAB5668UHfcDKzQAC9kqY07XZNb9gohAEfI935yg0Wk7xPT0+F zzoaroIzKYvULlbsEKv564crsn6fGpIsxZZsFMgBgOm8IZbXGCzHMhRHSebe89r71RsJraXNzh0en H1ElfRSVmFaH+zU8wvMzSIBifPCTgHB8EkHdXE0GEcrcrOB73YzSIDPxS5sjBeO+4wsJkXnj0NXEN A8q/i8MegoARdqfh1AvaBIfZwWXhiWnxn99azasrIHl2H6Wme3zMGnwyKFHSc2VLdRL6W9fMHrs68 b7VR25fA==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGJ-00000007Ntl-14y3 for linux-rockchip@lists.infradead.org; Mon, 02 Dec 2024 02:34:18 +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 4B22XVDf000375; Mon, 2 Dec 2024 11:33:34 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH v2 2/4] arm64: dts: rockchip: sort nodes in root node for Radxa ROCK 5B Date: Mon, 2 Dec 2024 02:32:25 +0000 Message-ID: <20241202023227.2671-3-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241202023227.2671-1-naoki@radxa.com> References: <20241202023227.2671-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241202_023413_241345_55D6D6F9 X-CRM114-Status: UNSURE ( 6.99 ) 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 sort alphanumerically. Signed-off-by: FUKAUMI Naoki --- Changes in v2: - none --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 08f5efeeac9c..c816febb486a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -91,30 +91,30 @@ typec_vin: regulator-typec-vin { regulator-boot-on; }; - vcc3v3_wf: regulator-vcc3v3-wf { + /* pi6c pcie clock generator */ + vcc3v3_pi6c_05: vcc3v3_pcie30: regulator-vcc3v3-pi6c-05 { compatible = "regulator-fixed"; enable-active-high; - gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&ekey_en>; - regulator-name = "vcc3v3_wf"; + pinctrl-0 = <&pcie30x4_pwren_h>; + regulator-name = "vcc3v3_pi6c_05"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - startup-delay-us = <50000>; + startup-delay-us = <5000>; vin-supply = <&vcc5v0_sys>; }; - /* pi6c pcie clock generator */ - vcc3v3_pi6c_05: vcc3v3_pcie30: regulator-vcc3v3-pi6c-05 { + vcc3v3_wf: regulator-vcc3v3-wf { compatible = "regulator-fixed"; enable-active-high; - gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&pcie30x4_pwren_h>; - regulator-name = "vcc3v3_pi6c_05"; + pinctrl-0 = <&ekey_en>; + regulator-name = "vcc3v3_wf"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - startup-delay-us = <5000>; + startup-delay-us = <50000>; vin-supply = <&vcc5v0_sys>; }; @@ -128,6 +128,16 @@ vcc4v0_sys: regulator-vcc4v0-sys { vin-supply = <&vcc5v0_sys>; }; + vcc5v0_sys: regulator-vcc5v0-sys { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&typec_vin>; + }; + vcc5v_usb: regulator-vcc5v-usb { compatible = "regulator-fixed"; regulator-name = "vcc5v_usb"; @@ -140,16 +150,6 @@ vcc5v_usb: regulator-vcc5v-usb { vin-supply = <&vcc5v0_sys>; }; - vcc5v0_sys: regulator-vcc5v0-sys { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&typec_vin>; - }; - vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 { compatible = "regulator-fixed"; regulator-name = "vcc_1v1_nldo_s3"; From patchwork Mon Dec 2 02:32: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: 13889823 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 242DDD49796 for ; Mon, 2 Dec 2024 02:34:24 +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=a7O8mWXN6Wn8E4Ucvmx9jYMWidBybPusQBNeyTDQrfk=; b=wjXs1AErnyJ/U/ 7aH/48D82QDZCIO4LtVuO4GjknFvh2x6OiKy9nNJ25fSius/3iyUbDKluxV9s5bDcDc70dFhEX4N6 KZEUjY4FjOdXp4XglN7DzSAOsYJZ07E8kBY9GLjwmWfqQ0Xdudyf172XLxCA7MSMLpBPzZJ947pSY mLyZBKxrMNYTPF3oCdk5Pr8NWu5eH7h+DPci8SYR+tCduOLqxWJCbe51XD5aH2EWDfAM2XH4n3kDz Bb352p07JnRgy9K2TQ1ynlRUO5HO5bkK/xgzA0SnIywFF59Tv6IBdS18NceOA27pYm0s1grBp5sYe /RETBSdNbK7cx4naR9Jg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGS-00000004ojg-3zng; Mon, 02 Dec 2024 02:34:20 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGR-00000004oia-0GLr for linux-rockchip@bombadil.infradead.org; Mon, 02 Dec 2024 02:34:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=epssVFBpVJy3IeNYywMhy8zNVTlBdtDEVzZwhrvPwxE=; b=lgcR0hmbj2SbP3C0Hvb47aGQ2d +GmvGkD8Uv7Tqnt4t5YYuxPqBTEzdtJJp5Z0Oz5ed+NrqCFtBxyrCf6FOjJGepJWn8vQJU0lc9Luu qrtu5GyzyVZQc8wXOCsuYS3BLPuytVPIztz8Fc+oXb1ZIUOtcQxEoobWy+AFbWEtoLWk+h9Y/J+mP cuGcYK4K5EeNYwpQTn0MWvskWZwHjznJHr4r4K/0CPILc23qvtAVt7sXEiIIcI2Sh3LKUIbRZ/ip2 PoAy9QdD8byP6Af+LHe+kFManHnfwgxHFbcJx+MI+UiytBP4jhlvS2fmAOqHzDHEIap6ie2Oz9nH9 FX/LuK/Q==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGJ-00000007Ntq-0lRl for linux-rockchip@lists.infradead.org; Mon, 02 Dec 2024 02:34:18 +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 4B22XVDg000375; Mon, 2 Dec 2024 11:33:34 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH v2 3/4] arm64: dts: rockchip: sort properties in .dts for Radxa ROCK 5B Date: Mon, 2 Dec 2024 02:32:26 +0000 Message-ID: <20241202023227.2671-4-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241202023227.2671-1-naoki@radxa.com> References: <20241202023227.2671-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241202_023413_179823_29F54215 X-CRM114-Status: UNSURE ( 7.67 ) 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 sort alphanumerically. Signed-off-by: FUKAUMI Naoki --- Changes in v2 - fix order in pcie2 in pinctrl --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 85 +++++++++---------- 1 file changed, 39 insertions(+), 46 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index c816febb486a..c29c61b4ffa7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -24,18 +24,15 @@ chosen { analog-sound { compatible = "audio-graph-card"; label = "rk3588-es8316"; - - widgets = "Microphone", "Mic Jack", - "Headphone", "Headphones"; - - routing = "MIC2", "Mic Jack", - "Headphones", "HPOL", - "Headphones", "HPOR"; - dais = <&i2s0_8ch_p0>; hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&hp_detect>; + routing = "MIC2", "Mic Jack", + "Headphones", "HPOL", + "Headphones", "HPOR"; + widgets = "Microphone", "Mic Jack", + "Headphone", "Headphones"; }; hdmi0-con { @@ -140,13 +137,13 @@ vcc5v0_sys: regulator-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 = <&usb_host_pwren_h>; + regulator-name = "vcc5v_usb"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; vin-supply = <&vcc5v0_sys>; }; @@ -315,10 +312,10 @@ &i2c7 { es8316: audio-codec@11 { compatible = "everest,es8316"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; - clock-names = "mclk"; assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; assigned-clock-rates = <12288000>; + clocks = <&cru I2S0_8CH_MCLKOUT>; + clock-names = "mclk"; #sound-dai-cells = <0>; port { @@ -407,27 +404,15 @@ &pcie3x4 { }; &pinctrl { - rtc { - rtc_int_l: rtc-int-l { - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - sound { - hp_detect: hp-detect { - rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; + pcie2 { + ekey_en: ekey-en { + rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; }; - }; - pcie2 { pcie30x1_0_perstn_m1_l: pcie30x1-0-perstn-m1-l { rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; }; - ekey_en: ekey-en { - rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - pcie_perst_l: pcie-perst-l { rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -443,6 +428,18 @@ pcie30x4_pwren_h: pcie30x4-pwren-h { }; }; + rtc { + rtc_int_l: rtc-int-l { + rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + sound { + hp_detect: hp-detect { + rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + usb { usb_host_pwren_h: usb-host-pwren-h { rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; @@ -465,44 +462,44 @@ &saradc { &sdhci { bus-width = <8>; + mmc-hs400-1_8v; + mmc-hs400-enhanced-strobe; no-sdio; no-sd; non-removable; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; status = "okay"; }; &sdio { max-frequency = <200000000>; - no-sd; - no-mmc; - non-removable; bus-width = <4>; cap-sdio-irq; disable-wp; keep-power-in-suspend; - wakeup-source; + no-sd; + no-mmc; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&sdiom0_pins>; sd-uhs-sdr12; sd-uhs-sdr25; sd-uhs-sdr50; sd-uhs-sdr104; vmmc-supply = <&vcc3v3_wf>; vqmmc-supply = <&vcc_1v8_s3>; - pinctrl-names = "default"; - pinctrl-0 = <&sdiom0_pins>; + wakeup-source; status = "okay"; }; &sdmmc { max-frequency = <200000000>; - no-sdio; - no-mmc; bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; 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>; @@ -527,22 +524,21 @@ &spi2 { status = "okay"; assigned-clocks = <&cru CLK_SPI2>; assigned-clock-rates = <200000000>; + num-cs = <1>; pinctrl-names = "default"; pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>; - num-cs = <1>; pmic@0 { compatible = "rockchip,rk806"; - spi-max-frequency = <1000000>; reg = <0x0>; - + gpio-controller; + #gpio-cells = <2>; interrupt-parent = <&gpio0>; interrupts = <7 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default"; pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; - + spi-max-frequency = <1000000>; system-power-controller; vcc1-supply = <&vcc4v0_sys>; @@ -561,9 +557,6 @@ pmic@0 { vcc14-supply = <&vcc_1v1_nldo_s3>; vcca-supply = <&vcc4v0_sys>; - gpio-controller; - #gpio-cells = <2>; - rk806_dvs1_null: dvs1-null-pins { pins = "gpio_pwrctrl1"; function = "pin_fun0"; From patchwork Mon Dec 2 02:32:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13889822 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 6F7BDD49797 for ; Mon, 2 Dec 2024 02:34:25 +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=f4MznhuX22i9IB+Jb8EtKzWA6CI5jWflSeiWf75h0rs=; b=hV5goyRQ6xhgqP JcOv0ls6vrvMcfUJWl4P0vH0SGwda6o0o9pnYAGTRDQGlNGwIrUcEIBeT1F7spdJkqRuGgw5dFrH9 DV9iXDeqQ0XUW2h1K9Vb65fk1iS26rtAQwpoHBqAh7xusz6wScqb+xu5esC2vaJjjwNeF5tMIx8V2 uq4RHbQ4t1Bjl6d6gd0zJBZgKlOAM4i+gPYo9NeRlLVCNS9cYO6aGI+F5sTEmjjLGUwDLvhNzEPmZ D5YLdQH+x4HlNA3EaOikvVchEu/r6uxOFPfv7DBixEQs3DMIOxsJVfqhHEltqdrCjnmNSbBOkaB9i 9HLDX2EekgZP47Li/48w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGT-00000004okM-1K2x; Mon, 02 Dec 2024 02:34:21 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGR-00000004oie-0rYR for linux-rockchip@bombadil.infradead.org; Mon, 02 Dec 2024 02:34:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=d33nmsiadzbl25hl5gT9RpvGfPPLQ5zaUpjl4lLKiQ8=; b=Ju5QrdTpSNOYg+lovYBXV8eIg4 9s/YipvLMyUON0mjVkIOjNTTycmz8VCN5gGdVrSoQUlbeXrvYg8kGFSvTfY6rnuDw5K7xPG1otZG/ csn0JPgjyrnkEBbJ+1cGFr/okg2mB96+u9b7S/KkT6gJMXchI03UaQA0oMBvsBmRX4SEtfw3j8F4q 40Vq/ipz/qYIIP9mtLiW725iWf5KXKmNbTiDWljCEo/eYpO0RibnCU5DzAn3YsGwibUapQgHyu1vJ 4xuWvi2q/RjWGEMNK7g7IG6AF2egt7VA/FFq1khKkr6Q7C1P/Ix2z4WqYJg3v5EbvQapO57Qf3hqT L7u9EIEA==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tHwGJ-00000007Ntp-1BS5 for linux-rockchip@lists.infradead.org; Mon, 02 Dec 2024 02:34:18 +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 4B22XVDh000375; Mon, 2 Dec 2024 11:33:34 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH v2 4/4] arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B Date: Mon, 2 Dec 2024 02:32:27 +0000 Message-ID: <20241202023227.2671-5-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241202023227.2671-1-naoki@radxa.com> References: <20241202023227.2671-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241202_023413_255841_8092789D X-CRM114-Status: UNSURE ( 6.23 ) 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 no functional change is intended. Signed-off-by: FUKAUMI Naoki --- Changes in v2: - none --- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index c29c61b4ffa7..3662549714e6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -138,7 +138,7 @@ vcc5v0_sys: regulator-vcc5v0-sys { vcc5v_usb: regulator-vcc5v-usb { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; + gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb_host_pwren_h>; regulator-name = "vcc5v_usb"; @@ -293,7 +293,7 @@ regulator-state-mem { &i2c6 { status = "okay"; - hym8563: rtc@51 { + rtc@51 { compatible = "haoyu,hym8563"; reg = <0x51>; #clock-cells = <0>; @@ -309,7 +309,7 @@ hym8563: rtc@51 { &i2c7 { status = "okay"; - es8316: audio-codec@11 { + audio-codec@11 { compatible = "everest,es8316"; reg = <0x11>; assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; @@ -471,7 +471,6 @@ &sdhci { }; &sdio { - max-frequency = <200000000>; bus-width = <4>; cap-sdio-irq; disable-wp; @@ -481,9 +480,6 @@ &sdio { non-removable; pinctrl-names = "default"; pinctrl-0 = <&sdiom0_pins>; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; sd-uhs-sdr104; vmmc-supply = <&vcc3v3_wf>; vqmmc-supply = <&vcc_1v8_s3>; @@ -492,7 +488,6 @@ &sdio { }; &sdmmc { - max-frequency = <200000000>; bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; @@ -530,7 +525,7 @@ &spi2 { pmic@0 { compatible = "rockchip,rk806"; - reg = <0x0>; + reg = <0>; gpio-controller; #gpio-cells = <2>; interrupt-parent = <&gpio0>;