| Message ID | 1344356985-21801-1-git-send-email-jlu@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Jan Luebbe <jlu@pengutronix.de> [120807 09:30]: > 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
diff --git a/arch/arm/plat-omap/include/plat/multi.h b/arch/arm/plat-omap/include/plat/multi.h index 045e320..324d31b 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 */
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> --- arch/arm/plat-omap/include/plat/multi.h | 9 +++++++++ 1 file changed, 9 insertions(+)