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

Commit c8d82ff6 authored by Vaibhav Hiremath's avatar Vaibhav Hiremath Committed by Paul Walmsley
Browse files

ARM: OMAP2/3: hwmod data: Add 32k-sync timer data to hwmod database 



Add 32k-sync timer hwmod-data and add ocp_if details to
omap2 & 3 hwmod table.

Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Reviewed-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 437e8970

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+19 −0
Original line number Diff line number Diff line
@@ -519,6 +519,24 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__hdq1w = { 
};





/* l4_wkup -> 32ksync_counter */

static struct omap_hwmod_addr_space omap2420_counter_32k_addrs[] = {

	{

		.pa_start	= 0x48004000,

		.pa_end		= 0x4800401f,

		.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,

	.clk		= "sync_32k_ick",

	.addr		= omap2420_counter_32k_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,
@@ -561,6 +579,7 @@ static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = { 
	&omap2420_l4_core__mcbsp2,

	&omap2420_l4_core__msdi1,

	&omap2420_l4_core__hdq1w,

	&omap2420_l4_wkup__counter_32k,

	NULL,

};

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+19 −0
Original line number Diff line number Diff line
@@ -865,6 +865,24 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__hdq1w = { 
	.flags		= OMAP_FIREWALL_L4 | OCPIF_SWSUP_IDLE,

};



/* l4_wkup -> 32ksync_counter */

static struct omap_hwmod_addr_space omap2430_counter_32k_addrs[] = {

	{

		.pa_start	= 0x49020000,

		.pa_end		= 0x4902001f,

		.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,

	.clk		= "sync_32k_ick",

	.addr		= omap2430_counter_32k_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,
@@ -914,6 +932,7 @@ static struct omap_hwmod_ocp_if *omap2430_hwmod_ocp_ifs[] __initdata = { 
	&omap2430_l4_core__mcbsp4,

	&omap2430_l4_core__mcbsp5,

	&omap2430_l4_core__hdq1w,

	&omap2430_l4_wkup__counter_32k,

	NULL,

};

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+20 −0
Original line number Diff line number Diff line
@@ -732,3 +732,23 @@ struct omap_hwmod omap2xxx_mcspi2_hwmod = { 
	.class		= &omap2xxx_mcspi_class,

	.dev_attr	= &omap_mcspi2_dev_attr,

};





static struct omap_hwmod_class omap2xxx_counter_hwmod_class = {

	.name	= "counter",

};



struct omap_hwmod omap2xxx_counter_32k_hwmod = {

	.name		= "counter_32k",

	.main_clk	= "func_32k_ck",

	.prcm		= {

		.omap2	= {

			.module_offs = WKUP_MOD,

			.prcm_reg_id = 1,

			.module_bit = OMAP24XX_ST_32KSYNC_SHIFT,

			.idlest_reg_id = 1,

			.idlest_idle_bit = OMAP24XX_ST_32KSYNC_SHIFT,

		},

	},

	.class		= &omap2xxx_counter_hwmod_class,

};

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+53 −0
Original line number Diff line number Diff line
@@ -1996,6 +1996,40 @@ static struct omap_hwmod omap3xxx_hdq1w_hwmod = { 
	.class		= &omap2_hdq1w_class,

};



/*

 * '32K sync counter' class

 * 32-bit ordinary counter, clocked by the falling edge of the 32 khz clock

 */

static struct omap_hwmod_class_sysconfig omap3xxx_counter_sysc = {

	.rev_offs	= 0x0000,

	.sysc_offs	= 0x0004,

	.sysc_flags	= SYSC_HAS_SIDLEMODE,

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO),

	.sysc_fields	= &omap_hwmod_sysc_type1,

};



static struct omap_hwmod_class omap3xxx_counter_hwmod_class = {

	.name	= "counter",

	.sysc	= &omap3xxx_counter_sysc,

};



static struct omap_hwmod omap3xxx_counter_32k_hwmod = {

	.name		= "counter_32k",

	.class		= &omap3xxx_counter_hwmod_class,

	.clkdm_name	= "wkup_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE,

	.main_clk	= "wkup_32k_fck",

	.prcm		= {

		.omap2	= {

			.module_offs = WKUP_MOD,

			.prcm_reg_id = 1,

			.module_bit = OMAP3430_ST_32KSYNC_SHIFT,

			.idlest_reg_id = 1,

			.idlest_idle_bit = OMAP3430_ST_32KSYNC_SHIFT,

		},

	},

};



/*

 * interfaces

 */
@@ -3085,6 +3119,24 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__hdq1w = { 
	.flags		= OMAP_FIREWALL_L4 | OCPIF_SWSUP_IDLE,

};



/* l4_wkup -> 32ksync_counter */

static struct omap_hwmod_addr_space omap3xxx_counter_32k_addrs[] = {

	{

		.pa_start	= 0x48320000,

		.pa_end		= 0x4832001f,

		.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,

	.clk		= "omap_32ksync_ick",

	.addr		= omap3xxx_counter_32k_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,
@@ -3129,6 +3181,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_hwmod_ocp_ifs[] __initdata = { 
	&omap34xx_l4_core__mcspi2,

	&omap34xx_l4_core__mcspi3,

	&omap34xx_l4_core__mcspi4,

	&omap3xxx_l4_wkup__counter_32k,

	NULL,

};

arch/arm/mach-omap2/omap_hwmod_common_data.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ extern struct omap_hwmod omap2xxx_gpio3_hwmod; 
extern struct omap_hwmod omap2xxx_gpio4_hwmod;

extern struct omap_hwmod omap2xxx_mcspi1_hwmod;

extern struct omap_hwmod omap2xxx_mcspi2_hwmod;

extern struct omap_hwmod omap2xxx_counter_32k_hwmod;



/* Common interface data across OMAP2xxx */

extern struct omap_hwmod_ocp_if omap2xxx_l3_main__l4_core;