diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-20 16:35:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-31 08:33:45 +0200 |
| commit | 6e22ff1b381106647358fe24912ccb581244d4da (patch) | |
| tree | f8ebed09627279b4bc06dd03d8318334b8771d84 /arch/arm/mach-imx/imx6.c | |
| parent | b62be26793d31e4bddaefa3427c0226cdfd4b83e (diff) | |
| download | barebox-6e22ff1b381106647358fe24912ccb581244d4da.tar.gz barebox-6e22ff1b381106647358fe24912ccb581244d4da.tar.xz | |
ARM: i.MX6: skip devices register when devicetree is present
When we have a devicetree, do not register the platform devices.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/imx6.c')
| -rw-r--r-- | arch/arm/mach-imx/imx6.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c index 7a7ce15c46..5c20aa1841 100644 --- a/arch/arm/mach-imx/imx6.c +++ b/arch/arm/mach-imx/imx6.c @@ -57,6 +57,9 @@ static int imx6_init(void) { imx6_boot_save_loc((void *)MX6_SRC_BASE_ADDR); + if (of_get_root_node()) + return 0; + add_generic_device("imx-iomuxv3", 0, NULL, MX6_IOMUXC_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx6-ccm", 0, NULL, MX6_CCM_BASE_ADDR, 0x4000, IORESOURCE_MEM, NULL); add_generic_device("imx31-gpt", 0, NULL, MX6_GPT_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); |