hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda/ca0132 - Actually fix microphone issue 

This patch fixes the microphone issue for all cards. The previous fix
worked on the ZxR, but not on the AE-5 or Z. This patch has been tested
to work for all cards.

Signed-off-by: Connor McAdams <conmanx360@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Connor McAdams 2018-10-21 13:53:03 -04:00 committed by Takashi Iwai
parent eb7ebfa3c1
commit b5a229350b
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
sound/pci/hda/patch_ca0132.c
View File

@ -6983,37 +6983,44 @@ static void sbz_chipio_startup_data(struct hda_codec *codec)
static void ca0132_alt_dsp_scp_startup(struct hda_codec *codec) static void ca0132_alt_dsp_scp_startup(struct hda_codec *codec)
{ {
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
unsigned int tmp; unsigned int tmp, i;
switch (spec->quirk) { /*
case QUIRK_SBZ: * Gotta run these twice, or else mic works inconsistently. Not clear
case QUIRK_AE5: * why this is, but multiple tests have confirmed it.
tmp = 0x00000003; */
dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); for (i = 0; i < 2; i++) {
tmp = 0x00000000; switch (spec->quirk) {
dspio_set_uint_param_no_source(codec, 0x80, 0x0A, tmp); case QUIRK_SBZ:
tmp = 0x00000001; case QUIRK_AE5:
dspio_set_uint_param_no_source(codec, 0x80, 0x0B, tmp); tmp = 0x00000003;
tmp = 0x00000004; dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp);
dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); tmp = 0x00000000;
tmp = 0x00000005; dspio_set_uint_param_no_source(codec, 0x80, 0x0A, tmp);
dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); tmp = 0x00000001;
tmp = 0x00000000; dspio_set_uint_param_no_source(codec, 0x80, 0x0B, tmp);
dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); tmp = 0x00000004;
break; dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp);
case QUIRK_R3D: tmp = 0x00000005;
case QUIRK_R3DI: dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp);
tmp = 0x00000000; tmp = 0x00000000;
dspio_set_uint_param_no_source(codec, 0x80, 0x0A, tmp); dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp);
tmp = 0x00000001; break;
dspio_set_uint_param_no_source(codec, 0x80, 0x0B, tmp); case QUIRK_R3D:
tmp = 0x00000004; case QUIRK_R3DI:
dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); tmp = 0x00000000;
tmp = 0x00000005; dspio_set_uint_param_no_source(codec, 0x80, 0x0A, tmp);
dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); tmp = 0x00000001;
tmp = 0x00000000; dspio_set_uint_param_no_source(codec, 0x80, 0x0B, tmp);
dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); tmp = 0x00000004;
break; dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp);
tmp = 0x00000005;
dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp);
tmp = 0x00000000;
dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp);
break;
}
msleep(100);
} }
} }
@ -7246,8 +7253,6 @@ static void r3d_setup_defaults(struct hda_codec *codec)
int num_fx; int num_fx;
int idx, i; int idx, i;
msleep(100);
if (spec->dsp_state != DSP_DOWNLOADED) if (spec->dsp_state != DSP_DOWNLOADED)
return; return;
@ -7292,8 +7297,6 @@ static void sbz_setup_defaults(struct hda_codec *codec)
int num_fx; int num_fx;
int idx, i; int idx, i;
msleep(100);
if (spec->dsp_state != DSP_DOWNLOADED) if (spec->dsp_state != DSP_DOWNLOADED)
return; return;
@ -7351,8 +7354,6 @@ static void ae5_setup_defaults(struct hda_codec *codec)
int num_fx; int num_fx;
int idx, i; int idx, i;
msleep(100);
if (spec->dsp_state != DSP_DOWNLOADED) if (spec->dsp_state != DSP_DOWNLOADED)
return; return;