Skip to contentSkip to conversation

ARM: OMAP2+: id: Add am33xx SoC type detection

PATCH New Afzal Mohammed 2 participants 2 messages Feb 13, 2012 – Mar 5, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Afzal Mohammed

author
#0 lore raw

PATCH v2 1/2 ARM: OMAP2+: id: Add am33xx SoC type detection

Determine SoC type, i.e. whether GP or HS

Note: cpu_is_34xx() is true for am33xx also. Doing cpu_is_am33xx() check after cpu_is_34xx() will not achieve what we want due to the above reason. Hence cpu_is_am33xx() is done before cpu_is_34xx()

Signed-off-by Afzal Mohammed <[email protected]>
Signed-off-by Vaibhav Hiremath <[email protected]>

---

v2: Use OMAP naming conventions for subject

 arch/arm/mach-omap2/control.h |    5 +++++
 arch/arm/mach-omap2/id.c      |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/control.h +5 -0
index 0ba68d3..96c4bcc 100644
@@ -339,6 +339,11 @@
 #define AM35XX_VPFE_PCLK_SW_RST		BIT(4)
 
 /*
+ * CONTROL AM33XX STATUS register
+ */
+#define AM33XX_CONTROL_STATUS		0x040
+
+/*
  * CONTROL OMAP STATUS register to identify OMAP3 features
  */
 #define OMAP3_CONTROL_OMAP_STATUS	0x044c
arch/arm/mach-omap2/id.c +2 -0
index 92e4d55..2879c7b 100644
@@ -44,6 +44,8 @@ int omap_type(void)
 
 	if (cpu_is_omap24xx()) {
 		val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
+	} else if (cpu_is_am33xx()) {
+		val = omap_ctrl_readl(AM33XX_CONTROL_STATUS);
 	} else if (cpu_is_omap34xx()) {
 		val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
 	} else if (cpu_is_omap44xx()) {
Signature · 1 line
1.7.1
maintainer
#1 lore raw

PATCH v2 1/2 ARM: OMAP2+: id: Add am33xx SoC type detection

Quoted 6 lines · Afzal Mohammed

Determine SoC type, i.e. whether GP or HS

Note: cpu_is_34xx() is true for am33xx also. Doing cpu_is_am33xx() check after cpu_is_34xx() will not achieve what we want due to the above reason. Hence cpu_is_am33xx() is done before cpu_is_34xx()

Thanks, applying into fixes-non-critical-part2.

Tony