* [PATCH 1/6] ASoC: fsl_ssi: enable IPG clock during AC'97 reg access
@ 2015-06-28 13:44 Maciej S. Szmigiero
0 siblings, 0 replies; 4+ messages in thread
From: Maciej S. Szmigiero @ 2015-06-28 13:44 UTC (permalink / raw)
To: alsa-devel@alsa-project.org
Cc: Timur Tabi, Nicolin Chen, Xiubo Li, Liam Girdwood, Mark Brown,
Jaroslav Kysela, Takashi Iwai, linuxppc-dev, linux-kernel,
Fabio Estevam
IPG clock have to be enabled during AC'97 CODEC register
access in fsl_ssi driver.
Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name>
---
sound/soc/fsl/fsl_ssi.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index c7647e0..9c46c7d 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -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;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/6] ASoC: fsl_ssi: enable IPG clock during AC'97 reg access
@ 2015-07-30 14:33 Maciej S. Szmigiero
2015-07-30 15:20 ` Fabio Estevam
0 siblings, 1 reply; 4+ messages in thread
From: Maciej S. Szmigiero @ 2015-07-30 14:33 UTC (permalink / raw)
To: alsa-devel@alsa-project.org
Cc: Timur Tabi, Nicolin Chen, Xiubo Li, Liam Girdwood, Mark Brown,
Jaroslav Kysela, Takashi Iwai, linuxppc-dev, linux-kernel,
Fabio Estevam
IPG clock have to be enabled during AC'97 CODEC register
access in fsl_ssi driver.
Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name>
---
sound/soc/fsl/fsl_ssi.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 484ff20..8185edc 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -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;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/6] ASoC: fsl_ssi: enable IPG clock during AC'97 reg access
2015-07-30 14:33 [PATCH 1/6] ASoC: fsl_ssi: enable IPG clock during AC'97 reg access Maciej S. Szmigiero
@ 2015-07-30 15:20 ` Fabio Estevam
2015-07-30 15:23 ` Maciej S. Szmigiero
0 siblings, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2015-07-30 15:20 UTC (permalink / raw)
To: Maciej S. Szmigiero
Cc: alsa-devel@alsa-project.org, Timur Tabi, Nicolin Chen, Xiubo Li,
Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
linuxppc-dev@lists.ozlabs.org, linux-kernel
Hi Maciej,
On Thu, Jul 30, 2015 at 11:33 AM, Maciej S. Szmigiero
<mail@maciej.szmigiero.name> wrote:
> 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;
return ret, please.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/6] ASoC: fsl_ssi: enable IPG clock during AC'97 reg access
2015-07-30 15:20 ` Fabio Estevam
@ 2015-07-30 15:23 ` Maciej S. Szmigiero
0 siblings, 0 replies; 4+ messages in thread
From: Maciej S. Szmigiero @ 2015-07-30 15:23 UTC (permalink / raw)
To: Fabio Estevam
Cc: alsa-devel@alsa-project.org, Timur Tabi, Nicolin Chen, Xiubo Li,
Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
linuxppc-dev@lists.ozlabs.org, linux-kernel
Hi Fabio,
On 30.07.2015 17:20, Fabio Estevam wrote:
> Hi Maciej,
>
> On Thu, Jul 30, 2015 at 11:33 AM, Maciej S. Szmigiero
> <mail@maciej.szmigiero.name> wrote:
>
>> 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;
>
> return ret, please.
>
This function normal return value is an AC'97 register value,
so isn't more appropriate to return 0xffff in case of error
than linux error code?
Best regards,
Maciej Szmigiero
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-30 15:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-30 14:33 [PATCH 1/6] ASoC: fsl_ssi: enable IPG clock during AC'97 reg access Maciej S. Szmigiero
2015-07-30 15:20 ` Fabio Estevam
2015-07-30 15:23 ` Maciej S. Szmigiero
-- strict thread matches above, loose matches on Subject: below --
2015-06-28 13:44 Maciej S. Szmigiero
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox