omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected
authorJan Luebbe <jlu@pengutronix.de>
Tue, 7 Aug 2012 16:29:45 +0000 (18:29 +0200)
committerTony Lindgren <tony@atomide.com>
Wed, 8 Aug 2012 14:22:45 +0000 (07:22 -0700)
commit6c691b5df1fcd93f2e9f65e1a8a3dd0e6fd158ea
tree3d2e31993ed9620a49161236b6ca92825832cd4c
parent54f32a35f4d3a653a18a2c8c239f19ae060bd803
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>
arch/arm/plat-omap/include/plat/multi.h