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

Commit 49484a60 authored by Afzal Mohammed's avatar Afzal Mohammed Committed by Paul Walmsley
Browse files

ARM: OMAP2/3: hwmod data: add gpmc 



Add gpmc hwmod and associated interconnect data

Signed-off-by: default avatarAfzal Mohammed <afzal@ti.com>
[paul@pwsan.com: added comments to the use of HWMOD_INIT_NO_RESET]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 230844db

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+18 −0
Original line number Diff line number Diff line
@@ -535,6 +535,15 @@ static struct omap_hwmod_addr_space omap2420_counter_32k_addrs[] = { 
	{ }

};



static struct omap_hwmod_addr_space omap2420_gpmc_addrs[] = {

	{

		.pa_start	= 0x6800a000,

		.pa_end		= 0x6800afff,

		.flags		= ADDR_TYPE_RT

	},

	{ }

};



static struct omap_hwmod_ocp_if omap2420_l4_wkup__counter_32k = {

	.master		= &omap2xxx_l4_wkup_hwmod,

	.slave		= &omap2xxx_counter_32k_hwmod,
@@ -543,6 +552,14 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__counter_32k = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



static struct omap_hwmod_ocp_if omap2420_l3__gpmc = {

	.master		= &omap2xxx_l3_main_hwmod,

	.slave		= &omap2xxx_gpmc_hwmod,

	.clk		= "core_l3_ck",

	.addr		= omap2420_gpmc_addrs,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = {

	&omap2xxx_l3_main__l4_core,

	&omap2xxx_mpu__l3_main,
@@ -586,6 +603,7 @@ static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = { 
	&omap2420_l4_core__msdi1,

	&omap2420_l4_core__hdq1w,

	&omap2420_l4_wkup__counter_32k,

	&omap2420_l3__gpmc,

	NULL,

};

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+18 −0
Original line number Diff line number Diff line
@@ -887,6 +887,15 @@ static struct omap_hwmod_addr_space omap2430_counter_32k_addrs[] = { 
	{ }

};



static struct omap_hwmod_addr_space omap2430_gpmc_addrs[] = {

	{

		.pa_start	= 0x6e000000,

		.pa_end		= 0x6e000fff,

		.flags		= ADDR_TYPE_RT

	},

	{ }

};



static struct omap_hwmod_ocp_if omap2430_l4_wkup__counter_32k = {

	.master		= &omap2xxx_l4_wkup_hwmod,

	.slave		= &omap2xxx_counter_32k_hwmod,
@@ -895,6 +904,14 @@ static struct omap_hwmod_ocp_if omap2430_l4_wkup__counter_32k = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



static struct omap_hwmod_ocp_if omap2430_l3__gpmc = {

	.master		= &omap2xxx_l3_main_hwmod,

	.slave		= &omap2xxx_gpmc_hwmod,

	.clk		= "core_l3_ck",

	.addr		= omap2430_gpmc_addrs,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



static struct omap_hwmod_ocp_if *omap2430_hwmod_ocp_ifs[] __initdata = {

	&omap2xxx_l3_main__l4_core,

	&omap2xxx_mpu__l3_main,
@@ -945,6 +962,7 @@ static struct omap_hwmod_ocp_if *omap2430_hwmod_ocp_ifs[] __initdata = { 
	&omap2430_l4_core__mcbsp5,

	&omap2430_l4_core__hdq1w,

	&omap2430_l4_wkup__counter_32k,

	&omap2430_l3__gpmc,

	NULL,

};

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+50 −1
Original line number Diff line number Diff line
@@ -172,6 +172,26 @@ struct omap_hwmod_class omap2xxx_mcspi_class = { 
	.rev	= OMAP2_MCSPI_REV,

};



/*

 * 'gpmc' class

 * general purpose memory controller

 */



static struct omap_hwmod_class_sysconfig omap2xxx_gpmc_sysc = {

	.rev_offs	= 0x0000,

	.sysc_offs	= 0x0010,

	.syss_offs	= 0x0014,

	.sysc_flags	= (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE |

			   SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),

	.sysc_fields	= &omap_hwmod_sysc_type1,

};



static struct omap_hwmod_class omap2xxx_gpmc_hwmod_class = {

	.name	= "gpmc",

	.sysc	= &omap2xxx_gpmc_sysc,

};



/*

 * IP blocks

 */
@@ -724,7 +744,6 @@ struct omap_hwmod omap2xxx_mcspi2_hwmod = { 
	.dev_attr	= &omap_mcspi2_dev_attr,

};





static struct omap_hwmod_class omap2xxx_counter_hwmod_class = {

	.name	= "counter",

};
@@ -743,3 +762,33 @@ struct omap_hwmod omap2xxx_counter_32k_hwmod = { 
	},

	.class		= &omap2xxx_counter_hwmod_class,

};



/* gpmc */

static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = {

	{ .irq = 20 },

	{ .irq = -1 }

};



struct omap_hwmod omap2xxx_gpmc_hwmod = {

	.name		= "gpmc",

	.class		= &omap2xxx_gpmc_hwmod_class,

	.mpu_irqs	= omap2xxx_gpmc_irqs,

	.main_clk	= "gpmc_fck",

	/*

	 * XXX HWMOD_INIT_NO_RESET should not be needed for this IP

	 * block.  It is not being added due to any known bugs with

	 * resetting the GPMC IP block, but rather because any timings

	 * set by the bootloader are not being correctly programmed by

	 * the kernel from the board file or DT data.

	 * HWMOD_INIT_NO_RESET should be removed ASAP.

	 */

	.flags		= (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET |

			   HWMOD_NO_IDLEST),

	.prcm		= {

		.omap2	= {

			.prcm_reg_id = 3,

			.module_bit = OMAP24XX_EN_GPMC_MASK,

			.module_offs = CORE_MOD,

		},

	},

};

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+61 −0
Original line number Diff line number Diff line
@@ -2095,6 +2095,49 @@ static struct omap_hwmod omap3xxx_counter_32k_hwmod = { 
	},

};



/*

 * 'gpmc' class

 * general purpose memory controller

 */



static struct omap_hwmod_class_sysconfig omap3xxx_gpmc_sysc = {

	.rev_offs	= 0x0000,

	.sysc_offs	= 0x0010,

	.syss_offs	= 0x0014,

	.sysc_flags	= (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE |

			   SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),

	.sysc_fields	= &omap_hwmod_sysc_type1,

};



static struct omap_hwmod_class omap3xxx_gpmc_hwmod_class = {

	.name	= "gpmc",

	.sysc	= &omap3xxx_gpmc_sysc,

};



static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = {

	{ .irq = 20 },

	{ .irq = -1 }

};



static struct omap_hwmod omap3xxx_gpmc_hwmod = {

	.name		= "gpmc",

	.class		= &omap3xxx_gpmc_hwmod_class,

	.clkdm_name	= "core_l3_clkdm",

	.mpu_irqs	= omap3xxx_gpmc_irqs,

	.main_clk	= "gpmc_fck",

	/*

	 * XXX HWMOD_INIT_NO_RESET should not be needed for this IP

	 * block.  It is not being added due to any known bugs with

	 * resetting the GPMC IP block, but rather because any timings

	 * set by the bootloader are not being correctly programmed by

	 * the kernel from the board file or DT data.

	 * HWMOD_INIT_NO_RESET should be removed ASAP.

	 */

	.flags		= (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET |

			   HWMOD_NO_IDLEST),

};



/*

 * interfaces

 */
@@ -3320,6 +3363,15 @@ static struct omap_hwmod_addr_space omap3xxx_counter_32k_addrs[] = { 
	{ }

};



static struct omap_hwmod_addr_space omap3xxx_gpmc_addrs[] = {

	{

		.pa_start	= 0x6e000000,

		.pa_end		= 0x6e000fff,

		.flags		= ADDR_TYPE_RT

	},

	{ }

};



static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__counter_32k = {

	.master		= &omap3xxx_l4_wkup_hwmod,

	.slave		= &omap3xxx_counter_32k_hwmod,
@@ -3429,6 +3481,14 @@ static struct omap_hwmod_ocp_if am35xx_l4_core__emac = { 
	.user		= OCP_USER_MPU,

};



static struct omap_hwmod_ocp_if omap3xxx_l3_main__gpmc = {

	.master		= &omap3xxx_l3_main_hwmod,

	.slave		= &omap3xxx_gpmc_hwmod,

	.clk		= "core_l3_ick",

	.addr		= omap3xxx_gpmc_addrs,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



static struct omap_hwmod_ocp_if *omap3xxx_hwmod_ocp_ifs[] __initdata = {

	&omap3xxx_l3_main__l4_core,

	&omap3xxx_l3_main__l4_per,
@@ -3474,6 +3534,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_hwmod_ocp_ifs[] __initdata = { 
	&omap34xx_l4_core__mcspi3,

	&omap34xx_l4_core__mcspi4,

	&omap3xxx_l4_wkup__counter_32k,

	&omap3xxx_l3_main__gpmc,

	NULL,

};

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+8 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,14 @@ static struct omap_hwmod omap44xx_gpmc_hwmod = { 
	.name		= "gpmc",

	.class		= &omap44xx_gpmc_hwmod_class,

	.clkdm_name	= "l3_2_clkdm",

	/*

	 * XXX HWMOD_INIT_NO_RESET should not be needed for this IP

	 * block.  It is not being added due to any known bugs with

	 * resetting the GPMC IP block, but rather because any timings

	 * set by the bootloader are not being correctly programmed by

	 * the kernel from the board file or DT data.

	 * HWMOD_INIT_NO_RESET should be removed ASAP.

	 */

	.flags		= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,

	.mpu_irqs	= omap44xx_gpmc_irqs,

	.sdma_reqs	= omap44xx_gpmc_sdma_reqs,