aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/clock3xxx_data.c2
-rw-r--r--arch/arm/mach-omap2/id.c4
-rw-r--r--arch/arm/plat-omap/include/plat/cpu.h12
-rw-r--r--arch/arm/plat-omap/sram.c4
4 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 71a1d3383807..7300982a8e0e 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3491,7 +3491,7 @@ int __init omap3xxx_clk_init(void)
3491 } else if (cpu_is_ti816x()) { 3491 } else if (cpu_is_ti816x()) {
3492 cpu_mask = RATE_IN_TI816X; 3492 cpu_mask = RATE_IN_TI816X;
3493 cpu_clkflg = CK_TI816X; 3493 cpu_clkflg = CK_TI816X;
3494 } else if (cpu_is_am33xx()) { 3494 } else if (soc_is_am33xx()) {
3495 cpu_mask = RATE_IN_AM33XX; 3495 cpu_mask = RATE_IN_AM33XX;
3496 } else if (cpu_is_ti814x()) { 3496 } else if (cpu_is_ti814x()) {
3497 cpu_mask = RATE_IN_TI814X; 3497 cpu_mask = RATE_IN_TI814X;
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 00486a8564fd..37eb95aaf2f6 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -44,7 +44,7 @@ int omap_type(void)
44 44
45 if (cpu_is_omap24xx()) { 45 if (cpu_is_omap24xx()) {
46 val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS); 46 val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
47 } else if (cpu_is_am33xx()) { 47 } else if (soc_is_am33xx()) {
48 val = omap_ctrl_readl(AM33XX_CONTROL_STATUS); 48 val = omap_ctrl_readl(AM33XX_CONTROL_STATUS);
49 } else if (cpu_is_omap34xx()) { 49 } else if (cpu_is_omap34xx()) {
50 val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS); 50 val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
@@ -189,7 +189,7 @@ static void __init omap3_cpuinfo(void)
189 cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505"; 189 cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";
190 } else if (cpu_is_ti816x()) { 190 } else if (cpu_is_ti816x()) {
191 cpu_name = "TI816X"; 191 cpu_name = "TI816X";
192 } else if (cpu_is_am335x()) { 192 } else if (soc_is_am335x()) {
193 cpu_name = "AM335X"; 193 cpu_name = "AM335X";
194 } else if (cpu_is_ti814x()) { 194 } else if (cpu_is_ti814x()) {
195 cpu_name = "TI814X"; 195 cpu_name = "TI814X";
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 4f9d60192ef4..14f050f7a897 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -150,8 +150,8 @@ IS_AM_SUBCLASS(335x, 0x335)
150#define cpu_is_ti816x() 0 150#define cpu_is_ti816x() 0
151#define cpu_is_ti814x() 0 151#define cpu_is_ti814x() 0
152#define soc_is_am35xx() 0 152#define soc_is_am35xx() 0
153#define cpu_is_am33xx() 0 153#define soc_is_am33xx() 0
154#define cpu_is_am335x() 0 154#define soc_is_am335x() 0
155#define cpu_is_omap44xx() 0 155#define cpu_is_omap44xx() 0
156#define cpu_is_omap443x() 0 156#define cpu_is_omap443x() 0
157#define cpu_is_omap446x() 0 157#define cpu_is_omap446x() 0
@@ -354,10 +354,10 @@ IS_OMAP_TYPE(3430, 0x3430)
354#endif 354#endif
355 355
356# if defined(CONFIG_SOC_AM33XX) 356# if defined(CONFIG_SOC_AM33XX)
357# undef cpu_is_am33xx 357# undef soc_is_am33xx
358# undef cpu_is_am335x 358# undef soc_is_am335x
359# define cpu_is_am33xx() is_am33xx() 359# define soc_is_am33xx() is_am33xx()
360# define cpu_is_am335x() is_am335x() 360# define soc_is_am335x() is_am335x()
361#endif 361#endif
362 362
363# if defined(CONFIG_ARCH_OMAP4) 363# if defined(CONFIG_ARCH_OMAP4)
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 564cb4c84b11..70cf825bdd87 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -123,7 +123,7 @@ static void __init omap_detect_sram(void)
123 omap_sram_size = 0x800; /* 2K */ 123 omap_sram_size = 0x800; /* 2K */
124 } 124 }
125 } else { 125 } else {
126 if (cpu_is_am33xx()) { 126 if (soc_is_am33xx()) {
127 omap_sram_start = AM33XX_SRAM_PA; 127 omap_sram_start = AM33XX_SRAM_PA;
128 omap_sram_size = 0x10000; /* 64K */ 128 omap_sram_size = 0x10000; /* 64K */
129 } else if (cpu_is_omap34xx()) { 129 } else if (cpu_is_omap34xx()) {
@@ -386,7 +386,7 @@ int __init omap_sram_init(void)
386 omap242x_sram_init(); 386 omap242x_sram_init();
387 else if (cpu_is_omap2430()) 387 else if (cpu_is_omap2430())
388 omap243x_sram_init(); 388 omap243x_sram_init();
389 else if (cpu_is_am33xx()) 389 else if (soc_is_am33xx())
390 am33xx_sram_init(); 390 am33xx_sram_init();
391 else if (cpu_is_omap34xx()) 391 else if (cpu_is_omap34xx())
392 omap34xx_sram_init(); 392 omap34xx_sram_init();