Commit a8eb7ca0 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3 



Replace ARCH_OMAP34XX with ARCH_OMAP3

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

arch/arm/mach-omap2/Kconfig

+16 −21
Original line number Original line Diff line number Diff line
@@ -11,14 +11,9 @@ config ARCH_OMAP2430 
	bool "OMAP2430 support"

	bool "OMAP2430 support"

	depends on ARCH_OMAP2

	depends on ARCH_OMAP2





config ARCH_OMAP34XX

	bool "OMAP34xx Based System"

	depends on ARCH_OMAP3

	select USB_ARCH_HAS_EHCI



config ARCH_OMAP3430

config ARCH_OMAP3430

	bool "OMAP3430 support"

	bool "OMAP3430 support"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select ARCH_OMAP_OTG

	select ARCH_OMAP_OTG





config OMAP_PACKAGE_CBC

config OMAP_PACKAGE_CBC
@@ -60,42 +55,42 @@ config MACH_OMAP_2430SDP 




config MACH_OMAP3_BEAGLE

config MACH_OMAP3_BEAGLE

	bool "OMAP3 BEAGLE board"

	bool "OMAP3 BEAGLE board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBB

	select OMAP_PACKAGE_CBB





config MACH_OMAP_LDP

config MACH_OMAP_LDP

	bool "OMAP3 LDP board"

	bool "OMAP3 LDP board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBB

	select OMAP_PACKAGE_CBB





config MACH_OVERO

config MACH_OVERO

	bool "Gumstix Overo board"

	bool "Gumstix Overo board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBB

	select OMAP_PACKAGE_CBB





config MACH_OMAP3EVM

config MACH_OMAP3EVM

	bool "OMAP 3530 EVM board"

	bool "OMAP 3530 EVM board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBB

	select OMAP_PACKAGE_CBB





config MACH_OMAP3517EVM

config MACH_OMAP3517EVM

	bool "OMAP3517/ AM3517 EVM board"

	bool "OMAP3517/ AM3517 EVM board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBB

	select OMAP_PACKAGE_CBB





config MACH_OMAP3_PANDORA

config MACH_OMAP3_PANDORA

	bool "OMAP3 Pandora"

	bool "OMAP3 Pandora"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBB

	select OMAP_PACKAGE_CBB





config MACH_OMAP3_TOUCHBOOK

config MACH_OMAP3_TOUCHBOOK

	bool "OMAP3 Touch Book"

	bool "OMAP3 Touch Book"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select BACKLIGHT_CLASS_DEVICE

	select BACKLIGHT_CLASS_DEVICE





config MACH_OMAP_3430SDP

config MACH_OMAP_3430SDP

	bool "OMAP 3430 SDP board"

	bool "OMAP 3430 SDP board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBB

	select OMAP_PACKAGE_CBB





config MACH_NOKIA_N800

config MACH_NOKIA_N800
@@ -116,33 +111,33 @@ config MACH_NOKIA_N8X0 




config MACH_NOKIA_RX51

config MACH_NOKIA_RX51

	bool "Nokia RX-51 board"

	bool "Nokia RX-51 board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBB

	select OMAP_PACKAGE_CBB





config MACH_OMAP_ZOOM2

config MACH_OMAP_ZOOM2

	bool "OMAP3 Zoom2 board"

	bool "OMAP3 Zoom2 board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBB

	select OMAP_PACKAGE_CBB





config MACH_OMAP_ZOOM3

config MACH_OMAP_ZOOM3

	bool "OMAP3630 Zoom3 board"

	bool "OMAP3630 Zoom3 board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBP

	select OMAP_PACKAGE_CBP





config MACH_CM_T35

config MACH_CM_T35

	bool "CompuLab CM-T35 module"

	bool "CompuLab CM-T35 module"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CUS

	select OMAP_PACKAGE_CUS

	select OMAP_MUX

	select OMAP_MUX





config MACH_IGEP0020

config MACH_IGEP0020

	bool "IGEP0020"

	bool "IGEP0020"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBB

	select OMAP_PACKAGE_CBB





config MACH_OMAP_3630SDP

config MACH_OMAP_3630SDP

	bool "OMAP3630 SDP board"

	bool "OMAP3630 SDP board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	select OMAP_PACKAGE_CBP

	select OMAP_PACKAGE_CBP





config MACH_OMAP_4430SDP

config MACH_OMAP_4430SDP
@@ -158,7 +153,7 @@ config OMAP3_EMU 




config OMAP3_SDRC_AC_TIMING

config OMAP3_SDRC_AC_TIMING

	bool "Enable SDRC AC timing register changes"

	bool "Enable SDRC AC timing register changes"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	depends on ARCH_OMAP3

	default n

	default n

	help

	help

	  If you know that none of your system initiators will attempt to

	  If you know that none of your system initiators will attempt to

arch/arm/mach-omap2/io.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ static struct map_desc omap243x_io_desc[] __initdata = { 
#endif

#endif

#endif

#endif





#ifdef	CONFIG_ARCH_OMAP34XX

#ifdef	CONFIG_ARCH_OMAP3

static struct map_desc omap34xx_io_desc[] __initdata = {

static struct map_desc omap34xx_io_desc[] __initdata = {

	{

	{

		.virtual	= L3_34XX_VIRT,

		.virtual	= L3_34XX_VIRT,
@@ -269,7 +269,7 @@ void __init omap243x_map_common_io() 
}

}

#endif

#endif





#ifdef CONFIG_ARCH_OMAP34XX

#ifdef CONFIG_ARCH_OMAP3

void __init omap34xx_map_common_io()

void __init omap34xx_map_common_io()

{

{

	iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));

	iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));

arch/arm/mach-omap2/mcbsp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { 
#define OMAP2430_MCBSP_PDATA_SZ		0

#define OMAP2430_MCBSP_PDATA_SZ		0

#endif

#endif





#ifdef CONFIG_ARCH_OMAP34XX

#ifdef CONFIG_ARCH_OMAP3

static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {

static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {

	{

	{

		.phys_base	= OMAP34XX_MCBSP1_BASE,

		.phys_base	= OMAP34XX_MCBSP1_BASE,

arch/arm/mach-omap2/mux.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -369,7 +369,7 @@ int __init omap2_mux_init(void) 




/*----------------------------------------------------------------------------*/

/*----------------------------------------------------------------------------*/





#ifdef CONFIG_ARCH_OMAP34XX

#ifdef CONFIG_ARCH_OMAP3

static LIST_HEAD(muxmodes);

static LIST_HEAD(muxmodes);

static DEFINE_MUTEX(muxmode_mutex);

static DEFINE_MUTEX(muxmode_mutex);
@@ -1018,5 +1018,5 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size, 
	return 0;

	return 0;

}

}





#endif	/* CONFIG_ARCH_OMAP34XX */

#endif	/* CONFIG_ARCH_OMAP3 */

arch/arm/mach-omap2/mux.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ struct omap_board_mux { 
	u16	value;

	u16	value;

};

};





#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_ARCH_OMAP34XX)

#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_ARCH_OMAP3)





/**

/**

 * omap_mux_init_gpio - initialize a signal based on the GPIO number

 * omap_mux_init_gpio - initialize a signal based on the GPIO number