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

Commit 4da71ae6 authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Paul Walmsley
Browse files

OMAP: clockdomain: Arch specific funcs for clkdm_clk_enable/disable 



Define the following architecture specific funtions for omap2/3/4
.clkdm_clk_enable
.clkdm_clk_disable

Convert the platform-independent framework to call these functions.
Also rename the api's by removing the omap2_ preamble.
Hence call omap2_clkdm_k_enable as clkdm_clk_enable and
omap2_clkdm_clk_disable as clkdm_clk_disable.a

Remove unused functions (_enable/_disable_hwsup) and unsed
headers from clockdomain.c file.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 5cd1937b

arch/arm/mach-omap2/clock.c

+3 −3
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ void omap2_clk_disable(struct clk *clk) 
	clk->ops->disable(clk);



	if (clk->clkdm)

		omap2_clkdm_clk_disable(clk->clkdm, clk);

		clkdm_clk_disable(clk->clkdm, clk);



	if (clk->parent)

		omap2_clk_disable(clk->parent);
@@ -304,7 +304,7 @@ int omap2_clk_enable(struct clk *clk) 
	}



	if (clk->clkdm) {

		ret = omap2_clkdm_clk_enable(clk->clkdm, clk);

		ret = clkdm_clk_enable(clk->clkdm, clk);

		if (ret) {

			WARN(1, "clock: %s: could not enable clockdomain %s: "

			     "%d\n", clk->name, clk->clkdm->name, ret);
@@ -322,7 +322,7 @@ int omap2_clk_enable(struct clk *clk) 


oce_err3:

	if (clk->clkdm)

		omap2_clkdm_clk_disable(clk->clkdm, clk);

		clkdm_clk_disable(clk->clkdm, clk);

oce_err2:

	if (clk->parent)

		omap2_clk_disable(clk->parent);

arch/arm/mach-omap2/clockdomain.c

+12 −119
Original line number Diff line number Diff line
@@ -26,17 +26,8 @@ 


#include <linux/bitops.h>



#include "prm2xxx_3xxx.h"

#include "prm-regbits-24xx.h"

#include "cm2xxx_3xxx.h"

#include "cm-regbits-24xx.h"

#include "cminst44xx.h"

#include "prcm44xx.h"



#include <plat/clock.h>

#include "powerdomain.h"

#include "clockdomain.h"

#include <plat/prcm.h>



/* clkdm_list contains all registered struct clockdomains */

static LIST_HEAD(clkdm_list);
@@ -235,58 +226,6 @@ void _clkdm_del_autodeps(struct clockdomain *clkdm) 
	}

}



/**

 * _enable_hwsup - place a clockdomain into hardware-supervised idle

 * @clkdm: struct clockdomain *

 *

 * Place the clockdomain into hardware-supervised idle mode.  No return

 * value.

 *

 * XXX Should this return an error if the clockdomain does not support

 * hardware-supervised idle mode?

 */

static void _enable_hwsup(struct clockdomain *clkdm)

{

	if (cpu_is_omap24xx())

		omap2xxx_cm_clkdm_enable_hwsup(clkdm->pwrdm.ptr->prcm_offs,

					       clkdm->clktrctrl_mask);

	else if (cpu_is_omap34xx())

		omap3xxx_cm_clkdm_enable_hwsup(clkdm->pwrdm.ptr->prcm_offs,

					       clkdm->clktrctrl_mask);

	else if (cpu_is_omap44xx())

		return omap4_cminst_clkdm_enable_hwsup(clkdm->prcm_partition,

						       clkdm->cm_inst,

						       clkdm->clkdm_offs);

	else

		BUG();

}



/**

 * _disable_hwsup - place a clockdomain into software-supervised idle

 * @clkdm: struct clockdomain *

 *

 * Place the clockdomain @clkdm into software-supervised idle mode.

 * No return value.

 *

 * XXX Should this return an error if the clockdomain does not support

 * software-supervised idle mode?

 */

static void _disable_hwsup(struct clockdomain *clkdm)

{

	if (cpu_is_omap24xx())

		omap2xxx_cm_clkdm_disable_hwsup(clkdm->pwrdm.ptr->prcm_offs,

						clkdm->clktrctrl_mask);

	else if (cpu_is_omap34xx())

		omap3xxx_cm_clkdm_disable_hwsup(clkdm->pwrdm.ptr->prcm_offs,

						clkdm->clktrctrl_mask);

	else if (cpu_is_omap44xx())

		return omap4_cminst_clkdm_disable_hwsup(clkdm->prcm_partition,

							clkdm->cm_inst,

							clkdm->clkdm_offs);

	else

		BUG();

}



/**

 * _resolve_clkdm_deps() - resolve clkdm_names in @clkdm_deps to clkdms

 * @clkdm: clockdomain that we are resolving dependencies for
@@ -884,7 +823,7 @@ void clkdm_deny_idle(struct clockdomain *clkdm) 
/* Clockdomain-to-clock framework interface code */



/**

 * omap2_clkdm_clk_enable - add an enabled downstream clock to this clkdm

 * clkdm_clk_enable - add an enabled downstream clock to this clkdm

 * @clkdm: struct clockdomain *

 * @clk: struct clk * of the enabled downstream clock

 *
@@ -897,10 +836,8 @@ void clkdm_deny_idle(struct clockdomain *clkdm) 
 * by on-chip processors.  Returns -EINVAL if passed null pointers;

 * returns 0 upon success or if the clockdomain is in hwsup idle mode.

 */

int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)

int clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)

{

	bool hwsup = false;



	/*

	 * XXX Rewrite this code to maintain a list of enabled

	 * downstream clocks for debugging purposes?
@@ -909,6 +846,9 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk) 
	if (!clkdm || !clk)

		return -EINVAL;



	if (!arch_clkdm || !arch_clkdm->clkdm_clk_enable)

		return -EINVAL;



	if (atomic_inc_return(&clkdm->usecount) > 1)

		return 0;
@@ -917,31 +857,7 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk) 
	pr_debug("clockdomain: clkdm %s: clk %s now enabled\n", clkdm->name,

		 clk->name);



	if (cpu_is_omap24xx() || cpu_is_omap34xx()) {



		if (!clkdm->clktrctrl_mask)

			return 0;



		hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs,

						   clkdm->clktrctrl_mask);



	} else if (cpu_is_omap44xx()) {



		hwsup = omap4_cminst_is_clkdm_in_hwsup(clkdm->prcm_partition,

						       clkdm->cm_inst,

						       clkdm->clkdm_offs);



	}



	if (hwsup) {

		/* Disable HW transitions when we are changing deps */

		_disable_hwsup(clkdm);

		_clkdm_add_autodeps(clkdm);

		_enable_hwsup(clkdm);

	} else {

		clkdm_wakeup(clkdm);

	}



	arch_clkdm->clkdm_clk_enable(clkdm);

	pwrdm_wait_transition(clkdm->pwrdm.ptr);

	pwrdm_clkdm_state_switch(clkdm);
@@ -949,7 +865,7 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk) 
}



/**

 * omap2_clkdm_clk_disable - remove an enabled downstream clock from this clkdm

 * clkdm_clk_disable - remove an enabled downstream clock from this clkdm

 * @clkdm: struct clockdomain *

 * @clk: struct clk * of the disabled downstream clock

 *
@@ -962,10 +878,8 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk) 
 * is enabled; or returns 0 upon success or if the clockdomain is in

 * hwsup idle mode.

 */

int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)

int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)

{

	bool hwsup = false;



	/*

	 * XXX Rewrite this code to maintain a list of enabled

	 * downstream clocks for debugging purposes?
@@ -974,6 +888,9 @@ int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk) 
	if (!clkdm || !clk)

		return -EINVAL;



	if (!arch_clkdm || !arch_clkdm->clkdm_clk_disable)

		return -EINVAL;



#ifdef DEBUG

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

		WARN_ON(1); /* underflow */
@@ -989,31 +906,7 @@ int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk) 
	pr_debug("clockdomain: clkdm %s: clk %s now disabled\n", clkdm->name,

		 clk->name);



	if (cpu_is_omap24xx() || cpu_is_omap34xx()) {



		if (!clkdm->clktrctrl_mask)

			return 0;



		hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs,

						   clkdm->clktrctrl_mask);



	} else if (cpu_is_omap44xx()) {



		hwsup = omap4_cminst_is_clkdm_in_hwsup(clkdm->prcm_partition,

						       clkdm->cm_inst,

						       clkdm->clkdm_offs);



	}



	if (hwsup) {

		/* Disable HW transitions when we are changing deps */

		_disable_hwsup(clkdm);

		_clkdm_del_autodeps(clkdm);

		_enable_hwsup(clkdm);

	} else {

		clkdm_sleep(clkdm);

	}



	arch_clkdm->clkdm_clk_disable(clkdm);

	pwrdm_clkdm_state_switch(clkdm);



	return 0;

arch/arm/mach-omap2/clockdomain.h

+2 −2
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ void clkdm_deny_idle(struct clockdomain *clkdm); 
int clkdm_wakeup(struct clockdomain *clkdm);

int clkdm_sleep(struct clockdomain *clkdm);



int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk);

int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk);

int clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk);

int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk);



extern void __init omap2xxx_clockdomains_init(void);

extern void __init omap3xxx_clockdomains_init(void);

arch/arm/mach-omap2/clockdomain2xxx_3xxx.c

+69 −0
Original line number Diff line number Diff line
@@ -146,6 +146,71 @@ static void omap2_clkdm_deny_idle(struct clockdomain *clkdm) 
		_clkdm_del_autodeps(clkdm);

}



static void _enable_hwsup(struct clockdomain *clkdm)

{

	if (cpu_is_omap24xx())

		omap2xxx_cm_clkdm_enable_hwsup(clkdm->pwrdm.ptr->prcm_offs,

					       clkdm->clktrctrl_mask);

	else if (cpu_is_omap34xx())

		omap3xxx_cm_clkdm_enable_hwsup(clkdm->pwrdm.ptr->prcm_offs,

					       clkdm->clktrctrl_mask);

}



static void _disable_hwsup(struct clockdomain *clkdm)

{

	if (cpu_is_omap24xx())

		omap2xxx_cm_clkdm_disable_hwsup(clkdm->pwrdm.ptr->prcm_offs,

						clkdm->clktrctrl_mask);

	else if (cpu_is_omap34xx())

		omap3xxx_cm_clkdm_disable_hwsup(clkdm->pwrdm.ptr->prcm_offs,

						clkdm->clktrctrl_mask);

}





static int omap2_clkdm_clk_enable(struct clockdomain *clkdm)

{

	bool hwsup = false;



	if (!clkdm->clktrctrl_mask)

		return 0;



	hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs,

				clkdm->clktrctrl_mask);



	if (hwsup) {

		/* Disable HW transitions when we are changing deps */

		_disable_hwsup(clkdm);

		_clkdm_add_autodeps(clkdm);

		_enable_hwsup(clkdm);

	} else {

		clkdm_wakeup(clkdm);

	}



	return 0;

}



static int omap2_clkdm_clk_disable(struct clockdomain *clkdm)

{

	bool hwsup = false;



	if (!clkdm->clktrctrl_mask)

		return 0;



	hwsup = omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs,

				clkdm->clktrctrl_mask);



	if (hwsup) {

		/* Disable HW transitions when we are changing deps */

		_disable_hwsup(clkdm);

		_clkdm_del_autodeps(clkdm);

		_enable_hwsup(clkdm);

	} else {

		clkdm_sleep(clkdm);

	}



	return 0;

}



static int omap3_clkdm_sleep(struct clockdomain *clkdm)

{

	omap3xxx_cm_clkdm_force_sleep(clkdm->pwrdm.ptr->prcm_offs,
@@ -187,6 +252,8 @@ struct clkdm_ops omap2_clkdm_operations = { 
	.clkdm_wakeup		= omap2_clkdm_wakeup,

	.clkdm_allow_idle	= omap2_clkdm_allow_idle,

	.clkdm_deny_idle	= omap2_clkdm_deny_idle,

	.clkdm_clk_enable	= omap2_clkdm_clk_enable,

	.clkdm_clk_disable	= omap2_clkdm_clk_disable,

};



struct clkdm_ops omap3_clkdm_operations = {
@@ -202,4 +269,6 @@ struct clkdm_ops omap3_clkdm_operations = { 
	.clkdm_wakeup		= omap3_clkdm_wakeup,

	.clkdm_allow_idle	= omap3_clkdm_allow_idle,

	.clkdm_deny_idle	= omap3_clkdm_deny_idle,

	.clkdm_clk_enable	= omap2_clkdm_clk_enable,

	.clkdm_clk_disable	= omap2_clkdm_clk_disable,

};

arch/arm/mach-omap2/clockdomain44xx.c

+28 −0
Original line number Diff line number Diff line
@@ -41,9 +41,37 @@ static void omap4_clkdm_deny_idle(struct clockdomain *clkdm) 
					clkdm->cm_inst, clkdm->clkdm_offs);

}



static int omap4_clkdm_clk_enable(struct clockdomain *clkdm)

{

	bool hwsup = false;



	hwsup = omap4_cminst_is_clkdm_in_hwsup(clkdm->prcm_partition,

					clkdm->cm_inst, clkdm->clkdm_offs);



	if (!hwsup)

		clkdm_wakeup(clkdm);



	return 0;

}



static int omap4_clkdm_clk_disable(struct clockdomain *clkdm)

{

	bool hwsup = false;



	hwsup = omap4_cminst_is_clkdm_in_hwsup(clkdm->prcm_partition,

					clkdm->cm_inst, clkdm->clkdm_offs);



	if (!hwsup)

		clkdm_sleep(clkdm);



	return 0;

}



struct clkdm_ops omap4_clkdm_operations = {

	.clkdm_sleep		= omap4_clkdm_sleep,

	.clkdm_wakeup		= omap4_clkdm_wakeup,

	.clkdm_allow_idle	= omap4_clkdm_allow_idle,

	.clkdm_deny_idle	= omap4_clkdm_deny_idle,

	.clkdm_clk_enable	= omap4_clkdm_clk_enable,

	.clkdm_clk_disable	= omap4_clkdm_clk_disable,

};