diff options
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
-rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 95449b90074d..b5a6e178a7f9 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
@@ -236,9 +236,9 @@ static void omap_st_on(struct omap_mcbsp *mcbsp) | |||
236 | * Sidetone uses McBSP ICLK - which must not idle when sidetones | 236 | * Sidetone uses McBSP ICLK - which must not idle when sidetones |
237 | * are enabled or sidetones start sounding ugly. | 237 | * are enabled or sidetones start sounding ugly. |
238 | */ | 238 | */ |
239 | w = cm_read_mod_reg(OMAP3430_PER_MOD, CM_AUTOIDLE); | 239 | w = omap2_cm_read_mod_reg(OMAP3430_PER_MOD, CM_AUTOIDLE); |
240 | w &= ~(1 << (mcbsp->id - 2)); | 240 | w &= ~(1 << (mcbsp->id - 2)); |
241 | cm_write_mod_reg(w, OMAP3430_PER_MOD, CM_AUTOIDLE); | 241 | omap2_cm_write_mod_reg(w, OMAP3430_PER_MOD, CM_AUTOIDLE); |
242 | 242 | ||
243 | /* Enable McBSP Sidetone */ | 243 | /* Enable McBSP Sidetone */ |
244 | w = MCBSP_READ(mcbsp, SSELCR); | 244 | w = MCBSP_READ(mcbsp, SSELCR); |
@@ -265,9 +265,9 @@ static void omap_st_off(struct omap_mcbsp *mcbsp) | |||
265 | w = MCBSP_READ(mcbsp, SSELCR); | 265 | w = MCBSP_READ(mcbsp, SSELCR); |
266 | MCBSP_WRITE(mcbsp, SSELCR, w & ~(SIDETONEEN)); | 266 | MCBSP_WRITE(mcbsp, SSELCR, w & ~(SIDETONEEN)); |
267 | 267 | ||
268 | w = cm_read_mod_reg(OMAP3430_PER_MOD, CM_AUTOIDLE); | 268 | w = omap2_cm_read_mod_reg(OMAP3430_PER_MOD, CM_AUTOIDLE); |
269 | w |= 1 << (mcbsp->id - 2); | 269 | w |= 1 << (mcbsp->id - 2); |
270 | cm_write_mod_reg(w, OMAP3430_PER_MOD, CM_AUTOIDLE); | 270 | omap2_cm_write_mod_reg(w, OMAP3430_PER_MOD, CM_AUTOIDLE); |
271 | } | 271 | } |
272 | 272 | ||
273 | static void omap_st_fir_write(struct omap_mcbsp *mcbsp, s16 *fir) | 273 | static void omap_st_fir_write(struct omap_mcbsp *mcbsp, s16 *fir) |