From patchwork Sat Nov 30 00:49:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13889031 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 9E1E3D735EB for ; Sat, 30 Nov 2024 00:49: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=vgtpGHemP11s42yeSEOmlMmok7kvBGjWKLN7aHH+Iy0=; b=Qzy1qoDcUbN8HJ HcjObS9wQOCzB7JATD2c+lKOPQolLbywHZKxWDq/SAZ+leiNlx/oAH165lx4wjWHuPgoWU5TF2EAq 44ffsXoTJo0DMwi54nXDo0te7r5SiA2mckvmPObEbb4AvgniUeS7CBVm2vGqovFgoD5slnYxjTbDi lEb/l645A5ALMO3OgQui3WZl747dPoJMmu/Z6WZuT59pxB7YfMbvjGSGRqZpmMTBP+tVoufYft83K /5HUYp9IpLf3sDGNLyBqyxQtx3NDo13iHOzX/PZWIltC6DPGHpE47gLzbPmTHYBlWaKJYAN1HMf3m eI2E41F5upDQOejBqxuA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tHBg1-00000001Blh-17BV; Sat, 30 Nov 2024 00:49:37 +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 1tHBfz-00000001BkQ-0itg for linux-rockchip@lists.infradead.org; Sat, 30 Nov 2024 00:49:36 +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 4AU0nQ2M024394; Sat, 30 Nov 2024 09:49:27 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Subject: [PATCH 1/4] arm64: dts: rockchip: sort nodes in .dts for Radxa ROCK 5B Date: Sat, 30 Nov 2024 00:49:17 +0000 Message-ID: <20241130004920.7505-2-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241130004920.7505-1-naoki@radxa.com> References: <20241130004920.7505-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_164935_416712_9128423F X-CRM114-Status: UNSURE ( 7.55 ) 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 --- .../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 = ;