diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2011-05-18 08:18:57 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2011-05-19 07:26:26 -0400 |
commit | a0eb221a446f2f6c988430f0b0a13f74b7c2b799 (patch) | |
tree | 1acb53fd96021665712a83532b7df78dc77a3fed | |
parent | a7c57cf7d4327c41510f8cbf45b1b970e02c34f8 (diff) |
dmaengine: move link order
Move the dmaengine subsystem up early in the drivers Makefile so
DMA is made available early to all drivers, just like e.g.
regulators. Now even regulators can use DMA on the same initlevel.
As a result we can bump the ste_dma40 and coh901318 dmaengine
drivers down one initlevel to subsys_init().
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r-- | drivers/Makefile | 4 | ||||
-rw-r--r-- | drivers/dma/coh901318.c | 2 | ||||
-rw-r--r-- | drivers/dma/ste_dma40.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 3f135b6fb014..e68423da897a 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
@@ -17,6 +17,9 @@ obj-$(CONFIG_SFI) += sfi/ | |||
17 | # was used and do nothing if so | 17 | # was used and do nothing if so |
18 | obj-$(CONFIG_PNP) += pnp/ | 18 | obj-$(CONFIG_PNP) += pnp/ |
19 | obj-$(CONFIG_ARM_AMBA) += amba/ | 19 | obj-$(CONFIG_ARM_AMBA) += amba/ |
20 | # Many drivers will want to use DMA so this has to be made available | ||
21 | # really early. | ||
22 | obj-$(CONFIG_DMA_ENGINE) += dma/ | ||
20 | 23 | ||
21 | obj-$(CONFIG_VIRTIO) += virtio/ | 24 | obj-$(CONFIG_VIRTIO) += virtio/ |
22 | obj-$(CONFIG_XEN) += xen/ | 25 | obj-$(CONFIG_XEN) += xen/ |
@@ -92,7 +95,6 @@ obj-$(CONFIG_EISA) += eisa/ | |||
92 | obj-y += lguest/ | 95 | obj-y += lguest/ |
93 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ | 96 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ |
94 | obj-$(CONFIG_CPU_IDLE) += cpuidle/ | 97 | obj-$(CONFIG_CPU_IDLE) += cpuidle/ |
95 | obj-$(CONFIG_DMA_ENGINE) += dma/ | ||
96 | obj-$(CONFIG_MMC) += mmc/ | 98 | obj-$(CONFIG_MMC) += mmc/ |
97 | obj-$(CONFIG_MEMSTICK) += memstick/ | 99 | obj-$(CONFIG_MEMSTICK) += memstick/ |
98 | obj-$(CONFIG_NEW_LEDS) += leds/ | 100 | obj-$(CONFIG_NEW_LEDS) += leds/ |
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c index 00deabd9a04b..b5a318916d05 100644 --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c | |||
@@ -1610,7 +1610,7 @@ int __init coh901318_init(void) | |||
1610 | { | 1610 | { |
1611 | return platform_driver_probe(&coh901318_driver, coh901318_probe); | 1611 | return platform_driver_probe(&coh901318_driver, coh901318_probe); |
1612 | } | 1612 | } |
1613 | arch_initcall(coh901318_init); | 1613 | subsys_initcall(coh901318_init); |
1614 | 1614 | ||
1615 | void __exit coh901318_exit(void) | 1615 | void __exit coh901318_exit(void) |
1616 | { | 1616 | { |
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 65d2535d12ef..5d054bb908e5 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c | |||
@@ -2962,4 +2962,4 @@ static int __init stedma40_init(void) | |||
2962 | { | 2962 | { |
2963 | return platform_driver_probe(&d40_driver, d40_probe); | 2963 | return platform_driver_probe(&d40_driver, d40_probe); |
2964 | } | 2964 | } |
2965 | arch_initcall(stedma40_init); | 2965 | subsys_initcall(stedma40_init); |