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

Commit b050f688 authored by Ming Lei's avatar Ming Lei Committed by Paul Walmsley
Browse files

ARM: OMAP4: hwmod data: introduce fdif(face detect module) hwmod 

Add hwmod data for the OMAP4 FDIF IP block.

This patch also includes a change (originally from Fernando Guzman
Lugo <fernando.lugo@ti.com>) to set a softreset delay for the FDIF IP
block:

   http://www.spinics.net/lists/arm-kernel/msg161874.html



Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
Acked-by: default avatarBenoît Cousson <b-cousson@ti.com>
Cc: Fernando Guzman Lugo <fernando.lugo@ti.com>
[paul@pwsan.com: rearranged to match script output; fixed FDIF end address to
 match script data; wrote trivial changelog; combined the FDIF portion of
 Fernando's srst_udelay patch]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 6ba5a69e

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+78 −1
Original line number Diff line number Diff line
@@ -263,7 +263,6 @@ static struct omap_hwmod omap44xx_mpu_private_hwmod = { 
 *  elm

 *  emif1

 *  emif2

 *  fdif

 *  gpmc

 *  gpu

 *  hdq1w
@@ -815,6 +814,56 @@ static struct omap_hwmod omap44xx_dss_venc_hwmod = { 
	},

};



/*

 * 'fdif' class

 * face detection hw accelerator module

 */



static struct omap_hwmod_class_sysconfig omap44xx_fdif_sysc = {

	.rev_offs	= 0x0000,

	.sysc_offs	= 0x0010,

	/*

	 * FDIF needs 100 OCP clk cycles delay after a softreset before

	 * accessing sysconfig again.

	 * The lowest frequency at the moment for L3 bus is 100 MHz, so

	 * 1usec delay is needed. Add an x2 margin to be safe (2 usecs).

	 *

	 * TODO: Indicate errata when available.

	 */

	.srst_udelay	= 2,

	.sysc_flags	= (SYSC_HAS_MIDLEMODE | SYSC_HAS_RESET_STATUS |

			   SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |

			   MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),

	.sysc_fields	= &omap_hwmod_sysc_type2,

};



static struct omap_hwmod_class omap44xx_fdif_hwmod_class = {

	.name	= "fdif",

	.sysc	= &omap44xx_fdif_sysc,

};



/* fdif */

static struct omap_hwmod_irq_info omap44xx_fdif_irqs[] = {

	{ .irq = 69 + OMAP44XX_IRQ_GIC_START },

	{ .irq = -1 }

};



static struct omap_hwmod omap44xx_fdif_hwmod = {

	.name		= "fdif",

	.class		= &omap44xx_fdif_hwmod_class,

	.clkdm_name	= "iss_clkdm",

	.mpu_irqs	= omap44xx_fdif_irqs,

	.main_clk	= "fdif_fck",

	.prcm = {

		.omap4 = {

			.clkctrl_offs = OMAP4_CM_CAM_FDIF_CLKCTRL_OFFSET,

			.context_offs = OMAP4_RM_CAM_FDIF_CONTEXT_OFFSET,

			.modulemode   = MODULEMODE_SWCTRL,

		},

	},

};



/*

 * 'gpio' class

 * general purpose io module
@@ -2980,6 +3029,14 @@ static struct omap_hwmod_ocp_if omap44xx_dma_system__l3_main_2 = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* fdif -> l3_main_2 */

static struct omap_hwmod_ocp_if omap44xx_fdif__l3_main_2 = {

	.master		= &omap44xx_fdif_hwmod,

	.slave		= &omap44xx_l3_main_2_hwmod,

	.clk		= "l3_div_ck",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* hsi -> l3_main_2 */

static struct omap_hwmod_ocp_if omap44xx_hsi__l3_main_2 = {

	.master		= &omap44xx_hsi_hwmod,
@@ -3530,6 +3587,24 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_venc = { 
	.user		= OCP_USER_MPU,

};



static struct omap_hwmod_addr_space omap44xx_fdif_addrs[] = {

	{

		.pa_start	= 0x4a10a000,

		.pa_end		= 0x4a10a1ff,

		.flags		= ADDR_TYPE_RT

	},

	{ }

};



/* l4_cfg -> fdif */

static struct omap_hwmod_ocp_if omap44xx_l4_cfg__fdif = {

	.master		= &omap44xx_l4_cfg_hwmod,

	.slave		= &omap44xx_fdif_hwmod,

	.clk		= "l4_div_ck",

	.addr		= omap44xx_fdif_addrs,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



static struct omap_hwmod_addr_space omap44xx_gpio1_addrs[] = {

	{

		.pa_start	= 0x4a310000,
@@ -4687,6 +4762,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { 
	&omap44xx_mmc2__l3_main_1,

	&omap44xx_mpu__l3_main_1,

	&omap44xx_dma_system__l3_main_2,

	&omap44xx_fdif__l3_main_2,

	&omap44xx_hsi__l3_main_2,

	&omap44xx_ipu__l3_main_2,

	&omap44xx_iss__l3_main_2,
@@ -4728,6 +4804,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { 
	&omap44xx_l4_per__dss_rfbi,

	&omap44xx_l3_main_2__dss_venc,

	&omap44xx_l4_per__dss_venc,

	&omap44xx_l4_cfg__fdif,

	&omap44xx_l4_wkup__gpio1,

	&omap44xx_l4_per__gpio2,

	&omap44xx_l4_per__gpio3,