Re: [PATCH] ARM: dts: rockchip: rk3588: sync with Linux
On 2023/5/29 15:34, Eugen Hristev wrote:
Sync the devicetree with linux-next tag: next-20230525
Signed-off-by: Eugen Hristev
Reviewed-by: Kever Yang
Thanks,
- Kever
---
arch/arm/dts/rk3588-rock-5b.dts | 152
arch/arm/dts/rk3588.dtsi | 68 +
arch/arm/dts/rk3588s-u-boot.dtsi | 12 --
arch/arm/dts/rk3588s.dtsi| 234 ++-
4 files changed, 449 insertions(+), 17 deletions(-)
diff --git a/arch/arm/dts/rk3588-rock-5b.dts b/arch/arm/dts/rk3588-rock-5b.dts
index 95805cb0adfa..3e4aee8f70c1 100644
--- a/arch/arm/dts/rk3588-rock-5b.dts
+++ b/arch/arm/dts/rk3588-rock-5b.dts
@@ -2,6 +2,7 @@
/dts-v1/;
+#include
#include "rk3588.dtsi"
/ {
@@ -17,6 +18,31 @@
stdout-path = "serial2:150n8";
};
+ fan: pwm-fan {
+ compatible = "pwm-fan";
+ cooling-levels = <0 95 145 195 255>;
+ fan-supply = <_sys>;
+ pwms = < 0 5 0>;
+ #cooling-cells = <2>;
+ };
+
+ sound {
+ compatible = "audio-graph-card";
+ label = "Analog";
+
+ widgets = "Microphone", "Mic Jack",
+ "Headphone", "Headphones";
+
+ routing = "MIC2", "Mic Jack",
+ "Headphones", "HPOL",
+ "Headphones", "HPOR";
+
+ dais = <_8ch_p0>;
+ hp-det-gpio = < RK_PD5 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <_detect>;
+ };
+
vcc5v0_sys: vcc5v0-sys-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys";
@@ -27,6 +53,132 @@
};
};
+_b0 {
+ cpu-supply = <_cpu_big0_s0>;
+};
+
+_b1 {
+ cpu-supply = <_cpu_big0_s0>;
+};
+
+_b2 {
+ cpu-supply = <_cpu_big1_s0>;
+};
+
+_b3 {
+ cpu-supply = <_cpu_big1_s0>;
+};
+
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_xfer>;
+ status = "okay";
+
+ vdd_cpu_big0_s0: regulator@42 {
+ compatible = "rockchip,rk8602";
+ reg = <0x42>;
+ fcs,suspend-voltage-selector = <1>;
+ regulator-name = "vdd_cpu_big0_s0";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <55>;
+ regulator-max-microvolt = <105>;
+ regulator-ramp-delay = <2300>;
+ vin-supply = <_sys>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+
+ vdd_cpu_big1_s0: regulator@43 {
+ compatible = "rockchip,rk8603", "rockchip,rk8602";
+ reg = <0x43>;
+ fcs,suspend-voltage-selector = <1>;
+ regulator-name = "vdd_cpu_big1_s0";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <55>;
+ regulator-max-microvolt = <105>;
+ regulator-ramp-delay = <2300>;
+ vin-supply = <_sys>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+};
+
+ {
+ status = "okay";
+
+ hym8563: rtc@51 {
+ compatible = "haoyu,hym8563";
+ reg = <0x51>;
+ #clock-cells = <0>;
+ clock-output-names = "hym8563";
+ pinctrl-names = "default";
+ pinctrl-0 = <_int>;
+ interrupt-parent = <>;
+ interrupts = ;
+ wakeup-source;
+ };
+};
+
+ {
+ status = "okay";
+
+ es8316: audio-codec@11 {
+ compatible = "everest,es8316";
+ reg = <0x11>;
+ clocks = < I2S0_8CH_MCLKOUT>;
+ clock-names = "mclk";
+ #sound-dai-cells = <0>;
+
+ port {
+ es8316_p0_0: endpoint {
+ remote-endpoint = <_8ch_p0_0>;
+ };
+ };
+ };
+};
+
+_8ch {
+ pinctrl-names = "default";
+ pinctrl-0 = <_lrck
+_mclk
+_sclk
+_sdi0
+_sdo0>;
+ status = "okay";
+
+ i2s0_8ch_p0: port {
+ i2s0_8ch_p0_0: endpoint {
+ dai-format = "i2s";
+ mclk-fs = <256>;
+ remote-endpoint = <_p0_0>;
+ };
+ };
+};
+
+ {
+ hym8563 {
+ hym8563_int: hym8563-int {
+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO _pull_none>;
+ };
+ };
+
+ sound {
+ hp_detect: hp-detect {
+ rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO _pull_none>;
+ };
+ };
+};
+
+ {
+ status =
[PATCH] ARM: dts: rockchip: rk3588: sync with Linux
Sync the devicetree with linux-next tag: next-20230525
Signed-off-by: Eugen Hristev
---
arch/arm/dts/rk3588-rock-5b.dts | 152
arch/arm/dts/rk3588.dtsi | 68 +
arch/arm/dts/rk3588s-u-boot.dtsi | 12 --
arch/arm/dts/rk3588s.dtsi| 234 ++-
4 files changed, 449 insertions(+), 17 deletions(-)
diff --git a/arch/arm/dts/rk3588-rock-5b.dts b/arch/arm/dts/rk3588-rock-5b.dts
index 95805cb0adfa..3e4aee8f70c1 100644
--- a/arch/arm/dts/rk3588-rock-5b.dts
+++ b/arch/arm/dts/rk3588-rock-5b.dts
@@ -2,6 +2,7 @@
/dts-v1/;
+#include
#include "rk3588.dtsi"
/ {
@@ -17,6 +18,31 @@
stdout-path = "serial2:150n8";
};
+ fan: pwm-fan {
+ compatible = "pwm-fan";
+ cooling-levels = <0 95 145 195 255>;
+ fan-supply = <_sys>;
+ pwms = < 0 5 0>;
+ #cooling-cells = <2>;
+ };
+
+ sound {
+ compatible = "audio-graph-card";
+ label = "Analog";
+
+ widgets = "Microphone", "Mic Jack",
+ "Headphone", "Headphones";
+
+ routing = "MIC2", "Mic Jack",
+ "Headphones", "HPOL",
+ "Headphones", "HPOR";
+
+ dais = <_8ch_p0>;
+ hp-det-gpio = < RK_PD5 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <_detect>;
+ };
+
vcc5v0_sys: vcc5v0-sys-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys";
@@ -27,6 +53,132 @@
};
};
+_b0 {
+ cpu-supply = <_cpu_big0_s0>;
+};
+
+_b1 {
+ cpu-supply = <_cpu_big0_s0>;
+};
+
+_b2 {
+ cpu-supply = <_cpu_big1_s0>;
+};
+
+_b3 {
+ cpu-supply = <_cpu_big1_s0>;
+};
+
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_xfer>;
+ status = "okay";
+
+ vdd_cpu_big0_s0: regulator@42 {
+ compatible = "rockchip,rk8602";
+ reg = <0x42>;
+ fcs,suspend-voltage-selector = <1>;
+ regulator-name = "vdd_cpu_big0_s0";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <55>;
+ regulator-max-microvolt = <105>;
+ regulator-ramp-delay = <2300>;
+ vin-supply = <_sys>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+
+ vdd_cpu_big1_s0: regulator@43 {
+ compatible = "rockchip,rk8603", "rockchip,rk8602";
+ reg = <0x43>;
+ fcs,suspend-voltage-selector = <1>;
+ regulator-name = "vdd_cpu_big1_s0";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <55>;
+ regulator-max-microvolt = <105>;
+ regulator-ramp-delay = <2300>;
+ vin-supply = <_sys>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
+ };
+};
+
+ {
+ status = "okay";
+
+ hym8563: rtc@51 {
+ compatible = "haoyu,hym8563";
+ reg = <0x51>;
+ #clock-cells = <0>;
+ clock-output-names = "hym8563";
+ pinctrl-names = "default";
+ pinctrl-0 = <_int>;
+ interrupt-parent = <>;
+ interrupts = ;
+ wakeup-source;
+ };
+};
+
+ {
+ status = "okay";
+
+ es8316: audio-codec@11 {
+ compatible = "everest,es8316";
+ reg = <0x11>;
+ clocks = < I2S0_8CH_MCLKOUT>;
+ clock-names = "mclk";
+ #sound-dai-cells = <0>;
+
+ port {
+ es8316_p0_0: endpoint {
+ remote-endpoint = <_8ch_p0_0>;
+ };
+ };
+ };
+};
+
+_8ch {
+ pinctrl-names = "default";
+ pinctrl-0 = <_lrck
+_mclk
+_sclk
+_sdi0
+_sdo0>;
+ status = "okay";
+
+ i2s0_8ch_p0: port {
+ i2s0_8ch_p0_0: endpoint {
+ dai-format = "i2s";
+ mclk-fs = <256>;
+ remote-endpoint = <_p0_0>;
+ };
+ };
+};
+
+ {
+ hym8563 {
+ hym8563_int: hym8563-int {
+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO _pull_none>;
+ };
+ };
+
+ sound {
+ hp_detect: hp-detect {
+ rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO _pull_none>;
+ };
+ };
+};
+
+ {
+ status = "okay";
+};
+
{
bus-width = <8>;
no-sdio;
diff --git a/arch/arm/dts/rk3588.dtsi
