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

Commit 907025e3 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'omap-fixes-b-for-3.4rc' of... 

Merge tag 'omap-fixes-b-for-3.4rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes

A few OMAP hwmod fixes against v3.4-rc2.  One of them is a reversion
of a previous v3.4-rc patch that caused some regressions, and upon
further review, appears not to be necessary.  The other two are fairly
minor.
parents 9a637e19 1f5e6247

arch/arm/mach-omap2/omap_hwmod.c

+15 −2
Original line number Diff line number Diff line
@@ -1422,6 +1422,9 @@ static int _ocp_softreset(struct omap_hwmod *oh) 
		goto dis_opt_clks;

	_write_sysconfig(v, oh);



	if (oh->class->sysc->srst_udelay)

		udelay(oh->class->sysc->srst_udelay);



	if (oh->class->sysc->sysc_flags & SYSS_HAS_RESET_STATUS)

		omap_test_timeout((omap_hwmod_read(oh,

						    oh->class->sysc->syss_offs)
@@ -1903,10 +1906,20 @@ void omap_hwmod_write(u32 v, struct omap_hwmod *oh, u16 reg_offs) 
 */

int omap_hwmod_softreset(struct omap_hwmod *oh)

{

	if (!oh)

	u32 v;

	int ret;



	if (!oh || !(oh->_sysc_cache))

		return -EINVAL;



	return _ocp_softreset(oh);

	v = oh->_sysc_cache;

	ret = _set_softreset(oh, &v);

	if (ret)

		goto error;

	_write_sysconfig(v, oh);



error:

	return ret;

}



/**

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+0 −1
Original line number Diff line number Diff line
@@ -1000,7 +1000,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_venc = { 
			.flags	= OMAP_FIREWALL_L4,

		}

	},

	.flags		= OCPIF_SWSUP_IDLE,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+0 −1
Original line number Diff line number Diff line
@@ -1049,7 +1049,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_venc = { 
	.slave		= &omap2430_dss_venc_hwmod,

	.clk		= "dss_ick",

	.addr		= omap2_dss_venc_addrs,

	.flags		= OCPIF_SWSUP_IDLE,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+0 −1
Original line number Diff line number Diff line
@@ -1676,7 +1676,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_venc = { 
			.flags	= OMAP_FIREWALL_L4,

		}

	},

	.flags		= OCPIF_SWSUP_IDLE,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+9 −0
Original line number Diff line number Diff line
@@ -2594,6 +2594,15 @@ static struct omap_hwmod omap44xx_ipu_hwmod = { 
static struct omap_hwmod_class_sysconfig omap44xx_iss_sysc = {

	.rev_offs	= 0x0000,

	.sysc_offs	= 0x0010,

	/*

	 * ISS 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 |