arm64: dts: rockchip: move common ROCK 5B/+ nodes into own tree

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 <nicolas.frattaroli@collabora.com>
Link: https://lore.kernel.org/r/20250520-add-rock5t-v2-3-1f1971850a20@collabora.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

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..973d39a7e0e09897ee72a89c836ecdc6e2cf91b5 100644 (file)
--- 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 @@
                stdout-path = "serial2:1500000n8";
        };
 
-       analog-sound {
-               compatible = "audio-graph-card";
-               label = "rk3588-es8316";
-
-               widgets = "Microphone", "Mic Jack",
-                         "Headphone", "Headphones";
-
-               routing = "MIC2", "Mic Jack",
-                         "Headphones", "HPOL",
-                         "Headphones", "HPOR";
-
-               dais = <&i2s0_8ch_p0>;
-               hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&hp_detect>;
-       };
-
        hdmi0-con {
                compatible = "hdmi-connector";
                type = "a";
@@ -57,19 +40,6 @@
                };
        };
 
-       leds {
-               compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_rgb_b>;
-
-               led_rgb_b {
-                       function = LED_FUNCTION_STATUS;
-                       color = <LED_COLOR_ID_BLUE>;
-                       gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-
        fan: pwm-fan {
                compatible = "pwm-fan";
                cooling-levels = <0 120 150 180 210 240 255>;
@@ -78,13 +48,6 @@
                #cooling-cells = <2>;
        };
 
-       rfkill {
-               compatible = "rfkill-gpio";
-               label = "rfkill-m2-wlan";
-               radio-type = "wlan";
-               shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
-       };
-
        rfkill-bt {
                compatible = "rfkill-gpio";
                label = "rfkill-m2-bt";
@@ -95,9 +58,6 @@
        vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pcie2_0_vcc3v3_en>;
                regulator-name = "vcc3v3_pcie2x1l0";
                regulator-always-on;
                regulator-boot-on;
@@ -105,6 +65,7 @@
                regulator-max-microvolt = <3300000>;
                startup-delay-us = <50000>;
                vin-supply = <&vcc5v0_sys>;
+               status = "disabled";
        };
 
        vcc3v3_pcie2x1l2: regulator-vcc3v3-pcie2x1l2 {
@@ -255,10 +216,8 @@
 };
 
 &hdmi_receiver {
-       hpd-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
        pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_hpd>;
        pinctrl-names = "default";
-       status = "okay";
 };
 
 &hdptxphy0 {
@@ -434,39 +393,17 @@
 };
 
 &pinctrl {
-       hdmirx {
-               hdmirx_hpd: hdmirx-5v-detection {
-                       rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
-               };
-       };
-
        hym8563 {
                hym8563_int: hym8563-int {
                        rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
                };
        };
 
-       leds {
-               led_rgb_b: led-rgb-b {
-                       rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
-               };
-       };
-
-       sound {
-               hp_detect: hp-detect {
-                       rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
-               };
-       };
-
        pcie2 {
                pcie2_0_rst: pcie2-0-rst {
                        rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
                };
 
-               pcie2_0_vcc3v3_en: pcie2-0-vcc-en {
-                       rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
-               };
-
                pcie2_2_rst: pcie2-2-rst {
                        rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
                };
@@ -918,10 +855,6 @@
        status = "okay";
 };
 
-&usb_host2_xhci {
-       status = "okay";
-};
-
 &vop {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
index 22c0745eae4eeafdbe4ac5654dd1def15a0cad74..74c7b6502e4dda4b774f43c704ebaee350703c0d 100644 (file)
--- 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 @@
 
 /dts-v1/;
 
-#include "rk3588-rock-5b-5bp-5t.dtsi"
+#include "rk3588-rock-5b.dtsi"
 
 / {
        model = "Radxa ROCK 5B+";

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 206198c22aa6c388c5321a4503fb0ae7bf376af8..9407a7c9910ada1f6c803d2e15785a9cbd9bd655 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -2,7 +2,7 @@
 
 /dts-v1/;
 
-#include "rk3588-rock-5b-5bp-5t.dtsi"
+#include "rk3588-rock-5b.dtsi"
 
 / {
        model = "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 (file)
index 0000000..e5c474e
--- /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 = "audio-graph-card";
+               label = "rk3588-es8316";
+
+               widgets = "Microphone", "Mic Jack",
+                         "Headphone", "Headphones";
+
+               routing = "MIC2", "Mic Jack",
+                         "Headphones", "HPOL",
+                         "Headphones", "HPOR";
+
+               dais = <&i2s0_8ch_p0>;
+               hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&hp_detect>;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&led_rgb_b>;
+
+               led_rgb_b {
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
+                       gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "heartbeat";
+               };
+       };
+
+       rfkill {
+               compatible = "rfkill-gpio";
+               label = "rfkill-m2-wlan";
+               radio-type = "wlan";
+               shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
+       };
+};
+
+&hdmi_receiver {
+       hpd-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
+       status = "okay";
+};
+
+&pinctrl {
+       hdmirx {
+               hdmirx_hpd: hdmirx-5v-detection {
+                       rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+
+       leds {
+               led_rgb_b: led-rgb-b {
+                       rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+
+       pcie2 {
+               pcie2_0_vcc3v3_en: pcie2-0-vcc-en {
+                       rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+
+       sound {
+               hp_detect: hp-detect {
+                       rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+};
+
+&usb_host2_xhci {
+       status = "okay";
+};
+
+&vcc3v3_pcie2x1l0 {
+       gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pcie2_0_vcc3v3_en>;
+       status = "okay";
+};