aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2013-05-15 10:48:42 -0400
committerPaul Walmsley <paul@pwsan.com>2013-05-19 18:37:15 -0400
commit3260c76055afc6c9396e5ad9f9e599505ea8891f (patch)
treee5ec8e563b5aa1e68b45cff55880bca06c85ed22 /arch/arm/mach-omap2
parent7f18d05a1af75142d4856a91ffd2f1d8eb553c12 (diff)
ARM: OMAP2+: hwmod: Remove sysc slave idle and auto idle apis
With the OMAP serial driver sysc cleanup patches in this series, we can now remove the hwmod external apis for sysc fiddling. While at this, also remove unused sysc auto idle api from hwmod code. Tested-by: Vaibhav Bedia <vaibhav.bedia@ti.com> Tested-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Rajendra nayak <rnayak@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Kevin Hilman <khilman@linaro.org> Tested-by: Kevin Hilman <khilman@linaro.org> # OMAP4/Panda Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod.c68
-rw-r--r--arch/arm/mach-omap2/omap_hwmod.h3
2 files changed, 0 insertions, 71 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 5739429894b0..03931425029b 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2255,42 +2255,6 @@ static int _idle(struct omap_hwmod *oh)
2255} 2255}
2256 2256
2257/** 2257/**
2258 * omap_hwmod_set_ocp_autoidle - set the hwmod's OCP autoidle bit
2259 * @oh: struct omap_hwmod *
2260 * @autoidle: desired AUTOIDLE bitfield value (0 or 1)
2261 *
2262 * Sets the IP block's OCP autoidle bit in hardware, and updates our
2263 * local copy. Intended to be used by drivers that require
2264 * direct manipulation of the AUTOIDLE bits.
2265 * Returns -EINVAL if @oh is null or is not in the ENABLED state, or passes
2266 * along the return value from _set_module_autoidle().
2267 *
2268 * Any users of this function should be scrutinized carefully.
2269 */
2270int omap_hwmod_set_ocp_autoidle(struct omap_hwmod *oh, u8 autoidle)
2271{
2272 u32 v;
2273 int retval = 0;
2274 unsigned long flags;
2275
2276 if (!oh || oh->_state != _HWMOD_STATE_ENABLED)
2277 return -EINVAL;
2278
2279 spin_lock_irqsave(&oh->_lock, flags);
2280
2281 v = oh->_sysc_cache;
2282
2283 retval = _set_module_autoidle(oh, autoidle, &v);
2284
2285 if (!retval)
2286 _write_sysconfig(v, oh);
2287
2288 spin_unlock_irqrestore(&oh->_lock, flags);
2289
2290 return retval;
2291}
2292
2293/**
2294 * _shutdown - shutdown an omap_hwmod 2258 * _shutdown - shutdown an omap_hwmod
2295 * @oh: struct omap_hwmod * 2259 * @oh: struct omap_hwmod *
2296 * 2260 *
@@ -3189,38 +3153,6 @@ error:
3189} 3153}
3190 3154
3191/** 3155/**
3192 * omap_hwmod_set_slave_idlemode - set the hwmod's OCP slave idlemode
3193 * @oh: struct omap_hwmod *
3194 * @idlemode: SIDLEMODE field bits (shifted to bit 0)
3195 *
3196 * Sets the IP block's OCP slave idlemode in hardware, and updates our
3197 * local copy. Intended to be used by drivers that have some erratum
3198 * that requires direct manipulation of the SIDLEMODE bits. Returns
3199 * -EINVAL if @oh is null, or passes along the return value from
3200 * _set_slave_idlemode().
3201 *
3202 * XXX Does this function have any current users? If not, we should
3203 * remove it; it is better to let the rest of the hwmod code handle this.
3204 * Any users of this function should be scrutinized carefully.
3205 */
3206int omap_hwmod_set_slave_idlemode(struct omap_hwmod *oh, u8 idlemode)
3207{
3208 u32 v;
3209 int retval = 0;
3210
3211 if (!oh)
3212 return -EINVAL;
3213
3214 v = oh->_sysc_cache;
3215
3216 retval = _set_slave_idlemode(oh, idlemode, &v);
3217 if (!retval)
3218 _write_sysconfig(v, oh);
3219
3220 return retval;
3221}
3222
3223/**
3224 * omap_hwmod_lookup - look up a registered omap_hwmod by name 3156 * omap_hwmod_lookup - look up a registered omap_hwmod by name
3225 * @name: name of the omap_hwmod to look up 3157 * @name: name of the omap_hwmod to look up
3226 * 3158 *
diff --git a/arch/arm/mach-omap2/omap_hwmod.h b/arch/arm/mach-omap2/omap_hwmod.h
index 8498774b5fb1..0c898f58ac9b 100644
--- a/arch/arm/mach-omap2/omap_hwmod.h
+++ b/arch/arm/mach-omap2/omap_hwmod.h
@@ -645,9 +645,6 @@ int omap_hwmod_read_hardreset(struct omap_hwmod *oh, const char *name);
645int omap_hwmod_enable_clocks(struct omap_hwmod *oh); 645int omap_hwmod_enable_clocks(struct omap_hwmod *oh);
646int omap_hwmod_disable_clocks(struct omap_hwmod *oh); 646int omap_hwmod_disable_clocks(struct omap_hwmod *oh);
647 647
648int omap_hwmod_set_slave_idlemode(struct omap_hwmod *oh, u8 idlemode);
649int omap_hwmod_set_ocp_autoidle(struct omap_hwmod *oh, u8 autoidle);
650
651int omap_hwmod_reset(struct omap_hwmod *oh); 648int omap_hwmod_reset(struct omap_hwmod *oh);
652void omap_hwmod_ocp_barrier(struct omap_hwmod *oh); 649void omap_hwmod_ocp_barrier(struct omap_hwmod *oh);
653 650