aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-08-16 16:41:07 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-22 20:17:13 +0100
commite586e955aa47f9b4afe6e665798fd2cb074a90f4 (patch)
treecec6d8b3454f4205a2f69f6686b1388203d8e5df /arch
parentdc26df52455348e06e4c34a2af2910d291369fe8 (diff)
downloadkernel_goldelico_gta04-e586e955aa47f9b4afe6e665798fd2cb074a90f4.zip
kernel_goldelico_gta04-e586e955aa47f9b4afe6e665798fd2cb074a90f4.tar.gz
kernel_goldelico_gta04-e586e955aa47f9b4afe6e665798fd2cb074a90f4.tar.bz2
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')
-rw-r--r--arch/arm/mach-omap2/mcbsp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 660e00b..d57a357 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;
}