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

Commit 021b6ff0 authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: OMAP2+: CM: add common API for cm_wait_module_ready 



This patch consolidates the parameters provided for the SoC specific
cm_*_wait_module_ready calls, adds the missing cm_ll_data function
pointers and uses the now generic call from the mach-omap2 board code.
SoC specific *_wait_module_ready calls are also made static so they
can only be accessed through the generic CM driver API only.

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 7632a02f

arch/arm/mach-omap2/clock.c

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ static void _omap2_module_wait_ready(struct clk_hw_omap *clk) 
		_wait_idlest_generic(clk, idlest_reg, (1 << idlest_bit),

				     idlest_val, __clk_get_name(clk->hw.clk));

	} else {

		cm_wait_module_ready(prcm_mod, idlest_reg_id, idlest_bit);

		omap_cm_wait_module_ready(0, prcm_mod, idlest_reg_id,

					  idlest_bit);

	};

}

arch/arm/mach-omap2/cm.h

+4 −3
Original line number Diff line number Diff line
@@ -49,13 +49,14 @@ extern void omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2); 
struct cm_ll_data {

	int (*split_idlest_reg)(void __iomem *idlest_reg, s16 *prcm_inst,

				u8 *idlest_reg_id);

	int (*wait_module_ready)(s16 prcm_mod, u8 idlest_id, u8 idlest_shift);

	int (*wait_module_ready)(u8 part, s16 prcm_mod, u16 idlest_reg,

				 u8 idlest_shift);

};



extern int cm_split_idlest_reg(void __iomem *idlest_reg, s16 *prcm_inst,

			       u8 *idlest_reg_id);

extern int cm_wait_module_ready(s16 prcm_mod, u8 idlest_id, u8 idlest_shift);



int omap_cm_wait_module_ready(u8 part, s16 prcm_mod, u16 idlest_reg,

			      u8 idlest_shift);

extern int cm_register(struct cm_ll_data *cld);

extern int cm_unregister(struct cm_ll_data *cld);

arch/arm/mach-omap2/cm2xxx.c

+4 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int _omap2xxx_apll_enable(u8 enable_bit, u8 status_bit) 
	v |= m;

	omap2_cm_write_mod_reg(v, PLL_MOD, CM_CLKEN);



	omap2xxx_cm_wait_module_ready(PLL_MOD, 1, status_bit);

	omap2xxx_cm_wait_module_ready(0, PLL_MOD, 1, status_bit);



	/*

	 * REVISIT: Should we return an error code if
@@ -238,6 +238,7 @@ int omap2xxx_cm_split_idlest_reg(void __iomem *idlest_reg, s16 *prcm_inst, 


/**

 * omap2xxx_cm_wait_module_ready - wait for a module to leave idle or standby

 * @part: PRCM partition, ignored for OMAP2

 * @prcm_mod: PRCM module offset

 * @idlest_id: CM_IDLESTx register ID (i.e., x = 1, 2, 3)

 * @idlest_shift: shift of the bit in the CM_IDLEST* register to check
@@ -246,7 +247,8 @@ int omap2xxx_cm_split_idlest_reg(void __iomem *idlest_reg, s16 *prcm_inst, 
 * (@prcm_mod, @idlest_id, @idlest_shift) is clocked.  Return 0 upon

 * success or -EBUSY if the module doesn't enable in time.

 */

int omap2xxx_cm_wait_module_ready(s16 prcm_mod, u8 idlest_id, u8 idlest_shift)

int omap2xxx_cm_wait_module_ready(u8 part, s16 prcm_mod, u16 idlest_id,

				  u8 idlest_shift)

{

	int ena = 0, i = 0;

	u8 cm_idlest_reg;

arch/arm/mach-omap2/cm2xxx.h

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ extern void omap2xxx_cm_set_apll96_disable_autoidle(void); 
extern void omap2xxx_cm_set_apll96_auto_low_power_stop(void);



extern bool omap2xxx_cm_is_clkdm_in_hwsup(s16 module, u32 mask);

extern int omap2xxx_cm_wait_module_ready(s16 prcm_mod, u8 idlest_id,

int omap2xxx_cm_wait_module_ready(u8 part, s16 prcm_mod, u16 idlest_id,

				  u8 idlest_shift);

extern int omap2xxx_cm_split_idlest_reg(void __iomem *idlest_reg,

					s16 *prcm_inst, u8 *idlest_reg_id);

arch/arm/mach-omap2/cm33xx.c

+7 −2
Original line number Diff line number Diff line
@@ -226,15 +226,18 @@ void am33xx_cm_clkdm_force_wakeup(u16 inst, u16 cdoffs) 


/**

 * am33xx_cm_wait_module_ready - wait for a module to be in 'func' state

 * @part: PRCM partition, ignored for AM33xx

 * @inst: CM instance register offset (*_INST macro)

 * @clkctrl_offs: Module clock control register offset (*_CLKCTRL macro)

 * @bit_shift: bit shift for the register, ignored for AM33xx

 *

 * Wait for the module IDLEST to be functional. If the idle state is in any

 * the non functional state (trans, idle or disabled), module and thus the

 * sysconfig cannot be accessed and will probably lead to an "imprecise

 * external abort"

 */

int am33xx_cm_wait_module_ready(u16 inst, u16 clkctrl_offs)

static int am33xx_cm_wait_module_ready(u8 part, s16 inst, u16 clkctrl_offs,

				       u8 bit_shift)

{

	int i = 0;
@@ -359,7 +362,9 @@ struct clkdm_ops am33xx_clkdm_operations = { 
	.clkdm_clk_disable	= am33xx_clkdm_clk_disable,

};



static struct cm_ll_data am33xx_cm_ll_data;

static struct cm_ll_data am33xx_cm_ll_data = {

	.wait_module_ready	= &am33xx_cm_wait_module_ready,

};



int __init am33xx_cm_init(void)

{