From patchwork Mon Mar 24 17:04:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 14027548 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 390C0C36002 for ; Mon, 24 Mar 2025 17:11:34 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fkzCVumoVL03yBwONjXSkNg5cPaKnHErNAazOZr4neQ=; b=zkEJXGpu6S6Etp GuyzHzxx78xtAqd9l1r0YByv7Imyl6RjQC0iI4gDoV1eVWM7ZQgrpVf8mgn4yrJBBQu0DmoMRBlAj vXkzkieCtwAsj5FAikXplfKiwRccouS4KtPSVMAcp68MJo8TIoTUtxUvfVL4ParmuqRO7XBBao9a1 TmQrD9WWS38OEYC+4vH0pa0ZbA9nwyol+2vg75Iw3qcsDFmTWb0LNqYFMxtIjlIJLOVNVc8ru70no cDm8N5RNEasL5Oc5jnXRDJTWlCxCCXLrhhlcK7lk0oVRAmsTsT2P6p5MxAi9180riRuaFfb7FVGOg yMDOkmQJOMsWybktuPZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1twlKj-00000003lIY-3lNA; Mon, 24 Mar 2025 17:11:29 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1twlDs-00000003k2S-4AVi; Mon, 24 Mar 2025 17:04:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1742835863; bh=Z1D9b/aDklkV/w1jDdHJ0QT0NlOJuOAq6fuu6adnAX4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RCTRxrRtcqyjnzZbZJxyNPhS3zz0EDcj4dHkNReppdgRJmRS/TkTSpuITq+qifDQZ 21PMGBVLQ0N/yb30qqkzp1SALU5SkUUGr/GYptGL848tRW71dn38mk7sqZ2S1cYpwH CrxDpa3C2iW+tGku0eESeVxQMiZVfycnPOtbaTYFdOT4+PywpshGOoIS8Y3RoXOhUb 4OrvzVRG3Sl6w/CTqWtPuHt6TGA30GxoxKijZKB/fb2r1swbCuTF4tYHUp9jJEZMZc 0Dg41JeLlk7NDE2Mbak+m+Qw98uMnp0Ikz4skvSCHPu9sna4hOodLeJ8THRK5fDqnu QQPcFctnVxPSw== Received: from jupiter.universe (dyndsl-091-248-188-184.ewe-ip-backbone.de [91.248.188.184]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by bali.collaboradmins.com (Postfix) with ESMTPSA id 1B8A317E0B9D; Mon, 24 Mar 2025 18:04:23 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id D779B480037; Mon, 24 Mar 2025 18:04:22 +0100 (CET) From: Sebastian Reichel Date: Mon, 24 Mar 2025 18:04:23 +0100 Subject: [PATCH 2/5] arm64: dts: rockchip: move rock 5b to include file MIME-Version: 1.0 Message-Id: <20250324-rock5bp-for-upstream-v1-2-6217edf15b19@kernel.org> References: <20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org> In-Reply-To: <20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org> To: Heiko Stuebner Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Sebastian Reichel X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3778; i=sre@kernel.org; h=from:subject:message-id; bh=Z1D9b/aDklkV/w1jDdHJ0QT0NlOJuOAq6fuu6adnAX4=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGfhkJZwAq2N9fnfh21CieN/Jfy7/q5h02WRO qr7EplupgmG5okCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJn4ZCWAAoJENju1/PI O/qaSMoQAJ0Tn5Do38EbDJ08eAFM6r9GiVzR0ma0pIDj7kdnFcgEZDTNWEQfsZn2HVgD7bnKUAZ 7U9j3odFs3HMmcc1HYHkx/iEUYvpc5sl+9i3YtivSEa0GK84dAJs1DrFlS+6hTvy3ATvAogGDp2 gn/tf2cPvLj5ZI/Qx1FT5nY50efyQ6NstPilFeioZLn/rNWAFqCf/udl2rLe1m7ovBvSnFunW3i rjqabbRwcKMRy9QLM9qvBSmrKqvxJnwlJP2GiGpvofNvoaxcj3sLe/bqKCL4w76RI4FuF9bVy/U Jzj/BFU3OCsWhxQ/qJLLch8JT55nxGkY1J8yBrZhxX7rVG8ftCCHbSjO8v3W2gHWRYRAhCrVZ6q O7eejooYeqKr/spWlm6J4UZ7cUbi+2xzLva9eM2jAXnKgdj4ls/rX4IS+SKlguLT/tp8CWGvN1p qvwxubRWO+ABDn6Bte1FtfkGJuzTb1K/kV4tHWpRjvL5Vxg1B847OJZBPb9hJDvYeFB4AvLu8jJ QdK9fk7YrHgH90sAjh90qoDFTutQjbg/uK6+Fae0i/bckBvWDtx/t2SYDdTRxYPS71pG6QlJ2cV 4uFMQ3OzlcYUTsFsAN7HSBh05F5Sc8fXcvZiaRgTnWpPow1xq2Nj9Tx/s87xz71B2g/Y2x0AEJ6 rGHx379F4nLA26Ndl1PE2VA== X-Developer-Key: i=sre@kernel.org; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250324_100425_200002_1DF40802 X-CRM114-Status: GOOD ( 16.37 ) 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 released some more boards, which are based on the original Rock 5B. Move its board description into an include file to avoid unnecessary duplication. NOTE: this should be merged with the previous commit to ensure bisectability. The rename happens in a separete commit during development because git does not properly detect the rename when the original filename is reused in the same commit. This means 1. it's a lot harder to review the changes 2. it's a lot harder to rebase the patch series Signed-off-by: Sebastian Reichel --- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 52 ++++++++++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi | 34 ---------------- 2 files changed, 52 insertions(+), 34 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts new file mode 100644 index 0000000000000000000000000000000000000000..9407a7c9910ada1f6c803d2e15785a9cbd9bd655 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "rk3588-rock-5b.dtsi" + +/ { + model = "Radxa ROCK 5B"; + compatible = "radxa,rock-5b", "rockchip,rk3588"; +}; + +&sdio { + max-frequency = <200000000>; + no-sd; + no-mmc; + non-removable; + bus-width = <4>; + cap-sdio-irq; + disable-wp; + keep-power-in-suspend; + wakeup-source; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + vmmc-supply = <&vcc3v3_pcie2x1l0>; + vqmmc-supply = <&vcc_1v8_s3>; + pinctrl-names = "default"; + pinctrl-0 = <&sdiom0_pins>; + status = "okay"; +}; + +&uart6 { + pinctrl-names = "default"; + pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>; + status = "okay"; +}; + +&pinctrl { + usb { + vcc5v0_host_en: vcc5v0-host-en { + rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&vcc5v0_host { + enable-active-high; + gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_host_en>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi index d22068475c5dc6cb885f878f3f527a66edf1ba70..dccb8492f9f0632abd96c3dafc723e01491abad5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi @@ -8,9 +8,6 @@ #include "rk3588.dtsi" / { - model = "Radxa ROCK 5B"; - compatible = "radxa,rock-5b", "rockchip,rk3588"; - aliases { mmc0 = &sdhci; mmc1 = &sdmmc; @@ -139,10 +136,6 @@ vcc5v0_host: regulator-vcc5v0-host { regulator-always-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&vcc5v0_host_en>; vin-supply = <&vcc5v0_sys>; }; @@ -530,27 +523,6 @@ &sdmmc { 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; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; - vmmc-supply = <&vcc3v3_pcie2x1l0>; - vqmmc-supply = <&vcc_1v8_s3>; - pinctrl-names = "default"; - pinctrl-0 = <&sdiom0_pins>; - status = "okay"; -}; - &sfc { pinctrl-names = "default"; pinctrl-0 = <&fspim2_pins>; @@ -565,12 +537,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>;