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

Commit bb6abcf4 authored by Kevin Hilman's avatar Kevin Hilman Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX 



No need to have an OMAP prefix on these SoCs that are in the family
but arent' really called OMAP.

Simple rename: CONFIG_SOC_OMAPAM33XX --> CONFIG_SOC_AM33XX

No functional change.

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Acked-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
[tony@atomide.com: updated for the driver config change also]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 33959553

arch/arm/mach-omap2/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ config SOC_TI81XX 
	depends on ARCH_OMAP3

	default y



config SOC_OMAPAM33XX

config SOC_AM33XX

	bool "AM33XX support"

	depends on ARCH_OMAP3

	default y

arch/arm/mach-omap2/common.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static inline void omapti81xx_map_common_io(void) 
}

#endif



#ifdef CONFIG_SOC_OMAPAM33XX

#ifdef CONFIG_SOC_AM33XX

extern void omapam33xx_map_common_io(void);

#else

static inline void omapam33xx_map_common_io(void)

arch/arm/mach-omap2/io.c

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static struct map_desc omapti81xx_io_desc[] __initdata = { 
};

#endif



#ifdef CONFIG_SOC_OMAPAM33XX

#ifdef CONFIG_SOC_AM33XX

static struct map_desc omapam33xx_io_desc[] __initdata = {

	{

		.virtual	= L4_34XX_VIRT,
@@ -292,7 +292,7 @@ void __init omapti81xx_map_common_io(void) 
}

#endif



#ifdef CONFIG_SOC_OMAPAM33XX

#ifdef CONFIG_SOC_AM33XX

void __init omapam33xx_map_common_io(void)

{

	iotable_init(omapam33xx_io_desc, ARRAY_SIZE(omapam33xx_io_desc));

drivers/net/ethernet/ti/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ config TI_DAVINCI_CPDMA 


config TI_CPSW

	tristate "TI CPSW Switch Support"

	depends on ARM && (ARCH_DAVINCI || SOC_OMAPAM33XX)

	depends on ARM && (ARCH_DAVINCI || SOC_AM33XX)

	select TI_DAVINCI_CPDMA

	select TI_DAVINCI_MDIO

	---help---