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

Commit 5f3530a0 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v4.8/soc' into omap-for-v4.8/fixes

parents 29b4817d e4e53287

arch/arm/mach-omap2/cm33xx.c

+0 −6
Original line number Diff line number Diff line
@@ -220,9 +220,6 @@ static int am33xx_cm_wait_module_ready(u8 part, s16 inst, u16 clkctrl_offs, 
{

	int i = 0;



	if (!clkctrl_offs)

		return 0;



	omap_test_timeout(_is_module_ready(inst, clkctrl_offs),

			  MAX_MODULE_READY_TIME, i);
@@ -246,9 +243,6 @@ static int am33xx_cm_wait_module_idle(u8 part, s16 inst, u16 clkctrl_offs, 
{

	int i = 0;



	if (!clkctrl_offs)

		return 0;



	omap_test_timeout((_clkctrl_idlest(inst, clkctrl_offs) ==

				CLKCTRL_IDLEST_DISABLED),

				MAX_MODULE_READY_TIME, i);

arch/arm/mach-omap2/cminst44xx.c

+0 −6
Original line number Diff line number Diff line
@@ -278,9 +278,6 @@ static int omap4_cminst_wait_module_ready(u8 part, s16 inst, u16 clkctrl_offs, 
{

	int i = 0;



	if (!clkctrl_offs)

		return 0;



	omap_test_timeout(_is_module_ready(part, inst, clkctrl_offs),

			  MAX_MODULE_READY_TIME, i);
@@ -304,9 +301,6 @@ static int omap4_cminst_wait_module_idle(u8 part, s16 inst, u16 clkctrl_offs, 
{

	int i = 0;



	if (!clkctrl_offs)

		return 0;



	omap_test_timeout((_clkctrl_idlest(part, inst, clkctrl_offs) ==

			   CLKCTRL_IDLEST_DISABLED),

			  MAX_MODULE_DISABLE_TIME, i);

arch/arm/mach-omap2/omap_hwmod.c

+8 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,10 @@ static int _omap4_wait_target_disable(struct omap_hwmod *oh) 
	if (oh->flags & HWMOD_NO_IDLEST)

		return 0;



	if (!oh->prcm.omap4.clkctrl_offs &&

	    !(oh->prcm.omap4.flags & HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET))

		return 0;



	return omap_cm_wait_module_idle(oh->clkdm->prcm_partition,

					oh->clkdm->cm_inst,

					oh->prcm.omap4.clkctrl_offs, 0);
@@ -2971,6 +2975,10 @@ static int _omap4_wait_target_ready(struct omap_hwmod *oh) 
	if (!_find_mpu_rt_port(oh))

		return 0;



	if (!oh->prcm.omap4.clkctrl_offs &&

	    !(oh->prcm.omap4.flags & HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET))

		return 0;



	/* XXX check module SIDLEMODE, hardreset status */



	return omap_cm_wait_module_ready(oh->clkdm->prcm_partition,

arch/arm/mach-omap2/omap_hwmod.h

+4 −0
Original line number Diff line number Diff line
@@ -443,8 +443,12 @@ struct omap_hwmod_omap2_prcm { 
 * HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT: Some IP blocks don't have a PRCM

 *     module-level context loss register associated with them; this

 *     flag bit should be set in those cases

 * HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET: Some IP blocks have a valid CLKCTRL

 *	offset of zero; this flag bit should be set in those cases to

 *	distinguish from hwmods that have no clkctrl offset.

 */

#define HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT		(1 << 0)

#define HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET		(1 << 1)



/**

 * struct omap_hwmod_omap4_prcm - OMAP4-specific PRCM data

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#define CLKCTRL(oh, clkctrl) ((oh).prcm.omap4.clkctrl_offs = (clkctrl))

#define RSTCTRL(oh, rstctrl) ((oh).prcm.omap4.rstctrl_offs = (rstctrl))

#define RSTST(oh, rstst) ((oh).prcm.omap4.rstst_offs = (rstst))

#define PRCM_FLAGS(oh, flag) ((oh).prcm.omap4.flags = (flag))



/*

 * 'l3' class
@@ -1296,6 +1297,7 @@ static void omap_hwmod_am33xx_clkctrl(void) 
	CLKCTRL(am33xx_i2c1_hwmod, AM33XX_CM_WKUP_I2C0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_wd_timer1_hwmod, AM33XX_CM_WKUP_WDT1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_rtc_hwmod, AM33XX_CM_RTC_RTC_CLKCTRL_OFFSET);

	PRCM_FLAGS(am33xx_rtc_hwmod, HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mmc2_hwmod, AM33XX_CM_PER_MMC2_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_gpmc_hwmod, AM33XX_CM_PER_GPMC_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_l4_ls_hwmod, AM33XX_CM_PER_L4LS_CLKCTRL_OFFSET);