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

Commit a3a9384a authored by R Sricharan's avatar R Sricharan Committed by Rajendra Nayak
Browse files

ARM: DRA7: Reuse io tables and add a new .init_early 



The IO descriptor tables for DRA7 are a complete reuse from OMAP5.
A new dra7xx_init_early() does the base address inits.

Signed-off-by: default avatarR Sricharan <r.sricharan@ti.com>
Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
parent bfe9211a

arch/arm/mach-omap2/common.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ void omap3630_init_late(void); 
void am35xx_init_late(void);

void ti81xx_init_late(void);

int omap2_common_pm_late_init(void);

void dra7xx_init_early(void);



#ifdef CONFIG_SOC_BUS

void omap_soc_device_init(void);

arch/arm/mach-omap2/io.c

+18 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static struct map_desc omap44xx_io_desc[] __initdata = { 
};

#endif



#ifdef	CONFIG_SOC_OMAP5

#if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)

static struct map_desc omap54xx_io_desc[] __initdata = {

	{

		.virtual	= L3_54XX_VIRT,
@@ -333,7 +333,7 @@ void __init omap4_map_io(void) 
}

#endif



#ifdef CONFIG_SOC_OMAP5

#if defined(CONFIG_SOC_OMAP5) ||  defined(CONFIG_SOC_DRA7XX)

void __init omap5_map_io(void)

{

	iotable_init(omap54xx_io_desc, ARRAY_SIZE(omap54xx_io_desc));
@@ -653,6 +653,22 @@ void __init omap5_init_early(void) 
}

#endif



#ifdef CONFIG_SOC_DRA7XX

void __init dra7xx_init_early(void)

{

	omap2_set_globals_tap(-1, OMAP2_L4_IO_ADDRESS(DRA7XX_TAP_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),

				  OMAP2_L4_IO_ADDRESS(DRA7XX_CTRL_BASE));

	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRM_BASE));

	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(DRA7XX_CM_CORE_AON_BASE),

			     OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));

	omap_prm_base_init();

	omap_cm_base_init();

}

#endif





void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

				      struct omap_sdrc_params *sdrc_cs1)

{

arch/arm/mach-omap2/omap54xx.h

+4 −0
Original line number Diff line number Diff line
@@ -30,4 +30,8 @@ 
#define OMAP54XX_CTRL_BASE		0x4a002800

#define OMAP54XX_SAR_RAM_BASE		0x4ae26000



#define DRA7XX_CM_CORE_AON_BASE		0x4a005000

#define DRA7XX_CTRL_BASE		0x4a003400

#define DRA7XX_TAP_BASE			0x4ae0c000



#endif /* __ASM_SOC_OMAP555554XX_H */