rockchip: rk356x: Sync device tree from linux v6.8-rc1

Sync rk356x device tree from linux v6.8-rc1.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3566-quartz64-a.dts b/arch/arm/dts/rk3566-quartz64-a.dts
index 854d02b46e6fcd72144b57a30079513767a07180..59843a7a199c24a2ceabcd9a15c9a990525cb31c 100644 (file)
--- a/arch/arm/dts/rk3566-quartz64-a.dts
+++ b/arch/arm/dts/rk3566-quartz64-a.dts
@@ -31,8 +31,9 @@
        fan: gpio_fan {
                compatible = "gpio-fan";
                gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
-               gpio-fan,speed-map = <0    0
-                                     4500 1>;
+               gpio-fan,speed-map =
+                               <   0 0>,
+                               <4500 1>;
                pinctrl-names = "default";
                pinctrl-0 = <&fan_en_h>;
                #cooling-cells = <2>;

diff --git a/arch/arm/dts/rk3566-radxa-cm3-io.dts b/arch/arm/dts/rk3566-radxa-cm3-io.dts
index 1b1c67d5b1ef335ed546ec7bea07b8a611da83e9..3ae24e39450a2d30e4101ae0fe44bd97395781ec 100644 (file)
--- a/arch/arm/dts/rk3566-radxa-cm3-io.dts
+++ b/arch/arm/dts/rk3566-radxa-cm3-io.dts
@@ -14,6 +14,7 @@
        compatible = "radxa,cm3-io", "radxa,cm3", "rockchip,rk3566";
 
        aliases {
+               ethernet0 = &gmac1;
                mmc1 = &sdmmc0;
        };
 

diff --git a/arch/arm/dts/rk3566-soquartz-blade.dts b/arch/arm/dts/rk3566-soquartz-blade.dts
index 4e49bebf548b48f9780652251708ee05703cc3d7..fdbf1c78324229b81715279e4182e39bb3cde176 100644 (file)
--- a/arch/arm/dts/rk3566-soquartz-blade.dts
+++ b/arch/arm/dts/rk3566-soquartz-blade.dts
@@ -13,6 +13,10 @@
        model = "PINE64 RK3566 SOQuartz on Blade carrier board";
        compatible = "pine64,soquartz-blade", "pine64,soquartz", "rockchip,rk3566";
 
+       aliases {
+               ethernet0 = &gmac1;
+       };
+
        /* labeled VCC3V0_SD in schematic to not conflict with PMIC regulator */
        vcc3v0_sd: vcc3v0-sd-regulator {
                compatible = "regulator-fixed";

diff --git a/arch/arm/dts/rk3566-soquartz-cm4.dts b/arch/arm/dts/rk3566-soquartz-cm4.dts
index cddf6cd2fecb1bf34458a98adc93b59560f98fde..6ed3fa4aee34f22a0b09f189000800331a49b2aa 100644 (file)
--- a/arch/arm/dts/rk3566-soquartz-cm4.dts
+++ b/arch/arm/dts/rk3566-soquartz-cm4.dts
@@ -8,6 +8,10 @@
        model = "Pine64 RK3566 SoQuartz with CM4-IO Carrier Board";
        compatible = "pine64,soquartz-cm4io", "pine64,soquartz", "rockchip,rk3566";
 
+       aliases {
+               ethernet0 = &gmac1;
+       };
+
        /* labeled +12v in schematic */
        vcc12v_dcin: vcc12v-dcin-regulator {
                compatible = "regulator-fixed";

diff --git a/arch/arm/dts/rk3566-soquartz-model-a.dts b/arch/arm/dts/rk3566-soquartz-model-a.dts
index 2208dbfb7f0a3c3a0935c79c69709d5e7acff6b3..f2095dfa4eaf6efe2d4c46d2dd78f68fa266ff7f 100644 (file)
--- a/arch/arm/dts/rk3566-soquartz-model-a.dts
+++ b/arch/arm/dts/rk3566-soquartz-model-a.dts
@@ -8,6 +8,10 @@
        model = "PINE64 RK3566 SOQuartz on Model A carrier board";
        compatible = "pine64,soquartz-model-a", "pine64,soquartz", "rockchip,rk3566";
 
+       aliases {
+               ethernet0 = &gmac1;
+       };
+
        /* labeled DCIN_12V in schematic */
        vcc12v_dcin: vcc12v-dcin-regulator {
                compatible = "regulator-fixed";

diff --git a/arch/arm/dts/rk3566-soquartz.dtsi b/arch/arm/dts/rk3566-soquartz.dtsi
index 63bae36b8f7e7d621b8961182e5a799bd5d05f5a..bfb7b952f4c5e849ed243c53ff3abef5cfb3c4d8 100644 (file)
--- a/arch/arm/dts/rk3566-soquartz.dtsi
+++ b/arch/arm/dts/rk3566-soquartz.dtsi
@@ -12,7 +12,6 @@
        compatible = "pine64,soquartz", "rockchip,rk3566";
 
        aliases {
-               ethernet0 = &gmac1;
                mmc0 = &sdmmc0;
                mmc1 = &sdhci;
                mmc2 = &sdmmc1;