shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

mmc: core: rockchip:

Browse Source 
Rockchip mmc controller take pm token from borad-relatived dts description.
Now, we assign pm_caps equals to pm_flags.
    ignore-pm-notify ==> MMC_PM_IGNORE_PM_NOTIFY
    keep-power-in-suspend ==> MMC_PM_KEEP_POWER
This commit is contained in:
lintao
2014-03-29 15:01:32 +08:00
parent 35bef05469
commit 8809c05d52
2 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
arch/arm/boot/dts/rk3288-tb.dts
View File

@@ -193,39 +193,34 @@
};
&emmc {
clock-frequency = <200000000>;
clock-freq-min-max = <400000 200000000>;
clock-frequency = <200000000>;
clock-freq-min-max = <400000 200000000>;
supports-highspeed;
supports-emmc;
bootpart-no-access;
supports-emmc;
bootpart-no-access;
ignore-pm-notify;
keep-power-in-suspend;
status = "okay";
};
&sdmmc {
clock-frequency = <50000000>;
lock-freq-min-max = <400000 50000000>;
supports-highspeed;
supports-sd;
broken-cd;
card-detect-delay = <200>;
vmmc-supply = <&rk808_ldo5_reg>;
status = "okay";
clock-frequency = <50000000>;
lock-freq-min-max = <400000 50000000>;
supports-highspeed;
supports-sd;
broken-cd;
card-detect-delay = <200>;
vmmc-supply = <&rk808_ldo5_reg>;
status = "okay";
};
&sdio {
clock-frequency = <50000000>;
clock-freq-min-max = <200000 50000000>;
supports-highspeed;
supports-sdio;
//cap-sdio-irq;
status = "okay";
clock-frequency = <50000000>;
clock-freq-min-max = <200000 50000000>;
supports-highspeed;
supports-sdio;
//cap-sdio-irq;
status = "okay";
};
&spi0 {

33
drivers/mmc/host/rk_sdmmc.c
View File

@@ -2506,12 +2506,14 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
mmc->f_min = DW_MCI_FREQ_MIN;
mmc->f_max = DW_MCI_FREQ_MAX;
printk("%d..%s: fmin=%d, fmax=%d [%s]\n", __LINE__,__FUNCTION__,mmc->f_min, mmc->f_max, mmc_hostname(mmc));
printk("%d..%s: fmin=%d, fmax=%d [%s]\n", __LINE__,__FUNCTION__,
mmc->f_min, mmc->f_max, mmc_hostname(mmc));
} else {
mmc->f_min = freq[0];
mmc->f_max = freq[1];
printk("%d..%s: fmin=%d, fmax=%d [%s]\n", __LINE__,__FUNCTION__,mmc->f_min, mmc->f_max, mmc_hostname(mmc));
printk("%d..%s: fmin=%d, fmax=%d [%s]\n", __LINE__,__FUNCTION__,
mmc->f_min, mmc->f_max, mmc_hostname(mmc));
}
if (of_find_property(host->dev->of_node, "supports-sd", NULL))
@@ -2521,22 +2523,14 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
if (of_find_property(host->dev->of_node, "supports-emmc", NULL))
mmc->restrict_caps |= RESTRICT_CARD_TYPE_EMMC;
//if(mmc->restrict_caps & RESTRICT_CARD_TYPE_EMMC)
// mmc->caps |= MMC_CAP_NONREMOVABLE;
/* eMMC should not sched into pm mgmt framework*/
if(mmc->restrict_caps & RESTRICT_CARD_TYPE_EMMC)
mmc->pm_flags |= (MMC_PM_IGNORE_PM_NOTIFY | MMC_PM_KEEP_POWER);
if (host->pdata->get_ocr)
mmc->ocr_avail = host->pdata->get_ocr(id);
else{
//mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
mmc->ocr_avail = MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|MMC_VDD_30_31
| MMC_VDD_31_32|MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_34_35| MMC_VDD_35_36;
mmc->ocr_avail |= MMC_VDD_26_27 |MMC_VDD_25_26 |MMC_VDD_24_25 |MMC_VDD_23_24
|MMC_VDD_22_23 |MMC_VDD_21_22 |MMC_VDD_20_21 |MMC_VDD_165_195;
else
{
mmc->ocr_avail = MMC_VDD_27_28| MMC_VDD_28_29| MMC_VDD_29_30| MMC_VDD_30_31
| MMC_VDD_31_32| MMC_VDD_32_33| MMC_VDD_33_34| MMC_VDD_34_35| MMC_VDD_35_36
| MMC_VDD_26_27| MMC_VDD_25_26| MMC_VDD_24_25| MMC_VDD_23_24
| MMC_VDD_22_23| MMC_VDD_21_22| MMC_VDD_20_21| MMC_VDD_165_195;
}
/*
@@ -2588,9 +2582,14 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
mmc->caps2 |= MMC_CAP2_FULL_PWR_CYCLE;
if (of_find_property(host->dev->of_node, "keep-power-in-suspend", NULL))
mmc->pm_caps |= MMC_PM_KEEP_POWER;
if (of_find_property(host->dev->of_node, "ignore-pm-notify", NULL))
mmc->pm_caps |= MMC_PM_IGNORE_PM_NOTIFY;
if (of_find_property(host->dev->of_node, "enable-sdio-wakeup", NULL))
mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
/*Assign pm_caps pass to pm_flags*/
mmc->pm_flags = mmc->pm_caps;
if (host->pdata->blk_settings) {
mmc->max_segs = host->pdata->blk_settings->max_segs;
mmc->max_blk_size = host->pdata->blk_settings->max_blk_size;
@@ -2845,8 +2844,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
if (of_find_property(np, "keep-power-in-suspend", NULL))
pdata->pm_caps |= MMC_PM_KEEP_POWER;
if (of_find_property(np, "enable-sdio-wakeup", NULL))
pdata->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;