AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx

Browse Source 
As per recent discussion on the linux-omap list, we are
moving in the direction where, we will have only architecture,
ARCH_OMAP2PLUS and all devices/platforms will be treated
as a SoC underneath.

So the first step in this direction is to adopt this change
for all new devices getting in, converting
cpu_is_am33xx/335x() ==> soc_is_am33xx/335x()

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Vaibhav Hiremath 2012-07-05 08:05:15 -07:00 committed by Tony Lindgren
parent 1c213ba16e
commit 971b8a9c3e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/clock3xxx_data.c
View File

@ -3491,7 +3491,7 @@ int __init omap3xxx_clk_init(void)
} else if (cpu_is_ti816x()) { } else if (cpu_is_ti816x()) {
cpu_mask = RATE_IN_TI816X; cpu_mask = RATE_IN_TI816X;
cpu_clkflg = CK_TI816X; cpu_clkflg = CK_TI816X;
} else if (cpu_is_am33xx()) { } else if (soc_is_am33xx()) {
cpu_mask = RATE_IN_AM33XX; cpu_mask = RATE_IN_AM33XX;
} else if (cpu_is_ti814x()) { } else if (cpu_is_ti814x()) {
cpu_mask = RATE_IN_TI814X; cpu_mask = RATE_IN_TI814X;

4
arch/arm/mach-omap2/id.c
View File

@ -44,7 +44,7 @@ int omap_type(void)
if (cpu_is_omap24xx()) { if (cpu_is_omap24xx()) {
val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS); val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
} else if (cpu_is_am33xx()) { } else if (soc_is_am33xx()) {
val = omap_ctrl_readl(AM33XX_CONTROL_STATUS); val = omap_ctrl_readl(AM33XX_CONTROL_STATUS);
} else if (cpu_is_omap34xx()) { } else if (cpu_is_omap34xx()) {
val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS); val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
@ -189,7 +189,7 @@ static void __init omap3_cpuinfo(void)
cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505"; cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";
} else if (cpu_is_ti816x()) { } else if (cpu_is_ti816x()) {
cpu_name = "TI816X"; cpu_name = "TI816X";
} else if (cpu_is_am335x()) { } else if (soc_is_am335x()) {
cpu_name = "AM335X"; cpu_name = "AM335X";
} else if (cpu_is_ti814x()) { } else if (cpu_is_ti814x()) {
cpu_name = "TI814X"; cpu_name = "TI814X";

12
arch/arm/plat-omap/include/plat/cpu.h
View File

@ -150,8 +150,8 @@ IS_AM_SUBCLASS(335x, 0x335)
#define cpu_is_ti816x() 0 #define cpu_is_ti816x() 0
#define cpu_is_ti814x() 0 #define cpu_is_ti814x() 0
#define soc_is_am35xx() 0 #define soc_is_am35xx() 0
#define cpu_is_am33xx() 0 #define soc_is_am33xx() 0
#define cpu_is_am335x() 0 #define soc_is_am335x() 0
#define cpu_is_omap44xx() 0 #define cpu_is_omap44xx() 0
#define cpu_is_omap443x() 0 #define cpu_is_omap443x() 0
#define cpu_is_omap446x() 0 #define cpu_is_omap446x() 0
@ -354,10 +354,10 @@ IS_OMAP_TYPE(3430, 0x3430)
#endif #endif
# if defined(CONFIG_SOC_AM33XX) # if defined(CONFIG_SOC_AM33XX)
# undef cpu_is_am33xx # undef soc_is_am33xx
# undef cpu_is_am335x # undef soc_is_am335x
# define cpu_is_am33xx() is_am33xx() # define soc_is_am33xx() is_am33xx()
# define cpu_is_am335x() is_am335x() # define soc_is_am335x() is_am335x()
#endif #endif
# if defined(CONFIG_ARCH_OMAP4) # if defined(CONFIG_ARCH_OMAP4)

4
arch/arm/plat-omap/sram.c
View File

@ -123,7 +123,7 @@ static void __init omap_detect_sram(void)
omap_sram_size = 0x800; /* 2K */ omap_sram_size = 0x800; /* 2K */
} }
} else { } else {
if (cpu_is_am33xx()) { if (soc_is_am33xx()) {
omap_sram_start = AM33XX_SRAM_PA; omap_sram_start = AM33XX_SRAM_PA;
omap_sram_size = 0x10000; /* 64K */ omap_sram_size = 0x10000; /* 64K */
} else if (cpu_is_omap34xx()) { } else if (cpu_is_omap34xx()) {
@ -386,7 +386,7 @@ int __init omap_sram_init(void)
omap242x_sram_init(); omap242x_sram_init();
else if (cpu_is_omap2430()) else if (cpu_is_omap2430())
omap243x_sram_init(); omap243x_sram_init();
else if (cpu_is_am33xx()) else if (soc_is_am33xx())
am33xx_sram_init(); am33xx_sram_init();
else if (cpu_is_omap34xx()) else if (cpu_is_omap34xx())
omap34xx_sram_init(); omap34xx_sram_init();