diff options
author | John Crispin <john@openwrt.org> | 2012-08-03 08:53:02 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2012-08-03 08:53:02 +0000 |
commit | 060b161ca6f18e0e022da1483723ad2e9335bca7 (patch) | |
tree | dc652c26bed4d4b79395a6daafaa5da59000e940 /target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch | |
parent | 162e272b4b2b770cd5eb97006bb4ff99b09bd8de (diff) | |
download | mtk-20170518-060b161ca6f18e0e022da1483723ad2e9335bca7.zip mtk-20170518-060b161ca6f18e0e022da1483723ad2e9335bca7.tar.gz mtk-20170518-060b161ca6f18e0e022da1483723ad2e9335bca7.tar.bz2 |
cleanup patches
SVN-Revision: 32953
Diffstat (limited to 'target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch b/target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch deleted file mode 100644 index 01ced68..0000000 --- a/target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d5904c1dd985d1e0944dd249927ad19c8522a943 Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Thu, 8 Mar 2012 11:21:08 +0100 -Subject: [PATCH 24/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"); - - /* 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 */ |