Skip to content

Commit 1836efa

Browse files
wangdichenggregkh
authored andcommitted
ALSA: hda/conexant: Renaming the codec with device ID 0x1f86 and 0x1f87
[ Upstream commit 7f4c540 ] Due to changes in the manufacturer's plan, all 0x14f11f86 will be named CX11880, and 0x14f11f87 will be named SN6140 Signed-off-by: wangdicheng <wangdicheng@kylinos.cn> Link: https://patch.msgid.link/20250616074331.581309-1-wangdich9700@163.com Signed-off-by: Takashi Iwai <tiwai@suse.de> Stable-dep-of: b0e2333 ("ALSA: hda/conexant: Fix missing error check for jack detection") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 5dab7c7 commit 1836efa

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

sound/pci/hda/patch_conexant.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct conexant_spec {
4242
unsigned int gpio_led;
4343
unsigned int gpio_mute_led_mask;
4444
unsigned int gpio_mic_led_mask;
45-
bool is_cx8070_sn6140;
45+
bool is_cx11880_sn6140;
4646
};
4747

4848

@@ -195,7 +195,7 @@ static int cx_auto_init(struct hda_codec *codec)
195195
cxt_init_gpio_led(codec);
196196
snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);
197197

198-
if (spec->is_cx8070_sn6140)
198+
if (spec->is_cx11880_sn6140)
199199
cx_fixup_headset_recog(codec);
200200

201201
return 0;
@@ -247,7 +247,7 @@ static void cx_update_headset_mic_vref(struct hda_codec *codec, struct hda_jack_
247247
{
248248
unsigned int mic_present;
249249

250-
/* In cx8070 and sn6140, the node 16 can only be configured to headphone or disabled,
250+
/* In cx11880 and sn6140, the node 16 can only be configured to headphone or disabled,
251251
* the node 19 can only be configured to microphone or disabled.
252252
* Check hp&mic tag to process headset plugin & plugout.
253253
*/
@@ -1193,11 +1193,11 @@ static int patch_conexant_auto(struct hda_codec *codec)
11931193
codec->spec = spec;
11941194
codec->patch_ops = cx_auto_patch_ops;
11951195

1196-
/* init cx8070/sn6140 flag and reset headset_present_flag */
1196+
/* init cx11880/sn6140 flag and reset headset_present_flag */
11971197
switch (codec->core.vendor_id) {
11981198
case 0x14f11f86:
11991199
case 0x14f11f87:
1200-
spec->is_cx8070_sn6140 = true;
1200+
spec->is_cx11880_sn6140 = true;
12011201
snd_hda_jack_detect_enable_callback(codec, 0x19, cx_update_headset_mic_vref);
12021202
break;
12031203
}
@@ -1285,7 +1285,7 @@ static int patch_conexant_auto(struct hda_codec *codec)
12851285
*/
12861286

12871287
static const struct hda_device_id snd_hda_id_conexant[] = {
1288-
HDA_CODEC_ENTRY(0x14f11f86, "CX8070", patch_conexant_auto),
1288+
HDA_CODEC_ENTRY(0x14f11f86, "CX11880", patch_conexant_auto),
12891289
HDA_CODEC_ENTRY(0x14f11f87, "SN6140", patch_conexant_auto),
12901290
HDA_CODEC_ENTRY(0x14f12008, "CX8200", patch_conexant_auto),
12911291
HDA_CODEC_ENTRY(0x14f120d0, "CX11970", patch_conexant_auto),

0 commit comments

Comments
 (0)