diff options
| author | Thomas Abraham <thomas.abraham@linaro.org> | 2011-10-24 13:57:43 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-12-23 02:07:06 +0100 |
| commit | fca3de6ab9bfc6f3b5beebd8f9792357c4e4d441 (patch) | |
| tree | 00719e0bc9681aa7474a2079789364085a32a139 /arch/arm/mach-exynos/dma.c | |
| parent | ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers (diff) | |
| download | linux-fca3de6ab9bfc6f3b5beebd8f9792357c4e4d441.tar.xz linux-fca3de6ab9bfc6f3b5beebd8f9792357c4e4d441.zip | |
ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build
The pl330 device instances and associated platform data is required only
for non-device-tree builds. With device tree enabled, the data about the
platform is obtained from the device tree. For images that include both
dt and non-dt platforms, an addditional check is added to ensure that
static amba device registrations is applicable to only non-dt platforms.
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-exynos/dma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c index 141093d60d0d..b10fcd270f07 100644 --- a/arch/arm/mach-exynos/dma.c +++ b/arch/arm/mach-exynos/dma.c @@ -24,6 +24,7 @@ #include <linux/dma-mapping.h> #include <linux/amba/bus.h> #include <linux/amba/pl330.h> +#include <linux/of.h> #include <asm/irq.h> #include <plat/devs.h> @@ -140,6 +141,9 @@ struct amba_device exynos4_device_pdma1 = { static int __init exynos4_dma_init(void) { + if (of_have_populated_dt()) + return 0; + dma_cap_set(DMA_SLAVE, exynos4_pdma0_pdata.cap_mask); dma_cap_set(DMA_CYCLIC, exynos4_pdma0_pdata.cap_mask); amba_device_register(&exynos4_device_pdma0, &iomem_resource); |