From ce8fb3bb3029338443d76e13eb007c3e841f0860 Mon Sep 17 00:00:00 2001 From: Cody Xie Date: Tue, 31 Oct 2023 14:44:36 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3588-vehicle\*maxim\*: Fix pins default pinctrls Set all default pins to expected input/output values to prevent glitch during probe. Change-Id: I29e882f47b8ab1e4d89e29cc1525187a434cba53 Signed-off-by: Cody Xie --- .../rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi | 6 +++--- .../rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi | 6 +++--- .../rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi | 6 +++--- .../rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi | 6 +++--- .../rockchip/rk3588-vehicle-evb-maxim-max96712.dtsi | 6 +++--- .../rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi | 6 +++--- .../rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi | 6 +++--- .../rockchip/rk3588-vehicle-evb-maxim-max96722.dtsi | 6 +++--- .../arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts | 10 +++++++--- 9 files changed, 31 insertions(+), 27 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi index 1f9af40db207..b34959997878 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi @@ -720,15 +720,15 @@ &pinctrl { max96712-dcphy0 { max96712_dcphy0_pwdn: max96712-dcphy0-pwdn { - rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_output_low>; }; max96712_dcphy0_errb: max96712-dcphy0-errb { - rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; max96712_dcphy0_lock: max96712-dcphy0-lock { - rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi index d7a0a2f46011..656402014983 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi @@ -490,15 +490,15 @@ &pinctrl { max96712-dcphy1 { max96712_dcphy1_pwdn: max96712-dcphy1-pwdn { - rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_output_low>; }; max96712_dcphy1_errb: max96712-dcphy1-errb { - rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; max96712_dcphy1_lock: max96712-dcphy1-lock { - rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi index 18580f723e28..d5e2cc86bbc1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi @@ -732,15 +732,15 @@ &pinctrl { max96712-dphy0 { max96712_dphy0_pwdn: max96712-dphy0-pwdn { - rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>; }; max96712_dphy0_errb: max96712-dphy0-errb { - rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; max96712_dphy0_lock: max96712-dphy0-lock { - rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi index e146b16365b9..720b3ec46e56 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi @@ -636,15 +636,15 @@ &pinctrl { max96712-dphy3 { max96712_dphy3_pwdn: max96712-dphy3-pwdn { - rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_output_low>; }; max96712_dphy3_errb: max96712-dphy3-errb { - rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; max96712_dphy3_lock: max96712-dphy3-lock { - rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712.dtsi index db774ff1a03f..586c869881ba 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712.dtsi @@ -148,15 +148,15 @@ &pinctrl { max96712-dphy3 { max96712_dphy3_power: max96712-dphy3-power { - rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_output_low>; }; max96712_dphy3_errb: max96712-dphy3-errb { - rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; max96712_dphy3_lock: max96712-dphy3-lock { - rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi index becc8999e206..d2eedacfeac7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi @@ -732,15 +732,15 @@ &pinctrl { max96722-dphy0 { max96722_dphy0_pwdn: max96722-dphy0-pwdn { - rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>; }; max96722_dphy0_errb: max96722-dphy0-errb { - rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; max96722_dphy0_lock: max96722-dphy0-lock { - rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi index ad1b25ef7b97..53dfac5b03a8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi @@ -502,15 +502,15 @@ &pinctrl { max96722-dphy3 { max96722_dphy3_pwdn: max96722-dphy3-pwdn { - rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_output_low>; }; max96722_dphy3_errb: max96722-dphy3-errb { - rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; max96722_dphy3_lock: max96722-dphy3-lock { - rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722.dtsi index 3b655bb8a3fc..c464e0a61ed6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722.dtsi @@ -149,15 +149,15 @@ &pinctrl { max96722-dphy0 { max96722_dphy0_power: max96722-dphy0-power { - rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>; }; max96722_dphy0_errb: max96722-dphy0-errb { - rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; max96722_dphy0_lock: max96722-dphy0-lock { - rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts index e161b05b7984..d418e022873e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts @@ -456,6 +456,10 @@ }; &pinctrl { + pinctrl-names = "init"; + pinctrl-0 = <&max96712_dphy3_pwdn + &max96712_dphy3_errb + &max96712_dphy3_lock>; bl { bl0_enable_pin: bl0-enable-pin { @@ -489,15 +493,15 @@ max96712-dphy3 { max96712_dphy3_pwdn: max96712-dphy3-pwdn { - rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_output_low>; }; max96712_dphy3_errb: max96712-dphy3-errb { - rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; max96712_dphy3_lock: max96712-dphy3-lock { - rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none_smt>; }; };