* [PATCH] omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected
@ 2012-08-07 16:29 ` Jan Luebbe
0 siblings, 0 replies; 4+ messages in thread
From: Jan Luebbe @ 2012-08-07 16:29 UTC (permalink / raw)
To: Tony Lindgren, linux-omap; +Cc: linux-arm-kernel, Vaibhav Hiremath, 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.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
arch/arm/plat-omap/include/plat/multi.h | 9 +++++++++
1 file changed, 9 insertions(+)
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 */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected
@ 2012-08-07 16:29 ` Jan Luebbe
0 siblings, 0 replies; 4+ messages in thread
From: Jan Luebbe @ 2012-08-07 16:29 UTC (permalink / raw)
To: linux-arm-kernel
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(+)
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 */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected
2012-08-07 16:29 ` Jan Luebbe
@ 2012-08-08 14:23 ` Tony Lindgren
-1 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2012-08-08 14:23 UTC (permalink / raw)
To: Jan Luebbe; +Cc: linux-omap, linux-arm-kernel, Vaibhav Hiremath
* 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected
@ 2012-08-08 14:23 ` Tony Lindgren
0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2012-08-08 14:23 UTC (permalink / raw)
To: linux-arm-kernel
* 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-08 14:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-07 16:29 [PATCH] omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected Jan Luebbe
2012-08-07 16:29 ` Jan Luebbe
2012-08-08 14:23 ` Tony Lindgren
2012-08-08 14:23 ` Tony Lindgren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.