From nobody Wed Dec 17 10:46:03 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC5AE283125; Tue, 20 May 2025 18:50:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747767051; cv=pass; b=hL+MUeYZ/4K6XcIgtd21eX5/jpxn813Md7KOHVzUBtHMcrLUCxtL5OqWhhPraYVkw5R4E0OMfZvFZbtOha/mXgag5VjkwTPS/8Mia2OsaieCiZkrbjRV2TYbxyVpreZHvdUq1EpST4LFc8YtA2GIJdmfV+Vzogu5yZskKXI5Tbc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747767051; c=relaxed/simple; bh=alsTNaUa84b7DQ3tcD8z3obAKGiee5QVHlDO27r8J4Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IJL/zJCXeoc1RoF+xjBOVO8d9ky3PUwdeXHfa2T6Ij4ZONPNprgd56gq9OF5TnuaL7LgrhUfdQ2tzqTctGhSu+i4XwG2S3xVL5STAUvS0oKsJyJHEOvg2paMclf6awWDhnecBjHk+fJ2lOKNo6/PSfWlgWp7irAuusC0AzKAJ0c= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=h+/BqKf/; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="h+/BqKf/" ARC-Seal: i=1; a=rsa-sha256; t=1747767036; cv=none; d=zohomail.com; s=zohoarc; b=RUA2Ii0Wc4kuYHfzWle5axCPrwJ48rqOhqr6Z8btYVmv9Zn3BznPC4Ex1OsfA66tXWAGkXIm5/+J55yr9EVZfL5xee50OiJ2f5pL7uIttwnKGFQTdqhIQ5mgtSp1mVyVsl316h6xf1XDopdVD/HIeSyELcTrZyDQOBWAD4ktW04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747767036; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=5Xw0kdbz8O8LMKi97j86EeCiDV5fCtGAH+d1/bTAu+8=; b=lFm96HUsVSPr8Do1tilztd79WwQjrCrQMgOGGlJq0vlVvtP+bpNZThtFXivmm8PSRT3q8KTBS24MIc+RHX2+i4m+kqW37e8EQA0jHvwQOEmCKR7ScnsQtnYFJCmWvBiiTk92O+TqIlfjluNWl5rfrEXKcb9N1J5GxUTo+SW60KU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1747767036; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=5Xw0kdbz8O8LMKi97j86EeCiDV5fCtGAH+d1/bTAu+8=; b=h+/BqKf/xBp6L5Hp3BrqbbtBA79Fh+T1DhfhbyuvGdltoIvkL8259Or6N0S7uUtN e7cKfkUGkmQSKAcpZ9c2qQdM4q+8FzjDDWZcj6YKbHwcBhmCrEKBt8+gUOpUmtGsxSV VymcuY3Tf872b64o04Rfo2Ntv6J1PM+bbZSEHNbU= Received: by mx.zohomail.com with SMTPS id 1747767034812633.9551351417898; Tue, 20 May 2025 11:50:34 -0700 (PDT) From: Nicolas Frattaroli Date: Tue, 20 May 2025 20:50:10 +0200 Subject: [PATCH v2 3/4] arm64: dts: rockchip: move common ROCK 5B/+ nodes into own tree Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250520-add-rock5t-v2-3-1f1971850a20@collabora.com> References: <20250520-add-rock5t-v2-0-1f1971850a20@collabora.com> In-Reply-To: <20250520-add-rock5t-v2-0-1f1971850a20@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sebastian Reichel Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.2 A few device tree nodes are shared between ROCK 5B and ROCK 5B+ that are not shared with ROCK 5T. Move them into their own device tree include. Signed-off-by: Nicolas Frattaroli --- .../boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 69 +---------------- .../boot/dts/rockchip/rk3588-rock-5b-plus.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi | 86 ++++++++++++++++++= ++++ 4 files changed, 89 insertions(+), 70 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi b/arch= /arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi index 6052787d2560978d2bae6cfbeea5fc1d419d583a..973d39a7e0e09897ee72a89c836= ecdc6e2cf91b5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi @@ -18,23 +18,6 @@ chosen { stdout-path =3D "serial2:1500000n8"; }; =20 - analog-sound { - compatible =3D "audio-graph-card"; - label =3D "rk3588-es8316"; - - widgets =3D "Microphone", "Mic Jack", - "Headphone", "Headphones"; - - routing =3D "MIC2", "Mic Jack", - "Headphones", "HPOL", - "Headphones", "HPOR"; - - dais =3D <&i2s0_8ch_p0>; - hp-det-gpios =3D <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&hp_detect>; - }; - hdmi0-con { compatible =3D "hdmi-connector"; type =3D "a"; @@ -57,19 +40,6 @@ hdmi1_con_in: endpoint { }; }; =20 - leds { - compatible =3D "gpio-leds"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&led_rgb_b>; - - led_rgb_b { - function =3D LED_FUNCTION_STATUS; - color =3D ; - gpios =3D <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; - linux,default-trigger =3D "heartbeat"; - }; - }; - fan: pwm-fan { compatible =3D "pwm-fan"; cooling-levels =3D <0 120 150 180 210 240 255>; @@ -78,13 +48,6 @@ fan: pwm-fan { #cooling-cells =3D <2>; }; =20 - rfkill { - compatible =3D "rfkill-gpio"; - label =3D "rfkill-m2-wlan"; - radio-type =3D "wlan"; - shutdown-gpios =3D <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>; - }; - rfkill-bt { compatible =3D "rfkill-gpio"; label =3D "rfkill-m2-bt"; @@ -95,9 +58,6 @@ rfkill-bt { vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 { compatible =3D "regulator-fixed"; enable-active-high; - gpios =3D <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pcie2_0_vcc3v3_en>; regulator-name =3D "vcc3v3_pcie2x1l0"; regulator-always-on; regulator-boot-on; @@ -105,6 +65,7 @@ vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 { regulator-max-microvolt =3D <3300000>; startup-delay-us =3D <50000>; vin-supply =3D <&vcc5v0_sys>; + status =3D "disabled"; }; =20 vcc3v3_pcie2x1l2: regulator-vcc3v3-pcie2x1l2 { @@ -255,10 +216,8 @@ &hdmi_receiver_cma { }; =20 &hdmi_receiver { - hpd-gpios =3D <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; pinctrl-0 =3D <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_= sda &hdmirx_hpd>; pinctrl-names =3D "default"; - status =3D "okay"; }; =20 &hdptxphy0 { @@ -434,39 +393,17 @@ &pd_gpu { }; =20 &pinctrl { - hdmirx { - hdmirx_hpd: hdmirx-5v-detection { - rockchip,pins =3D <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - hym8563 { hym8563_int: hym8563-int { rockchip,pins =3D <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; =20 - leds { - led_rgb_b: led-rgb-b { - rockchip,pins =3D <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - sound { - hp_detect: hp-detect { - rockchip,pins =3D <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pcie2 { pcie2_0_rst: pcie2-0-rst { rockchip,pins =3D <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; }; =20 - pcie2_0_vcc3v3_en: pcie2-0-vcc-en { - rockchip,pins =3D <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - pcie2_2_rst: pcie2-2-rst { rockchip,pins =3D <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -918,10 +855,6 @@ &usb_host1_xhci { status =3D "okay"; }; =20 -&usb_host2_xhci { - status =3D "okay"; -}; - &vop { status =3D "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts b/arch/ar= m64/boot/dts/rockchip/rk3588-rock-5b-plus.dts index 22c0745eae4eeafdbe4ac5654dd1def15a0cad74..74c7b6502e4dda4b774f43c704e= baee350703c0d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts @@ -2,7 +2,7 @@ =20 /dts-v1/; =20 -#include "rk3588-rock-5b-5bp-5t.dtsi" +#include "rk3588-rock-5b.dtsi" =20 / { model =3D "Radxa ROCK 5B+"; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/b= oot/dts/rockchip/rk3588-rock-5b.dts index 206198c22aa6c388c5321a4503fb0ae7bf376af8..9407a7c9910ada1f6c803d2e157= 85a9cbd9bd655 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -2,7 +2,7 @@ =20 /dts-v1/; =20 -#include "rk3588-rock-5b-5bp-5t.dtsi" +#include "rk3588-rock-5b.dtsi" =20 / { model =3D "Radxa ROCK 5B"; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/= boot/dts/rockchip/rk3588-rock-5b.dtsi new file mode 100644 index 0000000000000000000000000000000000000000..e5c474e4d02a6582efc3bd704d9= 5df95bf9fb0ee --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi @@ -0,0 +1,86 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "rk3588-rock-5b-5bp-5t.dtsi" + +/ { + analog-sound { + compatible =3D "audio-graph-card"; + label =3D "rk3588-es8316"; + + widgets =3D "Microphone", "Mic Jack", + "Headphone", "Headphones"; + + routing =3D "MIC2", "Mic Jack", + "Headphones", "HPOL", + "Headphones", "HPOR"; + + dais =3D <&i2s0_8ch_p0>; + hp-det-gpios =3D <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&hp_detect>; + }; + + leds { + compatible =3D "gpio-leds"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&led_rgb_b>; + + led_rgb_b { + function =3D LED_FUNCTION_STATUS; + color =3D ; + gpios =3D <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + linux,default-trigger =3D "heartbeat"; + }; + }; + + rfkill { + compatible =3D "rfkill-gpio"; + label =3D "rfkill-m2-wlan"; + radio-type =3D "wlan"; + shutdown-gpios =3D <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>; + }; +}; + +&hdmi_receiver { + hpd-gpios =3D <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; + status =3D "okay"; +}; + +&pinctrl { + hdmirx { + hdmirx_hpd: hdmirx-5v-detection { + rockchip,pins =3D <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + leds { + led_rgb_b: led-rgb-b { + rockchip,pins =3D <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + pcie2 { + pcie2_0_vcc3v3_en: pcie2-0-vcc-en { + rockchip,pins =3D <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + sound { + hp_detect: hp-detect { + rockchip,pins =3D <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&usb_host2_xhci { + status =3D "okay"; +}; + +&vcc3v3_pcie2x1l0 { + gpios =3D <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pcie2_0_vcc3v3_en>; + status =3D "okay"; +}; --=20 2.49.0