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

Commit cc26b3b0 authored by Syed Mohammed, Khasim's avatar Syed Mohammed, Khasim Committed by Tony Lindgren
Browse files

ARM: OMAP3: Add minimal omap3430 support 



Add minimal omap3430 support based on earlier patches from
Syed Mohammed Khasim. Also merge in omap34xx SRAM support
from Karthik Dasu and use consistent naming for sram init
functions.

Also do following changes that make 34xx support usable:

- Remove unused sram.c functions for 34xx

- Rename IRQ_SIR_IRQ to INTCPS_SIR_IRQ and define it locally
  in entry-macro.S

- Update mach-omap2/io.c to support 2420, 2430, and 34xx

- Also merge in 34xx GPMC changes to add fields wr_access and
  wr_data_mux_bus from Adrian Hunter

- Remove memory initialization call omap2_init_memory() until
  until more generic memory initialization patches are posted.
  It's OK to rely on bootloader initialization until then.

Signed-off-by: default avatarSyed Mohammed, Khasim <khasim@ti.com>
Signed-off-by: default avatarKarthik <Dasu&lt;karthik-dp@ti.com>
Signed-off-by: default avatarAdrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2e7509e5

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ endif 
 machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx

 machine-$(CONFIG_ARCH_OMAP1)	   := omap1

 machine-$(CONFIG_ARCH_OMAP2)	   := omap2

 machine-$(CONFIG_ARCH_OMAP3)	   := omap2

    plat-$(CONFIG_ARCH_OMAP)	   := omap

 machine-$(CONFIG_ARCH_S3C2410)	   := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443

    plat-$(CONFIG_PLAT_S3C24XX)	   := s3c24xx

arch/arm/mach-omap2/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -15,8 +15,17 @@ config ARCH_OMAP2430 
	bool "OMAP2430 support"

	depends on ARCH_OMAP24XX



config ARCH_OMAP34XX

	bool "OMAP34xx Based System"

	depends on ARCH_OMAP3



config ARCH_OMAP3430

	bool "OMAP3430 support"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select ARCH_OMAP_OTG



comment "OMAP Board Type"

	depends on ARCH_OMAP2

	depends on ARCH_OMAP2 || ARCH_OMAP3



config MACH_OMAP_GENERIC

	bool "Generic OMAP board"

arch/arm/mach-omap2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o 
# Functions loaded to SRAM

obj-$(CONFIG_ARCH_OMAP2420)		+= sram242x.o

obj-$(CONFIG_ARCH_OMAP2430)		+= sram243x.o

obj-$(CONFIG_ARCH_OMAP3)		+= sram34xx.o



# Power Management

ifeq ($(CONFIG_PM),y)

arch/arm/mach-omap2/gpmc.c

+5 −0
Original line number Diff line number Diff line
@@ -220,6 +220,11 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t) 


	GPMC_SET_ONE(GPMC_CS_CONFIG5, 24, 27, page_burst_access);



	if (cpu_is_omap34xx()) {

		GPMC_SET_ONE(GPMC_CS_CONFIG6, 16, 19, wr_data_mux_bus);

		GPMC_SET_ONE(GPMC_CS_CONFIG6, 24, 28, wr_access);

	}



	/* caller is expected to have initialized CONFIG1 to cover

	 * at least sync vs async

	 */

arch/arm/mach-omap2/io.c

+105 −21
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ 
 * The machine specific code may provide the extra mapping besides the

 * default mapping provided here.

 */

static struct map_desc omap2_io_desc[] __initdata = {



#ifdef CONFIG_ARCH_OMAP24XX

static struct map_desc omap24xx_io_desc[] __initdata = {

	{

		.virtual	= L3_24XX_VIRT,

		.pfn		= __phys_to_pfn(L3_24XX_PHYS),
@@ -56,7 +58,34 @@ static struct map_desc omap2_io_desc[] __initdata = { 
		.length		= L4_24XX_SIZE,

		.type		= MT_DEVICE

	},

};



#ifdef CONFIG_ARCH_OMAP2420

static struct map_desc omap242x_io_desc[] __initdata = {

	{

		.virtual	= DSP_MEM_24XX_VIRT,

		.pfn		= __phys_to_pfn(DSP_MEM_24XX_PHYS),

		.length		= DSP_MEM_24XX_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= DSP_IPI_24XX_VIRT,

		.pfn		= __phys_to_pfn(DSP_IPI_24XX_PHYS),

		.length		= DSP_IPI_24XX_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= DSP_MMU_24XX_VIRT,

		.pfn		= __phys_to_pfn(DSP_MMU_24XX_PHYS),

		.length		= DSP_MMU_24XX_SIZE,

		.type		= MT_DEVICE

	},

};



#endif



#ifdef CONFIG_ARCH_OMAP2430

static struct map_desc omap243x_io_desc[] __initdata = {

	{

		.virtual	= L4_WK_243X_VIRT,

		.pfn		= __phys_to_pfn(L4_WK_243X_PHYS),
@@ -69,30 +98,90 @@ static struct map_desc omap2_io_desc[] __initdata = { 
		.length		= OMAP243X_GPMC_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= OMAP243X_SDRC_VIRT,

		.pfn		= __phys_to_pfn(OMAP243X_SDRC_PHYS),

		.length		= OMAP243X_SDRC_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= OMAP243X_SMS_VIRT,

		.pfn		= __phys_to_pfn(OMAP243X_SMS_PHYS),

		.length		= OMAP243X_SMS_SIZE,

		.type		= MT_DEVICE

	},

};

#endif

#endif



#ifdef	CONFIG_ARCH_OMAP34XX

static struct map_desc omap34xx_io_desc[] __initdata = {

	{

		.virtual	= DSP_MEM_24XX_VIRT,

		.pfn		= __phys_to_pfn(DSP_MEM_24XX_PHYS),

		.length		= DSP_MEM_24XX_SIZE,

		.virtual	= L3_34XX_VIRT,

		.pfn		= __phys_to_pfn(L3_34XX_PHYS),

		.length		= L3_34XX_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= DSP_IPI_24XX_VIRT,

		.pfn		= __phys_to_pfn(DSP_IPI_24XX_PHYS),

		.length		= DSP_IPI_24XX_SIZE,

		.virtual	= L4_34XX_VIRT,

		.pfn		= __phys_to_pfn(L4_34XX_PHYS),

		.length		= L4_34XX_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= DSP_MMU_24XX_VIRT,

		.pfn		= __phys_to_pfn(DSP_MMU_24XX_PHYS),

		.length		= DSP_MMU_24XX_SIZE,

		.virtual	= L4_WK_34XX_VIRT,

		.pfn		= __phys_to_pfn(L4_WK_34XX_PHYS),

		.length		= L4_WK_34XX_SIZE,

		.type		= MT_DEVICE

	}

	},

	{

		.virtual	= OMAP34XX_GPMC_VIRT,

		.pfn		= __phys_to_pfn(OMAP34XX_GPMC_PHYS),

		.length		= OMAP34XX_GPMC_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= OMAP343X_SMS_VIRT,

		.pfn		= __phys_to_pfn(OMAP343X_SMS_PHYS),

		.length		= OMAP343X_SMS_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= OMAP343X_SDRC_VIRT,

		.pfn		= __phys_to_pfn(OMAP343X_SDRC_PHYS),

		.length		= OMAP343X_SDRC_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= L4_PER_34XX_VIRT,

		.pfn		= __phys_to_pfn(L4_PER_34XX_PHYS),

		.length		= L4_PER_34XX_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= L4_EMU_34XX_VIRT,

		.pfn		= __phys_to_pfn(L4_EMU_34XX_PHYS),

		.length		= L4_EMU_34XX_SIZE,

		.type		= MT_DEVICE

	},

};

#endif



void __init omap2_map_common_io(void)

{

	iotable_init(omap2_io_desc, ARRAY_SIZE(omap2_io_desc));

#if defined(CONFIG_ARCH_OMAP2420)

	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));

	iotable_init(omap242x_io_desc, ARRAY_SIZE(omap242x_io_desc));

#endif



#if defined(CONFIG_ARCH_OMAP2430)

	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));

	iotable_init(omap243x_io_desc, ARRAY_SIZE(omap243x_io_desc));

#endif



#if defined(CONFIG_ARCH_OMAP34XX)

	iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));

#endif



	/* Normally devicemaps_init() would flush caches and tlb after

	 * mdesc->map_io(), but we must also do it here because of the CPU
@@ -112,11 +201,6 @@ void __init omap2_init_common_hw(void) 
	pwrdm_init(powerdomains_omap);

	clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps);

	omap2_clk_init();

/*

 * Need to Fix this for 2430

 */

#ifndef CONFIG_ARCH_OMAP2430

	omap2_init_memory();

#endif

	gpmc_init();

}