mmc: host: rk_sdmmc:

	Add rk32 mmc controller with cap HW_RESET support, default N.

diff --git a/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt
index 7919b4ca362b7ac3256a6414692c9598d871709a..0b5377893716904d4f83001796cb226689a520bb 100755 (executable)
--- a/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt
@@ -82,6 +82,8 @@ Required Properties:
 * vmmc-supply: The phandle to the regulator to use for vmmc.  If this is
           specified we'll defer probe until we can find this regulator.
 
+* poll-hw-reset: need hardware reset for some eMMCs with VCCQ always supplied when powered up
+       to enter idle state.
 
 Example: adding device info in dtsi file
 

diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index 6f6643562980b5dc5cbed6ee3dea568d7602f5c8..fcf27607c3c5205a4af172630da2c08a47864868 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -211,7 +211,8 @@
                bootpart-no-access;
         ignore-pm-notify;
                keep-power-in-suspend;
-       status = "okay";
+               //poll-hw-reset 
+               status = "okay";
 };
     
 &sdmmc {

diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c
index 992e792b5b69e6a1fb90d6bb281d4297ba02c421..1f866f0ba781ae96f8d5507e4923497e8d29bb3d 100755 (executable)
--- a/drivers/mmc/host/rk_sdmmc.c
+++ b/drivers/mmc/host/rk_sdmmc.c
@@ -2761,6 +2761,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
                mmc->caps |= MMC_CAP_POWER_OFF_CARD;
        if (of_find_property(host->dev->of_node, "cap-sdio-irq", NULL))
                mmc->caps |= MMC_CAP_SDIO_IRQ;
+       if (of_find_property(host->dev->of_node, "poll-hw-reset", NULL))
+               mmc->caps |= MMC_CAP_HW_RESET;
        if (of_find_property(host->dev->of_node, "full-pwr-cycle", NULL))
                mmc->caps2 |= MMC_CAP2_FULL_PWR_CYCLE;
        if (of_find_property(host->dev->of_node, "keep-power-in-suspend", NULL))