diff options
| author | Magnus Damm <damm@opensource.se> | 2010-02-22 05:37:09 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-03-07 22:17:31 +0100 |
| commit | 3c49e810507c9d0659b8aa61f7f91aecda428ee3 (patch) | |
| tree | eb690aa697e2af922ab73892027f75043a1d7d57 /drivers/mfd/sh_mobile_sdhi.c | |
| parent | gpiolib: Force wm831x GPIOs into GPIO mode when requested (diff) | |
| download | linux-3c49e810507c9d0659b8aa61f7f91aecda428ee3.tar.xz linux-3c49e810507c9d0659b8aa61f7f91aecda428ee3.zip | |
mfd: sh_mobile_sdhi MMC_CAP_MMC_HIGHSPEED support
Add MMC_CAP_MMC_HIGHSPEED support to the sh_mobile_sdhi
driver. Also, remove type cast and FIXME comment.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/sh_mobile_sdhi.c')
| -rw-r--r-- | drivers/mfd/sh_mobile_sdhi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c index 03efae8041ab..468fd366d4da 100644 --- a/drivers/mfd/sh_mobile_sdhi.c +++ b/drivers/mfd/sh_mobile_sdhi.c @@ -21,7 +21,7 @@ #include <linux/kernel.h> #include <linux/clk.h> #include <linux/platform_device.h> - +#include <linux/mmc/host.h> #include <linux/mfd/core.h> #include <linux/mfd/tmio.h> #include <linux/mfd/sh_mobile_sdhi.h> @@ -95,9 +95,9 @@ static int __init sh_mobile_sdhi_probe(struct platform_device *pdev) clk_enable(priv->clk); - /* FIXME: silly const unsigned int hclk */ - *(unsigned int *)&priv->mmc_data.hclk = clk_get_rate(priv->clk); + priv->mmc_data.hclk = clk_get_rate(priv->clk); priv->mmc_data.set_pwr = sh_mobile_sdhi_set_pwr; + priv->mmc_data.capabilities = MMC_CAP_MMC_HIGHSPEED; memcpy(&priv->cell_mmc, &sh_mobile_sdhi_cell, sizeof(priv->cell_mmc)); priv->cell_mmc.driver_data = &priv->mmc_data; |