Hi Guennadi,
On Fri, May 07, 2010 at 04:32:29PM +0200, Guennadi Liakhovetski wrote:
> Pass DMA slave IDs from platform down to the tmio_mmc driver, to be used for
> dmaengine configuration.
I guess this should go through Dan's tree. If that's so, please add my:
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Cheers,
Samuel.
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
> ---
> drivers/mfd/sh_mobile_sdhi.c | 24 ++++++++++++++++++++----
> include/linux/mfd/sh_mobile_sdhi.h | 2 ++
> include/linux/mfd/tmio.h | 6 ++++++
> 3 files changed, 28 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c
> index 468fd36..dafa988 100644
> --- a/drivers/mfd/sh_mobile_sdhi.c
> +++ b/drivers/mfd/sh_mobile_sdhi.c
> @@ -25,11 +25,15 @@
> #include <linux/mfd/core.h>
> #include <linux/mfd/tmio.h>
> #include <linux/mfd/sh_mobile_sdhi.h>
> +#include <linux/sh_dma.h>
>
> struct sh_mobile_sdhi {
> struct clk *clk;
> struct tmio_mmc_data mmc_data;
> struct mfd_cell cell_mmc;
> + struct sh_dmae_slave param_tx;
> + struct sh_dmae_slave param_rx;
> + struct tmio_mmc_dma dma_priv;
> };
>
> static struct resource sh_mobile_sdhi_resources[] = {
> @@ -63,6 +67,8 @@ static void sh_mobile_sdhi_set_pwr(struct platform_device *tmio, int state)
> static int __init 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 resource *mem;
> char clk_name[8];
> int ret, irq;
> @@ -84,6 +90,8 @@ static int __init sh_mobile_sdhi_probe(struct platform_device *pdev)
> 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)) {
> @@ -95,12 +103,20 @@ static int __init sh_mobile_sdhi_probe(struct platform_device *pdev)
>
> clk_enable(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;
> + mmc_data->hclk = clk_get_rate(priv->clk);
> + mmc_data->set_pwr = sh_mobile_sdhi_set_pwr;
> + mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
> +
> + if (p && 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;
> + mmc_data->dma = &priv->dma_priv;
> + }
>
> memcpy(&priv->cell_mmc, &sh_mobile_sdhi_cell, sizeof(priv->cell_mmc));
> - priv->cell_mmc.driver_data = &priv->mmc_data;
> + priv->cell_mmc.driver_data = mmc_data;
> priv->cell_mmc.platform_data = &priv->cell_mmc;
> priv->cell_mmc.data_size = sizeof(priv->cell_mmc);
>
> diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h
> index 3bcd716..c305461 100644
> --- a/include/linux/mfd/sh_mobile_sdhi.h
> +++ b/include/linux/mfd/sh_mobile_sdhi.h
> @@ -2,6 +2,8 @@
> #define __SH_MOBILE_SDHI_H__
>
> struct sh_mobile_sdhi_info {
> + int dma_slave_tx;
> + int dma_slave_rx;
> void (*set_pwr)(struct platform_device *pdev, int state);
> };
>
> diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
> index c3f7dff..360fc95 100644
> --- a/include/linux/mfd/tmio.h
> +++ b/include/linux/mfd/tmio.h
> @@ -55,12 +55,18 @@ int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base);
> void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state);
> void tmio_core_mmc_clk_div(void __iomem *cnf, int shift, int state);
>
> +struct tmio_mmc_dma {
> + void *chan_priv_tx;
> + void *chan_priv_rx;
> +};
> +
> /*
> * data for the MMC controller
> */
> struct tmio_mmc_data {
> unsigned int hclk;
> unsigned long capabilities;
> + struct tmio_mmc_dma *dma;
> void (*set_pwr)(struct platform_device *host, int state);
> void (*set_clk_div)(struct platform_device *host, int state);
> };
> --
> 1.6.2.4
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
