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/mach-omap2/id.c | |
| parent | 1c213ba16ed8f48fc12dfec8a588d608ffef0904 (diff) | |
| download | linux-stable-971b8a9c3eeb798f6201299728fdbb04ebb681c6.tar.gz linux-stable-971b8a9c3eeb798f6201299728fdbb04ebb681c6.tar.bz2 linux-stable-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/mach-omap2/id.c')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) if (cpu_is_omap24xx()) { val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS); - } else if (cpu_is_am33xx()) { + } else if (soc_is_am33xx()) { val = omap_ctrl_readl(AM33XX_CONTROL_STATUS); } else if (cpu_is_omap34xx()) { val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS); @@ -189,7 +189,7 @@ static void __init omap3_cpuinfo(void) cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505"; } else if (cpu_is_ti816x()) { cpu_name = "TI816X"; - } else if (cpu_is_am335x()) { + } else if (soc_is_am335x()) { cpu_name = "AM335X"; } else if (cpu_is_ti814x()) { cpu_name = "TI814X"; |