Skip to content

Commit

Permalink
ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX
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_OMAPTI81XX --> CONFIG_SOC_TI81XX

No functional change.

Signed-off-by: Kevin Hilman <khilman@ti.com>
Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Kevin Hilman authored and Tony Lindgren committed May 10, 2012
1 parent b2f44dc commit 3395955
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions arch/arm/mach-omap2/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ config SOC_OMAP3430
default y
select ARCH_OMAP_OTG

config SOC_OMAPTI81XX
config SOC_TI81XX
bool "TI81XX support"
depends on ARCH_OMAP3
default y
Expand Down Expand Up @@ -319,12 +319,12 @@ config MACH_OMAP_3630SDP

config MACH_TI8168EVM
bool "TI8168 Evaluation Module"
depends on SOC_OMAPTI81XX
depends on SOC_TI81XX
default y

config MACH_TI8148EVM
bool "TI8148 Evaluation Module"
depends on SOC_OMAPTI81XX
depends on SOC_TI81XX
default y

config MACH_OMAP_4430SDP
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 @@ -55,7 +55,7 @@ static inline void omap34xx_map_common_io(void)
}
#endif

#ifdef CONFIG_SOC_OMAPTI81XX
#ifdef CONFIG_SOC_TI81XX
extern void omapti81xx_map_common_io(void);
#else
static inline void omapti81xx_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 @@ -172,7 +172,7 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
};
#endif

#ifdef CONFIG_SOC_OMAPTI81XX
#ifdef CONFIG_SOC_TI81XX
static struct map_desc omapti81xx_io_desc[] __initdata = {
{
.virtual = L4_34XX_VIRT,
Expand Down Expand Up @@ -285,7 +285,7 @@ void __init omap34xx_map_common_io(void)
}
#endif

#ifdef CONFIG_SOC_OMAPTI81XX
#ifdef CONFIG_SOC_TI81XX
void __init omapti81xx_map_common_io(void)
{
iotable_init(omapti81xx_io_desc, ARRAY_SIZE(omapti81xx_io_desc));
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs
goto out;

irqnr = readl_relaxed(base_addr + 0xd8);
#ifdef CONFIG_SOC_OMAPTI81XX
#ifdef CONFIG_SOC_TI81XX
if (irqnr)
goto out;
irqnr = readl_relaxed(base_addr + 0xf8);
Expand Down

0 comments on commit 3395955

Please sign in to comment.