summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/cminst44xx.h
diff options
context:
space:
mode:
authorBenoit Cousson2011-07-10 13:56:30 +0200
committerPaul Walmsley2011-07-10 13:56:30 +0200
commitd0f0631ddc61026dca71b5b679803000d70fde50 (patch)
tree3567cf7a32a1c6d65503a5d60c5265f0c0db484b /arch/arm/mach-omap2/cminst44xx.h
parentOMAP2+: hwmod: Init clkdm field at boot time (diff)
downloadkernel-qcow2-linux-d0f0631ddc61026dca71b5b679803000d70fde50.tar.gz
kernel-qcow2-linux-d0f0631ddc61026dca71b5b679803000d70fde50.tar.xz
kernel-qcow2-linux-d0f0631ddc61026dca71b5b679803000d70fde50.zip
OMAP4: hwmod: Replace CLKCTRL absolute address with offset macros
The CLKCTRL register was accessed using an absolute address. The usage of hardcoded macros to calculate virtual address from physical one should be avoided as much as possible. The usage of a offset will allow future improvement like migration from the current architecture code toward a module driver. Update cm_xxx accessor, move definition to the proper header file and update copyrights. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Cc: Paul Walmsley <paul@pwsan.com> Cc: Rajendra Nayak <rnayak@ti.com> Cc: Todd Poynor <toddpoynor@google.com> [paul@pwsan.com: renamed 'omap4_cm_' fns to 'omap4_cminst_'; removed empty fn prototype section from cm44xx.h; incorporated comments from Todd; documented some functions] Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/cminst44xx.h')
-rw-r--r--arch/arm/mach-omap2/cminst44xx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/cminst44xx.h b/arch/arm/mach-omap2/cminst44xx.h
index 2b32c181a2ee..8eba2ae87ad4 100644
--- a/arch/arm/mach-omap2/cminst44xx.h
+++ b/arch/arm/mach-omap2/cminst44xx.h
@@ -17,6 +17,8 @@ extern void omap4_cminst_clkdm_disable_hwsup(u8 part, s16 inst, u16 cdoffs);
extern void omap4_cminst_clkdm_force_sleep(u8 part, s16 inst, u16 cdoffs);
extern void omap4_cminst_clkdm_force_wakeup(u8 part, s16 inst, u16 cdoffs);
+extern int omap4_cminst_wait_module_ready(u8 part, u16 inst, s16 cdoffs, u16 clkctrl_offs);
+
/*
* In an ideal world, we would not export these low-level functions,
* but this will probably take some time to fix properly
@@ -32,6 +34,4 @@ extern u32 omap4_cminst_clear_inst_reg_bits(u32 bits, u8 part, s16 inst,
extern u32 omap4_cminst_read_inst_reg_bits(u8 part, u16 inst, s16 idx,
u32 mask);
-extern int omap4_cm_wait_module_ready(void __iomem *clkctrl_reg);
-
#endif