diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-27 23:11:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-28 08:18:43 +0100 |
| commit | 2a0f2d46fd4b4e6d0da83dee944916a7ce7013b1 (patch) | |
| tree | 981fe357f1fcf0de86e556770d20987f7f2055a1 /arch/arm/mach-mxs | |
| parent | c722646be66100d19837e7604708dba2649e1753 (diff) | |
| download | barebox-2a0f2d46fd4b4e6d0da83dee944916a7ce7013b1.tar.gz barebox-2a0f2d46fd4b4e6d0da83dee944916a7ce7013b1.tar.xz | |
ARM: MXS: Do not register devices with device tree support
When a device tree is present the SoC internal devices come from
it, so do not register them as platform devices.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/soc-imx23.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/soc-imx28.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/soc-imx23.c b/arch/arm/mach-mxs/soc-imx23.c index b21986536f..ece91e55e6 100644 --- a/arch/arm/mach-mxs/soc-imx23.c +++ b/arch/arm/mach-mxs/soc-imx23.c @@ -38,6 +38,9 @@ EXPORT_SYMBOL(reset_cpu); static int imx23_devices_init(void) { + if (of_get_root_node()) + return 0; + add_generic_device("imx23-dma-apbh", 0, NULL, MXS_APBH_BASE, 0x2000, IORESOURCE_MEM, NULL); add_generic_device("imx23-clkctrl", 0, NULL, IMX_CCM_BASE, 0x100, IORESOURCE_MEM, NULL); diff --git a/arch/arm/mach-mxs/soc-imx28.c b/arch/arm/mach-mxs/soc-imx28.c index c7252f537e..001c969f3c 100644 --- a/arch/arm/mach-mxs/soc-imx28.c +++ b/arch/arm/mach-mxs/soc-imx28.c @@ -56,6 +56,9 @@ postcore_initcall(imx28_init); static int imx28_devices_init(void) { + if (of_get_root_node()) + return 0; + add_generic_device("imx28-dma-apbh", 0, NULL, MXS_APBH_BASE, 0x2000, IORESOURCE_MEM, NULL); add_generic_device("imx28-clkctrl", 0, NULL, IMX_CCM_BASE, 0x100, IORESOURCE_MEM, NULL); |