diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-08-16 09:41:07 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-22 15:17:13 -0400 |
commit | e586e955aa47f9b4afe6e665798fd2cb074a90f4 (patch) | |
tree | cec6d8b3454f4205a2f69f6686b1388203d8e5df /arch/arm/mach-omap2 | |
parent | dc26df52455348e06e4c34a2af2910d291369fe8 (diff) |
ARM: OMAP2+: McBSP: Do not create legacy devices when booting with DT data
Only create the devices in a legacy way if we do not have the DT data.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/mcbsp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index 660e00b3ef82..d57a3578bf03 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/clk.h> | 15 | #include <linux/clk.h> |
16 | #include <linux/err.h> | 16 | #include <linux/err.h> |
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/of.h> | ||
18 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
19 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
20 | 21 | ||
@@ -113,7 +114,8 @@ static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused) | |||
113 | 114 | ||
114 | static int __init omap2_mcbsp_init(void) | 115 | static int __init omap2_mcbsp_init(void) |
115 | { | 116 | { |
116 | omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL); | 117 | if (!of_have_populated_dt()) |
118 | omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL); | ||
117 | 119 | ||
118 | return 0; | 120 | return 0; |
119 | } | 121 | } |