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

Commit 088ef950 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2 



Convert ARCH_OMAP24XX to ARCH_OMAP2

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d10f2b6e

arch/arm/mach-omap2/Kconfig

+6 −10
Original line number Diff line number Diff line 
comment "OMAP Core Type"

	depends on ARCH_OMAP2



config ARCH_OMAP24XX

	bool "OMAP24xx Based System"

	depends on ARCH_OMAP2



config ARCH_OMAP2420

	bool "OMAP2420 support"

	depends on ARCH_OMAP24XX

	depends on ARCH_OMAP2

	select OMAP_DM_TIMER

	select ARCH_OMAP_OTG



config ARCH_OMAP2430

	bool "OMAP2430 support"

	depends on ARCH_OMAP24XX

	depends on ARCH_OMAP2



config ARCH_OMAP34XX

	bool "OMAP34xx Based System"
@@ -42,7 +38,7 @@ comment "OMAP Board Type" 


config MACH_OMAP_GENERIC

	bool "Generic OMAP board"

	depends on ARCH_OMAP2 && ARCH_OMAP24XX

	depends on ARCH_OMAP2



config MACH_OMAP2_TUSB6010

	bool
@@ -51,16 +47,16 @@ config MACH_OMAP2_TUSB6010 


config MACH_OMAP_H4

	bool "OMAP 2420 H4 board"

	depends on ARCH_OMAP2 && ARCH_OMAP24XX

	depends on ARCH_OMAP2

	select OMAP_DEBUG_DEVICES



config MACH_OMAP_APOLLON

	bool "OMAP 2420 Apollon board"

	depends on ARCH_OMAP2 && ARCH_OMAP24XX

	depends on ARCH_OMAP2



config MACH_OMAP_2430SDP

	bool "OMAP 2430 SDP board"

	depends on ARCH_OMAP2 && ARCH_OMAP24XX

	depends on ARCH_OMAP2



config MACH_OMAP3_BEAGLE

	bool "OMAP3 BEAGLE board"

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o 
# Power Management

ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o

obj-$(CONFIG_ARCH_OMAP24XX)		+= sleep24xx.o

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o cpuidle34xx.o

obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o

arch/arm/mach-omap2/clock.h

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ extern const struct clksel_rate gpt_32k_rates[]; 
extern const struct clksel_rate gpt_sys_rates[];

extern const struct clksel_rate gfx_l3_rates[];



#if defined(CONFIG_ARCH_OMAP24XX) && defined(CONFIG_CPU_FREQ)

#if defined(CONFIG_ARCH_OMAP2) && defined(CONFIG_CPU_FREQ)

extern void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table);

extern void omap2_clk_exit_cpufreq_table(struct cpufreq_frequency_table **table);

#else

arch/arm/mach-omap2/clockdomains.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static struct clkdm_dep gfx_sgx_wkdeps[] = { 


/* 24XX-specific possible dependencies */



#ifdef CONFIG_ARCH_OMAP24XX

#ifdef CONFIG_ARCH_OMAP2



/* Wakeup dependency source arrays */

arch/arm/mach-omap2/io.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
 * default mapping provided here.

 */



#ifdef CONFIG_ARCH_OMAP24XX

#ifdef CONFIG_ARCH_OMAP2

static struct map_desc omap24xx_io_desc[] __initdata = {

	{

		.virtual	= L3_24XX_VIRT,