Skip to contentSkip to conversation

AM35xx: Update the macro names

PATCH New Sanjeev Premi 1 participant 1 message Dec 9, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 AM35xx: Update the macro names

Devices AM3505 and AM3517 will be more commonly available. Also, with more devices planned in this family, it is better to rename the macros to follow cpu_is_amXXX() naming.

---
 arch/arm/mach-omap2/id.c              |    6 +++---
 arch/arm/plat-omap/include/plat/cpu.h |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/id.c +3 -3
index 4fad192..d1bd8ba 100644
@@ -233,7 +233,7 @@ void __init omap3_check_revision(void)
 	case 0xb868:
 		/* Handle OMAP35xx/AM35xx devices
 		 *
-		 * Set the device to be OMAP3505 here. Actual device
+		 * Set the device to be AM3505/OMAP3505 here. Actual device
 		 * is identified later based on the features.
 		 */
 		omap_revision = OMAP3505_REV(rev);
@@ -263,7 +263,7 @@ void __init omap3_cpuinfo(void)
 	 */
 	if (cpu_is_omap3630()) {
 		strcpy(cpu_name, "OMAP3630");
-	} else if (cpu_is_omap3505()) {
+	} else if (cpu_is_am3505()) {
 		/*
 		 * AM35xx devices
 		 */
@@ -352,7 +352,7 @@ void __init omap2_check_revision(void)
 	} else if (cpu_is_omap242x()) {
 		/* Currently only supports 2420ES2.1.1 and 2420-all */
 		omap_chip.oc |= CHIP_IS_OMAP2420;
-	} else if (cpu_is_omap3505() || cpu_is_omap3517()) {
+	} else if (cpu_is_am3505() || cpu_is_am3517()) {
 		omap_chip.oc = CHIP_IS_OMAP3430 | CHIP_IS_OMAP3430ES3_1;
 	} else if (cpu_is_omap343x()) {
 		omap_chip.oc = CHIP_IS_OMAP3430;
arch/arm/plat-omap/include/plat/cpu.h +2 -2
index 2e17890..8dd8801 100644
@@ -399,8 +399,8 @@ IS_OMAP_TYPE(3517, 0x3517)
 						(omap3_has_sgx()) &&	\
 						(!omap3_has_iva()))
 # define cpu_is_omap3530()		(cpu_is_omap3430())
-# define cpu_is_omap3505()		is_omap3505()
-# define cpu_is_omap3517()		is_omap3517()
+# define cpu_is_am3505()		is_omap3505()
+# define cpu_is_am3517()		is_omap3517()
 # undef cpu_is_omap3630
 # define cpu_is_omap3630()		is_omap363x()
 #endif
Signature · 1 line
1.6.2.2