Skip to contentSkip to conversation

omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected

PATCH New Jan Luebbe 2 participants 2 messages Aug 7, 2012 – Aug 8, 2012

Subsystems (2)
lore
Share & tools
lore

Jan Luebbe

author
#0 lore raw

PATCH 1/1 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.

---
 arch/arm/plat-omap/include/plat/multi.h |    9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/plat-omap/include/plat/multi.h +9 -0
index 045e320..324d31b 100644
@@ -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 */
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected

Quoted 9 lines · Jan Luebbe

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.

Thanks applying into fixes.

Tony