summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJan Luebbe <jlu@pengutronix.de>2012-08-07 18:29:45 +0200
committerTony Lindgren <tony@atomide.com>2012-08-08 07:22:45 -0700
commit6c691b5df1fcd93f2e9f65e1a8a3dd0e6fd158ea (patch)
tree3d2e31993ed9620a49161236b6ca92825832cd4c /arch
parent54f32a35f4d3a653a18a2c8c239f19ae060bd803 (diff)
downloadblackbird-op-linux-6c691b5df1fcd93f2e9f65e1a8a3dd0e6fd158ea.tar.gz
blackbird-op-linux-6c691b5df1fcd93f2e9f65e1a8a3dd0e6fd158ea.zip
omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected
When only ARCH_OMAP3 (or -2,-4,...) and SOC_AM33XX are selected, multi.h doesn't set MULTI_OMAP2. In this case, cpu.h will simply define cpu_is_omap24xx() as 1. This causes problems for example for omap_hwmod.c:omap_hwmod_init which checks for cpu_is_omap24xx() first, using the wrong soc_ops for AM33xx. Fix this by defining MULTI_OMAP2 when using SOC_AM33XX together with something else. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/include/plat/multi.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/multi.h b/arch/arm/plat-omap/include/plat/multi.h
index 045e320f1067..324d31b14852 100644
--- a/arch/arm/plat-omap/include/plat/multi.h
+++ b/arch/arm/plat-omap/include/plat/multi.h
@@ -108,4 +108,13 @@
# endif
#endif
+#ifdef CONFIG_SOC_AM33XX
+# ifdef OMAP_NAME
+# undef MULTI_OMAP2
+# define MULTI_OMAP2
+# else
+# define OMAP_NAME am33xx
+# endif
+#endif
+
#endif /* __PLAT_OMAP_MULTI_H */
OpenPOWER on IntegriCloud