summaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-12 12:33:56 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-12 12:33:56 +0000
commit9e31085943dfadaa0f5961f5cbc4f7a240a09c53 (patch)
treed933bb536eb34a7b28b804d06d8dac93d585fd62 /target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch
parentd7f2b105adff786e97f5a45373392f1e8eeee8f9 (diff)
[lantiq] update 3.2 patches
sync with lantiq kernel series git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31260 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch b/target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch
deleted file mode 100644
index 93215768b..000000000
--- a/target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e6a19ba12790d04267a9f052a3dc64fa1a8cac16 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Thu, 8 Mar 2012 11:21:08 +0100
-Subject: [PATCH 28/70] MIPS: lantiq: convert dma driver to clkdev api
-
-Update from old pmu_{dis,en}able() to ckldev api.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- arch/mips/lantiq/xway/Makefile.rej | 11 +++++++++++
- arch/mips/lantiq/xway/dma.c | 6 +++++-
- 2 files changed, 16 insertions(+), 1 deletions(-)
- create mode 100644 arch/mips/lantiq/xway/Makefile.rej
-
---- /dev/null
-+++ b/arch/mips/lantiq/xway/Makefile.rej
-@@ -0,0 +1,11 @@
-+--- arch/mips/lantiq/xway/Makefile
-++++ arch/mips/lantiq/xway/Makefile
-+@@ -1,7 +1,4 @@
-+-obj-y := sysctrl.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o clk.o
-+-
-+-obj-$(CONFIG_SOC_XWAY) += prom-xway.o
-+-obj-$(CONFIG_SOC_AMAZON_SE) += prom-ase.o
-++obj-y := prom.o sysctrl.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o clk.o
-+
-+ obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o
-+ obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o
---- a/arch/mips/lantiq/xway/dma.c
-+++ b/arch/mips/lantiq/xway/dma.c
-@@ -20,6 +20,7 @@
- #include <linux/io.h>
- #include <linux/dma-mapping.h>
- #include <linux/export.h>
-+#include <linux/clk.h>
-
- #include <lantiq_soc.h>
- #include <xway_dma.h>
-@@ -216,6 +217,7 @@ EXPORT_SYMBOL_GPL(ltq_dma_init_port);
- int __init
- ltq_dma_init(void)
- {
-+ struct clk *clk;
- int i;
-
- /* remap dma register range */
-@@ -224,7 +226,9 @@ ltq_dma_init(void)
- panic("Failed to remap dma memory\n");
-
- /* power up and reset the dma engine */
-- ltq_pmu_enable(PMU_DMA);
-+ clk = clk_get_sys("ltq_dma", NULL);
-+ WARN_ON(!clk);
-+ clk_enable(clk);
- ltq_dma_w32_mask(0, DMA_RESET, LTQ_DMA_CTRL);
-
- /* disable all interrupts */