From 010d9df4b9b9261a0dc1dc79a17a64f5e731e59c Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Wed, 3 Nov 2021 10:26:59 +0800 Subject: [PATCH] arm64: dts: rockchip: Adjust node name for rk3588 evb rk_headset -> rk_headset: rk-headset vbus5v0_typec: vbus-typec-regulator -> vbus5v0_typec: vbus5v0-typec vcc5v0_host: vcc5v0-host-regulator -> vcc5v0_host: vcc5v0-host Signed-off-by: Tao Huang Change-Id: I888a2adc48efa33310f7c00d0fe90cb14a511801 --- arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi | 6 +++--- arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi | 6 +++--- arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi | 6 +++--- arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi | 8 ++++---- arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi index 4c54851d75f9..bc3cdbb2cbb5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi @@ -25,7 +25,7 @@ }; }; - rk_headset { + rk_headset: rk-headset { status = "disabled"; compatible = "rockchip_headset"; headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>; @@ -34,7 +34,7 @@ io-channels = <&saradc 3>; }; - vbus5v0_typec: vbus-typec-regulator { + vbus5v0_typec: vbus5v0-typec { compatible = "regulator-fixed"; regulator-name = "vbus5v0_typec"; regulator-min-microvolt = <5000000>; @@ -46,7 +46,7 @@ pinctrl-0 = <&typec5v_pwren>; }; - vcc5v0_host: vcc5v0-host-regulator { + vcc5v0_host: vcc5v0-host { compatible = "regulator-fixed"; regulator-name = "vcc5v0_host"; regulator-boot-on; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi index ca9f7f265065..d66929ccd379 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi @@ -41,7 +41,7 @@ }; }; - rk_headset { + rk_headset: rk-headset { status = "disabled"; compatible = "rockchip_headset"; headset_gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_LOW>; @@ -50,7 +50,7 @@ io-channels = <&saradc 3>; }; - vcc5v0_host: vcc5v0-host-regulator { + vcc5v0_host: vcc5v0-host { compatible = "regulator-fixed"; regulator-name = "vcc5v0_host"; regulator-boot-on; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi index ba37e313f7df..939908124bc3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi @@ -42,7 +42,7 @@ }; }; - rk_headset { + rk_headset: rk-headset { status = "disabled"; compatible = "rockchip_headset"; headset_gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_LOW>; @@ -51,7 +51,7 @@ io-channels = <&saradc 3>; }; - vbus5v0_typec: vbus-typec-regulator { + vbus5v0_typec: vbus5v0-typec { compatible = "regulator-fixed"; regulator-name = "vbus5v0_typec"; regulator-min-microvolt = <5000000>; @@ -63,7 +63,7 @@ pinctrl-0 = <&typec5v_pwren>; }; - vcc5v0_host: vcc5v0-host-regulator { + vcc5v0_host: vcc5v0-host { compatible = "regulator-fixed"; regulator-name = "vcc5v0_host"; regulator-boot-on; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi index 58c9dbe23715..765cc3ad680a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi @@ -10,7 +10,7 @@ #include "rk806-single.dtsi" / { - vbus5v0_typec: vbus-typec-regulator { + vbus5v0_typec: vbus5v0-typec { compatible = "regulator-fixed"; regulator-name = "vbus5v0_typec"; regulator-min-microvolt = <5000000>; @@ -22,7 +22,7 @@ pinctrl-0 = <&typec5v_pwren>; }; - vcc5v0_host: vcc5v0-host-regulator { + vcc5v0_host: vcc5v0-host { compatible = "regulator-fixed"; regulator-name = "vcc5v0_host"; regulator-boot-on; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi index 95f3bb0892f6..47feeb4dd218 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi @@ -24,7 +24,7 @@ }; }; - rk_headset { + rk_headset: rk-headset { status = "disabled"; compatible = "rockchip_headset"; headset_gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi index 1acba2e9f543..7f5ff5f57f03 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi @@ -42,7 +42,7 @@ }; }; - rk_headset { + rk_headset: rk-headset { status = "okay"; compatible = "rockchip_headset"; headset_gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; @@ -51,7 +51,7 @@ io-channels = <&saradc 3>; }; - vbus5v0_typec: vbus-typec-regulator { + vbus5v0_typec: vbus5v0-typec { compatible = "regulator-fixed"; regulator-name = "vbus5v0_typec"; regulator-min-microvolt = <5000000>; @@ -63,7 +63,7 @@ pinctrl-0 = <&typec5v_pwren>; }; - vcc5v0_host: vcc5v0-host-regulator { + vcc5v0_host: vcc5v0-host { compatible = "regulator-fixed"; regulator-name = "vcc5v0_host"; regulator-boot-on; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi index f5f51e8f3497..f0d8756fa6d6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi @@ -41,7 +41,7 @@ }; }; - rk_headset { + rk_headset: rk-headset { status = "okay"; compatible = "rockchip_headset"; headset_gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; @@ -50,7 +50,7 @@ io-channels = <&saradc 3>; }; - vbus5v0_typec: vbus-typec-regulator { + vbus5v0_typec: vbus5v0-typec { compatible = "regulator-fixed"; regulator-name = "vbus5v0_typec"; regulator-min-microvolt = <5000000>; @@ -62,7 +62,7 @@ pinctrl-0 = <&typec5v_pwren>; }; - vcc5v0_u2host: vcc5v0-u2host-regulator { + vcc5v0_u2host: vcc5v0-u2host { compatible = "regulator-fixed"; regulator-name = "vcc5v0_u2host"; regulator-boot-on; @@ -76,7 +76,7 @@ pinctrl-0 = <&vcc5v0_u2host_en>; }; - vcc5v0_u3host: vcc5v0-u3host-regulator { + vcc5v0_u3host: vcc5v0-u3host { compatible = "regulator-fixed"; regulator-name = "vcc5v0_u3host"; regulator-boot-on; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi index 1b343e4fa1d8..e53f30be94ab 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi @@ -10,7 +10,7 @@ #include "rk806-double.dtsi" / { - vbus5v0_typec: vbus-typec-regulator { + vbus5v0_typec: vbus5v0-typec { compatible = "regulator-fixed"; regulator-name = "vbus5v0_typec"; regulator-min-microvolt = <5000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi index 67f54c10bf3d..7976ea60a83c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi @@ -42,7 +42,7 @@ }; }; - rk_headset { + rk_headset: rk-headset { status = "okay"; compatible = "rockchip_headset"; headset_gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; @@ -51,7 +51,7 @@ io-channels = <&saradc 3>; }; - vbus5v0_typec: vbus-typec-regulator { + vbus5v0_typec: vbus5v0-typec { compatible = "regulator-fixed"; regulator-name = "vbus5v0_typec"; regulator-min-microvolt = <5000000>; @@ -63,7 +63,7 @@ pinctrl-0 = <&typec5v_pwren>; }; - vcc5v0_host: vcc5v0-host-regulator { + vcc5v0_host: vcc5v0-host { compatible = "regulator-fixed"; regulator-name = "vcc5v0_host"; regulator-boot-on;