From b8eabc8f0f0d3cbcaa8b3d82d2d107dafc7ba24d Mon Sep 17 00:00:00 2001 From: shengfei Xu Date: Tue, 11 Jan 2022 07:36:45 +0000 Subject: [PATCH] arm64: dts: rockchip: rk3588-rk806: fix the pinctrl for pmic the pmic_pins(gpio0a2,gpio0a3,gpio0a7,gpio0c1,gpio0c2,gpio0c3,gpio0d6) are used for pmic dvs and interrupt. Signed-off-by: shengfei Xu Change-Id: I0f749e01d2ba7716b705fba8489f0040ae88ac7f --- .../boot/dts/rockchip/rk3588-rk806-dual.dtsi | 23 +++------------- .../dts/rockchip/rk3588-rk806-single.dtsi | 26 ++----------------- 2 files changed, 5 insertions(+), 44 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rk806-dual.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rk806-dual.dtsi index 05c0fc648fac..8985f1730a84 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rk806-dual.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-rk806-dual.dtsi @@ -7,19 +7,6 @@ #include #include -&pinctrl { - pmic { - soc_slppin_gpio: soc_slppin_gpio { - rockchip,pins = <0 RK_PA2 - RK_FUNC_GPIO &pcfg_output_low>; - }; - soc_slppin_shutdown: soc_slppin_shutdown { - rockchip,pins = <0 RK_PA2 - RK_FUNC_GPIO &pcfg_output_high>; - }; - }; -}; - &spi2 { status = "okay"; assigned-clocks = <&cru CLK_SPI2>; @@ -34,11 +21,8 @@ interrupt-parent = <&gpio0>; interrupts = <7 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default", "pmic-sleep", "pmic-power-off", "pmic-reset"; - pinctrl-0 = <&soc_slppin_gpio>, <&rk806_dvs1_null>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; - pinctrl-1 = <&soc_slppin_gpio>, <&rk806_dvs1_slp>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; - pinctrl-2 = <&rk806_dvs1_pwrdn>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; - pinctrl-3 = <&rk806_dvs1_rst>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; /* 2800mv-3500mv */ low_voltage_threshold = <3000>; @@ -422,9 +406,8 @@ interrupt-parent = <&gpio0>; interrupts = <7 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default", "pmic-sleep"; + pinctrl-names = "default"; pinctrl-0 = <&rk806_slave_dvs1_null>, <&rk806_slave_dvs2_null>, <&rk806_slave_dvs3_null>; - pinctrl-1 = <&rk806_slave_dvs1_slp>, <&rk806_slave_dvs2_null>, <&rk806_slave_dvs3_null>; /* 0: restart PMU; * 1: reset all the power off reset registers, diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi index d9afec8d5f55..01c48cabdcd0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi @@ -66,25 +66,6 @@ }; }; -&pinctrl { - rk860_en { - rk860_en_gpio: rk860-en-gpio { - rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>; - }; - }; - - pmic { - soc_slppin_gpio: soc_slppin_gpio { - rockchip,pins = <0 RK_PA2 - RK_FUNC_GPIO &pcfg_output_low>; - }; - soc_slppin_shutdown: soc_slppin_shutdown { - rockchip,pins = <0 RK_PA2 - RK_FUNC_GPIO &pcfg_output_high>; - }; - }; -}; - &spi2 { status = "okay"; assigned-clocks = <&cru CLK_SPI2>; @@ -101,11 +82,8 @@ interrupt-parent = <&gpio0>; interrupts = <7 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default", "pmic-sleep", "pmic-power-off", "pmic-reset"; - pinctrl-0 = <&soc_slppin_gpio>, <&rk806_dvs1_null>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; - pinctrl-1 = <&soc_slppin_gpio>, <&rk806_dvs1_slp>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; - pinctrl-2 = <&rk806_dvs1_pwrdn>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; - pinctrl-3 = <&rk806_dvs1_rst>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; /* 2800mv-3500mv */ low_voltage_threshold = <3000>;