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

Commit 419cc97d authored by Ranjith Lohithakshan's avatar Ranjith Lohithakshan Committed by Paul Walmsley
Browse files

OMAP2/3 clock: Extend find_idlest() to pass back idle state value 



Current implementation defines clock idle state indicators based on the
cpu information (cpu_is_omap24xx() or cpu_is_omap34xx()) in a system wide
manner. This patch extends the find_idlest() function in clkops to pass
back the idle state indicator for that clock, thus allowing idle state
indicators to be defined on a per clock basis if required.

This is specifically needed on AM35xx devices as the new IPSS clocks
indicates the idle status (0 is idle, 1 is ready) in a way just
opposite to how its handled in OMAP3 (0 is ready, 1 is idle).

Signed-off-by: default avatarRanjith Lohithakshan <ranjithl@ti.com>
[paul@pwsan.com: updated to apply after commit 98c45457 et seq.]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent cde08f81

arch/arm/mach-omap2/clkt2xxx_apll.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int omap2_clk_apll_enable(struct clk *clk, u32 status_mask) 
	cm_write_mod_reg(cval, PLL_MOD, CM_CLKEN);



	omap2_cm_wait_idlest(OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), status_mask,

			     clk->name);

			     OMAP24XX_CM_IDLEST_VAL, clk->name);



	/*

	 * REVISIT: Should we return an error code if omap2_wait_clock_ready()

arch/arm/mach-omap2/clock.c

+20 −5
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ u8 cpu_mask; 
static void _omap2_module_wait_ready(struct clk *clk)

{

	void __iomem *companion_reg, *idlest_reg;

	u8 other_bit, idlest_bit;

	u8 other_bit, idlest_bit, idlest_val;



	/* Not all modules have multiple clocks that their IDLEST depends on */

	if (clk->ops->find_companion) {
@@ -66,9 +66,10 @@ static void _omap2_module_wait_ready(struct clk *clk) 
			return;

	}



	clk->ops->find_idlest(clk, &idlest_reg, &idlest_bit);

	clk->ops->find_idlest(clk, &idlest_reg, &idlest_bit, &idlest_val);



	omap2_cm_wait_idlest(idlest_reg, (1 << idlest_bit), clk->name);

	omap2_cm_wait_idlest(idlest_reg, (1 << idlest_bit), idlest_val,

			     clk->name);

}



/* Enables clock without considering parent dependencies or use count
@@ -175,7 +176,8 @@ void omap2_clk_dflt_find_companion(struct clk *clk, void __iomem **other_reg, 
 * omap2_clk_dflt_find_idlest - find CM_IDLEST reg va, bit shift for @clk

 * @clk: struct clk * to find IDLEST info for

 * @idlest_reg: void __iomem ** to return the CM_IDLEST va in

 * @idlest_bit: u8 ** to return the CM_IDLEST bit shift in

 * @idlest_bit: u8 * to return the CM_IDLEST bit shift in

 * @idlest_val: u8 * to return the idle status indicator

 *

 * Return the CM_IDLEST register address and bit shift corresponding

 * to the module that "owns" this clock.  This default code assumes
@@ -185,13 +187,26 @@ void omap2_clk_dflt_find_companion(struct clk *clk, void __iomem **other_reg, 
 * CM_IDLEST2).  This is not true for all modules.  No return value.

 */

void omap2_clk_dflt_find_idlest(struct clk *clk, void __iomem **idlest_reg,

				u8 *idlest_bit)

				u8 *idlest_bit, u8 *idlest_val)

{

	u32 r;



	r = (((__force u32)clk->enable_reg & ~0xf0) | 0x20);

	*idlest_reg = (__force void __iomem *)r;

	*idlest_bit = clk->enable_bit;



	/*

	 * 24xx uses 0 to indicate not ready, and 1 to indicate ready.

	 * 34xx reverses this, just to keep us on our toes

	 * AM35xx uses both, depending on the module.

	 */

	if (cpu_is_omap24xx())

		*idlest_val = OMAP24XX_CM_IDLEST_VAL;

	else if (cpu_is_omap34xx())

		*idlest_val = OMAP34XX_CM_IDLEST_VAL;

	else

		BUG();



}



int omap2_dflt_clk_enable(struct clk *clk)

arch/arm/mach-omap2/clock.h

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void omap2_dflt_clk_disable(struct clk *clk); 
void omap2_clk_dflt_find_companion(struct clk *clk, void __iomem **other_reg,

				   u8 *other_bit);

void omap2_clk_dflt_find_idlest(struct clk *clk, void __iomem **idlest_reg,

				u8 *idlest_bit);

				u8 *idlest_bit, u8 *idlest_val);

void omap2xxx_clk_commit(struct clk *clk);



extern u8 cpu_mask;

arch/arm/mach-omap2/clock2xxx.c

+4 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct clk *vclk, *sclk, *dclk; 
 * @clk: struct clk * being enabled

 * @idlest_reg: void __iomem ** to store CM_IDLEST reg address into

 * @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into

 * @idlest_val: pointer to a u8 to store the CM_IDLEST indicator

 *

 * OMAP2430 I2CHS CM_IDLEST bits are in CM_IDLEST1_CORE, but the

 * CM_*CLKEN bits are in CM_{I,F}CLKEN2_CORE.  This custom function
@@ -50,10 +51,12 @@ struct clk *vclk, *sclk, *dclk; 
 */

static void omap2430_clk_i2chs_find_idlest(struct clk *clk,

					   void __iomem **idlest_reg,

					   u8 *idlest_bit)

					   u8 *idlest_bit,

					   u8 *idlest_val)

{

	*idlest_reg = OMAP_CM_REGADDR(CORE_MOD, CM_IDLEST);

	*idlest_bit = clk->enable_bit;

	*idlest_val = OMAP24XX_CM_IDLEST_VAL;

}



#else

arch/arm/mach-omap2/clock34xx.c

+12 −3
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct clk *sdrc_ick_p, *arm_fck_p; 
 * @clk: struct clk * being enabled

 * @idlest_reg: void __iomem ** to store CM_IDLEST reg address into

 * @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into

 * @idlest_val: pointer to a u8 to store the CM_IDLEST indicator

 *

 * The OMAP3430ES2 SSI target CM_IDLEST bit is at a different shift

 * from the CM_{I,F}CLKEN bit.  Pass back the correct info via
@@ -54,13 +55,15 @@ struct clk *sdrc_ick_p, *arm_fck_p; 
 */

static void omap3430es2_clk_ssi_find_idlest(struct clk *clk,

					    void __iomem **idlest_reg,

					    u8 *idlest_bit)

					    u8 *idlest_bit,

					    u8 *idlest_val)

{

	u32 r;



	r = (((__force u32)clk->enable_reg & ~0xf0) | 0x20);

	*idlest_reg = (__force void __iomem *)r;

	*idlest_bit = OMAP3430ES2_ST_SSI_IDLE_SHIFT;

	*idlest_val = OMAP34XX_CM_IDLEST_VAL;

}



const struct clkops clkops_omap3430es2_ssi_wait = {
@@ -75,6 +78,7 @@ const struct clkops clkops_omap3430es2_ssi_wait = { 
 * @clk: struct clk * being enabled

 * @idlest_reg: void __iomem ** to store CM_IDLEST reg address into

 * @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into

 * @idlest_val: pointer to a u8 to store the CM_IDLEST indicator

 *

 * Some OMAP modules on OMAP3 ES2+ chips have both initiator and

 * target IDLEST bits.  For our purposes, we are concerned with the
@@ -85,7 +89,8 @@ const struct clkops clkops_omap3430es2_ssi_wait = { 
 */

static void omap3430es2_clk_dss_usbhost_find_idlest(struct clk *clk,

						    void __iomem **idlest_reg,

						    u8 *idlest_bit)

						    u8 *idlest_bit,

						    u8 *idlest_val)

{

	u32 r;
@@ -93,6 +98,7 @@ static void omap3430es2_clk_dss_usbhost_find_idlest(struct clk *clk, 
	*idlest_reg = (__force void __iomem *)r;

	/* USBHOST_IDLE has same shift */

	*idlest_bit = OMAP3430ES2_ST_DSS_IDLE_SHIFT;

	*idlest_val = OMAP34XX_CM_IDLEST_VAL;

}



const struct clkops clkops_omap3430es2_dss_usbhost_wait = {
@@ -107,6 +113,7 @@ const struct clkops clkops_omap3430es2_dss_usbhost_wait = { 
 * @clk: struct clk * being enabled

 * @idlest_reg: void __iomem ** to store CM_IDLEST reg address into

 * @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into

 * @idlest_val: pointer to a u8 to store the CM_IDLEST indicator

 *

 * The OMAP3430ES2 HSOTGUSB target CM_IDLEST bit is at a different

 * shift from the CM_{I,F}CLKEN bit.  Pass back the correct info via
@@ -114,13 +121,15 @@ const struct clkops clkops_omap3430es2_dss_usbhost_wait = { 
 */

static void omap3430es2_clk_hsotgusb_find_idlest(struct clk *clk,

						 void __iomem **idlest_reg,

						 u8 *idlest_bit)

						 u8 *idlest_bit,

						 u8 *idlest_val)

{

	u32 r;



	r = (((__force u32)clk->enable_reg & ~0xf0) | 0x20);

	*idlest_reg = (__force void __iomem *)r;

	*idlest_bit = OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT;

	*idlest_val = OMAP34XX_CM_IDLEST_VAL;

}



const struct clkops clkops_omap3430es2_hsotgusb_wait = {