Changeset 668

Timestamp:

Jan 29, 2021, 11:01:48 PM (5 years ago)

Author:

Paul Smedley

Message:

Update linux sound code to 5.10.11 level

Location:

GPL/branches/uniaud32-next/alsa-kernel

Files:

• core/seq/oss/seq_oss_synth.c (modified) (1 diff)
• include/sound/version.h (modified) (1 diff)
• pci/hda/hda_codec.c (modified) (8 diffs)
• pci/hda/hda_tegra.c (modified) (1 diff)
• pci/hda/patch_realtek.c (modified) (3 diffs)
• pci/hda/patch_via.c (modified) (1 diff)

GPL/branches/uniaud32-next/alsa-kernel/core/seq/oss/seq_oss_synth.c

@@ -612 +612 @@
         if (info->is_midi) {
                 struct midi_info minf;
-                snd_seq_oss_midi_make_info(dp, info->midi_mapped, &minf);
+                if (snd_seq_oss_midi_make_info(dp, info->midi_mapped, &minf))
+                        return -ENXIO;
                 inf->synth_type = SYNTH_TYPE_MIDI;
                 inf->synth_subtype = 0;

GPL/branches/uniaud32-next/alsa-kernel/include/sound/version.h

@@ -1 +1 @@
 /* include/version.h */
-#define CONFIG_SND_VERSION "5.10.10"
+#define CONFIG_SND_VERSION "5.10.11"
 #define CONFIG_SND_DATE ""

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_codec.c

@@ -2957 +2957 @@
 }
 
-static int hda_codec_suspend(struct device *dev)
+static int hda_codec_runtime_suspend(struct device *dev)
 {
         struct hda_codec *codec = dev_to_hda_codec(dev);
@@ -2976 +2976 @@
 }
 
-static int hda_codec_resume(struct device *dev)
+static int hda_codec_runtime_resume(struct device *dev)
 {
         struct hda_codec *codec = dev_to_hda_codec(dev);
@@ -2991 +2991 @@
 }
 
-static int hda_codec_runtime_suspend(struct device *dev)
-{
-        return hda_codec_suspend(dev);
-}
-
-static int hda_codec_runtime_resume(struct device *dev)
-{
-        return hda_codec_resume(dev);
-}
-
 #endif /* CONFIG_PM */
 
@@ -3021 +3011 @@
 {
         dev->power.power_state = PMSG_SUSPEND;
-        return hda_codec_suspend(dev);
+        return pm_runtime_force_suspend(dev);
 }
 
@@ -3027 +3017 @@
 {
         dev->power.power_state = PMSG_RESUME;
-        return hda_codec_resume(dev);
+        return pm_runtime_force_resume(dev);
 }
 
@@ -3033 +3023 @@
 {
         dev->power.power_state = PMSG_FREEZE;
-        return hda_codec_suspend(dev);
+        return pm_runtime_force_suspend(dev);
 }
 
@@ -3039 +3029 @@
 {
         dev->power.power_state = PMSG_THAW;
-        return hda_codec_resume(dev);
+        return pm_runtime_force_resume(dev);
 }
 
@@ -3045 +3035 @@
 {
         dev->power.power_state = PMSG_RESTORE;
-        return hda_codec_resume(dev);
+        return pm_runtime_force_resume(dev);
 }
 #endif /* CONFIG_PM_SLEEP */

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_tegra.c

@@ -328 +328 @@
          * 0 for 1 SDO, 1 for 2 SDO, 2 for 4 SDO lines.
          */
-        if (of_device_is_compatible(np, "nvidia,tegra194-hda")) {
+        if (of_device_is_compatible(np, "nvidia,tegra30-hda"))
                 u32 val;
 

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/patch_realtek.c

@@ -7047 +7047 @@
         ALC236_FIXUP_DELL_AIO_HEADSET_MIC,
         ALC282_FIXUP_ACER_DISABLE_LINEOUT,
+        ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST,
 };
 
@@ -8825 +8826 @@
         SND_PCI_QUIRK(0x1025, 0x1065, "Acer Aspire C20-820", ALC269VC_FIXUP_ACER_HEADSET_MIC),
         SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK),
+        SND_PCI_QUIRK(0x1025, 0x1094, "Acer Aspire E5-575T", ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x1025, 0x1099, "Acer Aspire E5-523G", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1025, 0x110e, "Acer Aspire ES1-432", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),
@@ -10238 +10240 @@
                 .v.func = alc861vd_fixup_dallas,
         },
+        [ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc269_fixup_limit_int_mic_boost,
+                .chained = true,
+                .chain_id = ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
+        },
 };
 

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/patch_via.c

@@ -118 +118 @@
         spec->gen.indep_hp = 1;
         spec->gen.keep_eapd_on = 1;
+        spec->gen.dac_min_mute = 1;
         spec->gen.pcm_playback_hook = via_playback_pcm_hook;
         spec->gen.add_stereo_mix_input = HDA_HINT_STEREO_MIX_AUTO;