diff options
author | Andrew Lunn <andrew@lunn.ch> | 2012-11-18 05:44:57 -0500 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 10:03:35 -0500 |
commit | c896ed0fd72505104db3e78fffe3d8c604d25277 (patch) | |
tree | 919710cb83286bf25fe807fc589aeb518439cda6 /arch/arm/mach-kirkwood | |
parent | 34c93c8657935d30649e777c4aa05f74f16aa418 (diff) |
arm: kirkwood: Convert XOR instantiation to DT.
Use DT to describe the two XOR DMA engines on Kirkwood. Remove the
C code initialization.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index 294ad5a4fd98..9826904277b8 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <asm/mach/map.h> | 21 | #include <asm/mach/map.h> |
22 | #include <mach/bridge-regs.h> | 22 | #include <mach/bridge-regs.h> |
23 | #include <linux/platform_data/usb-ehci-orion.h> | 23 | #include <linux/platform_data/usb-ehci-orion.h> |
24 | #include <linux/platform_data/dma-mv_xor.h> | ||
25 | #include <plat/irq.h> | 24 | #include <plat/irq.h> |
26 | #include <plat/common.h> | 25 | #include <plat/common.h> |
27 | #include "common.h" | 26 | #include "common.h" |
@@ -60,14 +59,6 @@ static void __init kirkwood_legacy_clk_init(void) | |||
60 | orion_clkdev_add(NULL, "orion-ehci.0", | 59 | orion_clkdev_add(NULL, "orion-ehci.0", |
61 | of_clk_get_from_provider(&clkspec)); | 60 | of_clk_get_from_provider(&clkspec)); |
62 | 61 | ||
63 | clkspec.args[0] = CGC_BIT_XOR0; | ||
64 | orion_clkdev_add(NULL, MV_XOR_NAME ".0", | ||
65 | of_clk_get_from_provider(&clkspec)); | ||
66 | |||
67 | clkspec.args[0] = CGC_BIT_XOR1; | ||
68 | orion_clkdev_add(NULL, MV_XOR_NAME ".1", | ||
69 | of_clk_get_from_provider(&clkspec)); | ||
70 | |||
71 | clkspec.args[0] = CGC_BIT_PEX1; | 62 | clkspec.args[0] = CGC_BIT_PEX1; |
72 | orion_clkdev_add("1", "pcie", | 63 | orion_clkdev_add("1", "pcie", |
73 | of_clk_get_from_provider(&clkspec)); | 64 | of_clk_get_from_provider(&clkspec)); |
@@ -103,10 +94,6 @@ static void __init kirkwood_dt_init(void) | |||
103 | /* Setup root of clk tree */ | 94 | /* Setup root of clk tree */ |
104 | kirkwood_of_clk_init(); | 95 | kirkwood_of_clk_init(); |
105 | 96 | ||
106 | /* internal devices that every board has */ | ||
107 | kirkwood_xor0_init(); | ||
108 | kirkwood_xor1_init(); | ||
109 | |||
110 | #ifdef CONFIG_KEXEC | 97 | #ifdef CONFIG_KEXEC |
111 | kexec_reinit = kirkwood_enable_pcie; | 98 | kexec_reinit = kirkwood_enable_pcie; |
112 | #endif | 99 | #endif |