projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mmc
/
host
/
rk29_sdmmc.c
diff --git
a/drivers/mmc/host/rk29_sdmmc.c
b/drivers/mmc/host/rk29_sdmmc.c
index 5584f198a924a6223e8b6e0799888fd72fee05fa..825672ca26c787c7b79c9e2b6e42ab029bc0ccd1 100755
(executable)
--- a/
drivers/mmc/host/rk29_sdmmc.c
+++ b/
drivers/mmc/host/rk29_sdmmc.c
@@
-3465,7
+3465,11
@@
static int rk29_sdmmc_probe(struct platform_device *pdev)
#else
if(RK29_CTRL_SDMMC_ID== host->pdev->id)
{
+#ifdef CONFIG_ARCH_RK2928
+ mmc->f_max = SD_FPP_FREQ;
+#else
mmc->f_max = SDHC_FPP_FREQ;
+#endif
}
else
{