mmc: tmio: convert the SDHI MMC driver from MFD to a platform driver
On sh-mobile platforms the SDHI driver was using the tmio_mmc SD/SDIO MFD cell driver. Now that the tmio_mmc driver has been split into a core and a separate MFD glue, we can support SDHI natively without the need to emulate an MFD controller. This also allows to support systems with an on-SoC SDHI controller and a separate MFD with a TMIO core. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Guennadi Liakhovetski
committed by
Chris Ball
Chris Ball
parent
4fbc5ece43
commit
42051e8a7b
@ -444,12 +444,19 @@ config MMC_TMIO_CORE
|
||||
|
||||
config MMC_TMIO
|
||||
tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"
|
||||
depends on MFD_TMIO || MFD_ASIC3 || MFD_SH_MOBILE_SDHI
|
||||
depends on MFD_TMIO || MFD_ASIC3
|
||||
select MMC_TMIO_CORE
|
||||
help
|
||||
This provides support for the SD/MMC cell found in TC6393XB,
|
||||
T7L66XB and also HTC ASIC3
|
||||
|
||||
config MMC_SDHI
|
||||
tristate "SH-Mobile SDHI SD/SDIO controller support"
|
||||
select MMC_TMIO_CORE
|
||||
help
|
||||
This provides support for the SDHI SD/SDIO controller found in
|
||||
SuperH and ARM SH-Mobile SoCs
|
||||
|
||||
config MMC_CB710
|
||||
tristate "ENE CB710 MMC/SD Interface support"
|
||||
depends on PCI
|
||||
|
||||
@ -31,8 +31,11 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o
|
||||
obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o
|
||||
obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o
|
||||
tmio_mmc_core-y := tmio_mmc_pio.o
|
||||
tmio_mmc_core-$(CONFIG_TMIO_MMC_DMA) += tmio_mmc_dma.o
|
||||
obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
|
||||
ifneq ($(CONFIG_MMC_SDHI),n)
|
||||
tmio_mmc_core-y += tmio_mmc_dma.o
|
||||
endif
|
||||
obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.o
|
||||
obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
|
||||
obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
|
||||
obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
|
||||
obj-$(CONFIG_MMC_DW) += dw_mmc.o
|
||||
|
||||
171
drivers/mmc/host/sh_mobile_sdhi.c
Normal file
171
drivers/mmc/host/sh_mobile_sdhi.c
Normal file
@ -0,0 +1,171 @@
|
||||
/*
|
||||
* SuperH Mobile SDHI
|
||||
*
|
||||
* Copyright (C) 2009 Magnus Damm
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* Based on "Compaq ASIC3 support":
|
||||
*
|
||||
* Copyright 2001 Compaq Computer Corporation.
|
||||
* Copyright 2004-2005 Phil Blundell
|
||||
* Copyright 2007-2008 OpenedHand Ltd.
|
||||
*
|
||||
* Authors: Phil Blundell <pb@handhelds.org>,
|
||||
* Samuel Ortiz <sameo@openedhand.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/mmc/host.h>
|
||||
#include <linux/mmc/sh_mobile_sdhi.h>
|
||||
#include <linux/mfd/tmio.h>
|
||||
#include <linux/sh_dma.h>
|
||||
|
||||
#include "tmio_mmc.h"
|
||||
|
||||
struct sh_mobile_sdhi {
|
||||
struct clk *clk;
|
||||
struct tmio_mmc_data mmc_data;
|
||||
struct sh_dmae_slave param_tx;
|
||||
struct sh_dmae_slave param_rx;
|
||||
struct tmio_mmc_dma dma_priv;
|
||||
};
|
||||
|
||||
static void sh_mobile_sdhi_set_pwr(struct platform_device *pdev, int state)
|
||||
{
|
||||
struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
|
||||
|
||||
if (p && p->set_pwr)
|
||||
p->set_pwr(pdev, state);
|
||||
}
|
||||
|
||||
static int sh_mobile_sdhi_get_cd(struct platform_device *pdev)
|
||||
{
|
||||
struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
|
||||
|
||||
if (p && p->get_cd)
|
||||
return p->get_cd(pdev);
|
||||
else
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct sh_mobile_sdhi *priv;
|
||||
struct tmio_mmc_data *mmc_data;
|
||||
struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
|
||||
struct tmio_mmc_host *host;
|
||||
char clk_name[8];
|
||||
int ret;
|
||||
|
||||
priv = kzalloc(sizeof(struct sh_mobile_sdhi), GFP_KERNEL);
|
||||
if (priv == NULL) {
|
||||
dev_err(&pdev->dev, "kzalloc failed\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
mmc_data = &priv->mmc_data;
|
||||
|
||||
snprintf(clk_name, sizeof(clk_name), "sdhi%d", pdev->id);
|
||||
priv->clk = clk_get(&pdev->dev, clk_name);
|
||||
if (IS_ERR(priv->clk)) {
|
||||
dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
|
||||
ret = PTR_ERR(priv->clk);
|
||||
goto eclkget;
|
||||
}
|
||||
|
||||
clk_enable(priv->clk);
|
||||
|
||||
mmc_data->hclk = clk_get_rate(priv->clk);
|
||||
mmc_data->set_pwr = sh_mobile_sdhi_set_pwr;
|
||||
mmc_data->get_cd = sh_mobile_sdhi_get_cd;
|
||||
mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
|
||||
if (p) {
|
||||
mmc_data->flags = p->tmio_flags;
|
||||
mmc_data->ocr_mask = p->tmio_ocr_mask;
|
||||
mmc_data->capabilities |= p->tmio_caps;
|
||||
|
||||
if (p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) {
|
||||
priv->param_tx.slave_id = p->dma_slave_tx;
|
||||
priv->param_rx.slave_id = p->dma_slave_rx;
|
||||
priv->dma_priv.chan_priv_tx = &priv->param_tx;
|
||||
priv->dma_priv.chan_priv_rx = &priv->param_rx;
|
||||
priv->dma_priv.alignment_shift = 1; /* 2-byte alignment */
|
||||
mmc_data->dma = &priv->dma_priv;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* All SDHI blocks support 2-byte and larger block sizes in 4-bit
|
||||
* bus width mode.
|
||||
*/
|
||||
mmc_data->flags |= TMIO_MMC_BLKSZ_2BYTES;
|
||||
|
||||
/*
|
||||
* All SDHI blocks support SDIO IRQ signalling.
|
||||
*/
|
||||
mmc_data->flags |= TMIO_MMC_SDIO_IRQ;
|
||||
|
||||
ret = tmio_mmc_host_probe(&host, pdev, mmc_data);
|
||||
if (ret < 0)
|
||||
goto eprobe;
|
||||
|
||||
pr_info("%s at 0x%08lx irq %d\n", mmc_hostname(host->mmc),
|
||||
(unsigned long)host->ctl, host->irq);
|
||||
|
||||
return ret;
|
||||
|
||||
eprobe:
|
||||
clk_disable(priv->clk);
|
||||
clk_put(priv->clk);
|
||||
eclkget:
|
||||
kfree(priv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int sh_mobile_sdhi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct mmc_host *mmc = platform_get_drvdata(pdev);
|
||||
struct tmio_mmc_host *host = mmc_priv(mmc);
|
||||
struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data);
|
||||
|
||||
tmio_mmc_host_remove(host);
|
||||
clk_disable(priv->clk);
|
||||
clk_put(priv->clk);
|
||||
kfree(priv);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver sh_mobile_sdhi_driver = {
|
||||
.driver = {
|
||||
.name = "sh_mobile_sdhi",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = sh_mobile_sdhi_probe,
|
||||
.remove = __devexit_p(sh_mobile_sdhi_remove),
|
||||
};
|
||||
|
||||
static int __init sh_mobile_sdhi_init(void)
|
||||
{
|
||||
return platform_driver_register(&sh_mobile_sdhi_driver);
|
||||
}
|
||||
|
||||
static void __exit sh_mobile_sdhi_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&sh_mobile_sdhi_driver);
|
||||
}
|
||||
|
||||
module_init(sh_mobile_sdhi_init);
|
||||
module_exit(sh_mobile_sdhi_exit);
|
||||
|
||||
MODULE_DESCRIPTION("SuperH Mobile SDHI driver");
|
||||
MODULE_AUTHOR("Magnus Damm");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_ALIAS("platform:sh_mobile_sdhi");
|
||||
@ -120,7 +120,7 @@ static inline void tmio_mmc_kunmap_atomic(struct scatterlist *sg,
|
||||
local_irq_restore(*flags);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_TMIO_MMC_DMA
|
||||
#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
|
||||
void tmio_mmc_start_dma(struct tmio_mmc_host *host, struct mmc_data *data);
|
||||
void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdata);
|
||||
void tmio_mmc_release_dma(struct tmio_mmc_host *host);
|
||||
|
||||
Reference in New Issue
Block a user