]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ALSA: hda/conexant: Renaming the codec with device ID 0x1f86 and 0x1f87
authorwangdicheng <wangdicheng@kylinos.cn>
Mon, 16 Jun 2025 07:43:31 +0000 (15:43 +0800)
committerTakashi Iwai <tiwai@suse.de>
Wed, 18 Jun 2025 08:16:50 +0000 (10:16 +0200)
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>
sound/pci/hda/patch_conexant.c

index 34874039ad4539a2b0755b56d606e4bc39c9fa16..e584a7b2877de507849cc095ce1fcff6c0543f3e 100644 (file)
@@ -42,7 +42,7 @@ struct conexant_spec {
        unsigned int gpio_led;
        unsigned int gpio_mute_led_mask;
        unsigned int gpio_mic_led_mask;
-       bool is_cx8070_sn6140;
+       bool is_cx11880_sn6140;
 };
 
 
@@ -195,7 +195,7 @@ static int cx_auto_init(struct hda_codec *codec)
        cxt_init_gpio_led(codec);
        snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);
 
-       if (spec->is_cx8070_sn6140)
+       if (spec->is_cx11880_sn6140)
                cx_fixup_headset_recog(codec);
 
        return 0;
@@ -247,7 +247,7 @@ static void cx_update_headset_mic_vref(struct hda_codec *codec, struct hda_jack_
 {
        unsigned int mic_present;
 
-       /* In cx8070 and sn6140, the node 16 can only be configured to headphone or disabled,
+       /* In cx11880 and sn6140, the node 16 can only be configured to headphone or disabled,
         * the node 19 can only be configured to microphone or disabled.
         * Check hp&mic tag to process headset plugin & plugout.
         */
@@ -1192,11 +1192,11 @@ static int patch_conexant_auto(struct hda_codec *codec)
        codec->spec = spec;
        codec->patch_ops = cx_auto_patch_ops;
 
-       /* init cx8070/sn6140 flag and reset headset_present_flag */
+       /* init cx11880/sn6140 flag and reset headset_present_flag */
        switch (codec->core.vendor_id) {
        case 0x14f11f86:
        case 0x14f11f87:
-               spec->is_cx8070_sn6140 = true;
+               spec->is_cx11880_sn6140 = true;
                snd_hda_jack_detect_enable_callback(codec, 0x19, cx_update_headset_mic_vref);
                break;
        }
@@ -1284,7 +1284,7 @@ static int patch_conexant_auto(struct hda_codec *codec)
  */
 
 static const struct hda_device_id snd_hda_id_conexant[] = {
-       HDA_CODEC_ENTRY(0x14f11f86, "CX8070", patch_conexant_auto),
+       HDA_CODEC_ENTRY(0x14f11f86, "CX11880", patch_conexant_auto),
        HDA_CODEC_ENTRY(0x14f11f87, "SN6140", patch_conexant_auto),
        HDA_CODEC_ENTRY(0x14f12008, "CX8200", patch_conexant_auto),
        HDA_CODEC_ENTRY(0x14f120d0, "CX11970", patch_conexant_auto),