e9688455f6
Also refresh 3.10 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37546
65 lines
2.0 KiB
Diff
65 lines
2.0 KiB
Diff
From 734bdfd446b1eba0c54ad07703a192e6093417fd Mon Sep 17 00:00:00 2001
|
|
From: Lars-Peter Clausen <lars@metafoo.de>
|
|
Date: Thu, 30 May 2013 18:25:03 +0200
|
|
Subject: [PATCH 14/16] MIPS: jz4740: Register jz4740 DMA device
|
|
|
|
Register a device for the newly added jz4740 dmaengine driver.
|
|
|
|
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
|
|
Acked-by: Ralf Baechle <ralf@linux-mips.org>
|
|
[manually edited to align struct assignment]
|
|
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
|
|
---
|
|
arch/mips/include/asm/mach-jz4740/platform.h | 1 +
|
|
arch/mips/jz4740/board-qi_lb60.c | 1 +
|
|
arch/mips/jz4740/platform.c | 21 +++++++++++++++++++++
|
|
3 files changed, 23 insertions(+)
|
|
|
|
--- a/arch/mips/include/asm/mach-jz4740/platform.h
|
|
+++ b/arch/mips/include/asm/mach-jz4740/platform.h
|
|
@@ -32,6 +32,7 @@ extern struct platform_device jz4740_cod
|
|
extern struct platform_device jz4740_adc_device;
|
|
extern struct platform_device jz4740_wdt_device;
|
|
extern struct platform_device jz4740_pwm_device;
|
|
+extern struct platform_device jz4740_dma_device;
|
|
|
|
void jz4740_serial_device_register(void);
|
|
|
|
--- a/arch/mips/jz4740/board-qi_lb60.c
|
|
+++ b/arch/mips/jz4740/board-qi_lb60.c
|
|
@@ -437,6 +437,7 @@ static struct platform_device *jz_platfo
|
|
&jz4740_rtc_device,
|
|
&jz4740_adc_device,
|
|
&jz4740_pwm_device,
|
|
+ &jz4740_dma_device,
|
|
&qi_lb60_gpio_keys,
|
|
&qi_lb60_pwm_beeper,
|
|
&qi_lb60_charger_device,
|
|
--- a/arch/mips/jz4740/platform.c
|
|
+++ b/arch/mips/jz4740/platform.c
|
|
@@ -329,3 +329,24 @@ struct platform_device jz4740_pwm_device
|
|
.name = "jz4740-pwm",
|
|
.id = -1,
|
|
};
|
|
+
|
|
+/* DMA */
|
|
+static struct resource jz4740_dma_resources[] = {
|
|
+ {
|
|
+ .start = JZ4740_DMAC_BASE_ADDR,
|
|
+ .end = JZ4740_DMAC_BASE_ADDR + 0x400 - 1,
|
|
+ .flags = IORESOURCE_MEM,
|
|
+ },
|
|
+ {
|
|
+ .start = JZ4740_IRQ_DMAC,
|
|
+ .end = JZ4740_IRQ_DMAC,
|
|
+ .flags = IORESOURCE_IRQ,
|
|
+ },
|
|
+};
|
|
+
|
|
+struct platform_device jz4740_dma_device = {
|
|
+ .name = "jz4740-dma",
|
|
+ .id = -1,
|
|
+ .num_resources = ARRAY_SIZE(jz4740_dma_resources),
|
|
+ .resource = jz4740_dma_resources,
|
|
+};
|