add DMA support to tmio_mmc, using dmaengine API, use it on SH
Subsystems (9)
v2 cover add DMA support to tmio_mmc, using dmaengine API, use it on SH
This patch series adds DMA support to the tmio_mmc SD/MMC host driver, using the dmaengine API. DMA is enabled on SuperH platforms and ARM shmobile boards, both use the sh_mobile_sdhi MFD driver. Other TMIO MFD implementations are unaffected. The patch transparently falls back to PIO if no DMA is configured by the MFD driver, or if DMA initialisation or execution fails.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
PATCH v2 1/9 sh: define DMA slaves per CPU type, remove now redundant header
Now that DMA slave IDs are only used used in platform specific code and have become opaque cookies for the rest of the code, we can make the, CPU specific too.
---
This patch is new in v2 - added per request from Magnus.
arch/sh/include/asm/dmaengine.h | 34 -------------------------------- arch/sh/include/asm/siu.h | 2 - arch/sh/include/cpu-sh4/cpu/sh7722.h | 15 ++++++++++++++ arch/sh/include/cpu-sh4/cpu/sh7724.h | 19 +++++++++++++++++ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 1 - arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 2 +- arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 3 +- arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 2 +- sound/soc/sh/siu.h | 3 +- sound/soc/sh/siu_pcm.c | 9 +++---- 10 files changed, 42 insertions(+), 48 deletions(-) delete mode 100644 arch/sh/include/asm/dmaengine.h
arch/sh/include/asm/dmaengine.h deleted +0 -34
@@ -1,34 +0,0 @@ -/* -* Header for the new SH dmaengine driver -* -* Copyright (C) 2010 Guennadi Liakhovetski <[email protected]> -* -* 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. -*/ -#ifndef ASM_DMAENGINE_H -#define ASM_DMAENGINE_H - -#include <linux/sh_dma.h> - -enum { -SHDMA_SLAVE_SCIF0_TX , -SHDMA_SLAVE_SCIF0_RX , -SHDMA_SLAVE_SCIF1_TX , -SHDMA_SLAVE_SCIF1_RX , -SHDMA_SLAVE_SCIF2_TX , -SHDMA_SLAVE_SCIF2_RX , -SHDMA_SLAVE_SCIF3_TX , -SHDMA_SLAVE_SCIF3_RX , -SHDMA_SLAVE_SCIF4_TX , -SHDMA_SLAVE_SCIF4_RX , -SHDMA_SLAVE_SCIF5_TX , -SHDMA_SLAVE_SCIF5_RX , -SHDMA_SLAVE_SIUA_TX , -SHDMA_SLAVE_SIUA_RX , -SHDMA_SLAVE_SIUB_TX , -SHDMA_SLAVE_SIUB_RX , -}; - -#endif
arch/sh/include/asm/siu.h +0 -2
@@ -11,8 +11,6 @@#ifndef ASM_SIU_H #define ASM_SIU_H -#include <asm/dmaengine.h> -struct device ; struct siu_platform {
arch/sh/include/cpu-sh4/cpu/sh7722.h +15 -0
@@ -235,4 +235,19 @@ enum { HWBLK_NR, }; +enum { +SHDMA_SLAVE_SCIF0_TX , +SHDMA_SLAVE_SCIF0_RX , +SHDMA_SLAVE_SCIF1_TX , +SHDMA_SLAVE_SCIF1_RX , +SHDMA_SLAVE_SCIF2_TX , +SHDMA_SLAVE_SCIF2_RX , +SHDMA_SLAVE_SIUA_TX , +SHDMA_SLAVE_SIUA_RX , +SHDMA_SLAVE_SIUB_TX , +SHDMA_SLAVE_SIUB_RX , +SHDMA_SLAVE_SDHI0_TX , +SHDMA_SLAVE_SDHI0_RX , +}; +#endif /* __ASM_SH7722_H__ */
arch/sh/include/cpu-sh4/cpu/sh7724.h +19 -0
@@ -283,4 +283,23 @@ enum { HWBLK_NR, }; +enum { +SHDMA_SLAVE_SCIF0_TX , +SHDMA_SLAVE_SCIF0_RX , +SHDMA_SLAVE_SCIF1_TX , +SHDMA_SLAVE_SCIF1_RX , +SHDMA_SLAVE_SCIF2_TX , +SHDMA_SLAVE_SCIF2_RX , +SHDMA_SLAVE_SCIF3_TX , +SHDMA_SLAVE_SCIF3_RX , +SHDMA_SLAVE_SCIF4_TX , +SHDMA_SLAVE_SCIF4_RX , +SHDMA_SLAVE_SCIF5_TX , +SHDMA_SLAVE_SCIF5_RX , +SHDMA_SLAVE_SDHI0_TX , +SHDMA_SLAVE_SDHI0_RX , +SHDMA_SLAVE_SDHI1_TX , +SHDMA_SLAVE_SDHI1_RX , +}; +#endif /* __ASM_SH7724_H__ */
arch/sh/kernel/cpu/sh4a/setup-sh7722.c +0 -1
@@ -17,7 +17,6 @@#include <linux/usb/m66592.h> #include <asm/clock.h> -#include <asm/dmaengine.h> #include <asm/mmzone.h> #include <asm/siu.h>
arch/sh/kernel/cpu/sh4a/setup-sh7724.c +1 -1
@@ -18,13 +18,13 @@#include <linux/mm.h> #include <linux/serial_sci.h> #include <linux/uio_driver.h> +#include <linux/sh_dma.h> #include <linux/sh_timer.h> #include <linux/io.h> #include <linux/notifier.h> #include <asm/suspend.h> #include <asm/clock.h> -#include <asm/dmaengine.h> #include <asm/mmzone.h> #include <cpu/dma-register.h>
arch/sh/kernel/cpu/sh4a/setup-sh7780.c +1 -2
@@ -12,10 +12,9 @@#include <linux/serial.h> #include <linux/io.h> #include <linux/serial_sci.h> +#include <linux/sh_dma.h> #include <linux/sh_timer.h> -#include <asm/dmaengine.h> -#include <cpu/dma-register.h> static struct plat_sci_port scif0_platform_data = {
arch/sh/kernel/cpu/sh4a/setup-sh7785.c +1 -1
@@ -13,9 +13,9 @@#include <linux/serial_sci.h> #include <linux/io.h> #include <linux/mm.h> +#include <linux/sh_dma.h> #include <linux/sh_timer.h> -#include <asm/dmaengine.h> #include <asm/mmzone.h> #include <cpu/dma-register.h>
sound/soc/sh/siu.h +1 -2
@@ -71,8 +71,7 @@ struct siu_firmware {#include <linux/dmaengine.h> #include <linux/interrupt.h> #include <linux/io.h> - -#include <asm/dmaengine.h> +#include <linux/sh_dma.h> #include <sound/core.h> #include <sound/pcm.h>
sound/soc/sh/siu_pcm.c +4 -5
@@ -32,7 +32,6 @@#include <sound/pcm_params.h> #include <sound/soc-dai.h> -#include <asm/dmaengine.h> #include <asm/siu.h> #include "siu.h"
@@ -359,13 +358,13 @@ static int siu_pcm_open(struct snd_pcm_substream *ss)if (ss->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { siu_stream = &port_info->playback; param = &siu_stream->param; - param->slave_id = port ?SHDMA_SLAVE_SIUB_TX : -SHDMA_SLAVE_SIUA_TX ; + param->slave_id = port ? pdata->dma_slave_tx_b : + pdata->dma_slave_tx_a; }else { siu_stream = &port_info->capture; param = &siu_stream->param; - param->slave_id = port ?SHDMA_SLAVE_SIUB_RX : -SHDMA_SLAVE_SIUA_RX ; + param->slave_id = port ? pdata->dma_slave_rx_b : + pdata->dma_slave_rx_a; } param->dma_dev = pdata->dma_dev;
Signature · 1 line
1.6.2.4
Magnus Damm
maintainerRe: [PATCH 1/9 v2] sh: define DMA slaves per CPU type, remove now redundant header
Quoted 8 lines · Guennadi Liakhovetski
Now that DMA slave IDs are only used used in platform specific code and have become opaque cookies for the rest of the code, we can make the, CPU specific too.
Signed-off-by Guennadi Liakhovetski <[email protected]>---
This patch is new in v2 - added per request from Magnus.
Thank you Guennadi, this looks very good!
/ magnus
PATCH v2 2/9 SH: add DMA slaves for two SDHI controllers to sh7722
In reply to Guennadi LiakhovetskiSuperH SDHI controllers can use DMA, add slave definitions to sh7722.
---
v1 -> v2:
SDHI slave IDs have already been defined by patch 1/9 from this series
arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/sh/kernel/cpu/sh4a/setup-sh7722.c +10 -0
@@ -74,6 +74,16 @@ static const struct sh_dmae_slave_config sh7722_dmae_slaves[] = { .addr = 0xa454c094, .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT), .mid_rid = 0xb6, + }, { + .slave_id = SHDMA_SLAVE_SDHI0_TX, + .addr = 0x04ce0030, + .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT), + .mid_rid = 0xc1, + }, { + .slave_id = SHDMA_SLAVE_SDHI0_RX, + .addr = 0x04ce0030, + .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT), + .mid_rid = 0xc2, }, };
Signature · 1 line
1.6.2.4
PATCH v2 3/9 SH: add DMA slave definitions to sh7724
In reply to Guennadi LiakhovetskiAdd a list of SCIF and SDHI DMA slave definitions to sh7724.
---
no change since v1
arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 86 ++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-)
arch/sh/kernel/cpu/sh4a/setup-sh7724.c +86 -0
@@ -31,6 +31,90 @@#include <cpu/sh7724.h> /* DMA */ +static const struct sh_dmae_slave_config sh7724_dmae_slaves[] = { + { + .slave_id =SHDMA_SLAVE_SCIF0_TX , + .addr =0xffe0000c , + .chcr =DM_FIX |SM_INC |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x21 , + }, { + .slave_id =SHDMA_SLAVE_SCIF0_RX , + .addr =0xffe00014 , + .chcr =DM_INC |SM_FIX |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x22 , + }, { + .slave_id =SHDMA_SLAVE_SCIF1_TX , + .addr =0xffe1000c , + .chcr =DM_FIX |SM_INC |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x25 , + }, { + .slave_id =SHDMA_SLAVE_SCIF1_RX , + .addr =0xffe10014 , + .chcr =DM_INC |SM_FIX |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x26 , + }, { + .slave_id =SHDMA_SLAVE_SCIF2_TX , + .addr =0xffe2000c , + .chcr =DM_FIX |SM_INC |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x29 , + }, { + .slave_id =SHDMA_SLAVE_SCIF2_RX , + .addr =0xffe20014 , + .chcr =DM_INC |SM_FIX |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x2a , + }, { + .slave_id =SHDMA_SLAVE_SCIF3_TX , + .addr =0xa4e30020 , + .chcr =DM_FIX |SM_INC |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x2d , + }, { + .slave_id =SHDMA_SLAVE_SCIF3_RX , + .addr =0xa4e30024 , + .chcr =DM_INC |SM_FIX |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x2e , + }, { + .slave_id =SHDMA_SLAVE_SCIF4_TX , + .addr =0xa4e40020 , + .chcr =DM_FIX |SM_INC |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x31 , + }, { + .slave_id =SHDMA_SLAVE_SCIF4_RX , + .addr =0xa4e40024 , + .chcr =DM_INC |SM_FIX |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x32 , + }, { + .slave_id =SHDMA_SLAVE_SCIF5_TX , + .addr =0xa4e50020 , + .chcr =DM_FIX |SM_INC |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x35 , + }, { + .slave_id =SHDMA_SLAVE_SCIF5_RX , + .addr =0xa4e50024 , + .chcr =DM_INC |SM_FIX |0x800 |TS_INDEX2VAL (XMIT_SZ_8BIT ), + .mid_rid =0x36 , + }, { + .slave_id =SHDMA_SLAVE_SDHI0_TX , + .addr =0x04ce0030 , + .chcr =DM_FIX |SM_INC |0x800 |TS_INDEX2VAL (XMIT_SZ_16BIT ), + .mid_rid =0xc1 , + }, { + .slave_id =SHDMA_SLAVE_SDHI0_RX , + .addr =0x04ce0030 , + .chcr =DM_INC |SM_FIX |0x800 |TS_INDEX2VAL (XMIT_SZ_16BIT ), + .mid_rid =0xc2 , + }, { + .slave_id =SHDMA_SLAVE_SDHI1_TX , + .addr =0x04cf0030 , + .chcr =DM_FIX |SM_INC |0x800 |TS_INDEX2VAL (XMIT_SZ_16BIT ), + .mid_rid =0xc9 , + }, { + .slave_id =SHDMA_SLAVE_SDHI1_RX , + .addr =0x04cf0030 , + .chcr =DM_INC |SM_FIX |0x800 |TS_INDEX2VAL (XMIT_SZ_16BIT ), + .mid_rid =0xca , + }, +}; +static const struct sh_dmae_channel sh7724_dmae_channels[] = { { .offset =0 ,
@@ -62,6 +146,8 @@ static const struct sh_dmae_channel sh7724_dmae_channels[] = {static const unsigned int ts_shift[] =TS_SHIFT ;static struct sh_dmae_pdata dma_platform_data = { + .slave = sh7724_dmae_slaves, + .slave_num =ARRAY_SIZE (sh7724_dmae_slaves), .channel = sh7724_dmae_channels, .channel_num =ARRAY_SIZE (sh7724_dmae_channels), .ts_low_shift =CHCR_TS_LOW_SHIFT ,
Signature · 1 line
1.6.2.4
PATCH v2 4/9 MMC: add DMA support to tmio_mmc driver, when used on SuperH
In reply to Guennadi LiakhovetskiSDHI controllers on SuperH, served by the tmio_mmc driver, can use slave DMA for data transfer. This patch adds support for the dmaengine API to tmio_mmc and the necessary interfacing to the sh_mobile_sdhi MFD driver.
---
v1 -> v2:
Immediate Rx completion proved to be unreliable. Removed it
drivers/mfd/sh_mobile_sdhi.c | 24 ++- drivers/mmc/host/tmio_mmc.c | 343 ++++++++++++++++++++++++++++++++---- drivers/mmc/host/tmio_mmc.h | 11 ++ include/linux/mfd/sh_mobile_sdhi.h | 2 + include/linux/mfd/tmio.h | 6 + 5 files changed, 350 insertions(+), 36 deletions(-)
drivers/mfd/sh_mobile_sdhi.c +20 -4
@@ -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);
drivers/mmc/host/tmio_mmc.c +311 -32
484 lines not on this page · raw message
drivers/mmc/host/tmio_mmc.h +11 -0
@@ -10,6 +10,8 @@*/ #include <linux/highmem.h> +#include <linux/interrupt.h> +#include <linux/dmaengine.h> #define CTL_SD_CMD 0x00#define CTL_ARG_REG 0x04
@@ -106,6 +108,15 @@ struct tmio_mmc_host {unsigned int sg_off;struct platform_device *pdev; + +/* DMA support */ +struct dma_chan *chan_rx; +struct dma_chan *chan_tx; +struct dma_async_tx_descriptor *desc; +unsigned int dma_sglen; +struct tasklet_struct dma_complete; +struct tasklet_struct dma_issue; +dma_cookie_t cookie; };#include <linux/io.h>
include/linux/mfd/sh_mobile_sdhi.h +2 -0
@@ -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); };
include/linux/mfd/tmio.h +6 -0
@@ -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); };
Signature · 1 line
1.6.2.4
PATCH v2 5/9 SH: Add SDHI DMA support to ecovec
In reply to Guennadi Liakhovetski---
v1 -> v2:
asm/dmaengine.h is now gone.
arch/sh/boards/mach-ecovec24/setup.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
arch/sh/boards/mach-ecovec24/setup.c +7 -2
@@ -11,6 +11,7 @@#include <linux/init.h> #include <linux/device.h> #include <linux/platform_device.h> +#include <linux/mfd/sh_mobile_sdhi.h> #include <linux/mtd/physmap.h> #include <linux/gpio.h> #include <linux/interrupt.h>
@@ -442,7 +443,9 @@ static void sdhi0_set_pwr(struct platform_device *pdev, int state) }static struct sh_mobile_sdhi_info sdhi0_info = { - .set_pwr = sdhi0_set_pwr, + .dma_slave_tx =SHDMA_SLAVE_SDHI0_TX , + .dma_slave_rx =SHDMA_SLAVE_SDHI0_RX , + .set_pwr = sdhi0_set_pwr, };static struct resource sdhi0_resources[] = {
@@ -478,7 +481,9 @@ static void sdhi1_set_pwr(struct platform_device *pdev, int state) }static struct sh_mobile_sdhi_info sdhi1_info = { - .set_pwr = sdhi1_set_pwr, + .dma_slave_tx =SHDMA_SLAVE_SDHI1_TX , + .dma_slave_rx =SHDMA_SLAVE_SDHI1_RX , + .set_pwr = sdhi1_set_pwr, };static struct resource sdhi1_resources[] = {
Signature · 1 line
1.6.2.4
PATCH v2 6/9 SH: Add SDHI DMA support to ms7724se
In reply to Guennadi Liakhovetski---
v1 -> v2:
asm/dmaengine.h is now gone.
arch/sh/boards/mach-se/7724/setup.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
arch/sh/boards/mach-se/7724/setup.c +17 -0
@@ -14,6 +14,7 @@#include <linux/device.h> #include <linux/interrupt.h> #include <linux/platform_device.h> +#include <linux/mfd/sh_mobile_sdhi.h> #include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/smc91x.h>
@@ -456,11 +457,19 @@ static struct resource sdhi0_cn7_resources[] = { }, }; +static struct sh_mobile_sdhi_info sh7724_sdhi0_data = { + .dma_slave_tx =SHDMA_SLAVE_SDHI0_TX , + .dma_slave_rx =SHDMA_SLAVE_SDHI0_RX , +}; +static struct platform_device sdhi0_cn7_device = { .name ="sh_mobile_sdhi" , .id =0 , .num_resources =ARRAY_SIZE (sdhi0_cn7_resources), .resource = sdhi0_cn7_resources, + .dev = { + .platform_data = &sh7724_sdhi0_data, + }, .archdata = { .hwblk_id =HWBLK_SDHI0 , },
@@ -479,11 +488,19 @@ static struct resource sdhi1_cn8_resources[] = { }, }; +static struct sh_mobile_sdhi_info sh7724_sdhi1_data = { + .dma_slave_tx =SHDMA_SLAVE_SDHI1_TX , + .dma_slave_rx =SHDMA_SLAVE_SDHI1_RX , +}; +static struct platform_device sdhi1_cn8_device = { .name ="sh_mobile_sdhi" , .id =1 , .num_resources =ARRAY_SIZE (sdhi1_cn8_resources), .resource = sdhi1_cn8_resources, + .dev = { + .platform_data = &sh7724_sdhi1_data, + }, .archdata = { .hwblk_id =HWBLK_SDHI1 , },
Signature · 1 line
1.6.2.4
PATCH v2 7/9 SH: Add SDHI DMA support to kfr2r09
In reply to Guennadi Liakhovetski---
v1 -> v2:
asm/dmaengine.h is now gone.
arch/sh/boards/mach-kfr2r09/setup.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
arch/sh/boards/mach-kfr2r09/setup.c +9 -0
@@ -10,6 +10,7 @@#include <linux/init.h> #include <linux/platform_device.h> #include <linux/interrupt.h> +#include <linux/mfd/sh_mobile_sdhi.h> #include <linux/mtd/physmap.h> #include <linux/mtd/onenand.h> #include <linux/delay.h>
@@ -356,10 +357,18 @@ static struct resource kfr2r09_sh_sdhi0_resources[] = { }, }; +static struct sh_mobile_sdhi_info sh7724_sdhi0_data = { + .dma_slave_tx =SHDMA_SLAVE_SDHI0_TX , + .dma_slave_rx =SHDMA_SLAVE_SDHI0_RX , +}; +static struct platform_device kfr2r09_sh_sdhi0_device = { .name ="sh_mobile_sdhi" , .num_resources =ARRAY_SIZE (kfr2r09_sh_sdhi0_resources), .resource = kfr2r09_sh_sdhi0_resources, + .dev = { + .platform_data = &sh7724_sdhi0_data, + }, .archdata = { .hwblk_id =HWBLK_SDHI0 , },
Signature · 1 line
1.6.2.4
PATCH v2 8/9 SH: Add SDHI DMA support to migor
In reply to Guennadi Liakhovetski---
v1 -> v2:
asm/dmaengine.h is now gone.
arch/sh/boards/mach-migor/setup.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
arch/sh/boards/mach-migor/setup.c +9 -0
@@ -12,6 +12,7 @@#include <linux/interrupt.h> #include <linux/input.h> #include <linux/input/sh_keysc.h> +#include <linux/mfd/sh_mobile_sdhi.h> #include <linux/mtd/physmap.h> #include <linux/mtd/nand.h> #include <linux/i2c.h>
@@ -402,10 +403,18 @@ static struct resource sdhi_cn9_resources[] = { }, }; +static struct sh_mobile_sdhi_info sh7724_sdhi_data = { + .dma_slave_tx =SHDMA_SLAVE_SDHI0_TX , + .dma_slave_rx =SHDMA_SLAVE_SDHI0_RX , +}; +static struct platform_device sdhi_cn9_device = { .name ="sh_mobile_sdhi" , .num_resources =ARRAY_SIZE (sdhi_cn9_resources), .resource = sdhi_cn9_resources, + .dev = { + .platform_data = &sh7724_sdhi_data, + }, .archdata = { .hwblk_id =HWBLK_SDHI , },
Signature · 1 line
1.6.2.4
PATCH v2 9/9 ARM: add DMA support to sh7372, enable DMA for SDHI
In reply to Guennadi LiakhovetskiThis adds DMA support for the sh7372 sh-mobile ARM core, using the shdma dmaengine driver, and uses DMA for the SDHI SD-card controller on this SoC.
---
This patch depends on patch series from Magnus for shmobile, adding INTC and clock support. This patch wasn't there in the first version of this series.
arch/arm/mach-shmobile/board-ap4evb.c | 9 + arch/arm/mach-shmobile/include/mach/sh7372.h | 10 ++ arch/arm/mach-shmobile/setup-sh7372.c | 223 ++++++++++++++++++++++++++ 3 files changed, 242 insertions(+), 0 deletions(-)
arch/arm/mach-shmobile/board-ap4evb.c +9 -0
@@ -23,6 +23,7 @@#include <linux/irq.h> #include <linux/platform_device.h> #include <linux/delay.h> +#include <linux/mfd/sh_mobile_sdhi.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h>
@@ -208,6 +209,11 @@ static struct platform_device keysc_device = { };/* SDHI0 */ +static struct sh_mobile_sdhi_info sdhi0_info = { + .dma_slave_tx =SHDMA_SLAVE_SDHI0_TX , + .dma_slave_rx =SHDMA_SLAVE_SDHI0_RX , +}; +static struct resource sdhi0_resources[] = { [0 ] = { .name ="SDHI0" ,
@@ -226,6 +232,9 @@ static struct platform_device sdhi0_device = { .num_resources = ARRAY_SIZE(sdhi0_resources), .resource = sdhi0_resources, .id = 0, + .dev = { + .platform_data = &sdhi0_info, + }, };static struct platform_device *ap4evb_devices[]__initdata = {
arch/arm/mach-shmobile/include/mach/sh7372.h +10 -0
@@ -431,4 +431,14 @@ enum { GPIO_FN_SDENC_DV_CLKI, }; +/* DMA slave IDs */ +enum { +SHDMA_SLAVE_SDHI0_RX , +SHDMA_SLAVE_SDHI0_TX , +SHDMA_SLAVE_SDHI1_RX , +SHDMA_SLAVE_SDHI1_TX , +SHDMA_SLAVE_SDHI2_RX , +SHDMA_SLAVE_SDHI2_TX , +}; +#endif /* __ASM_SH7372_H__ */
arch/arm/mach-shmobile/setup-sh7372.c +223 -0
244 lines not on this page · raw message
Signature · 1 line
1.6.2.4
PATCH 9/9 ARM: add DMA support to sh7372, enable DMA for SDHI
Quoted 3 lines · On Tue, 4 May 2010 16:07:15 +0200 (CEST) Guennadi Liakhovetski…
This patch depends on patch series from Magnus for shmobile, adding INTC and clock support. This patch wasn't there in the first version of this series.
Where is that patch series now?
PATCH v2 9/9 ARM: add DMA support to sh7372, enable DMA for SDHI
Quoted 8 lines · Andrew Morton
Quoted 3 lines · On Tue, 4 May 2010 16:07:15 +0200 (CEST) Guennadi Liakhovetski…
This patch depends on patch series from Magnus for shmobile, adding INTC and clock support. This patch wasn't there in the first version of this series.
Where is that patch series now?
AFAIU, these are two patch series - for the interrupt controller and for the clock framework, and they are not upstream yet. So, I think, we can leave patch 9/9 for later to be merged via the respective platform tree.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
PATCH 9/9 ARM: add DMA support to sh7372, enable DMA for SDHI
Quoted 9 lines · On Thu, 13 May 2010 08:57:06 +0200 (CEST) Guennadi Liakhovetski…
Quoted 7 lines · Andrew Morton
Quoted 3 lines · On Tue, 4 May 2010 16:07:15 +0200 (CEST) Guennadi Liakhovetski…
This patch depends on patch series from Magnus for shmobile, adding INTC and clock support. This patch wasn't there in the first version of this series.
Quoted 6 lines
Quoted 1 line
Where is that patch series now?
AFAIU, these are two patch series - for the interrupt controller and for the clock framework, and they are not upstream yet. So, I think, we can leave patch 9/9 for later to be merged via the respective platform tree.
Again, because of your lack of specificity in identifying patches I am unable to determine whether arm-add-dma-support-to-sh7372-enable-dma-for-sdhi.patch is presently mergeable.
So I won't merge it.
PATCH v2 9/9 ARM: add DMA support to sh7372, enable DMA for SDHI
Hi Andrew
Quoted 19 lines · Andrew Morton
Quoted 9 lines · On Thu, 13 May 2010 08:57:06 +0200 (CEST) Guennadi Liakhovetski…
Quoted 7 lines · Andrew Morton
Quoted 3 lines · On Tue, 4 May 2010 16:07:15 +0200 (CEST) Guennadi Liakhovetski…
This patch depends on patch series from Magnus for shmobile, adding INTC and clock support. This patch wasn't there in the first version of this series.
Quoted 6 lines
Quoted 1 line
Where is that patch series now?
AFAIU, these are two patch series - for the interrupt controller and for the clock framework, and they are not upstream yet. So, I think, we can leave patch 9/9 for later to be merged via the respective platform tree.
Quoted 6 lines
Again, because of your lack of specificity in identifying patches I am unable to determine whether arm-add-dma-support-to-sh7372-enable-dma-for-sdhi.patch is presently mergeable.
So I won't merge it.
Thanks for keeping an eye on these patches! Actually, my above sentence "I think, we can leave patch 9/9 for later to be merged via the respective platform tree" was supposed to mean, that you can drop _this_ specific patch, because it will be merged via the platform tree - in this case this is the "genesis-2.6" tree, maintained by Paul Mundt. Sorry for not being clear enough, please drop this patch.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
PATCH v2 9/9 ARM: mach-shmobile: add DMA support to sh7372, enable DMA for SDHI
In reply to Guennadi LiakhovetskiThis adds DMA support for the sh7372 sh-mobile ARM core, using the shdma dmaengine driver, and uses DMA for the SDHI SD-card controller on this SoC.
---
v1 -> v2:
1. updated to the current genesis tree HEAD
2. adjusted the topic line to match platform preferences
3. moved DMA platform devices to the top of the file, so that other devices can reference them.
Paul, this should be ready for you to merge now.
arch/arm/mach-shmobile/board-ap4evb.c | 9 + arch/arm/mach-shmobile/include/mach/sh7372.h | 10 ++ arch/arm/mach-shmobile/setup-sh7372.c | 223 ++++++++++++++++++++++++++ 3 files changed, 242 insertions(+), 0 deletions(-)
arch/arm/mach-shmobile/board-ap4evb.c +9 -0
@@ -23,6 +23,7 @@#include <linux/irq.h> #include <linux/platform_device.h> #include <linux/delay.h> +#include <linux/mfd/sh_mobile_sdhi.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h>
@@ -224,6 +225,11 @@ static struct platform_device keysc_device = { };/* SDHI0 */ +static struct sh_mobile_sdhi_info sdhi0_info = { + .dma_slave_tx =SHDMA_SLAVE_SDHI0_TX , + .dma_slave_rx =SHDMA_SLAVE_SDHI0_RX , +}; +static struct resource sdhi0_resources[] = { [0 ] = { .name ="SDHI0" ,
@@ -242,6 +248,9 @@ static struct platform_device sdhi0_device = { .num_resources = ARRAY_SIZE(sdhi0_resources), .resource = sdhi0_resources, .id = 0, + .dev = { + .platform_data = &sdhi0_info, + }, };/* USB1 */
arch/arm/mach-shmobile/include/mach/sh7372.h +10 -0
@@ -431,4 +431,14 @@ enum { GPIO_FN_SDENC_DV_CLKI, }; +/* DMA slave IDs */ +enum { +SHDMA_SLAVE_SDHI0_RX , +SHDMA_SLAVE_SDHI0_TX , +SHDMA_SLAVE_SDHI1_RX , +SHDMA_SLAVE_SDHI1_TX , +SHDMA_SLAVE_SDHI2_RX , +SHDMA_SLAVE_SDHI2_TX , +}; +#endif /* __ASM_SH7372_H__ */
arch/arm/mach-shmobile/setup-sh7372.c +223 -0
241 lines not on this page · raw message
Signature · 1 line
1.6.2.4
Paul Mundt
AppliedPATCH v2 9/9 ARM: mach-shmobile: add DMA support to sh7372, enable DMA for SDHI
Quoted 6 lines · Guennadi Liakhovetski
This adds DMA support for the sh7372 sh-mobile ARM core, using the shdma dmaengine driver, and uses DMA for the SDHI SD-card controller on this SoC.
Signed-off-by Guennadi Liakhovetski <[email protected]>---
Quoted 9 lines
v1 -> v2:
1. updated to the current genesis tree HEAD
2. adjusted the topic line to match platform preferences
3. moved DMA platform devices to the top of the file, so that other devices can reference them.Paul, this should be ready for you to merge now.
Applied, thanks.