diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-10-30 06:59:42 -0400 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 09:58:57 -0500 |
commit | 0dddee7a7d42192267ebef0fe15be8b296b665c8 (patch) | |
tree | 538b25f2d091bbcadde8a5656c85026f2a4cc6ac /arch/arm/mach-dove | |
parent | 7dde453d628687c0e991cfc55c9fd299a804aee6 (diff) |
dma: mv_xor: change the driver name to 'mv_xor'
Since we got rid of the per-XOR channel 'mv_xor' driver, now the
per-XOR engine driver that used to be called 'mv_xor_shared' can
simply be named 'mv_xor'.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'arch/arm/mach-dove')
-rw-r--r-- | arch/arm/mach-dove/common.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 6a2c4dc413a8..f4ac5b06014b 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/irq.h> | 33 | #include <linux/irq.h> |
34 | #include <plat/time.h> | 34 | #include <plat/time.h> |
35 | #include <linux/platform_data/usb-ehci-orion.h> | 35 | #include <linux/platform_data/usb-ehci-orion.h> |
36 | #include <linux/platform_data/dma-mv_xor.h> | ||
36 | #include <plat/irq.h> | 37 | #include <plat/irq.h> |
37 | #include <plat/common.h> | 38 | #include <plat/common.h> |
38 | #include <plat/addr-map.h> | 39 | #include <plat/addr-map.h> |
@@ -124,8 +125,8 @@ static void __init dove_clk_init(void) | |||
124 | orion_clkdev_add(NULL, "mv_crypto", crypto); | 125 | orion_clkdev_add(NULL, "mv_crypto", crypto); |
125 | orion_clkdev_add(NULL, "dove-ac97", ac97); | 126 | orion_clkdev_add(NULL, "dove-ac97", ac97); |
126 | orion_clkdev_add(NULL, "dove-pdma", pdma); | 127 | orion_clkdev_add(NULL, "dove-pdma", pdma); |
127 | orion_clkdev_add(NULL, "mv_xor_shared.0", xor0); | 128 | orion_clkdev_add(NULL, MV_XOR_NAME ".0", xor0); |
128 | orion_clkdev_add(NULL, "mv_xor_shared.1", xor1); | 129 | orion_clkdev_add(NULL, MV_XOR_NAME ".1", xor1); |
129 | } | 130 | } |
130 | 131 | ||
131 | /***************************************************************************** | 132 | /***************************************************************************** |
@@ -410,11 +411,11 @@ static void __init dove_legacy_clk_init(void) | |||
410 | of_clk_get_from_provider(&clkspec)); | 411 | of_clk_get_from_provider(&clkspec)); |
411 | 412 | ||
412 | clkspec.args[0] = CLOCK_GATING_BIT_XOR0; | 413 | clkspec.args[0] = CLOCK_GATING_BIT_XOR0; |
413 | orion_clkdev_add(NULL, "mv_xor_shared.0", | 414 | orion_clkdev_add(NULL, MV_XOR_NAME ".0", |
414 | of_clk_get_from_provider(&clkspec)); | 415 | of_clk_get_from_provider(&clkspec)); |
415 | 416 | ||
416 | clkspec.args[0] = CLOCK_GATING_BIT_XOR1; | 417 | clkspec.args[0] = CLOCK_GATING_BIT_XOR1; |
417 | orion_clkdev_add(NULL, "mv_xor_shared.1", | 418 | orion_clkdev_add(NULL, MV_XOR_NAME ".1", |
418 | of_clk_get_from_provider(&clkspec)); | 419 | of_clk_get_from_provider(&clkspec)); |
419 | } | 420 | } |
420 | 421 | ||