From patchwork Thu Nov 14 02:37:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 13874498 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 5B2C4D637D9 for ; Thu, 14 Nov 2024 02:42:48 +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=9SxzYXXAuXzzXOfucEYSBxFAhqnzOF5QyBEQwjn7/s4=; b=hgDcA64BDNar8p HYLscOPeWhcRYdgX/0SVKCPEybG1cZeQXmYE5pBZW40nzivr0HS79XhwKq902avplWa7IkSlzfTUj SlFLWAKztBM9VV3VteiylGgprPkHfEqKLwSSml8qqj/jow1A9HPESPWJgEEn5kcKI+H+jFCjFc8/i 49k3Bp82YbaLqfuE3mzmV1q+hqpAcztp+3zGisbABffn3qTCxZnB1sXhCYHcFAhjE5mWHxZO4hpvs lN/ka4Gyx1oE8GJk7GLw4uhCLmD7iLLW6tNXjCKvdy/oDxvoraaK9RQLnx6+oV1b/n6MsDZ0B/LYl Hk5h/gHlHYO5CdIj1UXg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tBPoj-00000008aIc-3O3c; Thu, 14 Nov 2024 02:42:45 +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 1tBPof-00000008aGQ-3Drc for linux-rockchip@lists.infradead.org; Thu, 14 Nov 2024 02:42:43 +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 4AE2bplv029356; Thu, 14 Nov 2024 11:37:54 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, dsimic@manjaro.org, sebastian.reichel@collabora.com, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH v2 9/9] arm64: dts: rockchip: sort nodes for Radxa ROCK 5C Date: Thu, 14 Nov 2024 02:37:46 +0000 Message-ID: <20241114023746.4867-9-naoki@radxa.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241114023746.4867-1-naoki@radxa.com> References: <20241114023746.4867-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241113_184242_038092_2C6CF368 X-CRM114-Status: UNSURE ( 7.10 ) 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. Fixes: 3ddf5cdb77e6 ("arm64: dts: rockchip: add Radxa ROCK 5C") Signed-off-by: FUKAUMI Naoki --- Changes in v2: - new --- .../boot/dts/rockchip/rk3588s-rock-5c.dts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts index af6770a1ffbd..9f4779b9f3e7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts @@ -36,6 +36,14 @@ analog-sound { "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 { compatible = "hdmi-connector"; type = "a"; @@ -68,14 +76,6 @@ 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>; - }; - vcc3v3_pcie2x1l2: regulator-vcc3v3_pcie2x1l2 { compatible = "regulator-fixed"; enable-active-high; @@ -859,11 +859,6 @@ &uart2 { status = "okay"; }; -&usbdp_phy0 { - rockchip,dp-lane-mux = <2 3>; - status = "okay"; -}; - &usb_host0_ehci { status = "okay"; }; @@ -885,7 +880,8 @@ &usb_host2_xhci { status = "okay"; }; -&vop_mmu { +&usbdp_phy0 { + rockchip,dp-lane-mux = <2 3>; status = "okay"; }; @@ -893,6 +889,10 @@ &vop { status = "okay"; }; +&vop_mmu { + status = "okay"; +}; + &vp0 { vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { reg = ;