From 05bd7e4fe2776fc7bc596b55f731a7544057b4a8 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Fri, 9 Jun 2023 09:40:10 +0800 Subject: [PATCH] ARM: dts: rockchip: rv1106 boards: Add sdmmc idle state support In order to avoid power leak for affacting SD cards, add idle state to all related boards for RV1106 series and change default state to normal state for the driver to totally control it. Signed-off-by: Shawn Lin Change-Id: I80089eecb2ce1d41f8aaca9a17f913f5fa971514 --- arch/arm/boot/dts/rv1103-evb-v10.dtsi | 3 ++- arch/arm/boot/dts/rv1103g-battery-ipc-v10.dts | 3 ++- arch/arm/boot/dts/rv1103g-battery-ipc-v11.dts | 3 ++- arch/arm/boot/dts/rv1106-ipc.dtsi | 3 ++- arch/arm/boot/dts/rv1106g-38x38-ipc-v10-spi-nand.dts | 3 ++- arch/arm/boot/dts/rv1106g-evb1-v10-dual-cam.dts | 3 ++- arch/arm/boot/dts/rv1106g-evb1-v10.dts | 3 ++- arch/arm/boot/dts/rv1106g-evb1-v11-cvr-dual-cam.dts | 3 ++- arch/arm/boot/dts/rv1106g-evb2-v10-dual-camera.dts | 3 ++- arch/arm/boot/dts/rv1106g-evb2-v10.dts | 3 ++- arch/arm/boot/dts/rv1106g-evb2-v11-emmc.dts | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/rv1103-evb-v10.dtsi b/arch/arm/boot/dts/rv1103-evb-v10.dtsi index 45200019a59d..8cd27939ff21 100644 --- a/arch/arm/boot/dts/rv1103-evb-v10.dtsi +++ b/arch/arm/boot/dts/rv1103-evb-v10.dtsi @@ -81,8 +81,9 @@ cap-mmc-highspeed; cap-sd-highspeed; disable-wp; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; + pinctrl-1 = <&sdmmc0_idle_pins &sdmmc0_det>; status = "okay"; }; diff --git a/arch/arm/boot/dts/rv1103g-battery-ipc-v10.dts b/arch/arm/boot/dts/rv1103g-battery-ipc-v10.dts index c96f6f4f43cb..ee95a1819db7 100644 --- a/arch/arm/boot/dts/rv1103g-battery-ipc-v10.dts +++ b/arch/arm/boot/dts/rv1103g-battery-ipc-v10.dts @@ -286,8 +286,9 @@ cap-sdio-irq; keep-power-in-suspend; non-removable; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc1m1_cmd &sdmmc1m1_clk &sdmmc1m1_bus4>; + pinctrl-1 = <&sdmmc1m1_idle_pins>; no-prescan-powerup; post-power-on-delay-ms = <0>; status = "okay"; diff --git a/arch/arm/boot/dts/rv1103g-battery-ipc-v11.dts b/arch/arm/boot/dts/rv1103g-battery-ipc-v11.dts index c5468385309b..e8a6f79d9bc7 100644 --- a/arch/arm/boot/dts/rv1103g-battery-ipc-v11.dts +++ b/arch/arm/boot/dts/rv1103g-battery-ipc-v11.dts @@ -287,8 +287,9 @@ cap-sdio-irq; keep-power-in-suspend; non-removable; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc1m1_cmd &sdmmc1m1_clk &sdmmc1m1_bus4>; + pinctrl-1 = <&sdmmc1m1_idle_pins>; no-prescan-powerup; post-power-on-delay-ms = <0>; status = "okay"; diff --git a/arch/arm/boot/dts/rv1106-ipc.dtsi b/arch/arm/boot/dts/rv1106-ipc.dtsi index d4ac29301f1f..f1f3cf6eb8b4 100644 --- a/arch/arm/boot/dts/rv1106-ipc.dtsi +++ b/arch/arm/boot/dts/rv1106-ipc.dtsi @@ -288,8 +288,9 @@ cap-mmc-highspeed; cap-sd-highspeed; disable-wp; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; + pinctrl-1 = <&sdmmc0_idle_pins &sdmmc0_det>; status = "okay"; }; diff --git a/arch/arm/boot/dts/rv1106g-38x38-ipc-v10-spi-nand.dts b/arch/arm/boot/dts/rv1106g-38x38-ipc-v10-spi-nand.dts index 3452c2c20dd3..d7c76712c194 100644 --- a/arch/arm/boot/dts/rv1106g-38x38-ipc-v10-spi-nand.dts +++ b/arch/arm/boot/dts/rv1106g-38x38-ipc-v10-spi-nand.dts @@ -61,8 +61,9 @@ cap-mmc-highspeed; cap-sd-highspeed; disable-wp; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; + pinctrl-1 = <&sdmmc0_idle_pins &sdmmc0_det>; vmmc-supply = <&vcc3v3_sd>; status = "okay"; }; diff --git a/arch/arm/boot/dts/rv1106g-evb1-v10-dual-cam.dts b/arch/arm/boot/dts/rv1106g-evb1-v10-dual-cam.dts index 7997f8f1f543..2451564f35b3 100644 --- a/arch/arm/boot/dts/rv1106g-evb1-v10-dual-cam.dts +++ b/arch/arm/boot/dts/rv1106g-evb1-v10-dual-cam.dts @@ -150,8 +150,9 @@ cap-mmc-highspeed; cap-sd-highspeed; disable-wp; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; + pinctrl-1 = <&sdmmc0_idle_pins &sdmmc0_det>; sd-uhs-sdr12; sd-uhs-sdr25; sd-uhs-sdr50; diff --git a/arch/arm/boot/dts/rv1106g-evb1-v10.dts b/arch/arm/boot/dts/rv1106g-evb1-v10.dts index 9966352dbaa9..8f820d60fecc 100644 --- a/arch/arm/boot/dts/rv1106g-evb1-v10.dts +++ b/arch/arm/boot/dts/rv1106g-evb1-v10.dts @@ -150,8 +150,9 @@ cap-mmc-highspeed; cap-sd-highspeed; disable-wp; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; + pinctrl-1 = <&sdmmc0_idle_pins &sdmmc0_det>; sd-uhs-sdr12; sd-uhs-sdr25; sd-uhs-sdr50; diff --git a/arch/arm/boot/dts/rv1106g-evb1-v11-cvr-dual-cam.dts b/arch/arm/boot/dts/rv1106g-evb1-v11-cvr-dual-cam.dts index cb295ebd6a5d..0368b0f6575d 100644 --- a/arch/arm/boot/dts/rv1106g-evb1-v11-cvr-dual-cam.dts +++ b/arch/arm/boot/dts/rv1106g-evb1-v11-cvr-dual-cam.dts @@ -140,8 +140,9 @@ cap-mmc-highspeed; cap-sd-highspeed; disable-wp; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; + pinctrl-1 = <&sdmmc0_idle_pins &sdmmc0_det>; sd-uhs-sdr12; sd-uhs-sdr25; sd-uhs-sdr50; diff --git a/arch/arm/boot/dts/rv1106g-evb2-v10-dual-camera.dts b/arch/arm/boot/dts/rv1106g-evb2-v10-dual-camera.dts index 06cc1407fb6c..e748e20ca5aa 100644 --- a/arch/arm/boot/dts/rv1106g-evb2-v10-dual-camera.dts +++ b/arch/arm/boot/dts/rv1106g-evb2-v10-dual-camera.dts @@ -393,8 +393,9 @@ cap-mmc-highspeed; cap-sd-highspeed; disable-wp; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; + pinctrl-1 = <&sdmmc0_idle_pins &sdmmc0_det>; vmmc-supply = <&vcc3v3_sd>; status = "okay"; }; diff --git a/arch/arm/boot/dts/rv1106g-evb2-v10.dts b/arch/arm/boot/dts/rv1106g-evb2-v10.dts index 9efd2a1f1a1b..90274546bad1 100644 --- a/arch/arm/boot/dts/rv1106g-evb2-v10.dts +++ b/arch/arm/boot/dts/rv1106g-evb2-v10.dts @@ -263,8 +263,9 @@ cap-mmc-highspeed; cap-sd-highspeed; disable-wp; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; + pinctrl-1 = <&sdmmc0_idle_pins &sdmmc0_det>; vmmc-supply = <&vcc3v3_sd>; status = "okay"; }; diff --git a/arch/arm/boot/dts/rv1106g-evb2-v11-emmc.dts b/arch/arm/boot/dts/rv1106g-evb2-v11-emmc.dts index 37635912fd4b..653c4eb44af7 100644 --- a/arch/arm/boot/dts/rv1106g-evb2-v11-emmc.dts +++ b/arch/arm/boot/dts/rv1106g-evb2-v11-emmc.dts @@ -263,8 +263,9 @@ cap-mmc-highspeed; cap-sd-highspeed; disable-wp; - pinctrl-names = "default"; + pinctrl-names = "normal", "idle"; pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; + pinctrl-1 = <&sdmmc0_idle_pins &sdmmc0_det>; vmmc-supply = <&vcc3v3_sd>; status = "okay"; };