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 c27f80e5d531..9d8ca990dde6 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 323afef77802..c2b0172a7589 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -811,7 +811,7 @@ static irqreturn_t sh_dmae_interrupt(int irq, void *data)
811 return ret; 811 return ret;
812} 812}
813 813
814#if defined(CONFIG_CPU_SH4) 814#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
815static irqreturn_t sh_dmae_err(int irq, void *data) 815static irqreturn_t sh_dmae_err(int irq, void *data)
816{ 816{
817 struct sh_dmae_device *shdev = (struct sh_dmae_device *)data; 817 struct sh_dmae_device *shdev = (struct sh_dmae_device *)data;
@@ -1052,7 +1052,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
1052 /* Default transfer size of 32 bytes requires 32-byte alignment */ 1052 /* Default transfer size of 32 bytes requires 32-byte alignment */
1053 shdev->common.copy_align = LOG2_DEFAULT_XFER_SIZE; 1053 shdev->common.copy_align = LOG2_DEFAULT_XFER_SIZE;
1054 1054
1055#if defined(CONFIG_CPU_SH4) 1055#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
1056 chanirq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 1); 1056 chanirq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
1057 1057
1058 if (!chanirq_res) 1058 if (!chanirq_res)
@@ -1077,7 +1077,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
1077 1077
1078#else 1078#else
1079 chanirq_res = errirq_res; 1079 chanirq_res = errirq_res;
1080#endif /* CONFIG_CPU_SH4 */ 1080#endif /* CONFIG_CPU_SH4 || CONFIG_ARCH_SHMOBILE */
1081 1081
1082 if (chanirq_res->start == chanirq_res->end && 1082 if (chanirq_res->start == chanirq_res->end &&
1083 !platform_get_resource(pdev, IORESOURCE_IRQ, 1)) { 1083 !platform_get_resource(pdev, IORESOURCE_IRQ, 1)) {
@@ -1124,7 +1124,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
1124chan_probe_err: 1124chan_probe_err:
1125 sh_dmae_chan_remove(shdev); 1125 sh_dmae_chan_remove(shdev);
1126eirqres: 1126eirqres:
1127#if defined(CONFIG_CPU_SH4) 1127#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
1128 free_irq(errirq, shdev); 1128 free_irq(errirq, shdev);
1129eirq_err: 1129eirq_err:
1130#endif 1130#endif