hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmc: tmio: tmio_mmc_host has .write16_hook 

Current .write16_hook is implemented under tmio_mmc_data.
It goes to tmio_mmc_host by this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Kuninori Morimoto 2015-01-13 04:57:42 +00:00 committed by Ulf Hansson
parent 7ecc09bab1
commit dfe9a229e0
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,11 +214,11 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
} }
host->dma = dma_priv; host->dma = dma_priv;
host->write16_hook = sh_mobile_sdhi_write16_hook;
mmc_data->clk_enable = sh_mobile_sdhi_clk_enable; mmc_data->clk_enable = sh_mobile_sdhi_clk_enable;
mmc_data->clk_disable = sh_mobile_sdhi_clk_disable; mmc_data->clk_disable = sh_mobile_sdhi_clk_disable;
mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED; mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
mmc_data->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk; mmc_data->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;
if (p) { if (p) {
mmc_data->flags = p->tmio_flags; mmc_data->flags = p->tmio_flags;

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

@ -94,6 +94,8 @@ struct tmio_mmc_host {
struct mutex ios_lock; /* protect set_ios() context */ struct mutex ios_lock; /* protect set_ios() context */
bool native_hotplug; bool native_hotplug;
bool sdio_irq_enabled; bool sdio_irq_enabled;
int (*write16_hook)(struct tmio_mmc_host *host, int addr);
}; };
struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev); struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev);
@ -183,7 +185,7 @@ static inline void sd_ctrl_write16(struct tmio_mmc_host *host, int addr, u16 val
/* If there is a hook and it returns non-zero then there /* If there is a hook and it returns non-zero then there
* is an error and the write should be skipped * is an error and the write should be skipped
*/ */
if (host->pdata->write16_hook && host->pdata->write16_hook(host, addr)) if (host->write16_hook && host->write16_hook(host, addr))
return; return;
writew(val, host->ctl + (addr << host->pdata->bus_shift)); writew(val, host->ctl + (addr << host->pdata->bus_shift));
} }

2
drivers/mmc/host/tmio_mmc_pio.c
View File

@ -1092,7 +1092,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
tmio_mmc_of_parse(pdev, pdata); tmio_mmc_of_parse(pdev, pdata);
if (!(pdata->flags & TMIO_MMC_HAS_IDLE_WAIT)) if (!(pdata->flags & TMIO_MMC_HAS_IDLE_WAIT))
pdata->write16_hook = NULL; _host->write16_hook = NULL;
res_ctl = platform_get_resource(pdev, IORESOURCE_MEM, 0); res_ctl = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res_ctl) if (!res_ctl)

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

@ -112,8 +112,6 @@ void tmio_core_mmc_clk_div(void __iomem *cnf, int shift, int state);
struct dma_chan; struct dma_chan;
struct tmio_mmc_host;
/* /*
* data for the MMC controller * data for the MMC controller
*/ */
@ -127,7 +125,6 @@ struct tmio_mmc_data {
unsigned int cd_gpio; unsigned int cd_gpio;
void (*set_pwr)(struct platform_device *host, int state); void (*set_pwr)(struct platform_device *host, int state);
void (*set_clk_div)(struct platform_device *host, int state); void (*set_clk_div)(struct platform_device *host, int state);
int (*write16_hook)(struct tmio_mmc_host *host, int addr);
/* clock management callbacks */ /* clock management callbacks */
int (*clk_enable)(struct platform_device *pdev, unsigned int *f); int (*clk_enable)(struct platform_device *pdev, unsigned int *f);
void (*clk_disable)(struct platform_device *pdev); void (*clk_disable)(struct platform_device *pdev);