Commit 59b479e0 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Start using CONFIG_SOC_OMAP 



We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest
are nowadays just subcategories of these.

Search and replace the following:

ARCH_OMAP2420		SOC_OMAP2420
ARCH_OMAP2430		SOC_OMAP2430
ARCH_OMAP3430		SOC_OMAP3430

No functional changes.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarThomas Weber <weber@corscience.de>
Acked-by: default avatarSourav Poddar <sourav.poddar@ti.com>
parent 0e6d8cad

arch/arm/mach-omap2/Kconfig

+8 −8
Original line number Diff line number Diff line
@@ -53,20 +53,20 @@ config ARCH_OMAP4 
comment "OMAP Core Type"

	depends on ARCH_OMAP2



config ARCH_OMAP2420

config SOC_OMAP2420

	bool "OMAP2420 support"

	depends on ARCH_OMAP2

	default y

	select OMAP_DM_TIMER

	select ARCH_OMAP_OTG



config ARCH_OMAP2430

config SOC_OMAP2430

	bool "OMAP2430 support"

	depends on ARCH_OMAP2

	default y

	select ARCH_OMAP_OTG



config ARCH_OMAP3430

config SOC_OMAP3430

	bool "OMAP3430 support"

	depends on ARCH_OMAP3

	default y
@@ -106,25 +106,25 @@ config MACH_OMAP_GENERIC 


config MACH_OMAP2_TUSB6010

	bool

	depends on ARCH_OMAP2 && ARCH_OMAP2420

	depends on ARCH_OMAP2 && SOC_OMAP2420

	default y if MACH_NOKIA_N8X0



config MACH_OMAP_H4

	bool "OMAP 2420 H4 board"

	depends on ARCH_OMAP2420

	depends on SOC_OMAP2420

	default y

	select OMAP_PACKAGE_ZAF

	select OMAP_DEBUG_DEVICES



config MACH_OMAP_APOLLON

	bool "OMAP 2420 Apollon board"

	depends on ARCH_OMAP2420

	depends on SOC_OMAP2420

	default y

	select OMAP_PACKAGE_ZAC



config MACH_OMAP_2430SDP

	bool "OMAP 2430 SDP board"

	depends on ARCH_OMAP2430

	depends on SOC_OMAP2430

	default y

	select OMAP_PACKAGE_ZAC
@@ -219,7 +219,7 @@ config MACH_NOKIA_N810_WIMAX 


config MACH_NOKIA_N8X0

	bool "Nokia N800/N810"

	depends on ARCH_OMAP2420

	depends on SOC_OMAP2420

	default y

	select OMAP_PACKAGE_ZAC

	select MACH_NOKIA_N800

arch/arm/mach-omap2/Makefile

+10 −10
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec) 
AFLAGS_omap44xx-smc.o			:=-Wa,-march=armv7-a$(plus_sec)



# Functions loaded to SRAM

obj-$(CONFIG_ARCH_OMAP2420)		+= sram242x.o

obj-$(CONFIG_ARCH_OMAP2430)		+= sram243x.o

obj-$(CONFIG_SOC_OMAP2420)		+= sram242x.o

obj-$(CONFIG_SOC_OMAP2430)		+= sram243x.o

obj-$(CONFIG_ARCH_OMAP3)		+= sram34xx.o



AFLAGS_sram242x.o			:=-Wa,-march=armv6
@@ -40,8 +40,8 @@ AFLAGS_sram243x.o :=-Wa,-march=armv6 
AFLAGS_sram34xx.o			:=-Wa,-march=armv7-a



# Pin multiplexing

obj-$(CONFIG_ARCH_OMAP2420)		+= mux2420.o

obj-$(CONFIG_ARCH_OMAP2430)		+= mux2430.o

obj-$(CONFIG_SOC_OMAP2420)		+= mux2420.o

obj-$(CONFIG_SOC_OMAP2430)		+= mux2430.o

obj-$(CONFIG_ARCH_OMAP3)		+= mux34xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= mux44xx.o
@@ -113,8 +113,8 @@ obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o \ 
					   clkt2xxx_dpllcore.o \

					   clkt2xxx_virt_prcm_set.o \

					   clkt2xxx_apll.o clkt2xxx_osc.o

obj-$(CONFIG_ARCH_OMAP2420)		+= clock2420_data.o

obj-$(CONFIG_ARCH_OMAP2430)		+= clock2430.o clock2430_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= clock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o clock2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o \

					   clock34xx.o clkt34xx_dpll3m2.o \

					   clock3517.o clock36xx.o \
@@ -123,12 +123,12 @@ obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o \ 
					   dpll3xxx.o



# OMAP2 clock rate set data (old "OPP" data)

obj-$(CONFIG_ARCH_OMAP2420)		+= opp2420_data.o

obj-$(CONFIG_ARCH_OMAP2430)		+= opp2430_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= opp2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= opp2430_data.o



# hwmod data

obj-$(CONFIG_ARCH_OMAP2420)		+= omap_hwmod_2420_data.o

obj-$(CONFIG_ARCH_OMAP2430)		+= omap_hwmod_2430_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap_hwmod_2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap_hwmod_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap_hwmod_44xx_data.o

arch/arm/mach-omap2/clock2xxx.h

+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ u32 omap2xxx_get_apll_clkin(void); 
u32 omap2xxx_get_sysclkdiv(void);

void omap2xxx_clk_prepare_for_reboot(void);



#ifdef CONFIG_ARCH_OMAP2420

#ifdef CONFIG_SOC_OMAP2420

int omap2420_clk_init(void);

#else

#define omap2420_clk_init()	0

#endif



#ifdef CONFIG_ARCH_OMAP2430

#ifdef CONFIG_SOC_OMAP2430

int omap2430_clk_init(void);

#else

#define omap2430_clk_init()	0

arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c

+8 −8
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static struct clkdm_dep core_24xx_wkdeps[] = { 


/* 2430-specific possible wakeup dependencies */



#ifdef CONFIG_ARCH_OMAP2430

#ifdef CONFIG_SOC_OMAP2430



/* 2430 PM_WKDEP_MDM: CORE, MPU, WKUP */

static struct clkdm_dep mdm_2430_wkdeps[] = {
@@ -194,7 +194,7 @@ static struct clkdm_dep mdm_2430_wkdeps[] = { 
	{ NULL },

};



#endif /* CONFIG_ARCH_OMAP2430 */

#endif /* CONFIG_SOC_OMAP2430 */





/* OMAP3-specific possible dependencies */
@@ -450,7 +450,7 @@ static struct clockdomain cm_clkdm = { 
 * 2420-only clockdomains

 */



#if defined(CONFIG_ARCH_OMAP2420)

#if defined(CONFIG_SOC_OMAP2420)



static struct clockdomain mpu_2420_clkdm = {

	.name		= "mpu_clkdm",
@@ -514,14 +514,14 @@ static struct clockdomain dss_2420_clkdm = { 
	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



#endif   /* CONFIG_ARCH_OMAP2420 */

#endif   /* CONFIG_SOC_OMAP2420 */





/*

 * 2430-only clockdomains

 */



#if defined(CONFIG_ARCH_OMAP2430)

#if defined(CONFIG_SOC_OMAP2430)



static struct clockdomain mpu_2430_clkdm = {

	.name		= "mpu_clkdm",
@@ -600,7 +600,7 @@ static struct clockdomain dss_2430_clkdm = { 
	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



#endif    /* CONFIG_ARCH_OMAP2430 */

#endif    /* CONFIG_SOC_OMAP2430 */





/*
@@ -811,7 +811,7 @@ static struct clockdomain *clockdomains_omap2[] __initdata = { 
	&cm_clkdm,

	&prm_clkdm,



#ifdef CONFIG_ARCH_OMAP2420

#ifdef CONFIG_SOC_OMAP2420

	&mpu_2420_clkdm,

	&iva1_2420_clkdm,

	&dsp_2420_clkdm,
@@ -821,7 +821,7 @@ static struct clockdomain *clockdomains_omap2[] __initdata = { 
	&dss_2420_clkdm,

#endif



#ifdef CONFIG_ARCH_OMAP2430

#ifdef CONFIG_SOC_OMAP2430

	&mpu_2430_clkdm,

	&mdm_clkdm,

	&dsp_2430_clkdm,

arch/arm/mach-omap2/common.c

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static void __init __omap2_set_globals(struct omap_globals *omap2_globals) 


#endif



#if defined(CONFIG_ARCH_OMAP2420)

#if defined(CONFIG_SOC_OMAP2420)



static struct omap_globals omap242x_globals = {

	.class	= OMAP242X_CLASS,
@@ -61,7 +61,7 @@ void __init omap2_set_globals_242x(void) 
}

#endif



#if defined(CONFIG_ARCH_OMAP2430)

#if defined(CONFIG_SOC_OMAP2430)



static struct omap_globals omap243x_globals = {

	.class	= OMAP243X_CLASS,

CRA Git | Maintained and supported by SUSTech CRA and CCSE