2010-02-22 04:37:37

by Magnus Damm

[permalink] [raw]
Subject: [PATCH] mfd: sh_mobile_sdhi MMC_CAP_MMC_HIGHSPEED support

From: Magnus Damm <[email protected]>

Add MMC_CAP_MMC_HIGHSPEED support to the sh_mobile_sdhi
driver. Also, remove type cast and FIXME comment.

Signed-off-by: Magnus Damm <[email protected]>
---

Depends on the series:
"[PATCH 00/05] tmio_mmc: SDHI hotplug and random fixes"

drivers/mfd/sh_mobile_sdhi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

--- 0001/drivers/mfd/sh_mobile_sdhi.c
+++ work/drivers/mfd/sh_mobile_sdhi.c 2010-02-22 11:51:12.000000000 +0900
@@ -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(s

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;