diff options
| author | Vaibhav Hiremath <hvaibhav@ti.com> | 2012-07-05 08:05:15 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-07-05 08:05:15 -0700 |
| commit | 971b8a9c3eeb798f6201299728fdbb04ebb681c6 (patch) | |
| tree | a603e81825f64cf494e13f542614c263c0455b21 /arch/arm/plat-omap | |
| parent | 1c213ba16ed8f48fc12dfec8a588d608ffef0904 (diff) | |
| download | blackbird-op-linux-971b8a9c3eeb798f6201299728fdbb04ebb681c6.tar.gz blackbird-op-linux-971b8a9c3eeb798f6201299728fdbb04ebb681c6.zip | |
ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
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>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/cpu.h | 12 | ||||
| -rw-r--r-- | arch/arm/plat-omap/sram.c | 4 |
2 files changed, 8 insertions, 8 deletions
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) #define cpu_is_ti816x() 0 #define cpu_is_ti814x() 0 #define soc_is_am35xx() 0 -#define cpu_is_am33xx() 0 -#define cpu_is_am335x() 0 +#define soc_is_am33xx() 0 +#define soc_is_am335x() 0 #define cpu_is_omap44xx() 0 #define cpu_is_omap443x() 0 #define cpu_is_omap446x() 0 @@ -354,10 +354,10 @@ IS_OMAP_TYPE(3430, 0x3430) #endif # if defined(CONFIG_SOC_AM33XX) -# undef cpu_is_am33xx -# undef cpu_is_am335x -# define cpu_is_am33xx() is_am33xx() -# define cpu_is_am335x() is_am335x() +# undef soc_is_am33xx +# undef soc_is_am335x +# define soc_is_am33xx() is_am33xx() +# define soc_is_am335x() is_am335x() #endif # 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) omap_sram_size = 0x800; /* 2K */ } } else { - if (cpu_is_am33xx()) { + if (soc_is_am33xx()) { omap_sram_start = AM33XX_SRAM_PA; omap_sram_size = 0x10000; /* 64K */ } else if (cpu_is_omap34xx()) { @@ -386,7 +386,7 @@ int __init omap_sram_init(void) omap242x_sram_init(); else if (cpu_is_omap2430()) omap243x_sram_init(); - else if (cpu_is_am33xx()) + else if (soc_is_am33xx()) am33xx_sram_init(); else if (cpu_is_omap34xx()) omap34xx_sram_init(); |
