redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX

Browse source 
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>
This commit is contained in:
Kevin Hilman 2012-05-10 11:10:07 -07:00 committed by Tony Lindgren
parent b2f44dc29b
commit 33959553b8
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,7 @@ config SOC_OMAP3430
default y default y
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
config SOC_OMAPTI81XX config SOC_TI81XX
bool "TI81XX support" bool "TI81XX support"
depends on ARCH_OMAP3 depends on ARCH_OMAP3
default y default y
@ -319,12 +319,12 @@ config MACH_OMAP_3630SDP
config MACH_TI8168EVM config MACH_TI8168EVM
bool "TI8168 Evaluation Module" bool "TI8168 Evaluation Module"
depends on SOC_OMAPTI81XX depends on SOC_TI81XX
default y default y
config MACH_TI8148EVM config MACH_TI8148EVM
bool "TI8148 Evaluation Module" bool "TI8148 Evaluation Module"
depends on SOC_OMAPTI81XX depends on SOC_TI81XX
default y default y
config MACH_OMAP_4430SDP config MACH_OMAP_4430SDP

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

@ -55,7 +55,7 @@ static inline void omap34xx_map_common_io(void)
} }
#endif #endif
#ifdef CONFIG_SOC_OMAPTI81XX #ifdef CONFIG_SOC_TI81XX
extern void omapti81xx_map_common_io(void); extern void omapti81xx_map_common_io(void);
#else #else
static inline void omapti81xx_map_common_io(void) static inline void omapti81xx_map_common_io(void)

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

@ -172,7 +172,7 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
}; };
#endif #endif
#ifdef CONFIG_SOC_OMAPTI81XX #ifdef CONFIG_SOC_TI81XX
static struct map_desc omapti81xx_io_desc[] __initdata = { static struct map_desc omapti81xx_io_desc[] __initdata = {
{ {
.virtual = L4_34XX_VIRT, .virtual = L4_34XX_VIRT,
@ -285,7 +285,7 @@ void __init omap34xx_map_common_io(void)
} }
#endif #endif
#ifdef CONFIG_SOC_OMAPTI81XX #ifdef CONFIG_SOC_TI81XX
void __init omapti81xx_map_common_io(void) void __init omapti81xx_map_common_io(void)
{ {
iotable_init(omapti81xx_io_desc, ARRAY_SIZE(omapti81xx_io_desc)); iotable_init(omapti81xx_io_desc, ARRAY_SIZE(omapti81xx_io_desc));

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

@ -230,7 +230,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs
goto out; goto out;
irqnr = readl_relaxed(base_addr + 0xd8); irqnr = readl_relaxed(base_addr + 0xd8);
#ifdef CONFIG_SOC_OMAPTI81XX #ifdef CONFIG_SOC_TI81XX
if (irqnr) if (irqnr)
goto out; goto out;
irqnr = readl_relaxed(base_addr + 0xf8); irqnr = readl_relaxed(base_addr + 0xf8);