public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

omap: Start using CONFIG_SOC_OMAP

Browse source 
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: Tony Lindgren <tony@atomide.com>
Signed-off-by: Thomas Weber <weber@corscience.de>
Acked-by: Sourav Poddar <sourav.poddar@ti.com>
This commit is contained in:
Tony Lindgren 2011-01-27 16:39:40 -08:00
parent 0e6d8cad44
commit 59b479e098
24 changed files with 71 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arch/arm/mach-omap2/Kconfig
View file

@ -53,20 +53,20 @@ config ARCH_OMAP4
comment "OMAP Core Type" comment "OMAP Core Type"
depends on ARCH_OMAP2 depends on ARCH_OMAP2
config ARCH_OMAP2420 config SOC_OMAP2420
bool "OMAP2420 support" bool "OMAP2420 support"
depends on ARCH_OMAP2 depends on ARCH_OMAP2
default y default y
select OMAP_DM_TIMER select OMAP_DM_TIMER
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
config ARCH_OMAP2430 config SOC_OMAP2430
bool "OMAP2430 support" bool "OMAP2430 support"
depends on ARCH_OMAP2 depends on ARCH_OMAP2
default y default y
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
config ARCH_OMAP3430 config SOC_OMAP3430
bool "OMAP3430 support" bool "OMAP3430 support"
depends on ARCH_OMAP3 depends on ARCH_OMAP3
default y default y
@ -106,25 +106,25 @@ config MACH_OMAP_GENERIC
config MACH_OMAP2_TUSB6010 config MACH_OMAP2_TUSB6010
bool bool
depends on ARCH_OMAP2 && ARCH_OMAP2420 depends on ARCH_OMAP2 && SOC_OMAP2420
default y if MACH_NOKIA_N8X0 default y if MACH_NOKIA_N8X0
config MACH_OMAP_H4 config MACH_OMAP_H4
bool "OMAP 2420 H4 board" bool "OMAP 2420 H4 board"
depends on ARCH_OMAP2420 depends on SOC_OMAP2420
default y default y
select OMAP_PACKAGE_ZAF select OMAP_PACKAGE_ZAF
select OMAP_DEBUG_DEVICES select OMAP_DEBUG_DEVICES
config MACH_OMAP_APOLLON config MACH_OMAP_APOLLON
bool "OMAP 2420 Apollon board" bool "OMAP 2420 Apollon board"
depends on ARCH_OMAP2420 depends on SOC_OMAP2420
default y default y
select OMAP_PACKAGE_ZAC select OMAP_PACKAGE_ZAC
config MACH_OMAP_2430SDP config MACH_OMAP_2430SDP
bool "OMAP 2430 SDP board" bool "OMAP 2430 SDP board"
depends on ARCH_OMAP2430 depends on SOC_OMAP2430
default y default y
select OMAP_PACKAGE_ZAC select OMAP_PACKAGE_ZAC
@ -219,7 +219,7 @@ config MACH_NOKIA_N810_WIMAX
config MACH_NOKIA_N8X0 config MACH_NOKIA_N8X0
bool "Nokia N800/N810" bool "Nokia N800/N810"
depends on ARCH_OMAP2420 depends on SOC_OMAP2420
default y default y
select OMAP_PACKAGE_ZAC select OMAP_PACKAGE_ZAC
select MACH_NOKIA_N800 select MACH_NOKIA_N800

20
arch/arm/mach-omap2/Makefile
View file

@ -31,8 +31,8 @@ AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec)
AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a$(plus_sec) AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a$(plus_sec)
# Functions loaded to SRAM # Functions loaded to SRAM
obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o obj-$(CONFIG_SOC_OMAP2420) += sram242x.o
obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o obj-$(CONFIG_SOC_OMAP2430) += sram243x.o
obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o
AFLAGS_sram242x.o :=-Wa,-march=armv6 AFLAGS_sram242x.o :=-Wa,-march=armv6
@ -40,8 +40,8 @@ AFLAGS_sram243x.o :=-Wa,-march=armv6
AFLAGS_sram34xx.o :=-Wa,-march=armv7-a AFLAGS_sram34xx.o :=-Wa,-march=armv7-a
# Pin multiplexing # Pin multiplexing
obj-$(CONFIG_ARCH_OMAP2420) += mux2420.o obj-$(CONFIG_SOC_OMAP2420) += mux2420.o
obj-$(CONFIG_ARCH_OMAP2430) += mux2430.o obj-$(CONFIG_SOC_OMAP2430) += mux2430.o
obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o
obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o
@ -113,8 +113,8 @@ obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o \
clkt2xxx_dpllcore.o \ clkt2xxx_dpllcore.o \
clkt2xxx_virt_prcm_set.o \ clkt2xxx_virt_prcm_set.o \
clkt2xxx_apll.o clkt2xxx_osc.o clkt2xxx_apll.o clkt2xxx_osc.o
obj-$(CONFIG_ARCH_OMAP2420) += clock2420_data.o obj-$(CONFIG_SOC_OMAP2420) += clock2420_data.o
obj-$(CONFIG_ARCH_OMAP2430) += clock2430.o clock2430_data.o obj-$(CONFIG_SOC_OMAP2430) += clock2430.o clock2430_data.o
obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o \ obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o \
clock34xx.o clkt34xx_dpll3m2.o \ clock34xx.o clkt34xx_dpll3m2.o \
clock3517.o clock36xx.o \ clock3517.o clock36xx.o \
@ -123,12 +123,12 @@ obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o \
dpll3xxx.o dpll3xxx.o
# OMAP2 clock rate set data (old "OPP" data) # OMAP2 clock rate set data (old "OPP" data)
obj-$(CONFIG_ARCH_OMAP2420) += opp2420_data.o obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o
obj-$(CONFIG_ARCH_OMAP2430) += opp2430_data.o obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o
# hwmod data # hwmod data
obj-$(CONFIG_ARCH_OMAP2420) += omap_hwmod_2420_data.o obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2420_data.o
obj-$(CONFIG_ARCH_OMAP2430) += omap_hwmod_2430_data.o obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2430_data.o
obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o
obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o

4
arch/arm/mach-omap2/clock2xxx.h
View file

@ -20,13 +20,13 @@ u32 omap2xxx_get_apll_clkin(void);
u32 omap2xxx_get_sysclkdiv(void); u32 omap2xxx_get_sysclkdiv(void);
void omap2xxx_clk_prepare_for_reboot(void); void omap2xxx_clk_prepare_for_reboot(void);
#ifdef CONFIG_ARCH_OMAP2420 #ifdef CONFIG_SOC_OMAP2420
int omap2420_clk_init(void); int omap2420_clk_init(void);
#else #else
#define omap2420_clk_init() 0 #define omap2420_clk_init() 0
#endif #endif
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
int omap2430_clk_init(void); int omap2430_clk_init(void);
#else #else
#define omap2430_clk_init() 0 #define omap2430_clk_init() 0

16
arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
View file

@ -171,7 +171,7 @@ static struct clkdm_dep core_24xx_wkdeps[] = {
/* 2430-specific possible wakeup dependencies */ /* 2430-specific possible wakeup dependencies */
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
/* 2430 PM_WKDEP_MDM: CORE, MPU, WKUP */ /* 2430 PM_WKDEP_MDM: CORE, MPU, WKUP */
static struct clkdm_dep mdm_2430_wkdeps[] = { static struct clkdm_dep mdm_2430_wkdeps[] = {
@ -194,7 +194,7 @@ static struct clkdm_dep mdm_2430_wkdeps[] = {
{ NULL }, { NULL },
}; };
#endif /* CONFIG_ARCH_OMAP2430 */ #endif /* CONFIG_SOC_OMAP2430 */
/* OMAP3-specific possible dependencies */ /* OMAP3-specific possible dependencies */
@ -450,7 +450,7 @@ static struct clockdomain cm_clkdm = {
* 2420-only clockdomains * 2420-only clockdomains
*/ */
#if defined(CONFIG_ARCH_OMAP2420) #if defined(CONFIG_SOC_OMAP2420)
static struct clockdomain mpu_2420_clkdm = { static struct clockdomain mpu_2420_clkdm = {
.name = "mpu_clkdm", .name = "mpu_clkdm",
@ -514,14 +514,14 @@ static struct clockdomain dss_2420_clkdm = {
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420),
}; };
#endif /* CONFIG_ARCH_OMAP2420 */ #endif /* CONFIG_SOC_OMAP2420 */
/* /*
* 2430-only clockdomains * 2430-only clockdomains
*/ */
#if defined(CONFIG_ARCH_OMAP2430) #if defined(CONFIG_SOC_OMAP2430)
static struct clockdomain mpu_2430_clkdm = { static struct clockdomain mpu_2430_clkdm = {
.name = "mpu_clkdm", .name = "mpu_clkdm",
@ -600,7 +600,7 @@ static struct clockdomain dss_2430_clkdm = {
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), .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, &cm_clkdm,
&prm_clkdm, &prm_clkdm,
#ifdef CONFIG_ARCH_OMAP2420 #ifdef CONFIG_SOC_OMAP2420
&mpu_2420_clkdm, &mpu_2420_clkdm,
&iva1_2420_clkdm, &iva1_2420_clkdm,
&dsp_2420_clkdm, &dsp_2420_clkdm,
@ -821,7 +821,7 @@ static struct clockdomain *clockdomains_omap2[] __initdata = {
&dss_2420_clkdm, &dss_2420_clkdm,
#endif #endif
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
&mpu_2430_clkdm, &mpu_2430_clkdm,
&mdm_clkdm, &mdm_clkdm,
&dsp_2430_clkdm, &dsp_2430_clkdm,

4
arch/arm/mach-omap2/common.c
View file

@ -40,7 +40,7 @@ static void __init __omap2_set_globals(struct omap_globals *omap2_globals)
#endif #endif
#if defined(CONFIG_ARCH_OMAP2420) #if defined(CONFIG_SOC_OMAP2420)
static struct omap_globals omap242x_globals = { static struct omap_globals omap242x_globals = {
.class = OMAP242X_CLASS, .class = OMAP242X_CLASS,
@ -61,7 +61,7 @@ void __init omap2_set_globals_242x(void)
} }
#endif #endif
#if defined(CONFIG_ARCH_OMAP2430) #if defined(CONFIG_SOC_OMAP2430)
static struct omap_globals omap243x_globals = { static struct omap_globals omap243x_globals = {
.class = OMAP243X_CLASS, .class = OMAP243X_CLASS,

6
arch/arm/mach-omap2/devices.c
View file

@ -333,7 +333,7 @@ static struct platform_device omap2_mcspi2 = {
}, },
}; };
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
static struct omap2_mcspi_platform_config omap2_mcspi3_config = { static struct omap2_mcspi_platform_config omap2_mcspi3_config = {
.num_cs = 2, .num_cs = 2,
@ -400,7 +400,7 @@ static inline void omap4_mcspi_fixup(void)
} }
#endif #endif
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
static inline void omap2_mcspi3_init(void) static inline void omap2_mcspi3_init(void)
{ {
@ -895,7 +895,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE) #if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE)
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
#define OMAP_HDQ_BASE 0x480B2000 #define OMAP_HDQ_BASE 0x480B2000
#endif #endif
static struct resource omap_hdq_resources[] = { static struct resource omap_hdq_resources[] = {

8
arch/arm/mach-omap2/io.c
View file

@ -66,7 +66,7 @@ static struct map_desc omap24xx_io_desc[] __initdata = {
}, },
}; };
#ifdef CONFIG_ARCH_OMAP2420 #ifdef CONFIG_SOC_OMAP2420
static struct map_desc omap242x_io_desc[] __initdata = { static struct map_desc omap242x_io_desc[] __initdata = {
{ {
.virtual = DSP_MEM_2420_VIRT, .virtual = DSP_MEM_2420_VIRT,
@ -90,7 +90,7 @@ static struct map_desc omap242x_io_desc[] __initdata = {
#endif #endif
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
static struct map_desc omap243x_io_desc[] __initdata = { static struct map_desc omap243x_io_desc[] __initdata = {
{ {
.virtual = L4_WK_243X_VIRT, .virtual = L4_WK_243X_VIRT,
@ -241,7 +241,7 @@ static void __init _omap2_map_common_io(void)
omap_sram_init(); omap_sram_init();
} }
#ifdef CONFIG_ARCH_OMAP2420 #ifdef CONFIG_SOC_OMAP2420
void __init omap242x_map_common_io(void) void __init omap242x_map_common_io(void)
{ {
iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc)); iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
@ -250,7 +250,7 @@ void __init omap242x_map_common_io(void)
} }
#endif #endif
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
void __init omap243x_map_common_io(void) void __init omap243x_map_common_io(void)
{ {
iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc)); iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));

2
arch/arm/mach-omap2/mailbox.c
View file

@ -310,7 +310,7 @@ struct omap_mbox mbox_dsp_info = {
struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL }; struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL };
#endif #endif
#if defined(CONFIG_ARCH_OMAP2420) #if defined(CONFIG_SOC_OMAP2420)
/* IVA */ /* IVA */
static struct omap_mbox2_priv omap2_mbox_iva_priv = { static struct omap_mbox2_priv omap2_mbox_iva_priv = {
.tx_fifo = { .tx_fifo = {

4
arch/arm/mach-omap2/mcbsp.c
View file

@ -104,7 +104,7 @@ EXPORT_SYMBOL(omap2_mcbsp_set_clks_src);
/* Platform data */ /* Platform data */
#ifdef CONFIG_ARCH_OMAP2420 #ifdef CONFIG_SOC_OMAP2420
static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = { static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
{ {
.phys_base = OMAP24XX_MCBSP1_BASE, .phys_base = OMAP24XX_MCBSP1_BASE,
@ -129,7 +129,7 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
#define OMAP2420_MCBSP_REG_NUM 0 #define OMAP2420_MCBSP_REG_NUM 0
#endif #endif
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
{ {
.phys_base = OMAP24XX_MCBSP1_BASE, .phys_base = OMAP24XX_MCBSP1_BASE,

2
arch/arm/mach-omap2/opp2xxx.h
View file

@ -418,7 +418,7 @@ struct prcm_config {
extern const struct prcm_config omap2420_rate_table[]; extern const struct prcm_config omap2420_rate_table[];
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
extern const struct prcm_config omap2430_rate_table[]; extern const struct prcm_config omap2430_rate_table[];
#else #else
#define omap2430_rate_table NULL #define omap2430_rate_table NULL

6
arch/arm/mach-omap2/powerdomains2xxx_data.c
View file

@ -78,7 +78,7 @@ static struct powerdomain core_24xx_pwrdm = {
* 2430-specific powerdomains * 2430-specific powerdomains
*/ */
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
/* XXX 2430 KILLDOMAINWKUP bit? No current users apparently */ /* XXX 2430 KILLDOMAINWKUP bit? No current users apparently */
@ -97,7 +97,7 @@ static struct powerdomain mdm_pwrdm = {
}, },
}; };
#endif /* CONFIG_ARCH_OMAP2430 */ #endif /* CONFIG_SOC_OMAP2430 */
/* As powerdomains are added or removed above, this list must also be changed */ /* As powerdomains are added or removed above, this list must also be changed */
static struct powerdomain *powerdomains_omap2xxx[] __initdata = { static struct powerdomain *powerdomains_omap2xxx[] __initdata = {
@ -111,7 +111,7 @@ static struct powerdomain *powerdomains_omap2xxx[] __initdata = {
&core_24xx_pwrdm, &core_24xx_pwrdm,
#endif #endif
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
&mdm_pwrdm, &mdm_pwrdm,
#endif #endif
NULL NULL

4
arch/arm/plat-omap/counter_32k.c
View file

@ -54,7 +54,7 @@ static cycle_t notrace omap16xx_32k_read(struct clocksource *cs)
#define omap16xx_32k_read NULL #define omap16xx_32k_read NULL
#endif #endif
#ifdef CONFIG_ARCH_OMAP2420 #ifdef CONFIG_SOC_OMAP2420
static cycle_t notrace omap2420_32k_read(struct clocksource *cs) static cycle_t notrace omap2420_32k_read(struct clocksource *cs)
{ {
return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10) - offset_32k; return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10) - offset_32k;
@ -63,7 +63,7 @@ static cycle_t notrace omap2420_32k_read(struct clocksource *cs)
#define omap2420_32k_read NULL #define omap2420_32k_read NULL
#endif #endif
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
static cycle_t notrace omap2430_32k_read(struct clocksource *cs) static cycle_t notrace omap2430_32k_read(struct clocksource *cs)
{ {
return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10) - offset_32k; return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10) - offset_32k;

10
arch/arm/plat-omap/include/plat/cpu.h
View file

@ -170,11 +170,11 @@ IS_OMAP_SUBCLASS(443x, 0x443)
# undef cpu_is_omap24xx # undef cpu_is_omap24xx
# define cpu_is_omap24xx() is_omap24xx() # define cpu_is_omap24xx() is_omap24xx()
# endif # endif
# if defined (CONFIG_ARCH_OMAP2420) # if defined (CONFIG_SOC_OMAP2420)
# undef cpu_is_omap242x # undef cpu_is_omap242x
# define cpu_is_omap242x() is_omap242x() # define cpu_is_omap242x() is_omap242x()
# endif # endif
# if defined (CONFIG_ARCH_OMAP2430) # if defined (CONFIG_SOC_OMAP2430)
# undef cpu_is_omap243x # undef cpu_is_omap243x
# define cpu_is_omap243x() is_omap243x() # define cpu_is_omap243x() is_omap243x()
# endif # endif
@ -189,11 +189,11 @@ IS_OMAP_SUBCLASS(443x, 0x443)
# undef cpu_is_omap24xx # undef cpu_is_omap24xx
# define cpu_is_omap24xx() 1 # define cpu_is_omap24xx() 1
# endif # endif
# if defined(CONFIG_ARCH_OMAP2420) # if defined(CONFIG_SOC_OMAP2420)
# undef cpu_is_omap242x # undef cpu_is_omap242x
# define cpu_is_omap242x() 1 # define cpu_is_omap242x() 1
# endif # endif
# if defined(CONFIG_ARCH_OMAP2430) # if defined(CONFIG_SOC_OMAP2430)
# undef cpu_is_omap243x # undef cpu_is_omap243x
# define cpu_is_omap243x() 1 # define cpu_is_omap243x() 1
# endif # endif
@ -201,7 +201,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
# undef cpu_is_omap34xx # undef cpu_is_omap34xx
# define cpu_is_omap34xx() 1 # define cpu_is_omap34xx() 1
# endif # endif
# if defined(CONFIG_ARCH_OMAP3430) # if defined(CONFIG_SOC_OMAP3430)
# undef cpu_is_omap343x # undef cpu_is_omap343x
# define cpu_is_omap343x() 1 # define cpu_is_omap343x() 1
# endif # endif

4
arch/arm/plat-omap/include/plat/io.h
View file

@ -259,7 +259,7 @@ struct omap_sdrc_params;
extern void omap1_map_common_io(void); extern void omap1_map_common_io(void);
extern void omap1_init_common_hw(void); extern void omap1_init_common_hw(void);
#ifdef CONFIG_ARCH_OMAP2420 #ifdef CONFIG_SOC_OMAP2420
extern void omap242x_map_common_io(void); extern void omap242x_map_common_io(void);
#else #else
static inline void omap242x_map_common_io(void) static inline void omap242x_map_common_io(void)
@ -267,7 +267,7 @@ static inline void omap242x_map_common_io(void)
} }
#endif #endif
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
extern void omap243x_map_common_io(void); extern void omap243x_map_common_io(void);
#else #else
static inline void omap243x_map_common_io(void) static inline void omap243x_map_common_io(void)

4
arch/arm/plat-omap/include/plat/multi.h
View file

@ -66,7 +66,7 @@
# error "OMAP1 and OMAP2PLUS can't be selected at the same time" # error "OMAP1 and OMAP2PLUS can't be selected at the same time"
# endif # endif
#endif #endif
#ifdef CONFIG_ARCH_OMAP2420 #ifdef CONFIG_SOC_OMAP2420
# ifdef OMAP_NAME # ifdef OMAP_NAME
# undef MULTI_OMAP2 # undef MULTI_OMAP2
# define MULTI_OMAP2 # define MULTI_OMAP2
@ -74,7 +74,7 @@
# define OMAP_NAME omap2420 # define OMAP_NAME omap2420
# endif # endif
#endif #endif
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
# ifdef OMAP_NAME # ifdef OMAP_NAME
# undef MULTI_OMAP2 # undef MULTI_OMAP2
# define MULTI_OMAP2 # define MULTI_OMAP2

4
arch/arm/plat-omap/sram.c
View file

@ -312,7 +312,7 @@ u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass)
} }
#endif #endif
#ifdef CONFIG_ARCH_OMAP2420 #ifdef CONFIG_SOC_OMAP2420
static int __init omap242x_sram_init(void) static int __init omap242x_sram_init(void)
{ {
_omap2_sram_ddr_init = omap_sram_push(omap242x_sram_ddr_init, _omap2_sram_ddr_init = omap_sram_push(omap242x_sram_ddr_init,
@ -333,7 +333,7 @@ static inline int omap242x_sram_init(void)
} }
#endif #endif
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_SOC_OMAP2430
static int __init omap243x_sram_init(void) static int __init omap243x_sram_init(void)
{ {
_omap2_sram_ddr_init = omap_sram_push(omap243x_sram_ddr_init, _omap2_sram_ddr_init = omap_sram_push(omap243x_sram_ddr_init,

2
drivers/mmc/host/Kconfig
View file

@ -225,7 +225,7 @@ config MMC_OMAP
config MMC_OMAP_HS config MMC_OMAP_HS
tristate "TI OMAP High Speed Multimedia Card Interface support" tristate "TI OMAP High Speed Multimedia Card Interface support"
depends on ARCH_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4 depends on SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
help help
This selects the TI OMAP High Speed Multimedia card Interface. This selects the TI OMAP High Speed Multimedia card Interface.
If you have an OMAP2430 or OMAP3 board or OMAP4 board with a If you have an OMAP2430 or OMAP3 board or OMAP4 board with a

4
drivers/spi/omap2_mcspi.c
View file

@ -1111,7 +1111,7 @@ static u8 __initdata spi2_txdma_id[] = {
OMAP24XX_DMA_SPI2_TX1, OMAP24XX_DMA_SPI2_TX1,
}; };
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \ #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
|| defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_OMAP4)
static u8 __initdata spi3_rxdma_id[] = { static u8 __initdata spi3_rxdma_id[] = {
OMAP24XX_DMA_SPI3_RX0, OMAP24XX_DMA_SPI3_RX0,
@ -1154,7 +1154,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
txdma_id = spi2_txdma_id; txdma_id = spi2_txdma_id;
num_chipselect = 2; num_chipselect = 2;
break; break;
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \ #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
|| defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_OMAP4)
case 3: case 3:
rxdma_id = spi3_rxdma_id; rxdma_id = spi3_rxdma_id;

2
drivers/usb/musb/musb_core.c
View file

@ -1535,7 +1535,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) || \ #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \
defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500) || \ defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500) || \
defined(CONFIG_ARCH_U5500) defined(CONFIG_ARCH_U5500)

6
drivers/usb/musb/musb_core.h
View file

@ -212,8 +212,8 @@ enum musb_g_ep0_state {
* directly with the "flat" model, or after setting up an index register. * directly with the "flat" model, or after setting up an index register.
*/ */
#if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_ARCH_OMAP2430) \ #if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_SOC_OMAP2430) \
|| defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_BLACKFIN) \ || defined(CONFIG_SOC_OMAP3430) || defined(CONFIG_BLACKFIN) \
|| defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_OMAP4)
/* REVISIT indexed access seemed to /* REVISIT indexed access seemed to
* misbehave (on DaVinci) for at least peripheral IN ... * misbehave (on DaVinci) for at least peripheral IN ...
@ -358,7 +358,7 @@ struct musb_csr_regs {
struct musb_context_registers { struct musb_context_registers {
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
u32 otg_sysconfig, otg_forcestandby; u32 otg_sysconfig, otg_forcestandby;
#endif #endif

2
drivers/usb/musb/musbhsdma.h
View file

@ -31,7 +31,7 @@
* *
*/ */
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
#include "omap2430.h" #include "omap2430.h"
#endif #endif

2
drivers/w1/masters/Kconfig
View file

@ -60,7 +60,7 @@ config W1_MASTER_GPIO
config HDQ_MASTER_OMAP config HDQ_MASTER_OMAP
tristate "OMAP HDQ driver" tristate "OMAP HDQ driver"
depends on ARCH_OMAP2430 || ARCH_OMAP3 depends on SOC_OMAP2430 || ARCH_OMAP3
help help
Say Y here if you want support for the 1-wire or HDQ Interface Say Y here if you want support for the 1-wire or HDQ Interface
on an OMAP processor. on an OMAP processor.

6
sound/soc/omap/omap-mcbsp.c
View file

@ -92,7 +92,7 @@ static const unsigned long omap1_mcbsp_port[][2] = {};
static const int omap24xx_dma_reqs[][2] = { static const int omap24xx_dma_reqs[][2] = {
{ OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX }, { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX },
{ OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX }, { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX },
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
{ OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX }, { OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX },
{ OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX }, { OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX },
{ OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX }, { OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX },
@ -113,7 +113,7 @@ static const int omap44xx_dma_reqs[][2] = {
static const int omap44xx_dma_reqs[][2] = {}; static const int omap44xx_dma_reqs[][2] = {};
#endif #endif
#if defined(CONFIG_ARCH_OMAP2420) #if defined(CONFIG_SOC_OMAP2420)
static const unsigned long omap2420_mcbsp_port[][2] = { static const unsigned long omap2420_mcbsp_port[][2] = {
{ OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1, { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1,
OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 }, OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 },
@ -124,7 +124,7 @@ static const unsigned long omap2420_mcbsp_port[][2] = {
static const unsigned long omap2420_mcbsp_port[][2] = {}; static const unsigned long omap2420_mcbsp_port[][2] = {};
#endif #endif
#if defined(CONFIG_ARCH_OMAP2430) #if defined(CONFIG_SOC_OMAP2430)
static const unsigned long omap2430_mcbsp_port[][2] = { static const unsigned long omap2430_mcbsp_port[][2] = {
{ OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR, { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR,
OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR }, OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR },

4
sound/soc/omap/omap-mcbsp.h
View file

@ -43,7 +43,7 @@ enum omap_mcbsp_div {
OMAP_MCBSP_CLKGDV, /* Sample rate generator divider */ OMAP_MCBSP_CLKGDV, /* Sample rate generator divider */
}; };
#if defined(CONFIG_ARCH_OMAP2420) #if defined(CONFIG_SOC_OMAP2420)
#define NUM_LINKS 2 #define NUM_LINKS 2
#endif #endif
#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
@ -54,7 +54,7 @@ enum omap_mcbsp_div {
#undef NUM_LINKS #undef NUM_LINKS
#define NUM_LINKS 4 #define NUM_LINKS 4
#endif #endif
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430)
#undef NUM_LINKS #undef NUM_LINKS
#define NUM_LINKS 5 #define NUM_LINKS 5
#endif #endif