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

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

ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX 



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: default avatarKevin Hilman <khilman@ti.com>
Acked-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b2f44dc2

arch/arm/mach-omap2/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -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
@@ -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

arch/arm/mach-omap2/common.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-omap2/io.c

+2 −2
Original line number Diff line number Diff line
@@ -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,
@@ -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));

arch/arm/mach-omap2/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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);