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

Commit 56bc78d4 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP4: clockdomain: bypass unimplemented wake-up dependency functions on OMAP4 

Commit 56a6a19d ("omap2plus: prm:
Trvial build break fix for undefined reference to
'omap2_prm_read_mod_reg'") generates a lot of warnings on boot since
clockdomain functions that manipulate wake-up dependencies are not
implemented yet on OMAP4 for 2.6.38.  This patch bypasses the OMAP2/3
functions on OMAP4, which in turn avoids the warnings when the
functions would attempt to call the underlying OMAP2/3 PRCM functions.
A one-line warning is still logged from the clockdomain code that the
OMAP4 wake-up dependency code is not yet implemented.

A clockdomain wake-up and sleep dependency implementation for OMAP4
from Rajendra should be possible to merge during the 2.6.39 merge
window:

    http://www.mail-archive.com/linux-omap@vger.kernel.org/msg41748.html

    http://www.mail-archive.com/linux-omap@vger.kernel.org/msg42222.html



Reported-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Benoît Cousson <b-cousson@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent d8328f3b

arch/arm/mach-omap2/clockdomain.c

+26 −4
Original line number Diff line number Diff line
@@ -423,6 +423,12 @@ int clkdm_add_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) 
{

	struct clkdm_dep *cd;



	if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) {

		pr_err("clockdomain: %s/%s: %s: not yet implemented\n",

		       clkdm1->name, clkdm2->name, __func__);

		return -EINVAL;

	}



	if (!clkdm1 || !clkdm2)

		return -EINVAL;
@@ -458,6 +464,12 @@ int clkdm_del_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) 
{

	struct clkdm_dep *cd;



	if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) {

		pr_err("clockdomain: %s/%s: %s: not yet implemented\n",

		       clkdm1->name, clkdm2->name, __func__);

		return -EINVAL;

	}



	if (!clkdm1 || !clkdm2)

		return -EINVAL;
@@ -500,6 +512,12 @@ int clkdm_read_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) 
	if (!clkdm1 || !clkdm2)

		return -EINVAL;



	if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) {

		pr_err("clockdomain: %s/%s: %s: not yet implemented\n",

		       clkdm1->name, clkdm2->name, __func__);

		return -EINVAL;

	}



	cd = _clkdm_deps_lookup(clkdm2, clkdm1->wkdep_srcs);

	if (IS_ERR(cd)) {

		pr_debug("clockdomain: hardware cannot set/clear wake up of "
@@ -527,6 +545,12 @@ int clkdm_clear_all_wkdeps(struct clockdomain *clkdm) 
	struct clkdm_dep *cd;

	u32 mask = 0;



	if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) {

		pr_err("clockdomain: %s: %s: not yet implemented\n",

		       clkdm->name, __func__);

		return -EINVAL;

	}



	if (!clkdm)

		return -EINVAL;
@@ -830,8 +854,7 @@ void omap2_clkdm_allow_idle(struct clockdomain *clkdm) 
	 * dependency code and data for OMAP4.

	 */

	if (cpu_is_omap44xx()) {

		WARN_ONCE(1, "clockdomain: OMAP4 wakeup/sleep dependency "

			  "support is not yet implemented\n");

		pr_err("clockdomain: %s: OMAP4 wakeup/sleep dependency support: not yet implemented\n", clkdm->name);

	} else {

		if (atomic_read(&clkdm->usecount) > 0)

			_clkdm_add_autodeps(clkdm);
@@ -872,8 +895,7 @@ void omap2_clkdm_deny_idle(struct clockdomain *clkdm) 
	 * dependency code and data for OMAP4.

	 */

	if (cpu_is_omap44xx()) {

		WARN_ONCE(1, "clockdomain: OMAP4 wakeup/sleep dependency "

			  "support is not yet implemented\n");

		pr_err("clockdomain: %s: OMAP4 wakeup/sleep dependency support: not yet implemented\n", clkdm->name);

	} else {

		if (atomic_read(&clkdm->usecount) > 0)

			_clkdm_del_autodeps(clkdm);