[PATCH next v3 3/8] arm64: dts: rockchip: correct gpio_pwrctrl1 typos on rk3588(s) boards

Kever Yang kever.yang at rock-chips.com
Fri Jun 14 11:00:47 CEST 2024


On 2024/6/10 21:13, Quentin Schulz wrote:
> From: Jing Luo <jing at jing.rocks>
>
> gpio_pwrctrl2 gets duplicated by both rk806_dvs1_null and rk806_dvs2_null
> gpio_pwrctrl1 is unset. This typo appears in multiple files. Let's fix them.
>
> Note: I haven't had the chance to test them all because I don't own all
> of these boards (obviously). Please test if it's needed.
>
> Signed-off-by: Jing Luo <jing at jing.rocks>
> Link: https://lore.kernel.org/r/20240420130355.639406-1-jing@jing.rocks
> Signed-off-by: Heiko Stuebner <heiko at sntech.de>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
>
> [ upstream commit: d7f2039e5321636069baa77ef2f1e5d22cb69a88 ]
>
> (cherry picked from commit cb2b6d1d19ed10fcaec5f5859c08a3355d1c66e0)
> ---
>   dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5.dtsi           | 2 +-
>   dts/upstream/src/arm64/rockchip/rk3588-edgeble-neu6a-common.dtsi | 2 +-
>   dts/upstream/src/arm64/rockchip/rk3588-jaguar.dts                | 2 +-
>   dts/upstream/src/arm64/rockchip/rk3588-tiger.dtsi                | 2 +-
>   dts/upstream/src/arm64/rockchip/rk3588-turing-rk1.dtsi           | 2 +-
>   dts/upstream/src/arm64/rockchip/rk3588s-coolpi-4b.dts            | 2 +-
>   dts/upstream/src/arm64/rockchip/rk3588s-indiedroid-nova.dts      | 2 +-
>   dts/upstream/src/arm64/rockchip/rk3588s-orangepi-5.dts           | 2 +-
>   dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts              | 2 +-
>   9 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5.dtsi
> index 94ecb9b4f98..170501a879d 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5.dtsi
> +++ b/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5.dtsi
> @@ -357,7 +357,7 @@
>   		vcca-supply = <&vcc5v0_sys>;
>   
>   		rk806_dvs1_null: dvs1-null-pins {
> -			pins = "gpio_pwrctrl2";
> +			pins = "gpio_pwrctrl1";
>   			function = "pin_fun0";
>   		};
>   
> diff --git a/dts/upstream/src/arm64/rockchip/rk3588-edgeble-neu6a-common.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-edgeble-neu6a-common.dtsi
> index c0d4a15323e..d9bf67525e8 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3588-edgeble-neu6a-common.dtsi
> +++ b/dts/upstream/src/arm64/rockchip/rk3588-edgeble-neu6a-common.dtsi
> @@ -182,7 +182,7 @@
>   		#gpio-cells = <2>;
>   
>   		rk806_dvs1_null: dvs1-null-pins {
> -			pins = "gpio_pwrctrl2";
> +			pins = "gpio_pwrctrl1";
>   			function = "pin_fun0";
>   		};
>   
> diff --git a/dts/upstream/src/arm64/rockchip/rk3588-jaguar.dts b/dts/upstream/src/arm64/rockchip/rk3588-jaguar.dts
> index 39d65002add..7d7303f8ecb 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3588-jaguar.dts
> +++ b/dts/upstream/src/arm64/rockchip/rk3588-jaguar.dts
> @@ -452,7 +452,7 @@
>   		vcca-supply = <&vcc5v0_sys>;
>   
>   		rk806_dvs1_null: dvs1-null-pins {
> -			pins = "gpio_pwrctrl2";
> +			pins = "gpio_pwrctrl1";
>   			function = "pin_fun0";
>   		};
>   
> diff --git a/dts/upstream/src/arm64/rockchip/rk3588-tiger.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-tiger.dtsi
> index 4984e36a8c2..29f8e536de1 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3588-tiger.dtsi
> +++ b/dts/upstream/src/arm64/rockchip/rk3588-tiger.dtsi
> @@ -401,7 +401,7 @@
>   		vcca-supply = <&vcc5v0_sys>;
>   
>   		rk806_dvs1_null: dvs1-null-pins {
> -			pins = "gpio_pwrctrl2";
> +			pins = "gpio_pwrctrl1";
>   			function = "pin_fun0";
>   		};
>   
> diff --git a/dts/upstream/src/arm64/rockchip/rk3588-turing-rk1.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-turing-rk1.dtsi
> index dc08da518a7..6b9206ce4a0 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3588-turing-rk1.dtsi
> +++ b/dts/upstream/src/arm64/rockchip/rk3588-turing-rk1.dtsi
> @@ -318,7 +318,7 @@
>   		#gpio-cells = <2>;
>   
>   		rk806_dvs1_null: dvs1-null-pins {
> -			pins = "gpio_pwrctrl2";
> +			pins = "gpio_pwrctrl1";
>   			function = "pin_fun0";
>   		};
>   
> diff --git a/dts/upstream/src/arm64/rockchip/rk3588s-coolpi-4b.dts b/dts/upstream/src/arm64/rockchip/rk3588s-coolpi-4b.dts
> index e037bf9db75..7f4d7bb9a07 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3588s-coolpi-4b.dts
> +++ b/dts/upstream/src/arm64/rockchip/rk3588s-coolpi-4b.dts
> @@ -479,7 +479,7 @@
>   		vcca-supply = <&vcc5v0_sys>;
>   
>   		rk806_dvs1_null: dvs1-null-pins {
> -			pins = "gpio_pwrctrl2";
> +			pins = "gpio_pwrctrl1";
>   			function = "pin_fun0";
>   		};
>   
> diff --git a/dts/upstream/src/arm64/rockchip/rk3588s-indiedroid-nova.dts b/dts/upstream/src/arm64/rockchip/rk3588s-indiedroid-nova.dts
> index ce8119cbb82..a5b76e24ceb 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3588s-indiedroid-nova.dts
> +++ b/dts/upstream/src/arm64/rockchip/rk3588s-indiedroid-nova.dts
> @@ -528,7 +528,7 @@
>   		vcca-supply = <&vcc5v0_sys>;
>   
>   		rk806_dvs1_null: dvs1-null-pins {
> -			pins = "gpio_pwrctrl2";
> +			pins = "gpio_pwrctrl1";
>   			function = "pin_fun0";
>   		};
>   
> diff --git a/dts/upstream/src/arm64/rockchip/rk3588s-orangepi-5.dts b/dts/upstream/src/arm64/rockchip/rk3588s-orangepi-5.dts
> index 25de4362af3..73700d77eed 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3588s-orangepi-5.dts
> +++ b/dts/upstream/src/arm64/rockchip/rk3588s-orangepi-5.dts
> @@ -336,7 +336,7 @@
>   		#gpio-cells = <2>;
>   
>   		rk806_dvs1_null: dvs1-null-pins {
> -			pins = "gpio_pwrctrl2";
> +			pins = "gpio_pwrctrl1";
>   			function = "pin_fun0";
>   		};
>   
> diff --git a/dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts b/dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts
> index 00afb90d4eb..5c99636a1d0 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts
> +++ b/dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts
> @@ -414,7 +414,7 @@
>   		#gpio-cells = <2>;
>   
>   		rk806_dvs1_null: dvs1-null-pins {
> -			pins = "gpio_pwrctrl2";
> +			pins = "gpio_pwrctrl1";
>   			function = "pin_fun0";
>   		};
>   
>


More information about the U-Boot mailing list