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 = ;