Skip to content

Commit

Permalink
ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX
Browse files Browse the repository at this point in the history
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: Kevin Hilman <khilman@ti.com>
Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
[tony@atomide.com: updated for the driver config change also]
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Kevin Hilman authored and Tony Lindgren committed May 10, 2012
1 parent 3395955 commit bb6abcf
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-omap2/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/ti/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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---
Expand Down

0 comments on commit bb6abcf

Please sign in to comment.