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

Commit 05d2b093 authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: AM33xx: hwmod: remove am33xx specific module SoC opts 



These are now identical with the OMAP4 implementations, so use the OMAP4
versions and remove the AM33xx ones.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2196a9b8

arch/arm/mach-omap2/omap_hwmod.c

+3 −102
Original line number Diff line number Diff line
@@ -984,25 +984,6 @@ static void _omap4_enable_module(struct omap_hwmod *oh) 
			      oh->clkdm->cm_inst, oh->prcm.omap4.clkctrl_offs);

}



/**

 * _am33xx_enable_module - enable CLKCTRL modulemode on AM33XX

 * @oh: struct omap_hwmod *

 *

 * Enables the PRCM module mode related to the hwmod @oh.

 * No return value.

 */

static void _am33xx_enable_module(struct omap_hwmod *oh)

{

	if (!oh->clkdm || !oh->prcm.omap4.modulemode)

		return;



	pr_debug("omap_hwmod: %s: %s: %d\n",

		 oh->name, __func__, oh->prcm.omap4.modulemode);



	omap_cm_module_enable(oh->prcm.omap4.modulemode, 0, oh->clkdm->cm_inst,

			      oh->prcm.omap4.clkctrl_offs);

}



/**

 * _omap4_wait_target_disable - wait for a module to be disabled on OMAP4

 * @oh: struct omap_hwmod *
@@ -1028,30 +1009,6 @@ static int _omap4_wait_target_disable(struct omap_hwmod *oh) 
					oh->prcm.omap4.clkctrl_offs, 0);

}



/**

 * _am33xx_wait_target_disable - wait for a module to be disabled on AM33XX

 * @oh: struct omap_hwmod *

 *

 * Wait for a module @oh to enter slave idle.  Returns 0 if the module

 * does not have an IDLEST bit or if the module successfully enters

 * slave idle; otherwise, pass along the return value of the

 * appropriate *_cm*_wait_module_idle() function.

 */

static int _am33xx_wait_target_disable(struct omap_hwmod *oh)

{

	if (!oh)

		return -EINVAL;



	if (oh->_int_flags & _HWMOD_NO_MPU_PORT)

		return 0;



	if (oh->flags & HWMOD_NO_IDLEST)

		return 0;



	return omap_cm_wait_module_idle(0, oh->clkdm->cm_inst,

					oh->prcm.omap4.clkctrl_offs, 0);

}



/**

 * _count_mpu_irqs - count the number of MPU IRQ lines associated with @oh

 * @oh: struct omap_hwmod *oh
@@ -1865,36 +1822,6 @@ static int _omap4_disable_module(struct omap_hwmod *oh) 
	return 0;

}



/**

 * _am33xx_disable_module - enable CLKCTRL modulemode on AM33XX

 * @oh: struct omap_hwmod *

 *

 * Disable the PRCM module mode related to the hwmod @oh.

 * Return EINVAL if the modulemode is not supported and 0 in case of success.

 */

static int _am33xx_disable_module(struct omap_hwmod *oh)

{

	int v;



	if (!oh->clkdm || !oh->prcm.omap4.modulemode)

		return -EINVAL;



	pr_debug("omap_hwmod: %s: %s\n", oh->name, __func__);



	if (_are_any_hardreset_lines_asserted(oh))

		return 0;



	omap_cm_module_disable(0, oh->clkdm->cm_inst,

			       oh->prcm.omap4.clkctrl_offs);



	v = _am33xx_wait_target_disable(oh);

	if (v)

		pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",

			oh->name);



	return 0;

}



/**

 * _ocp_softreset - reset an omap_hwmod via the OCP_SYSCONFIG bit

 * @oh: struct omap_hwmod *
@@ -2973,32 +2900,6 @@ static int _omap4_wait_target_ready(struct omap_hwmod *oh) 
					 oh->prcm.omap4.clkctrl_offs, 0);

}



/**

 * _am33xx_wait_target_ready - wait for a module to leave slave idle

 * @oh: struct omap_hwmod *

 *

 * Wait for a module @oh to leave slave idle.  Returns 0 if the module

 * does not have an IDLEST bit or if the module successfully leaves

 * slave idle; otherwise, pass along the return value of the

 * appropriate *_cm*_wait_module_ready() function.

 */

static int _am33xx_wait_target_ready(struct omap_hwmod *oh)

{

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

		return -EINVAL;



	if (oh->flags & HWMOD_NO_IDLEST)

		return 0;



	if (!_find_mpu_rt_port(oh))

		return 0;



	/* XXX check module SIDLEMODE, hardreset status */



	return omap_cm_wait_module_ready(0, oh->clkdm->cm_inst,

					 oh->prcm.omap4.clkctrl_offs, 0);

}



/**

 * _omap2_assert_hardreset - call OMAP2 PRM hardreset fn with hwmod args

 * @oh: struct omap_hwmod * to assert hardreset
@@ -4227,9 +4128,9 @@ void __init omap_hwmod_init(void) 
		soc_ops.is_hardreset_asserted = _am33xx_is_hardreset_asserted;

		soc_ops.init_clkdm = _init_clkdm;

	} else if (soc_is_am33xx()) {

		soc_ops.enable_module = _am33xx_enable_module;

		soc_ops.disable_module = _am33xx_disable_module;

		soc_ops.wait_target_ready = _am33xx_wait_target_ready;

		soc_ops.enable_module = _omap4_enable_module;

		soc_ops.disable_module = _omap4_disable_module;

		soc_ops.wait_target_ready = _omap4_wait_target_ready;

		soc_ops.assert_hardreset = _am33xx_assert_hardreset;

		soc_ops.deassert_hardreset = _am33xx_deassert_hardreset;

		soc_ops.is_hardreset_asserted = _am33xx_is_hardreset_asserted;