diff options
| author | Tero Kristo <t-kristo@ti.com> | 2014-10-27 18:39:23 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-10-27 18:39:23 +0300 |
| commit | 021b6ff05c4a17cb20d71c05e251ea7f80b1c516 (patch) | |
| tree | 93df0c5995581095d8c2838f1aabe566322ec5c5 /arch/arm/mach-omap2/cminst44xx.c | |
| parent | 7632a02f80eb99e942999e522b2eb0f6592ea5b5 (diff) | |
| download | linux-021b6ff05c4a17cb20d71c05e251ea7f80b1c516.tar.xz | |
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: Tero Kristo <t-kristo@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/cminst44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cminst44xx.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index 695e71e802a5..c4f42de7f718 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -266,13 +266,15 @@ void omap4_cminst_clkdm_force_sleep(u8 part, u16 inst, u16 cdoffs) * @part: PRCM partition ID that the CM_CLKCTRL register exists in * @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 OMAP4+ * * 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 omap4_cminst_wait_module_ready(u8 part, u16 inst, u16 clkctrl_offs) +static int omap4_cminst_wait_module_ready(u8 part, s16 inst, u16 clkctrl_offs, + u8 bit_shift) { int i = 0; @@ -506,7 +508,9 @@ struct clkdm_ops am43xx_clkdm_operations = { .clkdm_clk_disable = omap4_clkdm_clk_disable, }; -static struct cm_ll_data omap4xxx_cm_ll_data; +static struct cm_ll_data omap4xxx_cm_ll_data = { + .wait_module_ready = &omap4_cminst_wait_module_ready, +}; int __init omap4_cm_init(void) { |