[alsa-devel] [PATCH 1/2] ASoC: SSM2602: drop rate and sample bits constraints

Mike Frysinger

26 Mar 2011 26 Mar '11

8:28 a.m.

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org --- sound/soc/codecs/ssm2602.c | 53 -------------------------------------------- 1 files changed, 0 insertions(+), 53 deletions(-)

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 2727bef..70a33414 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -49,8 +49,6 @@ struct ssm2602_priv { unsigned int sysclk; enum snd_soc_control_type control_type; void *control_data; - struct snd_pcm_substream *master_substream; - struct snd_pcm_substream *slave_substream; };

/* @@ -278,15 +276,9 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); - struct i2c_client *i2c = codec->control_data; u16 iface = ssm2602_read_reg_cache(codec, SSM2602_IFACE) & 0xfff3; int i = get_coeff(ssm2602->sysclk, params_rate(params));

- if (substream == ssm2602->slave_substream) { - dev_dbg(&i2c->dev, "Ignoring hw_params for slave substream\n"); - return 0; - } - /*no match is found*/ if (i == ARRAY_SIZE(coeff_div)) return -EINVAL; @@ -316,44 +308,6 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, return 0; }

-static int ssm2602_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->codec; - struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); - struct i2c_client *i2c = codec->control_data; - struct snd_pcm_runtime *master_runtime; - - /* The DAI has shared clocks so if we already have a playback or - * capture going then constrain this substream to match it. - * TODO: the ssm2602 allows pairs of non-matching PB/REC rates - */ - if (ssm2602->master_substream) { - master_runtime = ssm2602->master_substream->runtime; - dev_dbg(&i2c->dev, "Constraining to %d bits at %dHz\n", - master_runtime->sample_bits, - master_runtime->rate); - - if (master_runtime->rate != 0) - snd_pcm_hw_constraint_minmax(substream->runtime, - SNDRV_PCM_HW_PARAM_RATE, - master_runtime->rate, - master_runtime->rate); - - if (master_runtime->sample_bits != 0) - snd_pcm_hw_constraint_minmax(substream->runtime, - SNDRV_PCM_HW_PARAM_SAMPLE_BITS, - master_runtime->sample_bits, - master_runtime->sample_bits); - - ssm2602->slave_substream = substream; - } else - ssm2602->master_substream = substream; - - return 0; -} - static int ssm2602_pcm_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { @@ -370,16 +324,10 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; - struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);

/* deactivate */ if (!codec->active) ssm2602_write(codec, SSM2602_ACTIVE, 0); - - if (ssm2602->master_substream == substream) - ssm2602->master_substream = ssm2602->slave_substream; - - ssm2602->slave_substream = NULL; }

static int ssm2602_mute(struct snd_soc_dai *dai, int mute) @@ -505,7 +453,6 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec, SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)

static struct snd_soc_dai_ops ssm2602_dai_ops = { - .startup = ssm2602_startup, .prepare = ssm2602_pcm_prepare, .hw_params = ssm2602_hw_params, .shutdown = ssm2602_shutdown,

-- 1.7.4.1

Show replies by date

Mike Frysinger

26 Mar 26 Mar

8:28 a.m.

New subject: [alsa-devel] [PATCH 2/2] ASoC: SSM2602: convert to soc-cache

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org --- sound/soc/codecs/ssm2602.c | 130 ++++++++++++++------------------------------ 1 files changed, 42 insertions(+), 88 deletions(-)

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 70a33414..874d482 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -48,7 +48,6 @@ struct ssm2602_priv { unsigned int sysclk; enum snd_soc_control_type control_type; - void *control_data; };

/* @@ -63,55 +62,7 @@ static const u16 ssm2602_reg[SSM2602_CACHEREGNUM] = { 0x0000, 0x0000 };

-/* - * read ssm2602 register cache - */ -static inline unsigned int ssm2602_read_reg_cache(struct snd_soc_codec *codec, - unsigned int reg) -{ - u16 *cache = codec->reg_cache; - if (reg == SSM2602_RESET) - return 0; - if (reg >= SSM2602_CACHEREGNUM) - return -1; - return cache[reg]; -} - -/* - * write ssm2602 register cache - */ -static inline void ssm2602_write_reg_cache(struct snd_soc_codec *codec, - u16 reg, unsigned int value) -{ - u16 *cache = codec->reg_cache; - if (reg >= SSM2602_CACHEREGNUM) - return; - cache[reg] = value; -} - -/* - * write to the ssm2602 register space - */ -static int ssm2602_write(struct snd_soc_codec *codec, unsigned int reg, - unsigned int value) -{ - u8 data[2]; - - /* data is - * D15..D9 ssm2602 register offset - * D8...D0 register data - */ - data[0] = (reg << 1) | ((value >> 8) & 0x0001); - data[1] = value & 0x00ff; - - ssm2602_write_reg_cache(codec, reg, value); - if (codec->hw_write(codec->control_data, data, 2) == 2) - return 0; - else - return -EIO; -} - -#define ssm2602_reset(c) ssm2602_write(c, SSM2602_RESET, 0) +#define ssm2602_reset(c) snd_soc_write(c, SSM2602_RESET, 0)

/*Appending several "None"s just for OSS mixer use*/ static const char *ssm2602_input_select[] = { @@ -276,7 +227,7 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); - u16 iface = ssm2602_read_reg_cache(codec, SSM2602_IFACE) & 0xfff3; + u16 iface = snd_soc_read(codec, SSM2602_IFACE) & 0xfff3; int i = get_coeff(ssm2602->sysclk, params_rate(params));

/*no match is found*/ @@ -286,8 +237,8 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, srate = (coeff_div[i].sr << 2) | (coeff_div[i].bosr << 1) | coeff_div[i].usb;

- ssm2602_write(codec, SSM2602_ACTIVE, 0); - ssm2602_write(codec, SSM2602_SRATE, srate); + snd_soc_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_SRATE, srate);

/* bit size */ switch (params_format(params)) { @@ -303,8 +254,8 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, iface |= 0x000c; break; } - ssm2602_write(codec, SSM2602_IFACE, iface); - ssm2602_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC); + snd_soc_write(codec, SSM2602_IFACE, iface); + snd_soc_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC); return 0; }

@@ -314,7 +265,7 @@ static int ssm2602_pcm_prepare(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; /* set active */ - ssm2602_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC); + snd_soc_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC);

return 0; } @@ -327,18 +278,18 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,

/* deactivate */ if (!codec->active) - ssm2602_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_ACTIVE, 0); }

static int ssm2602_mute(struct snd_soc_dai *dai, int mute) { struct snd_soc_codec *codec = dai->codec; - u16 mute_reg = ssm2602_read_reg_cache(codec, SSM2602_APDIGI) & ~APDIGI_ENABLE_DAC_MUTE; + u16 mute_reg = snd_soc_read(codec, SSM2602_APDIGI) & ~APDIGI_ENABLE_DAC_MUTE; if (mute) - ssm2602_write(codec, SSM2602_APDIGI, + snd_soc_write(codec, SSM2602_APDIGI, mute_reg | APDIGI_ENABLE_DAC_MUTE); else - ssm2602_write(codec, SSM2602_APDIGI, mute_reg); + snd_soc_write(codec, SSM2602_APDIGI, mute_reg); return 0; }

@@ -414,30 +365,30 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai, }

/* set iface */ - ssm2602_write(codec, SSM2602_IFACE, iface); + snd_soc_write(codec, SSM2602_IFACE, iface); return 0; }

static int ssm2602_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { - u16 reg = ssm2602_read_reg_cache(codec, SSM2602_PWR) & 0xff7f; + u16 reg = snd_soc_read(codec, SSM2602_PWR) & 0xff7f;

switch (level) { case SND_SOC_BIAS_ON: /* vref/mid, osc on, dac unmute */ - ssm2602_write(codec, SSM2602_PWR, reg); + snd_soc_write(codec, SSM2602_PWR, reg); break; case SND_SOC_BIAS_PREPARE: break; case SND_SOC_BIAS_STANDBY: /* everything off except vref/vmid, */ - ssm2602_write(codec, SSM2602_PWR, reg | PWR_CLK_OUT_PDN); + snd_soc_write(codec, SSM2602_PWR, reg | PWR_CLK_OUT_PDN); break; case SND_SOC_BIAS_OFF: /* everything off, dac mute, inactive */ - ssm2602_write(codec, SSM2602_ACTIVE, 0); - ssm2602_write(codec, SSM2602_PWR, 0xffff); + snd_soc_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_PWR, 0xffff); break;

} @@ -487,16 +438,14 @@ static int ssm2602_suspend(struct snd_soc_codec *codec, pm_message_t state) static int ssm2602_resume(struct snd_soc_codec *codec) { int i; - u8 data[2]; u16 *cache = codec->reg_cache;

/* Sync reg_cache with the hardware */ - for (i = 0; i < ARRAY_SIZE(ssm2602_reg); i++) { - data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); - data[1] = cache[i] & 0x00ff; - codec->hw_write(codec->control_data, data, 2); - } + for (i = 0; i < ARRAY_SIZE(ssm2602_reg); i++) + snd_soc_write(codec, i, cache[i]); + ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + return 0; }

@@ -507,25 +456,33 @@ static int ssm2602_probe(struct snd_soc_codec *codec)

pr_info("ssm2602 Audio Codec %s", SSM2602_VERSION);

- codec->control_data = ssm2602->control_data; + ret = snd_soc_codec_set_cache_io(codec, 7, 9, ssm2602->control_type); + if (ret < 0) { + dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); + return ret; + }

- ssm2602_reset(codec); + ret = ssm2602_reset(codec); + if (ret < 0) { + dev_err(codec->dev, "Failed to issue reset: %d\n", ret); + return ret; + }

/*power on device*/ - ssm2602_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_ACTIVE, 0); /* set the update bits */ - reg = ssm2602_read_reg_cache(codec, SSM2602_LINVOL); - ssm2602_write(codec, SSM2602_LINVOL, reg | LINVOL_LRIN_BOTH); - reg = ssm2602_read_reg_cache(codec, SSM2602_RINVOL); - ssm2602_write(codec, SSM2602_RINVOL, reg | RINVOL_RLIN_BOTH); - reg = ssm2602_read_reg_cache(codec, SSM2602_LOUT1V); - ssm2602_write(codec, SSM2602_LOUT1V, reg | LOUT1V_LRHP_BOTH); - reg = ssm2602_read_reg_cache(codec, SSM2602_ROUT1V); - ssm2602_write(codec, SSM2602_ROUT1V, reg | ROUT1V_RLHP_BOTH); + reg = snd_soc_read(codec, SSM2602_LINVOL); + snd_soc_write(codec, SSM2602_LINVOL, reg | LINVOL_LRIN_BOTH); + reg = snd_soc_read(codec, SSM2602_RINVOL); + snd_soc_write(codec, SSM2602_RINVOL, reg | RINVOL_RLIN_BOTH); + reg = snd_soc_read(codec, SSM2602_LOUT1V); + snd_soc_write(codec, SSM2602_LOUT1V, reg | LOUT1V_LRHP_BOTH); + reg = snd_soc_read(codec, SSM2602_ROUT1V); + snd_soc_write(codec, SSM2602_ROUT1V, reg | ROUT1V_RLHP_BOTH); /*select Line in as default input*/ - ssm2602_write(codec, SSM2602_APANA, APANA_SELECT_DAC | + snd_soc_write(codec, SSM2602_APANA, APANA_SELECT_DAC | APANA_ENABLE_MIC_BOOST); - ssm2602_write(codec, SSM2602_PWR, 0); + snd_soc_write(codec, SSM2602_PWR, 0);

snd_soc_add_controls(codec, ssm2602_snd_controls, ARRAY_SIZE(ssm2602_snd_controls)); @@ -546,8 +503,6 @@ static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = { .remove = ssm2602_remove, .suspend = ssm2602_suspend, .resume = ssm2602_resume, - .read = ssm2602_read_reg_cache, - .write = ssm2602_write, .set_bias_level = ssm2602_set_bias_level, .reg_cache_size = sizeof(ssm2602_reg), .reg_word_size = sizeof(u16), @@ -572,7 +527,6 @@ static int ssm2602_i2c_probe(struct i2c_client *i2c, return -ENOMEM;

i2c_set_clientdata(i2c, ssm2602); - ssm2602->control_data = i2c; ssm2602->control_type = SND_SOC_I2C;

ret = snd_soc_register_codec(&i2c->dev,

-- 1.7.4.1

Mike Frysinger

8:36 a.m.

New subject: [alsa-devel] [PATCH 2/2 v2] ASoC: SSM2602: convert to soc-cache

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org --- v2 - sorry, v1 had a 1 liner typo due to a local file being out of sync

sound/soc/codecs/ssm2602.c | 132 ++++++++++++++----------------------------- 1 files changed, 43 insertions(+), 89 deletions(-)

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 70a33414..b041e97 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -48,7 +48,6 @@ struct ssm2602_priv { unsigned int sysclk; enum snd_soc_control_type control_type; - void *control_data; };

/* @@ -63,55 +62,7 @@ static const u16 ssm2602_reg[SSM2602_CACHEREGNUM] = { 0x0000, 0x0000 };

/*no match is found*/ @@ -286,8 +237,8 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, srate = (coeff_div[i].sr << 2) | (coeff_div[i].bosr << 1) | coeff_div[i].usb;

- ssm2602_write(codec, SSM2602_ACTIVE, 0); - ssm2602_write(codec, SSM2602_SRATE, srate); + snd_soc_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_SRATE, srate);

return 0; } @@ -327,18 +278,18 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,

/* deactivate */ if (!codec->active) - ssm2602_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_ACTIVE, 0); }

@@ -414,30 +365,30 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai, }

/* set iface */ - ssm2602_write(codec, SSM2602_IFACE, iface); + snd_soc_write(codec, SSM2602_IFACE, iface); return 0; }

@@ -507,31 +456,39 @@ static int ssm2602_probe(struct snd_soc_codec *codec)

pr_info("ssm2602 Audio Codec %s", SSM2602_VERSION);

- ssm2602_reset(codec); + ret = ssm2602_reset(codec); + if (ret < 0) { + dev_err(codec->dev, "Failed to issue reset: %d\n", ret); + return ret; + }

snd_soc_add_controls(codec, ssm2602_snd_controls, ARRAY_SIZE(ssm2602_snd_controls)); ssm2602_add_widgets(codec);

- return ret; + return 0; }

/* remove everything here */ @@ -546,8 +503,6 @@ static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = { .remove = ssm2602_remove, .suspend = ssm2602_suspend, .resume = ssm2602_resume, - .read = ssm2602_read_reg_cache, - .write = ssm2602_write, .set_bias_level = ssm2602_set_bias_level, .reg_cache_size = sizeof(ssm2602_reg), .reg_word_size = sizeof(u16), @@ -572,7 +527,6 @@ static int ssm2602_i2c_probe(struct i2c_client *i2c, return -ENOMEM;

i2c_set_clientdata(i2c, ssm2602); - ssm2602->control_data = i2c; ssm2602->control_type = SND_SOC_I2C;

ret = snd_soc_register_codec(&i2c->dev,

-- 1.7.4.1

Mark Brown

1:48 p.m.

New subject: [alsa-devel] [PATCH 2/2 v2] ASoC: SSM2602: convert to soc-cache

On Sat, Mar 26, 2011 at 03:36:15AM -0400, Mike Frysinger wrote:

...

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org

The conversion itself is good but one thing:

...

for (i = 0; i < ARRAY_SIZE(ssm2602_reg); i++)
snd_soc_write(codec, i, cache[i]);

The core cache sync stuff would be good here - that can be fixed in an incremental patch if Liam is OK with this version.

Mike Frysinger

27 Mar 27 Mar

6:09 a.m.

New subject: [alsa-devel] [Device-drivers-devel] [PATCH 2/2 v2] ASoC: SSM2602: convert to soc-cache

On Sat, Mar 26, 2011 at 08:48, Mark Brown wrote:

...

...

for (i = 0; i < ARRAY_SIZE(ssm2602_reg); i++)

snd_soc_write(codec, i, cache[i]);

The core cache sync stuff would be good here - that can be fixed in an incremental patch if Liam is OK with this version.

is there an existing codec driver you can highlight that does what you're saying here ?

and i would prefer to have an incremental patch done after this one, but obviously i'll send out a new one that doesnt depend on the previous commit (sample rate changes). -mike

Mark Brown

12:36 p.m.

New subject: [alsa-devel] [Device-drivers-devel] [PATCH 2/2 v2] ASoC: SSM2602: convert to soc-cache

On Sun, Mar 27, 2011 at 12:09:16AM -0400, Mike Frysinger wrote:

...

is there an existing codec driver you can highlight that does what you're saying here ?

$ grep snd_soc_cache_sync sound/soc/codecs/*.c sound/soc/codecs/cs4271.c: ret = snd_soc_cache_sync(codec); sound/soc/codecs/max9850.c: ret = snd_soc_cache_sync(codec); sound/soc/codecs/wm8737.c: snd_soc_cache_sync(codec); sound/soc/codecs/wm8991.c: snd_soc_cache_sync(codec); sound/soc/codecs/wm8994.c: ret = snd_soc_cache_sync(codec); sound/soc/codecs/wm8995.c: ret = snd_soc_cache_sync(codec);

Mike Frysinger

5:07 p.m.

New subject: [alsa-devel] [Device-drivers-devel] [PATCH 2/2 v2] ASoC: SSM2602: convert to soc-cache

On Sun, Mar 27, 2011 at 06:36, Mark Brown wrote:

...

On Sun, Mar 27, 2011 at 12:09:16AM -0400, Mike Frysinger wrote:

...
is there an existing codec driver you can highlight that does what you're saying here ?

$ grep snd_soc_cache_sync sound/soc/codecs/*.c sound/soc/codecs/cs4271.c: ret = snd_soc_cache_sync(codec); sound/soc/codecs/max9850.c: ret = snd_soc_cache_sync(codec); sound/soc/codecs/wm8737.c: snd_soc_cache_sync(codec); sound/soc/codecs/wm8991.c: snd_soc_cache_sync(codec); sound/soc/codecs/wm8994.c: ret = snd_soc_cache_sync(codec); sound/soc/codecs/wm8995.c: ret = snd_soc_cache_sync(codec);

so i could drop the whole for loop in favor of this one call ? -mike

Mark Brown

8:18 p.m.

New subject: [alsa-devel] [Device-drivers-devel] [PATCH 2/2 v2] ASoC: SSM2602: convert to soc-cache

On Sun, Mar 27, 2011 at 11:07:10AM -0400, Mike Frysinger wrote:

...

so i could drop the whole for loop in favor of this one call ?

Yes.

Mark Brown

26 Mar 26 Mar

6:36 p.m.

New subject: [alsa-devel] [PATCH 2/2 v2] ASoC: SSM2602: convert to soc-cache

On Sat, Mar 26, 2011 at 03:36:15AM -0400, Mike Frysinger wrote:

...

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org

This doesn't apply (probably because patch 1/2 didn't get applied).

Mike Frysinger

27 Mar 27 Mar

6:45 a.m.

New subject: [alsa-devel] [PATCH v2] ASoC: SSM2602: convert to soc-cache

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org --- v2 - rebased to apply before sample rate conversion patch

sound/soc/codecs/ssm2602.c | 129 ++++++++++++++------------------------------ 1 files changed, 41 insertions(+), 88 deletions(-)

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 5a5a6b1..108f3cd 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -48,7 +48,6 @@ struct ssm2602_priv { unsigned int sysclk; enum snd_soc_control_type control_type; - void *control_data; struct snd_pcm_substream *master_substream; struct snd_pcm_substream *slave_substream; }; @@ -65,55 +64,7 @@ static const u16 ssm2602_reg[SSM2602_CACHEREGNUM] = { 0x0000, 0x0000 };

/*Appending several "None"s just for OSS mixer use*/ static const char *ssm2602_input_select[] = { @@ -278,7 +229,6 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); - struct i2c_client *i2c = codec->control_data; u16 iface = ssm2602_read_reg_cache(codec, SSM2602_IFACE) & 0xfff3; int i = get_coeff(ssm2602->sysclk, params_rate(params));

@@ -294,8 +244,8 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, srate = (coeff_div[i].sr << 2) | (coeff_div[i].bosr << 1) | coeff_div[i].usb;

- ssm2602_write(codec, SSM2602_ACTIVE, 0); - ssm2602_write(codec, SSM2602_SRATE, srate); + snd_soc_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_SRATE, srate);

/* bit size */ switch (params_format(params)) { @@ -311,8 +261,8 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, iface |= 0x000c; break; } - ssm2602_write(codec, SSM2602_IFACE, iface); - ssm2602_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC); + snd_soc_write(codec, SSM2602_IFACE, iface); + snd_soc_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC); return 0; }

@@ -360,7 +310,7 @@ static int ssm2602_pcm_prepare(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; /* set active */ - ssm2602_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC); + snd_soc_write(codec, SSM2602_ACTIVE, ACTIVE_ACTIVATE_CODEC);

return 0; } @@ -385,12 +335,12 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream, static int ssm2602_mute(struct snd_soc_dai *dai, int mute) { struct snd_soc_codec *codec = dai->codec; - u16 mute_reg = ssm2602_read_reg_cache(codec, SSM2602_APDIGI) & ~APDIGI_ENABLE_DAC_MUTE; + u16 mute_reg = snd_soc_read(codec, SSM2602_APDIGI) & ~APDIGI_ENABLE_DAC_MUTE; if (mute) - ssm2602_write(codec, SSM2602_APDIGI, + snd_soc_write(codec, SSM2602_APDIGI, mute_reg | APDIGI_ENABLE_DAC_MUTE); else - ssm2602_write(codec, SSM2602_APDIGI, mute_reg); + snd_soc_write(codec, SSM2602_APDIGI, mute_reg); return 0; }

@@ -466,30 +416,30 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai, }

/* set iface */ - ssm2602_write(codec, SSM2602_IFACE, iface); + snd_soc_write(codec, SSM2602_IFACE, iface); return 0; }

} @@ -540,16 +490,14 @@ static int ssm2602_suspend(struct snd_soc_codec *codec, pm_message_t state) static int ssm2602_resume(struct snd_soc_codec *codec) { int i; - u8 data[2]; u16 *cache = codec->reg_cache;

@@ -560,31 +508,39 @@ static int ssm2602_probe(struct snd_soc_codec *codec)

pr_info("ssm2602 Audio Codec %s", SSM2602_VERSION);

- ssm2602_reset(codec); + ret = ssm2602_reset(codec); + if (ret < 0) { + dev_err(codec->dev, "Failed to issue reset: %d\n", ret); + return ret; + }

snd_soc_add_controls(codec, ssm2602_snd_controls, ARRAY_SIZE(ssm2602_snd_controls)); ssm2602_add_widgets(codec);

- return ret; + return 0; }

/* remove everything here */ @@ -599,8 +555,6 @@ static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = { .remove = ssm2602_remove, .suspend = ssm2602_suspend, .resume = ssm2602_resume, - .read = ssm2602_read_reg_cache, - .write = ssm2602_write, .set_bias_level = ssm2602_set_bias_level, .reg_cache_size = sizeof(ssm2602_reg), .reg_word_size = sizeof(u16), @@ -625,7 +579,6 @@ static int ssm2602_i2c_probe(struct i2c_client *i2c, return -ENOMEM;

i2c_set_clientdata(i2c, ssm2602); - ssm2602->control_data = i2c; ssm2602->control_type = SND_SOC_I2C;

ret = snd_soc_register_codec(&i2c->dev,

-- 1.7.4.1

Mike Frysinger

6:59 a.m.

New subject: [alsa-devel] [PATCH v3] ASoC: SSM2602: convert to soc-cache

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org --- v3 - misread some of the conflict hunks in v2 patch

sound/soc/codecs/ssm2602.c | 133 ++++++++++++++----------------------------- 1 files changed, 43 insertions(+), 90 deletions(-)

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 5a5a6b1..ba02771 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -48,7 +48,6 @@ struct ssm2602_priv { unsigned int sysclk; enum snd_soc_control_type control_type; - void *control_data; struct snd_pcm_substream *master_substream; struct snd_pcm_substream *slave_substream; }; @@ -65,55 +64,7 @@ static const u16 ssm2602_reg[SSM2602_CACHEREGNUM] = { 0x0000, 0x0000 };

/*Appending several "None"s just for OSS mixer use*/ static const char *ssm2602_input_select[] = { @@ -278,8 +229,7 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); - struct i2c_client *i2c = codec->control_data; - u16 iface = ssm2602_read_reg_cache(codec, SSM2602_IFACE) & 0xfff3; + u16 iface = snd_soc_read(codec, SSM2602_IFACE) & 0xfff3; int i = get_coeff(ssm2602->sysclk, params_rate(params));

if (substream == ssm2602->slave_substream) { @@ -294,8 +244,8 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, srate = (coeff_div[i].sr << 2) | (coeff_div[i].bosr << 1) | coeff_div[i].usb;

- ssm2602_write(codec, SSM2602_ACTIVE, 0); - ssm2602_write(codec, SSM2602_SRATE, srate); + snd_soc_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_SRATE, srate);

return 0; } @@ -374,7 +324,7 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,

/* deactivate */ if (!codec->active) - ssm2602_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_ACTIVE, 0);

if (ssm2602->master_substream == substream) ssm2602->master_substream = ssm2602->slave_substream; @@ -385,12 +335,12 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream, static int ssm2602_mute(struct snd_soc_dai *dai, int mute) { struct snd_soc_codec *codec = dai->codec; - u16 mute_reg = ssm2602_read_reg_cache(codec, SSM2602_APDIGI) & ~APDIGI_ENABLE_DAC_MUTE; + u16 mute_reg = snd_soc_read(codec, SSM2602_APDIGI) & ~APDIGI_ENABLE_DAC_MUTE; if (mute) - ssm2602_write(codec, SSM2602_APDIGI, + snd_soc_write(codec, SSM2602_APDIGI, mute_reg | APDIGI_ENABLE_DAC_MUTE); else - ssm2602_write(codec, SSM2602_APDIGI, mute_reg); + snd_soc_write(codec, SSM2602_APDIGI, mute_reg); return 0; }

@@ -466,30 +416,30 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai, }

/* set iface */ - ssm2602_write(codec, SSM2602_IFACE, iface); + snd_soc_write(codec, SSM2602_IFACE, iface); return 0; }

@@ -560,31 +508,39 @@ static int ssm2602_probe(struct snd_soc_codec *codec)

pr_info("ssm2602 Audio Codec %s", SSM2602_VERSION);

- ssm2602_reset(codec); + ret = ssm2602_reset(codec); + if (ret < 0) { + dev_err(codec->dev, "Failed to issue reset: %d\n", ret); + return ret; + }

snd_soc_add_controls(codec, ssm2602_snd_controls, ARRAY_SIZE(ssm2602_snd_controls)); ssm2602_add_widgets(codec);

- return ret; + return 0; }

i2c_set_clientdata(i2c, ssm2602); - ssm2602->control_data = i2c; ssm2602->control_type = SND_SOC_I2C;

ret = snd_soc_register_codec(&i2c->dev,

-- 1.7.4.1

Mike Frysinger

11:14 p.m.

New subject: [alsa-devel] [PATCH v5] ASoC: SSM2602: convert to soc-cache

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org --- v5 - use snd_soc_cache_sync

sound/soc/codecs/ssm2602.c | 133 ++++++++++++++----------------------------- 1 files changed, 43 insertions(+), 90 deletions(-)

- ssm2602_write(codec, SSM2602_ACTIVE, 0); - ssm2602_write(codec, SSM2602_SRATE, srate); + snd_soc_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_SRATE, srate);

return 0; } @@ -374,7 +324,7 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,

/* deactivate */ if (!codec->active) - ssm2602_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_ACTIVE, 0);

@@ -466,30 +416,30 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai, }

/* set iface */ - ssm2602_write(codec, SSM2602_IFACE, iface); + snd_soc_write(codec, SSM2602_IFACE, iface); return 0; }

@@ -560,31 +508,39 @@ static int ssm2602_probe(struct snd_soc_codec *codec)

pr_info("ssm2602 Audio Codec %s", SSM2602_VERSION);

- ssm2602_reset(codec); + ret = ssm2602_reset(codec); + if (ret < 0) { + dev_err(codec->dev, "Failed to issue reset: %d\n", ret); + return ret; + }

snd_soc_add_controls(codec, ssm2602_snd_controls, ARRAY_SIZE(ssm2602_snd_controls)); ssm2602_add_widgets(codec);

- return ret; + return 0; }

i2c_set_clientdata(i2c, ssm2602); - ssm2602->control_data = i2c; ssm2602->control_type = SND_SOC_I2C;

ret = snd_soc_register_codec(&i2c->dev,

-- 1.7.4.1

Mike Frysinger

28 Mar 28 Mar

12:14 a.m.

New subject: [alsa-devel] [Device-drivers-devel] [PATCH v5] ASoC: SSM2602: convert to soc-cache

On Sun, Mar 27, 2011 at 17:14, Mike Frysinger wrote:

...

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org

v5 - use snd_soc_cache_sync

ugh, damn codec names screwing me up. this doesnt actually fix ssm2602, i fixed ssm2604 instead. sorry for the noise. -mike

Liam Girdwood

29 Mar 29 Mar

10:27 p.m.

New subject: [alsa-devel] [PATCH v5] ASoC: SSM2602: convert to soc-cache

On Sun, 2011-03-27 at 17:14 -0400, Mike Frysinger wrote:

...

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org

v5

use snd_soc_cache_sync

sound/soc/codecs/ssm2602.c | 133 ++++++++++++++----------------------------- 1 files changed, 43 insertions(+), 90 deletions(-)

Acked-by: Liam Girdwood lrg@ti.com

Mike Frysinger

27 Mar 27 Mar

11:22 p.m.

New subject: [alsa-devel] [PATCH v6] ASoC: SSM2602: convert to soc-cache

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org --- v6 - actually convert to snd_soc_cache_sync

sound/soc/codecs/ssm2602.c | 138 ++++++++++++++------------------------------ 1 files changed, 43 insertions(+), 95 deletions(-)

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 5a5a6b1..8a2b52f 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -48,7 +48,6 @@ struct ssm2602_priv { unsigned int sysclk; enum snd_soc_control_type control_type; - void *control_data; struct snd_pcm_substream *master_substream; struct snd_pcm_substream *slave_substream; }; @@ -65,55 +64,7 @@ static const u16 ssm2602_reg[SSM2602_CACHEREGNUM] = { 0x0000, 0x0000 };

/*Appending several "None"s just for OSS mixer use*/ static const char *ssm2602_input_select[] = { @@ -278,12 +229,11 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); - struct i2c_client *i2c = codec->control_data; - u16 iface = ssm2602_read_reg_cache(codec, SSM2602_IFACE) & 0xfff3; + u16 iface = snd_soc_read(codec, SSM2602_IFACE) & 0xfff3; int i = get_coeff(ssm2602->sysclk, params_rate(params));

if (substream == ssm2602->slave_substream) { - dev_dbg(&i2c->dev, "Ignoring hw_params for slave substream\n"); + dev_dbg(codec->dev, "Ignoring hw_params for slave substream\n"); return 0; }

@@ -294,8 +244,8 @@ static int ssm2602_hw_params(struct snd_pcm_substream *substream, srate = (coeff_div[i].sr << 2) | (coeff_div[i].bosr << 1) | coeff_div[i].usb;

- ssm2602_write(codec, SSM2602_ACTIVE, 0); - ssm2602_write(codec, SSM2602_SRATE, srate); + snd_soc_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_SRATE, srate);

return 0; } @@ -374,7 +324,7 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream,

/* deactivate */ if (!codec->active) - ssm2602_write(codec, SSM2602_ACTIVE, 0); + snd_soc_write(codec, SSM2602_ACTIVE, 0);

@@ -466,30 +416,30 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai, }

/* set iface */ - ssm2602_write(codec, SSM2602_IFACE, iface); + snd_soc_write(codec, SSM2602_IFACE, iface); return 0; }

} @@ -539,17 +489,10 @@ static int ssm2602_suspend(struct snd_soc_codec *codec, pm_message_t state)

static int ssm2602_resume(struct snd_soc_codec *codec) { - int i; - u8 data[2]; - u16 *cache = codec->reg_cache; - - /* Sync reg_cache with the hardware */ - for (i = 0; i < ARRAY_SIZE(ssm2602_reg); i++) { - data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); - data[1] = cache[i] & 0x00ff; - codec->hw_write(codec->control_data, data, 2); - } + snd_soc_cache_sync(codec); + ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + return 0; }

@@ -560,31 +503,39 @@ static int ssm2602_probe(struct snd_soc_codec *codec)

pr_info("ssm2602 Audio Codec %s", SSM2602_VERSION);

- ssm2602_reset(codec); + ret = ssm2602_reset(codec); + if (ret < 0) { + dev_err(codec->dev, "Failed to issue reset: %d\n", ret); + return ret; + }

snd_soc_add_controls(codec, ssm2602_snd_controls, ARRAY_SIZE(ssm2602_snd_controls)); ssm2602_add_widgets(codec);

- return ret; + return 0; }

/* remove everything here */ @@ -599,8 +550,6 @@ static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = { .remove = ssm2602_remove, .suspend = ssm2602_suspend, .resume = ssm2602_resume, - .read = ssm2602_read_reg_cache, - .write = ssm2602_write, .set_bias_level = ssm2602_set_bias_level, .reg_cache_size = sizeof(ssm2602_reg), .reg_word_size = sizeof(u16), @@ -625,7 +574,6 @@ static int ssm2602_i2c_probe(struct i2c_client *i2c, return -ENOMEM;

i2c_set_clientdata(i2c, ssm2602); - ssm2602->control_data = i2c; ssm2602->control_type = SND_SOC_I2C;

ret = snd_soc_register_codec(&i2c->dev,

-- 1.7.4.1

Liam Girdwood

29 Mar 29 Mar

10:29 p.m.

New subject: [alsa-devel] [PATCH v6] ASoC: SSM2602: convert to soc-cache

On Sun, 2011-03-27 at 17:22 -0400, Mike Frysinger wrote:

...

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org

v6

actually convert to snd_soc_cache_sync

Acked version 5 by mistake.

Acked-by: Liam Girdwood lrg@ti.com

Mark Brown

30 Mar 30 Mar

12:18 a.m.

New subject: [alsa-devel] [PATCH v6] ASoC: SSM2602: convert to soc-cache

On Sun, Mar 27, 2011 at 05:22:57PM -0400, Mike Frysinger wrote:

...

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org

Applied, thanks.

Mark Brown

26 Mar 26 Mar

1:44 p.m.

New subject: [alsa-devel] [PATCH 1/2] ASoC: SSM2602: drop rate and sample bits constraints

On Sat, Mar 26, 2011 at 03:28:58AM -0400, Mike Frysinger wrote:

...

From: Cliff Cai cliff.cai@analog.com

Signed-off-by: Cliff Cai cliff.cai@analog.com Signed-off-by: Mike Frysinger vapier@gentoo.org

I suspect this change is incomplete and should also be setting the symmetric_rates flag in the driver which does the equivalent thing in the core as this code is doing. Looking at the code some symmetry handling is required as the driver is setting the same registers for playback and capture rates so simultaneous playback and record with different rates is not supported?

Converting to symmetric_rates would definitely be a good thing.

Mike Frysinger

27 Mar 27 Mar

6:07 a.m.

New subject: [alsa-devel] [Device-drivers-devel] [PATCH 1/2] ASoC: SSM2602: drop rate and sample bits constraints

On Sat, Mar 26, 2011 at 08:44, Mark Brown wrote:

...

I suspect this change is incomplete and should also be setting the symmetric_rates flag in the driver which does the equivalent thing in the core as this code is doing. Looking at the code some symmetry handling is required as the driver is setting the same registers for playback and capture rates so simultaneous playback and record with different rates is not supported?

Converting to symmetric_rates would definitely be a good thing.

i imagine you're right on all these points. this change was necessary as it's easy to see errors in sample rate conversion or even hangs. hopefully Cliff can find some time for this as the words you use go right over my head ;). -mike

4924

Age (days ago)

4927

Last active (days ago)

List overview

Download

18 comments

3 participants

tags (0)

participants (3)

Liam Girdwood
Mark Brown
Mike Frysinger