Commit f5d2d659 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Tony Lindgren
Browse files

omap: Add OMAP4 L3 and L4 peripherals. 



This patch adds few necessary peripherals for OMAP4.

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b4224b23

arch/arm/mach-omap2/io.c

+18 −0
Original line number Diff line number Diff line
@@ -202,6 +202,24 @@ static struct map_desc omap44xx_io_desc[] __initdata = { 
		.length		= OMAP44XX_GPMC_SIZE,

		.type		= MT_DEVICE,

	},

	{

		.virtual	= OMAP44XX_EMIF1_VIRT,

		.pfn		= __phys_to_pfn(OMAP44XX_EMIF1_PHYS),

		.length		= OMAP44XX_EMIF1_SIZE,

		.type		= MT_DEVICE,

	},

	{

		.virtual	= OMAP44XX_EMIF2_VIRT,

		.pfn		= __phys_to_pfn(OMAP44XX_EMIF2_PHYS),

		.length		= OMAP44XX_EMIF2_SIZE,

		.type		= MT_DEVICE,

	},

	{

		.virtual	= OMAP44XX_DMM_VIRT,

		.pfn		= __phys_to_pfn(OMAP44XX_DMM_PHYS),

		.length		= OMAP44XX_DMM_SIZE,

		.type		= MT_DEVICE,

	},

	{

		.virtual	= L4_PER_44XX_VIRT,

		.pfn		= __phys_to_pfn(L4_PER_44XX_PHYS),

arch/arm/plat-omap/include/mach/io.h

+26 −3
Original line number Diff line number Diff line
@@ -66,15 +66,19 @@ 
#define OMAP2_L3_IO_OFFSET	0x90000000

#define OMAP2_L3_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_L3_IO_OFFSET) /* L3 */





#define OMAP2_L4_IO_OFFSET	0xb2000000

#define OMAP2_L4_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_L4_IO_OFFSET) /* L4 */



#define OMAP4_L3_IO_OFFSET	0xb4000000

#define OMAP4_L3_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_L3_IO_OFFSET) /* L3 */



#define OMAP4_L3_PER_IO_OFFSET	0xb1100000

#define OMAP4_L3_PER_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_L3_PER_IO_OFFSET)



#define OMAP4_GPMC_IO_OFFSET		0xa9000000

#define OMAP4_GPMC_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_GPMC_IO_OFFSET)



#define OMAP2_L4_IO_OFFSET	0xb2000000

#define OMAP2_L4_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_L4_IO_OFFSET) /* L4 */



#define OMAP2_EMU_IO_OFFSET		0xaa800000	/* Emulation */

#define OMAP2_EMU_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_EMU_IO_OFFSET)
@@ -214,6 +218,11 @@ 
#define L4_PER_44XX_VIRT	(L4_PER_44XX_PHYS + OMAP2_L4_IO_OFFSET)

#define L4_PER_44XX_SIZE	SZ_4M



#define L4_ABE_44XX_PHYS	L4_ABE_44XX_BASE

						/* 0x49000000 --> 0xfb000000 */

#define L4_ABE_44XX_VIRT	(L4_ABE_44XX_PHYS + OMAP2_L4_IO_OFFSET)

#define L4_ABE_44XX_SIZE	SZ_1M



#define L4_EMU_44XX_PHYS	L4_EMU_44XX_BASE

						/* 0x54000000 --> 0xfe800000 */

#define L4_EMU_44XX_VIRT	(L4_EMU_44XX_PHYS + OMAP2_EMU_IO_OFFSET)
@@ -225,6 +234,20 @@ 
#define OMAP44XX_GPMC_SIZE	SZ_1M





#define OMAP44XX_EMIF1_PHYS	OMAP44XX_EMIF1_BASE

						/* 0x4c000000 --> 0xfd100000 */

#define OMAP44XX_EMIF1_VIRT	(OMAP44XX_EMIF1_PHYS + OMAP4_L3_PER_IO_OFFSET)

#define OMAP44XX_EMIF1_SIZE	SZ_1M



#define OMAP44XX_EMIF2_PHYS	OMAP44XX_EMIF2_BASE

						/* 0x4d000000 --> 0xfd200000 */

#define OMAP44XX_EMIF2_VIRT	(OMAP44XX_EMIF2_PHYS + OMAP4_L3_PER_IO_OFFSET)

#define OMAP44XX_EMIF2_SIZE	SZ_1M



#define OMAP44XX_DMM_PHYS	OMAP44XX_DMM_BASE

						/* 0x4e000000 --> 0xfd300000 */

#define OMAP44XX_DMM_VIRT	(OMAP44XX_DMM_PHYS + OMAP4_L3_PER_IO_OFFSET)

#define OMAP44XX_DMM_SIZE	SZ_1M

/*

 * ----------------------------------------------------------------------------

 * Omap specific register access

arch/arm/plat-omap/include/mach/omap44xx.h

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#define L4_PER_44XX_BASE		0x48000000

#define L4_EMU_44XX_BASE		0x54000000

#define L3_44XX_BASE			0x44000000

#define OMAP44XX_EMIF1_BASE		0x4c000000

#define OMAP44XX_EMIF2_BASE		0x4d000000

#define OMAP44XX_DMM_BASE		0x4e000000

#define OMAP4430_32KSYNCT_BASE		0x4a304000

#define OMAP4430_CM_BASE		0x4a004000

#define OMAP4430_PRM_BASE		0x48306000

arch/arm/plat-omap/io.c

+8 −0
Original line number Diff line number Diff line
@@ -114,6 +114,14 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type) 
			return XLATE(p, L4_WK_44XX_PHYS, L4_WK_44XX_VIRT);

		if (BETWEEN(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_SIZE))

			return XLATE(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_VIRT);

		if (BETWEEN(p, OMAP44XX_EMIF1_PHYS, OMAP44XX_EMIF1_SIZE))

			return XLATE(p, OMAP44XX_EMIF1_PHYS,		\

							OMAP44XX_EMIF1_VIRT);

		if (BETWEEN(p, OMAP44XX_EMIF2_PHYS, OMAP44XX_EMIF2_SIZE))

			return XLATE(p, OMAP44XX_EMIF2_PHYS,		\

							OMAP44XX_EMIF2_VIRT);

		if (BETWEEN(p, OMAP44XX_DMM_PHYS, OMAP44XX_DMM_SIZE))

			return XLATE(p, OMAP44XX_DMM_PHYS, OMAP44XX_DMM_VIRT);

		if (BETWEEN(p, L4_PER_44XX_PHYS, L4_PER_44XX_SIZE))

			return XLATE(p, L4_PER_44XX_PHYS, L4_PER_44XX_VIRT);

		if (BETWEEN(p, L4_EMU_44XX_PHYS, L4_EMU_44XX_SIZE))