diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2013-07-22 18:41:23 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2013-07-22 18:41:23 +0000 |
| commit | 32a83db34718f3145068d8f0af010320430d68c0 (patch) | |
| tree | 76a6524942af537b972ffe80ada771d85748fcd4 /target/linux/xburst/patches-3.10/014-MIPS-jz4740-Register-jz4740-DMA-device.patch | |
| parent | e7d77883c7bd91a365ae0d9d4e9c8579b4799bba (diff) | |
| download | upstream-32a83db34718f3145068d8f0af010320430d68c0.tar.gz upstream-32a83db34718f3145068d8f0af010320430d68c0.tar.bz2 upstream-32a83db34718f3145068d8f0af010320430d68c0.zip | |
xburst: Add 3.10 support
Missing files from the previous commit.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
SVN-Revision: 37510
Diffstat (limited to 'target/linux/xburst/patches-3.10/014-MIPS-jz4740-Register-jz4740-DMA-device.patch')
| -rw-r--r-- | target/linux/xburst/patches-3.10/014-MIPS-jz4740-Register-jz4740-DMA-device.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/target/linux/xburst/patches-3.10/014-MIPS-jz4740-Register-jz4740-DMA-device.patch b/target/linux/xburst/patches-3.10/014-MIPS-jz4740-Register-jz4740-DMA-device.patch new file mode 100644 index 0000000000..1ae288b264 --- /dev/null +++ b/target/linux/xburst/patches-3.10/014-MIPS-jz4740-Register-jz4740-DMA-device.patch @@ -0,0 +1,73 @@ +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(+) + +diff --git a/arch/mips/include/asm/mach-jz4740/platform.h b/arch/mips/include/asm/mach-jz4740/platform.h +index 72cfebd..05988c2 100644 +--- 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_codec_device; + 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); + +diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c +index bc454e6..b857521 100644 +--- 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_platform_devices[] __initdata = { + &jz4740_rtc_device, + &jz4740_adc_device, + &jz4740_pwm_device, ++ &jz4740_dma_device, + &qi_lb60_gpio_keys, + &qi_lb60_pwm_beeper, + &qi_lb60_charger_device, +diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c +index e9348fd..df65677 100644 +--- 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, ++}; +-- +1.7.10.4 + |