Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 971b8a9c authored Jul 05, 2012 by Vaibhav Hiremath Committed by Tony Lindgren Jul 05, 2012

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>

parent 1c213ba1

arch/arm/mach-omap2/clock3xxx_data.c

+1 −1

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

arch/arm/mach-omap2/id.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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";

arch/arm/plat-omap/include/plat/cpu.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -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)

arch/arm/plat-omap/sram.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();