From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Thu, 16 Aug 2012 13:41:07 +0000 (+0300)
Subject: ARM: OMAP2+: McBSP: Do not create legacy devices when booting with DT data
X-Git-Tag: next-20120823~53^2^2^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e586e955aa47f9b4afe6e665798fd2cb074a90f4;p=karo-tx-linux.git

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>
---

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 @@
 #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;
 }