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

Commit a51ca38b authored by Sekhar Nori's avatar Sekhar Nori
Browse files

davinci: pass clock flags to davinci_psc_config() 



Enabling or disabling a PSC can take certain
modifiers like "disable with reset", "force
enable/disable" and "enable/disable with local
reset" apart from the regular clock gating
functionality.

Pass a flags argument to davinci_psc_config()
so these variations can be supported there.

At this time only "disable with reset" is
supported, but other functionality will be
added in subsequent patches.

Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 8d54297b

arch/arm/mach-davinci/clock.c

+3 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void __clk_enable(struct clk *clk) 
		__clk_enable(clk->parent);

	if (clk->usecount++ == 0 && (clk->flags & CLK_PSC))

		davinci_psc_config(psc_domain(clk), clk->gpsc, clk->lpsc,

				PSC_STATE_ENABLE);

				true, clk->flags);

}



static void __clk_disable(struct clk *clk)
@@ -54,8 +54,7 @@ static void __clk_disable(struct clk *clk) 
	if (--clk->usecount == 0 && !(clk->flags & CLK_PLL) &&

	    (clk->flags & CLK_PSC))

		davinci_psc_config(psc_domain(clk), clk->gpsc, clk->lpsc,

				(clk->flags & PSC_SWRSTDISABLE) ?

				PSC_STATE_SWRSTDISABLE : PSC_STATE_DISABLE);

				false, clk->flags);

	if (clk->parent)

		__clk_disable(clk->parent);

}
@@ -239,8 +238,7 @@ static int __init clk_disable_unused(void) 
		pr_debug("Clocks: disable unused %s\n", ck->name);



		davinci_psc_config(psc_domain(ck), ck->gpsc, ck->lpsc,

				(ck->flags & PSC_SWRSTDISABLE) ?

				PSC_STATE_SWRSTDISABLE : PSC_STATE_DISABLE);

				false, ck->flags);

	}

	spin_unlock_irq(&clockfw_lock);

arch/arm/mach-davinci/include/mach/psc.h

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ 


extern int davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id);

extern void davinci_psc_config(unsigned int domain, unsigned int ctlr,

		unsigned int id, u32 next_state);

		unsigned int id, bool enable, u32 flags);



#endif

arch/arm/mach-davinci/psc.c

+11 −1
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <mach/cputype.h>

#include <mach/psc.h>



#include "clock.h"



/* Return nonzero iff the domain's clock is active */

int __init davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id)

{
@@ -48,11 +50,12 @@ int __init davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id) 


/* Enable or disable a PSC domain */

void davinci_psc_config(unsigned int domain, unsigned int ctlr,

		unsigned int id, u32 next_state)

		unsigned int id, bool enable, u32 flags)

{

	u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl;

	void __iomem *psc_base;

	struct davinci_soc_info *soc_info = &davinci_soc_info;

	u32 next_state = PSC_STATE_ENABLE;



	if (!soc_info->psc_bases || (ctlr >= soc_info->psc_bases_num)) {

		pr_warning("PSC: Bad psc data: 0x%x[%d]\n",
@@ -62,6 +65,13 @@ void davinci_psc_config(unsigned int domain, unsigned int ctlr, 


	psc_base = ioremap(soc_info->psc_bases[ctlr], SZ_4K);



	if (!enable) {

		if (flags & PSC_SWRSTDISABLE)

			next_state = PSC_STATE_SWRSTDISABLE;

		else

			next_state = PSC_STATE_DISABLE;

	}



	mdctl = __raw_readl(psc_base + MDCTL + 4 * id);

	mdctl &= ~MDSTAT_STATE_MASK;

	mdctl |= next_state;