From bde40359eaf3e4ac387edffae7096ca8e53ad7b6 Mon Sep 17 00:00:00 2001 From: xbw Date: Thu, 8 May 2014 18:33:17 +0800 Subject: [PATCH] SDMMC: 1. modify the policy of suspend-resume for sd-card.i.e ignore-pm-notify and keep-power-in-suspend. 2, Unified the SDMMC-setting of individual projects, refer to rk3288-p977.dts --- arch/arm/boot/dts/rk3288-chrome.dts | 16 ++++++++++++---- arch/arm/boot/dts/rk3288-p977.dts | 2 ++ arch/arm/boot/dts/rk3288-tb.dts | 26 ++++++++++++++++++-------- arch/arm/boot/dts/rk3288-tesco.dts | 20 ++++++++++++++------ 4 files changed, 46 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-chrome.dts b/arch/arm/boot/dts/rk3288-chrome.dts index efc675c6ba54..0ace2865183c 100755 --- a/arch/arm/boot/dts/rk3288-chrome.dts +++ b/arch/arm/boot/dts/rk3288-chrome.dts @@ -196,11 +196,15 @@ }; &emmc { - clock-frequency = <1500000000>; - clock-freq-min-max = <400000 150000000>; + clock-frequency = <150000000>; + clock-freq-min-max = <400000 150000000>; supports-highspeed; - supports-emmc; - bootpart-no-access; + supports-emmc; + bootpart-no-access; + + supports-DDR_MODE; + caps2-mmc-hs200; + ignore-pm-notify; keep-power-in-suspend; status = "okay"; @@ -213,6 +217,10 @@ supports-sd; broken-cd; card-detect-delay = <200>; + + ignore-pm-notify; + keep-power-in-suspend; + vmmc-supply = <&rk808_ldo5_reg>; status = "okay"; }; diff --git a/arch/arm/boot/dts/rk3288-p977.dts b/arch/arm/boot/dts/rk3288-p977.dts index ea09ace26805..2e6559ef8d06 100755 --- a/arch/arm/boot/dts/rk3288-p977.dts +++ b/arch/arm/boot/dts/rk3288-p977.dts @@ -200,6 +200,8 @@ broken-cd; card-detect-delay = <200>; + ignore-pm-notify; + keep-power-in-suspend; vmmc-supply = <&rk808_ldo5_reg>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts index fefdd2fa1be3..7bcade47ebc5 100755 --- a/arch/arm/boot/dts/rk3288-tb.dts +++ b/arch/arm/boot/dts/rk3288-tb.dts @@ -204,15 +204,21 @@ }; &emmc { - clock-frequency = <150000000>; - clock-freq-min-max = <400000 1500000000>; + clock-frequency = <100000000>; + clock-freq-min-max = <400000 100000000>; + supports-highspeed; - supports-emmc; - bootpart-no-access; + supports-emmc; + bootpart-no-access; + + //supports-DDR_MODE; //you should set the two value in your project. only close in RK3288-SDK board. + //caps2-mmc-hs200; + ignore-pm-notify; - keep-power-in-suspend; - //poll-hw-reset - status = "okay"; + keep-power-in-suspend; + + //poll-hw-reset + status = "okay"; }; &sdmmc { @@ -222,7 +228,11 @@ supports-sd; broken-cd; card-detect-delay = <200>; - vmmc-supply = <&rk808_ldo5_reg>; + + ignore-pm-notify; + keep-power-in-suspend; + + vmmc-supply = <&rk808_ldo5_reg>; status = "okay"; }; diff --git a/arch/arm/boot/dts/rk3288-tesco.dts b/arch/arm/boot/dts/rk3288-tesco.dts index e459598b7a22..408f1234784a 100755 --- a/arch/arm/boot/dts/rk3288-tesco.dts +++ b/arch/arm/boot/dts/rk3288-tesco.dts @@ -202,13 +202,17 @@ }; &emmc { - clock-frequency = <1500000000>; - clock-freq-min-max = <400000 150000000>; + clock-frequency = <150000000>; + clock-freq-min-max = <400000 150000000>; supports-highspeed; - supports-emmc; - bootpart-no-access; + supports-emmc; + bootpart-no-access; + + supports-DDR_MODE; + caps2-mmc-hs200; + ignore-pm-notify; - keep-power-in-suspend; + keep-power-in-suspend; status = "okay"; }; @@ -219,7 +223,11 @@ supports-sd; broken-cd; card-detect-delay = <200>; - vmmc-supply = <&rk808_ldo5_reg>; + + ignore-pm-notify; + keep-power-in-suspend; + + vmmc-supply = <&rk808_ldo5_reg>; status = "okay"; }; -- 2.34.1