From c7911b9ee49e3d4db23048fb720994bfb0afcf3c Mon Sep 17 00:00:00 2001 From: Haibo Chen Date: Tue, 8 Sep 2015 14:21:04 +0800 Subject: [PATCH] MLK-11503-2 ARM: dts: imx7d-12x12-lpddr3-arm2: enable usdhc in lpsr mode Add pinctrl sleep mode support for usdhc, and enable usdhc in lpsr mode. Signed-off-by: Haibo Chen (cherry picked from commit 75b33d1a578abaed44b11a05187c19dedb25aad2) Conflicts: arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts --- arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts index 228be030b3fe..a66649c58f28 100644 --- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts +++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts @@ -839,8 +839,9 @@ }; &usdhc1 { - pinctrl-names = "default"; + pinctrl-names = "default", "sleep"; pinctrl-0 = <&pinctrl_usdhc1_1>; + pinctrl-1 = <&pinctrl_usdhc1_1>; cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; no-1-8-v; @@ -851,10 +852,11 @@ }; &usdhc2 { - pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; pinctrl-0 = <&pinctrl_usdhc2_1>; pinctrl-1 = <&pinctrl_usdhc2_1_100mhz>; pinctrl-2 = <&pinctrl_usdhc2_1_200mhz>; + pinctrl-3 = <&pinctrl_usdhc2_1>; cd-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio5 10 GPIO_ACTIVE_HIGH>; keep-power-in-suspend; @@ -865,10 +867,11 @@ }; &usdhc3 { - pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; pinctrl-0 = <&pinctrl_usdhc3_1>; pinctrl-1 = <&pinctrl_usdhc3_1_100mhz>; pinctrl-2 = <&pinctrl_usdhc3_1_200mhz>; + pinctrl-3 = <&pinctrl_usdhc3_1>; assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>; assigned-clock-rates = <400000000>; bus-width = <8>; -- 2.17.1