Skip to content

L
linux
Commit 27ebeb0b authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: hda - Use the standard PCM ops for CA0132 

Now with the workaround using codec->pcm_format_first flag, we can
clean up the home-baked codes in patch_ca0132.c.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 55cf87fe
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 113 deletions
sound/pci/hda/patch_ca0132.c
View file @ 27ebeb0b
...@@ -464,50 +464,17 @@ static int chipio_read(struct hda_codec *codec, ...@@ -464,50 +464,17 @@ static int chipio_read(struct hda_codec *codec,
} }
/* /*
* PCM stuffs * PCM callbacks
*/ */
static void ca0132_setup_stream(struct hda_codec *codec, hda_nid_t nid, static int ca0132_playback_pcm_open(struct hda_pcm_stream *hinfo,
u32 stream_tag, struct hda_codec *codec,
int channel_id, int format) struct snd_pcm_substream *substream)
{ {
unsigned int oldval, newval; struct ca0132_spec *spec = codec->spec;
return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
if (!nid) hinfo);
return;
snd_printdd("ca0132_setup_stream: "
"NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n",
nid, stream_tag, channel_id, format);
/* update the format-id if changed */
oldval = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_STREAM_FORMAT,
0);
if (oldval != format) {
msleep(20);
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_STREAM_FORMAT,
format);
}
oldval = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONV, 0);
newval = (stream_tag << 4) | channel_id;
if (oldval != newval) {
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_CHANNEL_STREAMID,
newval);
}
}
static void ca0132_cleanup_stream(struct hda_codec *codec, hda_nid_t nid)
{
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, 0);
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID, 0);
} }
/*
* PCM callbacks
*/
static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo, static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
struct hda_codec *codec, struct hda_codec *codec,
unsigned int stream_tag, unsigned int stream_tag,
...@@ -515,10 +482,8 @@ static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo, ...@@ -515,10 +482,8 @@ static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
return snd_hda_multi_out_analog_prepare(codec, &spec->multiout,
ca0132_setup_stream(codec, spec->dacs[0], stream_tag, 0, format); stream_tag, format, substream);
return 0;
} }
static int ca0132_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, static int ca0132_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
...@@ -526,92 +491,45 @@ static int ca0132_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, ...@@ -526,92 +491,45 @@ static int ca0132_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
ca0132_cleanup_stream(codec, spec->dacs[0]);
return 0;
} }
/* /*
* Digital out * Digital out
*/ */
static int ca0132_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo, static int ca0132_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
struct hda_codec *codec, struct hda_codec *codec,
unsigned int stream_tag, struct snd_pcm_substream *substream)
unsigned int format,
struct snd_pcm_substream *substream)
{ {
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
return snd_hda_multi_out_dig_open(codec, &spec->multiout);
ca0132_setup_stream(codec, spec->dig_out, stream_tag, 0, format);
return 0;
}
static int ca0132_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
struct hda_codec *codec,
struct snd_pcm_substream *substream)
{
struct ca0132_spec *spec = codec->spec;
ca0132_cleanup_stream(codec, spec->dig_out);
return 0;
} }
/* static int ca0132_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
* Analog capture
*/
static int ca0132_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
struct hda_codec *codec, struct hda_codec *codec,
unsigned int stream_tag, unsigned int stream_tag,
unsigned int format, unsigned int format,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
return snd_hda_multi_out_dig_prepare(codec, &spec->multiout,
ca0132_setup_stream(codec, spec->adcs[substream->number], stream_tag, format, substream);
stream_tag, 0, format);
return 0;
} }
static int ca0132_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, static int ca0132_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
struct hda_codec *codec,
struct snd_pcm_substream *substream)
{
struct ca0132_spec *spec = codec->spec;
ca0132_cleanup_stream(codec, spec->adcs[substream->number]);
return 0;
}
/*
* Digital capture
*/
static int ca0132_dig_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
struct hda_codec *codec, struct hda_codec *codec,
unsigned int stream_tag,
unsigned int format,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout);
ca0132_setup_stream(codec, spec->dig_in, stream_tag, 0, format);
return 0;
} }
static int ca0132_dig_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, static int ca0132_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
struct hda_codec *codec, struct hda_codec *codec,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
return snd_hda_multi_out_dig_close(codec, &spec->multiout);
ca0132_cleanup_stream(codec, spec->dig_in);
return 0;
} }
/* /*
...@@ -621,6 +539,7 @@ static struct hda_pcm_stream ca0132_pcm_analog_playback = { ...@@ -621,6 +539,7 @@ static struct hda_pcm_stream ca0132_pcm_analog_playback = {
.channels_min = 2, .channels_min = 2,
.channels_max = 2, .channels_max = 2,
.ops = { .ops = {
.open = ca0132_playback_pcm_open,
.prepare = ca0132_playback_pcm_prepare, .prepare = ca0132_playback_pcm_prepare,
.cleanup = ca0132_playback_pcm_cleanup .cleanup = ca0132_playback_pcm_cleanup
}, },
...@@ -630,10 +549,6 @@ static struct hda_pcm_stream ca0132_pcm_analog_capture = { ...@@ -630,10 +549,6 @@ static struct hda_pcm_stream ca0132_pcm_analog_capture = {
.substreams = 1, .substreams = 1,
.channels_min = 2, .channels_min = 2,
.channels_max = 2, .channels_max = 2,
.ops = {
.prepare = ca0132_capture_pcm_prepare,
.cleanup = ca0132_capture_pcm_cleanup
},
}; };
static struct hda_pcm_stream ca0132_pcm_digital_playback = { static struct hda_pcm_stream ca0132_pcm_digital_playback = {
...@@ -641,6 +556,8 @@ static struct hda_pcm_stream ca0132_pcm_digital_playback = { ...@@ -641,6 +556,8 @@ static struct hda_pcm_stream ca0132_pcm_digital_playback = {
.channels_min = 2, .channels_min = 2,
.channels_max = 2, .channels_max = 2,
.ops = { .ops = {
.open = ca0132_dig_playback_pcm_open,
.close = ca0132_dig_playback_pcm_close,
.prepare = ca0132_dig_playback_pcm_prepare, .prepare = ca0132_dig_playback_pcm_prepare,
.cleanup = ca0132_dig_playback_pcm_cleanup .cleanup = ca0132_dig_playback_pcm_cleanup
}, },
...@@ -650,10 +567,6 @@ static struct hda_pcm_stream ca0132_pcm_digital_capture = { ...@@ -650,10 +567,6 @@ static struct hda_pcm_stream ca0132_pcm_digital_capture = {
.substreams = 1, .substreams = 1,
.channels_min = 2, .channels_min = 2,
.channels_max = 2, .channels_max = 2,
.ops = {
.prepare = ca0132_dig_capture_pcm_prepare,
.cleanup = ca0132_dig_capture_pcm_cleanup
},
}; };
static int ca0132_build_pcms(struct hda_codec *codec) static int ca0132_build_pcms(struct hda_codec *codec)
...@@ -961,6 +874,9 @@ static void ca0132_config(struct hda_codec *codec) ...@@ -961,6 +874,9 @@ static void ca0132_config(struct hda_codec *codec)
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
struct auto_pin_cfg *cfg = &spec->autocfg; struct auto_pin_cfg *cfg = &spec->autocfg;
codec->pcm_format_first = 1;
codec->no_sticky_stream = 1;
/* line-outs */ /* line-outs */
cfg->line_outs = 1; cfg->line_outs = 1;
cfg->line_out_pins[0] = 0x0b; /* front */ cfg->line_out_pins[0] = 0x0b; /* front */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7