mmc: rk_sdmmc: add new property for mmc_assume_removable
authorShawn Lin <shawn.lin@rock-chips.com>
Tue, 9 Jun 2015 08:15:28 +0000 (16:15 +0800)
committerShawn Lin <shawn.lin@rock-chips.com>
Tue, 23 Jun 2015 01:36:42 +0000 (09:36 +0800)
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
drivers/mmc/host/rk_sdmmc.c

index e26b0d4b10e1e9cdfadeb264138509c2197ce5c1..63777801e5bf08ffb9eda551d9921096e75f9c7f 100755 (executable)
@@ -4,7 +4,6 @@
  *
  * Copyright (C) 2009 NXP Semiconductors
  * Copyright (C) 2009, 2010 Imagination Technologies Ltd.
- *
  * Copyright (C) 2014 - 2015 Fuzhou Rockchip Electronics Co.Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -3913,12 +3912,14 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
 
        if (of_get_property(np, "cd-inverted", NULL))
                pdata->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;
+
        if (of_get_property(np, "bootpart-no-access", NULL))
                pdata->caps2 |= MMC_CAP2_BOOTPART_NOACC;
 
        if (of_get_property(np, "controller-power-down", NULL)) {
-               host->regs_buffer = (u32 *)devm_kzalloc(host->dev,
-                                               DW_REGS_SIZE, GFP_KERNEL);
+               host->regs_buffer =
+                       (u32 *)devm_kzalloc(host->dev,
+                                           DW_REGS_SIZE, GFP_KERNEL);
                if (!host->regs_buffer) {
                        dev_err(host->dev,
                                "could not allocate memory for regs_buffer\n");
@@ -3926,9 +3927,11 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
                }
 
                host->rst_ops = &dw_mci_pdrst_ops;
-               mmc_assume_removable = 0;
        }
 
+       if (of_get_property(np, "assume_removable", NULL))
+               mmc_assume_removable = 0;
+
        return pdata;
 }