From: Paul Walmsley Date: Wed, 21 May 2008 00:43:00 +0000 (-0600) Subject: DSP Gateway: remove manual clockdomain/powerdomain tweaking X-Git-Tag: v2.6.26-omap1~123^2~49 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f1e4e674e2a3db0ce658acffdf7fb89a483188b8;p=linux-2.6-omap-h63xx.git DSP Gateway: remove manual clockdomain/powerdomain tweaking The recent powerdomain and clockdomain layer updates for OMAP24XX should now control the DSP powerdomain and clockdomain automatically when DSP Gateway calls clk_{enable,disable}(). Remove the manual clockdomain/powerdomain register tweaks from DSP Gateway. Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- diff --git a/drivers/dsp/dspgateway/dsp_core.c b/drivers/dsp/dspgateway/dsp_core.c index 913376e958d..68cc9e643ff 100644 --- a/drivers/dsp/dspgateway/dsp_core.c +++ b/drivers/dsp/dspgateway/dsp_core.c @@ -460,16 +460,6 @@ static inline void dsp_clk_disable(void) {} #elif defined(CONFIG_ARCH_OMAP2) static inline void dsp_clk_enable(void) { - /*XXX should be handled in mach-omap[1,2] XXX*/ - prm_write_mod_reg(OMAP24XX_FORCESTATE | (1 << OMAP_POWERSTATE_SHIFT), - OMAP24XX_DSP_MOD, PM_PWSTCTRL); - - cm_set_mod_reg_bits(OMAP2420_AUTO_DSP_IPI, OMAP24XX_DSP_MOD, - CM_AUTOIDLE); - - cm_set_mod_reg_bits(OMAP24XX_AUTOSTATE_DSP_MASK, OMAP24XX_DSP_MOD, - CM_CLKSTCTRL); - clk_enable(dsp_fck_handle); clk_enable(dsp_ick_handle); __dsp_per_enable(); @@ -479,9 +469,6 @@ static inline void dsp_clk_disable(void) __dsp_per_disable(); clk_disable(dsp_ick_handle); clk_disable(dsp_fck_handle); - - prm_write_mod_reg(OMAP24XX_FORCESTATE | (3 << OMAP_POWERSTATE_SHIFT), - OMAP24XX_DSP_MOD, PM_PWSTCTRL); } #endif