UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmc: tmio: mmc: tmio: tmio_mmc_data has .chan_priv_?x 

dma_request_slave_channel_compat() in tmio_mmc_dma
needs .chan_priv_tx/.chan_priv_rx. But these are copied from
sh_mobile_sdhi only, and sh_mobile_sdhi_info is now almost
same as tmio_mmc_data except .chan_priv_?x.
sh_mobile_sdhi_info can be replaced to tmio_mmc_data, but it is
used from ${LINUX}/arch/arm/mach-shmobile, ${LINUX}/arch/sh.
So, this patch adds .chan_priv_?x into tmio_mmc_data as 1st step,
and sh_mobile_sdhi driver has dummy operation for now.
It will be replaced/removed together with platform data replace.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Kuninori Morimoto 2015-02-24 02:06:43 +00:00 committed by Vinod Koul
parent 7c6cc8f201
commit f33c9d6558
4 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/mmc/host/sh_mobile_sdhi.c
View File

@ -201,6 +201,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
of_match_device(sh_mobile_sdhi_of_match, &pdev->dev); of_match_device(sh_mobile_sdhi_of_match, &pdev->dev);
struct sh_mobile_sdhi *priv; struct sh_mobile_sdhi *priv;
struct tmio_mmc_data *mmc_data; struct tmio_mmc_data *mmc_data;
struct tmio_mmc_data *mmd = pdev->dev.platform_data;
struct sh_mobile_sdhi_info *p = pdev->dev.platform_data; struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
struct tmio_mmc_host *host; struct tmio_mmc_host *host;
struct resource *res; struct resource *res;
@ -245,28 +246,37 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
else else
host->bus_shift = 0; host->bus_shift = 0;
mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED; if (mmd) {
if (p) { /*
mmc_data->flags = p->tmio_flags; * FIXME
mmc_data->ocr_mask = p->tmio_ocr_mask; *
mmc_data->capabilities |= p->tmio_caps; * sh_mobile_sdhi_info will be replaced to tmio_mmc_data soon.
mmc_data->capabilities2 |= p->tmio_caps2; * But, sh_mobile_sdhi_info is used under
mmc_data->cd_gpio = p->cd_gpio; * ${LINUX}/arch/arm/mach-shmobile/
* ${LINUX}/arch/sh/
* To separate large patch into "tmio_mmc_data has .chan_priv_?x"
* and "replace sh_mobile_sdhi_info in tmio_mmc_data",
* here has dummy method.
* These should be removed.
*/
struct tmio_mmc_data m;
if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) { mmd = &m;
/* m.flags = p->tmio_flags;
* Yes, we have to provide slave IDs twice to TMIO: m.ocr_mask = p->tmio_ocr_mask;
* once as a filter parameter and once for channel m.capabilities = p->tmio_caps;
* configuration as an explicit slave ID m.capabilities2 = p->tmio_caps2;
*/ m.cd_gpio = p->cd_gpio;
dma_priv->chan_priv_tx = (void *)p->dma_slave_tx; m.chan_priv_tx = (void *)p->dma_slave_tx;
dma_priv->chan_priv_rx = (void *)p->dma_slave_rx; m.chan_priv_rx = (void *)p->dma_slave_rx;
}
*mmc_data = *mmd;
} }
dma_priv->filter = shdma_chan_filter; dma_priv->filter = shdma_chan_filter;
dma_priv->enable = sh_mobile_sdhi_enable_dma; dma_priv->enable = sh_mobile_sdhi_enable_dma;
mmc_data->alignment_shift = 1; /* 2-byte alignment */ mmc_data->alignment_shift = 1; /* 2-byte alignment */
mmc_data->capabilities |= MMC_CAP_MMC_HIGHSPEED;
/* /*
* All SDHI blocks support 2-byte and larger block sizes in 4-bit * All SDHI blocks support 2-byte and larger block sizes in 4-bit

2
drivers/mmc/host/tmio_mmc.h
View File

@ -43,8 +43,6 @@ struct tmio_mmc_data;
struct tmio_mmc_host; struct tmio_mmc_host;
struct tmio_mmc_dma { struct tmio_mmc_dma {
void *chan_priv_tx;
void *chan_priv_rx;
enum dma_slave_buswidth dma_buswidth; enum dma_slave_buswidth dma_buswidth;
bool (*filter)(struct dma_chan *chan, void *arg); bool (*filter)(struct dma_chan *chan, void *arg);
void (*enable)(struct tmio_mmc_host *host, bool enable); void (*enable)(struct tmio_mmc_host *host, bool enable);

6
drivers/mmc/host/tmio_mmc_dma.c
View File

@ -261,7 +261,7 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat
{ {
/* We can only either use DMA for both Tx and Rx or not use it at all */ /* We can only either use DMA for both Tx and Rx or not use it at all */
if (!host->dma || (!host->pdev->dev.of_node && if (!host->dma || (!host->pdev->dev.of_node &&
(!host->dma->chan_priv_tx || !host->dma->chan_priv_rx))) (!pdata->chan_priv_tx || !pdata->chan_priv_rx)))
return; return;
if (!host->chan_tx && !host->chan_rx) { if (!host->chan_tx && !host->chan_rx) {
@ -278,7 +278,7 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat
dma_cap_set(DMA_SLAVE, mask); dma_cap_set(DMA_SLAVE, mask);
host->chan_tx = dma_request_slave_channel_compat(mask, host->chan_tx = dma_request_slave_channel_compat(mask,
host->dma->filter, host->dma->chan_priv_tx, host->dma->filter, pdata->chan_priv_tx,
&host->pdev->dev, "tx"); &host->pdev->dev, "tx");
dev_dbg(&host->pdev->dev, "%s: TX: got channel %p\n", __func__, dev_dbg(&host->pdev->dev, "%s: TX: got channel %p\n", __func__,
host->chan_tx); host->chan_tx);
@ -297,7 +297,7 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat
goto ecfgtx; goto ecfgtx;
host->chan_rx = dma_request_slave_channel_compat(mask, host->chan_rx = dma_request_slave_channel_compat(mask,
host->dma->filter, host->dma->chan_priv_rx, host->dma->filter, pdata->chan_priv_rx,
&host->pdev->dev, "rx"); &host->pdev->dev, "rx");
dev_dbg(&host->pdev->dev, "%s: RX: got channel %p\n", __func__, dev_dbg(&host->pdev->dev, "%s: RX: got channel %p\n", __func__,
host->chan_rx); host->chan_rx);

2
include/linux/mfd/tmio.h
View File

@ -111,6 +111,8 @@ struct dma_chan;
* data for the MMC controller * data for the MMC controller
*/ */
struct tmio_mmc_data { struct tmio_mmc_data {
void *chan_priv_tx;
void *chan_priv_rx;
unsigned int hclk; unsigned int hclk;
unsigned long capabilities; unsigned long capabilities;
unsigned long capabilities2; unsigned long capabilities2;