+++ /dev/null
-From 07910699cda1dfec48856de36c7d2b2cf7f89f31 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 18 Aug 2023 16:58:35 +0800
-Subject: ALSA: hda/tas2781: Add tas2781 HDA driver
-
-From: Shenghao Ding <shenghao-ding@ti.com>
-
-[ Upstream commit 3babae915f4c15d76a5134e55806a1c1588e2865 ]
-
-Integrate tas2781 configs for Lenovo Laptops. All of the tas2781s in the
-laptop will be aggregated as one audio device. The code support realtek
-as the primary codec. Rename "struct cs35l41_dev_name" to
-"struct scodec_dev_name" for all other side codecs instead of the certain
-one.
-
-Signed-off-by: Shenghao Ding <shenghao-ding@ti.com>
-Link: https://lore.kernel.org/r/20230818085836.1442-1-shenghao-ding@ti.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Stable-dep-of: 41b07476da38 ("ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/pci/hda/patch_realtek.c | 88 +++++++++++++++++++++++++++++++++--
- 1 file changed, 85 insertions(+), 3 deletions(-)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 57e07aa4e136c..7d549229d0b95 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -6721,7 +6721,7 @@ static void comp_generic_playback_hook(struct hda_pcm_stream *hinfo, struct hda_
- }
- }
-
--struct cs35l41_dev_name {
-+struct scodec_dev_name {
- const char *bus;
- const char *hid;
- int index;
-@@ -6730,7 +6730,7 @@ struct cs35l41_dev_name {
- /* match the device name in a slightly relaxed manner */
- static int comp_match_cs35l41_dev_name(struct device *dev, void *data)
- {
-- struct cs35l41_dev_name *p = data;
-+ struct scodec_dev_name *p = data;
- const char *d = dev_name(dev);
- int n = strlen(p->bus);
- char tmp[32];
-@@ -6746,12 +6746,32 @@ static int comp_match_cs35l41_dev_name(struct device *dev, void *data)
- return !strcmp(d + n, tmp);
- }
-
-+static int comp_match_tas2781_dev_name(struct device *dev,
-+ void *data)
-+{
-+ struct scodec_dev_name *p = data;
-+ const char *d = dev_name(dev);
-+ int n = strlen(p->bus);
-+ char tmp[32];
-+
-+ /* check the bus name */
-+ if (strncmp(d, p->bus, n))
-+ return 0;
-+ /* skip the bus number */
-+ if (isdigit(d[n]))
-+ n++;
-+ /* the rest must be exact matching */
-+ snprintf(tmp, sizeof(tmp), "-%s:00", p->hid);
-+
-+ return !strcmp(d + n, tmp);
-+}
-+
- static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char *bus,
- const char *hid, int count)
- {
- struct device *dev = hda_codec_dev(cdc);
- struct alc_spec *spec = cdc->spec;
-- struct cs35l41_dev_name *rec;
-+ struct scodec_dev_name *rec;
- int ret, i;
-
- switch (action) {
-@@ -6776,6 +6796,41 @@ static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char
- }
- }
-
-+static void tas2781_generic_fixup(struct hda_codec *cdc, int action,
-+ const char *bus, const char *hid)
-+{
-+ struct device *dev = hda_codec_dev(cdc);
-+ struct alc_spec *spec = cdc->spec;
-+ struct scodec_dev_name *rec;
-+ int ret;
-+
-+ switch (action) {
-+ case HDA_FIXUP_ACT_PRE_PROBE:
-+ rec = devm_kmalloc(dev, sizeof(*rec), GFP_KERNEL);
-+ if (!rec)
-+ return;
-+ rec->bus = bus;
-+ rec->hid = hid;
-+ rec->index = 0;
-+ spec->comps[0].codec = cdc;
-+ component_match_add(dev, &spec->match,
-+ comp_match_tas2781_dev_name, rec);
-+ ret = component_master_add_with_match(dev, &comp_master_ops,
-+ spec->match);
-+ if (ret)
-+ codec_err(cdc,
-+ "Fail to register component aggregator %d\n",
-+ ret);
-+ else
-+ spec->gen.pcm_playback_hook =
-+ comp_generic_playback_hook;
-+ break;
-+ case HDA_FIXUP_ACT_FREE:
-+ component_master_del(dev, &comp_master_ops);
-+ break;
-+ }
-+}
-+
- static void cs35l41_fixup_i2c_two(struct hda_codec *cdc, const struct hda_fixup *fix, int action)
- {
- cs35l41_generic_fixup(cdc, action, "i2c", "CSC3551", 2);
-@@ -6803,6 +6858,12 @@ static void alc287_fixup_legion_16ithg6_speakers(struct hda_codec *cdc, const st
- cs35l41_generic_fixup(cdc, action, "i2c", "CLSA0101", 2);
- }
-
-+static void tas2781_fixup_i2c(struct hda_codec *cdc,
-+ const struct hda_fixup *fix, int action)
-+{
-+ tas2781_generic_fixup(cdc, action, "i2c", "TIAS2781");
-+}
-+
- /* for alc295_fixup_hp_top_speakers */
- #include "hp_x360_helper.c"
-
-@@ -7227,6 +7288,7 @@ enum {
- ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS,
- ALC236_FIXUP_DELL_DUAL_CODECS,
- ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,
-+ ALC287_FIXUP_TAS2781_I2C,
- };
-
- /* A special fixup for Lenovo C940 and Yoga Duet 7;
-@@ -9296,6 +9358,12 @@ static const struct hda_fixup alc269_fixups[] = {
- .chained = true,
- .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
- },
-+ [ALC287_FIXUP_TAS2781_I2C] = {
-+ .type = HDA_FIXUP_FUNC,
-+ .v.func = tas2781_fixup_i2c,
-+ .chained = true,
-+ .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
-+ },
- };
-
- static const struct snd_pci_quirk alc269_fixup_tbl[] = {
-@@ -9867,6 +9935,20 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- SND_PCI_QUIRK(0x17aa, 0x3853, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
- SND_PCI_QUIRK(0x17aa, 0x3855, "Legion 7 16ITHG6", ALC287_FIXUP_LEGION_16ITHG6),
- SND_PCI_QUIRK(0x17aa, 0x3869, "Lenovo Yoga7 14IAL7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
-+ SND_PCI_QUIRK(0x17aa, 0x387d, "Yoga S780-16 pro Quad AAC", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x387e, "Yoga S780-16 pro Quad YC", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x3881, "YB9 dual powe mode2 YC", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x3884, "Y780 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x3886, "Y780 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38a7, "Y780P AMD YG dual", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38a8, "Y780P AMD VECO dual", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38ba, "Yoga S780-14.5 Air AMD quad YC", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38bb, "Yoga S780-14.5 Air AMD quad AAC", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38be, "Yoga S980-14.5 proX YC Dual", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38bf, "Yoga S980-14.5 proX LX Dual", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38c3, "Y980 DUAL", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38cb, "Y790 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38cd, "Y790 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
- SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
- SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
- SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
---
-2.40.1
-
spi-zynqmp-gqspi-convert-to-platform-remove-callback.patch
spi-zynqmp-gqspi-fix-clock-imbalance-on-probe-failur.patch
-alsa-hda-tas2781-add-tas2781-hda-driver.patch
asoc-soc-utils-export-snd_soc_dai_is_dummy-symbol.patch
asoc-tegra-fix-redundant-plla-and-plla_out0-updates.patch
mptcp-rename-timer-related-helper-to-less-confusing-.patch
+++ /dev/null
-From 49ae5f8082daf33e220fd5c14df7c14565971741 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 18 Aug 2023 16:58:35 +0800
-Subject: ALSA: hda/tas2781: Add tas2781 HDA driver
-
-From: Shenghao Ding <shenghao-ding@ti.com>
-
-[ Upstream commit 3babae915f4c15d76a5134e55806a1c1588e2865 ]
-
-Integrate tas2781 configs for Lenovo Laptops. All of the tas2781s in the
-laptop will be aggregated as one audio device. The code support realtek
-as the primary codec. Rename "struct cs35l41_dev_name" to
-"struct scodec_dev_name" for all other side codecs instead of the certain
-one.
-
-Signed-off-by: Shenghao Ding <shenghao-ding@ti.com>
-Link: https://lore.kernel.org/r/20230818085836.1442-1-shenghao-ding@ti.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Stable-dep-of: 41b07476da38 ("ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/pci/hda/patch_realtek.c | 88 +++++++++++++++++++++++++++++++++--
- 1 file changed, 85 insertions(+), 3 deletions(-)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 4a13747b2b0f3..ccf99f881cc4f 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -6721,7 +6721,7 @@ static void comp_generic_playback_hook(struct hda_pcm_stream *hinfo, struct hda_
- }
- }
-
--struct cs35l41_dev_name {
-+struct scodec_dev_name {
- const char *bus;
- const char *hid;
- int index;
-@@ -6730,7 +6730,7 @@ struct cs35l41_dev_name {
- /* match the device name in a slightly relaxed manner */
- static int comp_match_cs35l41_dev_name(struct device *dev, void *data)
- {
-- struct cs35l41_dev_name *p = data;
-+ struct scodec_dev_name *p = data;
- const char *d = dev_name(dev);
- int n = strlen(p->bus);
- char tmp[32];
-@@ -6746,12 +6746,32 @@ static int comp_match_cs35l41_dev_name(struct device *dev, void *data)
- return !strcmp(d + n, tmp);
- }
-
-+static int comp_match_tas2781_dev_name(struct device *dev,
-+ void *data)
-+{
-+ struct scodec_dev_name *p = data;
-+ const char *d = dev_name(dev);
-+ int n = strlen(p->bus);
-+ char tmp[32];
-+
-+ /* check the bus name */
-+ if (strncmp(d, p->bus, n))
-+ return 0;
-+ /* skip the bus number */
-+ if (isdigit(d[n]))
-+ n++;
-+ /* the rest must be exact matching */
-+ snprintf(tmp, sizeof(tmp), "-%s:00", p->hid);
-+
-+ return !strcmp(d + n, tmp);
-+}
-+
- static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char *bus,
- const char *hid, int count)
- {
- struct device *dev = hda_codec_dev(cdc);
- struct alc_spec *spec = cdc->spec;
-- struct cs35l41_dev_name *rec;
-+ struct scodec_dev_name *rec;
- int ret, i;
-
- switch (action) {
-@@ -6779,6 +6799,41 @@ static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char
- }
- }
-
-+static void tas2781_generic_fixup(struct hda_codec *cdc, int action,
-+ const char *bus, const char *hid)
-+{
-+ struct device *dev = hda_codec_dev(cdc);
-+ struct alc_spec *spec = cdc->spec;
-+ struct scodec_dev_name *rec;
-+ int ret;
-+
-+ switch (action) {
-+ case HDA_FIXUP_ACT_PRE_PROBE:
-+ rec = devm_kmalloc(dev, sizeof(*rec), GFP_KERNEL);
-+ if (!rec)
-+ return;
-+ rec->bus = bus;
-+ rec->hid = hid;
-+ rec->index = 0;
-+ spec->comps[0].codec = cdc;
-+ component_match_add(dev, &spec->match,
-+ comp_match_tas2781_dev_name, rec);
-+ ret = component_master_add_with_match(dev, &comp_master_ops,
-+ spec->match);
-+ if (ret)
-+ codec_err(cdc,
-+ "Fail to register component aggregator %d\n",
-+ ret);
-+ else
-+ spec->gen.pcm_playback_hook =
-+ comp_generic_playback_hook;
-+ break;
-+ case HDA_FIXUP_ACT_FREE:
-+ component_master_del(dev, &comp_master_ops);
-+ break;
-+ }
-+}
-+
- static void cs35l41_fixup_i2c_two(struct hda_codec *cdc, const struct hda_fixup *fix, int action)
- {
- cs35l41_generic_fixup(cdc, action, "i2c", "CSC3551", 2);
-@@ -6806,6 +6861,12 @@ static void alc287_fixup_legion_16ithg6_speakers(struct hda_codec *cdc, const st
- cs35l41_generic_fixup(cdc, action, "i2c", "CLSA0101", 2);
- }
-
-+static void tas2781_fixup_i2c(struct hda_codec *cdc,
-+ const struct hda_fixup *fix, int action)
-+{
-+ tas2781_generic_fixup(cdc, action, "i2c", "TIAS2781");
-+}
-+
- /* for alc295_fixup_hp_top_speakers */
- #include "hp_x360_helper.c"
-
-@@ -7231,6 +7292,7 @@ enum {
- ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS,
- ALC236_FIXUP_DELL_DUAL_CODECS,
- ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,
-+ ALC287_FIXUP_TAS2781_I2C,
- };
-
- /* A special fixup for Lenovo C940 and Yoga Duet 7;
-@@ -9309,6 +9371,12 @@ static const struct hda_fixup alc269_fixups[] = {
- .chained = true,
- .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
- },
-+ [ALC287_FIXUP_TAS2781_I2C] = {
-+ .type = HDA_FIXUP_FUNC,
-+ .v.func = tas2781_fixup_i2c,
-+ .chained = true,
-+ .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
-+ },
- };
-
- static const struct snd_pci_quirk alc269_fixup_tbl[] = {
-@@ -9890,6 +9958,20 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- SND_PCI_QUIRK(0x17aa, 0x3853, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
- SND_PCI_QUIRK(0x17aa, 0x3855, "Legion 7 16ITHG6", ALC287_FIXUP_LEGION_16ITHG6),
- SND_PCI_QUIRK(0x17aa, 0x3869, "Lenovo Yoga7 14IAL7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
-+ SND_PCI_QUIRK(0x17aa, 0x387d, "Yoga S780-16 pro Quad AAC", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x387e, "Yoga S780-16 pro Quad YC", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x3881, "YB9 dual powe mode2 YC", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x3884, "Y780 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x3886, "Y780 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38a7, "Y780P AMD YG dual", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38a8, "Y780P AMD VECO dual", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38ba, "Yoga S780-14.5 Air AMD quad YC", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38bb, "Yoga S780-14.5 Air AMD quad AAC", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38be, "Yoga S980-14.5 proX YC Dual", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38bf, "Yoga S980-14.5 proX LX Dual", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38c3, "Y980 DUAL", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38cb, "Y790 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
-+ SND_PCI_QUIRK(0x17aa, 0x38cd, "Y790 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
- SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
- SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
- SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
---
-2.40.1
-
-alsa-hda-tas2781-add-tas2781-hda-driver.patch
asoc-soc-utils-export-snd_soc_dai_is_dummy-symbol.patch
asoc-tegra-fix-redundant-plla-and-plla_out0-updates.patch
maple_tree-add-mas_is_active-to-detect-in-tree-walks.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
