| Message ID | 20240126221508.4093334-3-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | d7b100ab32485a2c25f504d13c15bc6471be0596 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk35xx: Sync device tree with linux v6.8-rc1 | expand |
On 2024/1/27 06:14, Jonas Karlman wrote: > 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> Thanks, - Kever > --- > arch/arm/dts/rk3566-quartz64-a.dts | 5 +++-- > arch/arm/dts/rk3566-radxa-cm3-io.dts | 1 + > arch/arm/dts/rk3566-soquartz-blade.dts | 4 ++++ > arch/arm/dts/rk3566-soquartz-cm4.dts | 4 ++++ > arch/arm/dts/rk3566-soquartz-model-a.dts | 4 ++++ > arch/arm/dts/rk3566-soquartz.dtsi | 1 - > 6 files changed, 16 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/dts/rk3566-quartz64-a.dts b/arch/arm/dts/rk3566-quartz64-a.dts > index 854d02b46e6f..59843a7a199c 100644 > --- 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 1b1c67d5b1ef..3ae24e39450a 100644 > --- 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 4e49bebf548b..fdbf1c783242 100644 > --- 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 cddf6cd2fecb..6ed3fa4aee34 100644 > --- 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 2208dbfb7f0a..f2095dfa4eaf 100644 > --- 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 63bae36b8f7e..bfb7b952f4c5 100644 > --- 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;
diff --git a/arch/arm/dts/rk3566-quartz64-a.dts b/arch/arm/dts/rk3566-quartz64-a.dts index 854d02b46e6f..59843a7a199c 100644 --- 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 1b1c67d5b1ef..3ae24e39450a 100644 --- 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 4e49bebf548b..fdbf1c783242 100644 --- 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 cddf6cd2fecb..6ed3fa4aee34 100644 --- 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 2208dbfb7f0a..f2095dfa4eaf 100644 --- 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 63bae36b8f7e..bfb7b952f4c5 100644 --- 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;
Sync rk356x device tree from linux v6.8-rc1. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/rk3566-quartz64-a.dts | 5 +++-- arch/arm/dts/rk3566-radxa-cm3-io.dts | 1 + arch/arm/dts/rk3566-soquartz-blade.dts | 4 ++++ arch/arm/dts/rk3566-soquartz-cm4.dts | 4 ++++ arch/arm/dts/rk3566-soquartz-model-a.dts | 4 ++++ arch/arm/dts/rk3566-soquartz.dtsi | 1 - 6 files changed, 16 insertions(+), 3 deletions(-)