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

Commit 05e152c7 authored by R Sricharan's avatar R Sricharan Committed by Santosh Shilimkar
Browse files

ARM: OMAP5: Add minimal support for OMAP5430 SOC 



OMAP5430 is Texas Instrument's SOC based on ARM Cortex-A15 SMP
architecture. It's a dual core SOC with GIC used for interrupt
handling and with an integrated L2 cache controller.

OMAP5432 is another variant of OMAP5430, with a
memory controller supporting DDR3 and SATA.

Patch includes:
 - The machine specific headers and sources updates.
 - Platform header updates.
 - Minimum initialisation support for serial.
 - IO table init

Signed-off-by: default avatarR Sricharan <r.sricharan@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent b13e80a8

arch/arm/mach-omap2/Makefile

+18 −5
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) 
obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common)

obj-$(CONFIG_SOC_OMAP5)	 += prm44xx.o $(hwmod-common) $(secure-common)



ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

obj-y += mcbsp.o
@@ -29,8 +30,10 @@ obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o 


obj-$(CONFIG_SMP)			+= omap-smp.o omap-headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)		+= omap-hotplug.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap4-common.o omap-wakeupgen.o

obj-$(CONFIG_ARCH_OMAP4)		+= sleep44xx.o

omap-4-5-common				=  omap4-common.o omap-wakeupgen.o \

					   sleep44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-4-5-common)

obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-common)



plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)
@@ -70,6 +73,7 @@ obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o 
obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= cpuidle34xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o

obj-$(CONFIG_SOC_OMAP5)			+= omap-mpuss-lowpower.o

obj-$(CONFIG_ARCH_OMAP4)		+= cpuidle44xx.o

obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o

obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o
@@ -85,14 +89,16 @@ endif 
endif



# PRCM

omap-prcm-4-5-common			=  prcm.o cminst44xx.o cm44xx.o \

					   prcm_mpu44xx.o prminst44xx.o \

					   vc44xx_data.o vp44xx_data.o

obj-y					+= prm_common.o

obj-$(CONFIG_ARCH_OMAP2)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= vc3xxx_data.o vp3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= prcm.o cminst44xx.o cm44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= prcm_mpu44xx.o prminst44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= vc44xx_data.o vp44xx_data.o prm44xx.o

obj-$(CONFIG_SOC_AM33XX)		+= prcm.o prm33xx.o cm33xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-prcm-4-5-common) prm44xx.o

obj-$(CONFIG_SOC_OMAP5)			+= $(omap-prcm-4-5-common)



# OMAP voltage domains

voltagedomain-common			:= voltage.o vc.o vp.o
@@ -104,6 +110,7 @@ obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) 
obj-$(CONFIG_ARCH_OMAP4)		+= voltagedomains44xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= $(voltagedomain-common)

obj-$(CONFIG_SOC_AM33XX)                += voltagedomains33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(voltagedomain-common)



# OMAP powerdomain framework

powerdomain-common			+= powerdomain.o powerdomain-common.o
@@ -121,6 +128,8 @@ obj-$(CONFIG_ARCH_OMAP4) += powerdomains44xx_data.o 
obj-$(CONFIG_SOC_AM33XX)		+= $(powerdomain-common)

obj-$(CONFIG_SOC_AM33XX)		+= powerdomain33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= powerdomains33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(powerdomain-common)

obj-$(CONFIG_SOC_OMAP5)			+= powerdomain44xx.o



# PRCM clockdomain control

clockdomain-common			+= clockdomain.o
@@ -139,6 +148,8 @@ obj-$(CONFIG_ARCH_OMAP4) += clockdomains44xx_data.o 
obj-$(CONFIG_SOC_AM33XX)		+= $(clockdomain-common)

obj-$(CONFIG_SOC_AM33XX)		+= clockdomain33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= clockdomains33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(clockdomain-common)

obj-$(CONFIG_SOC_OMAP5)			+= clockdomain44xx.o



# Clock framework

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o
@@ -157,6 +168,8 @@ obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o 
obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o

obj-$(CONFIG_SOC_AM33XX)		+= $(clock-common) dpll3xxx.o

obj-$(CONFIG_SOC_OMAP5)			+= $(clock-common)

obj-$(CONFIG_SOC_OMAP5)			+= dpll3xxx.o dpll44xx.o



# OMAP2 clock rate set data (old "OPP" data)

obj-$(CONFIG_SOC_OMAP2420)		+= opp2420_data.o

arch/arm/mach-omap2/common.c

+24 −0
Original line number Diff line number Diff line
@@ -178,3 +178,27 @@ void __init omap4_map_io(void) 
}

#endif



#if defined(CONFIG_SOC_OMAP5)

static struct omap_globals omap5_globals = {

	.class	= OMAP54XX_CLASS,

	.tap	= OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),

	.ctrl	= OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),

	.ctrl_pad	= OMAP2_L4_IO_ADDRESS(OMAP54XX_CTRL_BASE),

	.prm	= OMAP2_L4_IO_ADDRESS(OMAP54XX_PRM_BASE),

	.cm	= OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_AON_BASE),

	.cm2	= OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE),

	.prcm_mpu = OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE),

};



void __init omap2_set_globals_5xxx(void)

{

	omap2_set_globals_tap(&omap5_globals);

	omap2_set_globals_control(&omap5_globals);

	omap2_set_globals_prcm(&omap5_globals);

}



void __init omap5_map_io(void)

{

	omap5_map_common_io();

}

#endif

arch/arm/mach-omap2/common.h

+11 −0
Original line number Diff line number Diff line
@@ -115,6 +115,14 @@ static inline int omap_mux_late_init(void) 
}

#endif



#ifdef CONFIG_SOC_OMAP5

extern void omap5_map_common_io(void);

#else

static inline void omap5_map_common_io(void)

{

}

#endif



extern void omap2_init_common_infrastructure(void);



extern struct sys_timer omap2_timer;
@@ -134,6 +142,7 @@ void am35xx_init_early(void); 
void ti81xx_init_early(void);

void am33xx_init_early(void);

void omap4430_init_early(void);

void omap5_init_early(void);

void omap3_init_late(void);	/* Do not use this one */

void omap4430_init_late(void);

void omap2420_init_late(void);
@@ -169,6 +178,7 @@ void omap2_set_globals_242x(void); 
void omap2_set_globals_243x(void);

void omap2_set_globals_3xxx(void);

void omap2_set_globals_443x(void);

void omap2_set_globals_5xxx(void);

void omap2_set_globals_ti81xx(void);

void omap2_set_globals_am33xx(void);
@@ -188,6 +198,7 @@ void omap243x_map_io(void); 
void omap3_map_io(void);

void am33xx_map_io(void);

void omap4_map_io(void);

void omap5_map_io(void);

void ti81xx_map_io(void);

void omap_barriers_init(void);

arch/arm/mach-omap2/include/mach/debug-macro.S

+4 −4
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ omap_uart_lsr: .word 0 
		beq	23f			@ configure OMAP2UART3

		cmp	\rp, #OMAP3UART3	@ only on 34xx

		beq	33f			@ configure OMAP3UART3

		cmp	\rp, #OMAP4UART3	@ only on 44xx

		beq	43f			@ configure OMAP4UART3

		cmp	\rp, #OMAP4UART3	@ only on 44xx/54xx

		beq	43f			@ configure OMAP4/5UART3

		cmp	\rp, #OMAP3UART4	@ only on 36xx

		beq	34f			@ configure OMAP3UART4

		cmp	\rp, #OMAP4UART4	@ only on 44xx

		beq	44f			@ configure OMAP4UART4

		cmp	\rp, #OMAP4UART4	@ only on 44xx/54xx

		beq	44f			@ configure OMAP4/5UART4

		cmp	\rp, #TI81XXUART1	@ ti81Xx UART offsets different

		beq	81f			@ configure UART1

		cmp	\rp, #TI81XXUART2	@ ti81Xx UART offsets different

arch/arm/mach-omap2/io.c

+44 −0
Original line number Diff line number Diff line
@@ -233,6 +233,35 @@ static struct map_desc omap44xx_io_desc[] __initdata = { 
};

#endif



#ifdef	CONFIG_SOC_OMAP5

static struct map_desc omap54xx_io_desc[] __initdata = {

	{

		.virtual	= L3_54XX_VIRT,

		.pfn		= __phys_to_pfn(L3_54XX_PHYS),

		.length		= L3_54XX_SIZE,

		.type		= MT_DEVICE,

	},

	{

		.virtual	= L4_54XX_VIRT,

		.pfn		= __phys_to_pfn(L4_54XX_PHYS),

		.length		= L4_54XX_SIZE,

		.type		= MT_DEVICE,

	},

	{

		.virtual	= L4_WK_54XX_VIRT,

		.pfn		= __phys_to_pfn(L4_WK_54XX_PHYS),

		.length		= L4_WK_54XX_SIZE,

		.type		= MT_DEVICE,

	},

	{

		.virtual	= L4_PER_54XX_VIRT,

		.pfn		= __phys_to_pfn(L4_PER_54XX_PHYS),

		.length		= L4_PER_54XX_SIZE,

		.type		= MT_DEVICE,

	},

};

#endif



#ifdef CONFIG_SOC_OMAP2420

void __init omap242x_map_common_io(void)

{
@@ -278,6 +307,12 @@ void __init omap44xx_map_common_io(void) 
}

#endif



#ifdef CONFIG_SOC_OMAP5

void __init omap5_map_common_io(void)

{

	iotable_init(omap54xx_io_desc, ARRAY_SIZE(omap54xx_io_desc));

}

#endif

/*

 * omap2_init_reprogram_sdrc - reprogram SDRC timing parameters

 *
@@ -513,6 +548,15 @@ void __init omap4430_init_late(void) 
}

#endif



#ifdef CONFIG_SOC_OMAP5

void __init omap5_init_early(void)

{

	omap2_set_globals_5xxx();

	omap5xxx_check_revision();

	omap_common_init_early();

}

#endif



void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

				      struct omap_sdrc_params *sdrc_cs1)

{