ARM: OMAP2+: McBSP: Do not create legacy devices when booting with DT data
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 16 Aug 2012 13:41:07 +0000 (16:41 +0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Aug 2012 19:17:13 +0000 (20:17 +0100)
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>
arch/arm/mach-omap2/mcbsp.c

index 660e00b3ef82ed3a5cd6c0b4480d663b53b27848..d57a3578bf039e2142ea4a89bf2aade44463eae8 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
@@ -113,7 +114,8 @@ static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
 
 static int __init omap2_mcbsp_init(void)
 {
-       omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL);
+       if (!of_have_populated_dt())
+               omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL);
 
        return 0;
 }