|
@@ -1127,10 +1127,17 @@ static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
|
|
|
struct regmap *regs = fsl_ac97_data->regs;
|
|
|
unsigned int lreg;
|
|
|
unsigned int lval;
|
|
|
+ int ret;
|
|
|
|
|
|
if (reg > 0x7f)
|
|
|
return;
|
|
|
|
|
|
+ ret = clk_prepare_enable(fsl_ac97_data->clk);
|
|
|
+ if (ret) {
|
|
|
+ pr_err("ac97 write clk_prepare_enable failed: %d\n",
|
|
|
+ ret);
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
lreg = reg << 12;
|
|
|
regmap_write(regs, CCSR_SSI_SACADD, lreg);
|
|
@@ -1141,6 +1148,8 @@ static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
|
|
|
regmap_update_bits(regs, CCSR_SSI_SACNT, CCSR_SSI_SACNT_RDWR_MASK,
|
|
|
CCSR_SSI_SACNT_WR);
|
|
|
udelay(100);
|
|
|
+
|
|
|
+ clk_disable_unprepare(fsl_ac97_data->clk);
|
|
|
}
|
|
|
|
|
|
static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
|
|
@@ -1151,6 +1160,14 @@ static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
|
|
|
unsigned short val = -1;
|
|
|
u32 reg_val;
|
|
|
unsigned int lreg;
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ ret = clk_prepare_enable(fsl_ac97_data->clk);
|
|
|
+ if (ret) {
|
|
|
+ pr_err("ac97 read clk_prepare_enable failed: %d\n",
|
|
|
+ ret);
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
|
|
|
lreg = (reg & 0x7f) << 12;
|
|
|
regmap_write(regs, CCSR_SSI_SACADD, lreg);
|
|
@@ -1162,6 +1179,8 @@ static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
|
|
|
regmap_read(regs, CCSR_SSI_SACDAT, ®_val);
|
|
|
val = (reg_val >> 4) & 0xffff;
|
|
|
|
|
|
+ clk_disable_unprepare(fsl_ac97_data->clk);
|
|
|
+
|
|
|
return val;
|
|
|
}
|
|
|
|