aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/Kconfig2
-rw-r--r--drivers/dma/shdma.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 1b8877922fb0..dab6f17fbbc7 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -128,7 +128,7 @@ config TXX9_DMAC
128 128
129config SH_DMAE 129config SH_DMAE
130 tristate "Renesas SuperH DMAC support" 130 tristate "Renesas SuperH DMAC support"
131 depends on SUPERH && SH_DMA 131 depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
132 depends on !SH_DMA_API 132 depends on !SH_DMA_API
133 select DMA_ENGINE 133 select DMA_ENGINE
134 help 134 help
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index a1727522343e..a2585c90a139 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -812,7 +812,7 @@ static irqreturn_t sh_dmae_interrupt(int irq, void *data)
812 return ret; 812 return ret;
813} 813}
814 814
815#if defined(CONFIG_CPU_SH4) 815#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
816static irqreturn_t sh_dmae_err(int irq, void *data) 816static irqreturn_t sh_dmae_err(int irq, void *data)
817{ 817{
818 struct sh_dmae_device *shdev = (struct sh_dmae_device *)data; 818 struct sh_dmae_device *shdev = (struct sh_dmae_device *)data;
@@ -1053,7 +1053,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
1053 /* Default transfer size of 32 bytes requires 32-byte alignment */ 1053 /* Default transfer size of 32 bytes requires 32-byte alignment */
1054 shdev->common.copy_align = LOG2_DEFAULT_XFER_SIZE; 1054 shdev->common.copy_align = LOG2_DEFAULT_XFER_SIZE;
1055 1055
1056#if defined(CONFIG_CPU_SH4) 1056#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
1057 chanirq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 1); 1057 chanirq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
1058 1058
1059 if (!chanirq_res) 1059 if (!chanirq_res)
@@ -1078,7 +1078,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
1078 1078
1079#else 1079#else
1080 chanirq_res = errirq_res; 1080 chanirq_res = errirq_res;
1081#endif /* CONFIG_CPU_SH4 */ 1081#endif /* CONFIG_CPU_SH4 || CONFIG_ARCH_SHMOBILE */
1082 1082
1083 if (chanirq_res->start == chanirq_res->end && 1083 if (chanirq_res->start == chanirq_res->end &&
1084 !platform_get_resource(pdev, IORESOURCE_IRQ, 1)) { 1084 !platform_get_resource(pdev, IORESOURCE_IRQ, 1)) {
@@ -1125,7 +1125,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
1125chan_probe_err: 1125chan_probe_err:
1126 sh_dmae_chan_remove(shdev); 1126 sh_dmae_chan_remove(shdev);
1127eirqres: 1127eirqres:
1128#if defined(CONFIG_CPU_SH4) 1128#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
1129 free_irq(errirq, shdev); 1129 free_irq(errirq, shdev);
1130eirq_err: 1130eirq_err:
1131#endif 1131#endif