Skip to content

Commit b3bbc40

Browse files
1Naim1Naim
committed
Revert "ALSA: hda: add AW88399 side codec support"
This reverts commit 12ed4bb. Signed-off-by: Eric Naim <dnaim@cachyos.org>
1 parent a974eab commit b3bbc40

10 files changed

Lines changed: 16 additions & 733 deletions

File tree

‎drivers/acpi/scan.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1750,7 +1750,6 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
17501750
* by the drivers/platform/x86/serial-multi-instantiate.c driver, which
17511751
* knows which client device id to use for each resource.
17521752
*/
1753-
{"AWDZ8399", },
17541753
{"BSG1160", },
17551754
{"BSG2150", },
17561755
{"CSC3551", },

‎drivers/platform/x86/serial-multi-instantiate.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -411,21 +411,11 @@ static const struct smi_node max98390_hda = {
411411
.bus_type = SMI_I2C,
412412
};
413413

414-
static const struct smi_node aw88399_hda = {
415-
.instances = {
416-
{ "aw88399-hda", IRQ_RESOURCE_AUTO, 0 },
417-
{ "aw88399-hda", IRQ_RESOURCE_AUTO, 0 },
418-
{}
419-
},
420-
.bus_type = SMI_AUTO_DETECT,
421-
};
422-
423414
/*
424415
* Note new device-ids must also be added to ignore_serial_bus_ids in
425416
* drivers/acpi/scan.c: acpi_device_enumeration_by_parent().
426417
*/
427418
static const struct acpi_device_id smi_acpi_ids[] = {
428-
{ "AWDZ8399", (unsigned long)&aw88399_hda },
429419
{ "BSG1160", (unsigned long)&bsg1160_data },
430420
{ "BSG2150", (unsigned long)&bsg2150_data },
431421
{ "CSC3551", (unsigned long)&cs35l41_hda },

‎sound/hda/codecs/realtek/alc269.c‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3254,16 +3254,6 @@ static void find_cirrus_companion_amps(struct hda_codec *cdc)
32543254
comp_generic_fixup(cdc, HDA_FIXUP_ACT_PRE_PROBE, bus, acpi_ids[i].hid, match, count);
32553255
}
32563256

3257-
static void aw88399_fixup_i2c_two(struct hda_codec *cdc, const struct hda_fixup *fix, int action)
3258-
{
3259-
comp_generic_fixup(cdc, action, "i2c", "AWDZ8399", "-%s:00-aw88399-hda.%d", 2);
3260-
}
3261-
3262-
static void alc287_fixup_legion_16iax_aw88399(struct hda_codec *codec,
3263-
const struct hda_fixup *fix, int action)
3264-
{
3265-
}
3266-
32673257
static void cs35l41_fixup_i2c_two(struct hda_codec *cdc, const struct hda_fixup *fix, int action)
32683258
{
32693259
comp_generic_fixup(cdc, action, "i2c", "CSC3551", "-%s:00-cs35l41-hda.%d", 2);
@@ -4140,8 +4130,6 @@ enum {
41404130
ALC245_FIXUP_ACER_MICMUTE_LED,
41414131
ALC245_FIXUP_CS35L41_I2C_2_MUTE_LED,
41424132
ALC236_FIXUP_HP_DMIC,
4143-
ALC287_FIXUP_AW88399_I2C_2,
4144-
ALC287_FIXUP_LENOVO_LEGION_AW88399,
41454133
};
41464134

41474135
/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -6688,16 +6676,6 @@ static const struct hda_fixup alc269_fixups[] = {
66886676
{ 0x12, 0x90a60160 }, /* use as internal mic */
66896677
{ }
66906678
},
6691-
},
6692-
[ALC287_FIXUP_AW88399_I2C_2] = {
6693-
.type = HDA_FIXUP_FUNC,
6694-
.v.func = aw88399_fixup_i2c_two,
6695-
},
6696-
[ALC287_FIXUP_LENOVO_LEGION_AW88399] = {
6697-
.type = HDA_FIXUP_FUNC,
6698-
.v.func = alc287_fixup_legion_16iax_aw88399,
6699-
.chained = true,
6700-
.chain_id = ALC287_FIXUP_AW88399_I2C_2,
67016679
}
67026680
};
67036681

@@ -7716,16 +7694,13 @@ static const struct hda_quirk alc269_fixup_tbl[] = {
77167694
SND_PCI_QUIRK(0x17aa, 0x38fa, "Thinkbook 16P Gen5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
77177695
SND_PCI_QUIRK(0x17aa, 0x38fd, "ThinkBook plus Gen5 Hybrid", ALC287_FIXUP_TAS2781_I2C),
77187696
SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
7719-
SND_PCI_QUIRK(0x17aa, 0x3906, "Lenovo Legion Pro 7 16IAX10H", ALC287_FIXUP_LENOVO_LEGION_AW88399),
7720-
SND_PCI_QUIRK(0x17aa, 0x3907, "Lenovo Legion Pro 7 16IAX10H", ALC287_FIXUP_LENOVO_LEGION_AW88399),
77217697
SND_PCI_QUIRK(0x17aa, 0x390d, "Lenovo Yoga Pro 7 14ASP10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
77227698
SND_PCI_QUIRK(0x17aa, 0x3913, "Lenovo 145", ALC236_FIXUP_LENOVO_INV_DMIC),
77237699
SND_PCI_QUIRK(0x17aa, 0x391a, "Lenovo Yoga Slim 7 14AKP10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
77247700
SND_PCI_QUIRK(0x17aa, 0x391f, "Yoga S990-16 pro Quad YC Quad", ALC287_FIXUP_TXNW2781_I2C),
77257701
SND_PCI_QUIRK(0x17aa, 0x3920, "Yoga S990-16 pro Quad VECO Quad", ALC287_FIXUP_TXNW2781_I2C),
77267702
SND_PCI_QUIRK(0x17aa, 0x3929, "Thinkbook 13x Gen 5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
77277703
SND_PCI_QUIRK(0x17aa, 0x392b, "Thinkbook 13x Gen 5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
7728-
SND_PCI_QUIRK(0x17aa, 0x3938, "Lenovo Legion Pro 7 16AFR10H", ALC287_FIXUP_LENOVO_LEGION_AW88399),
77297704
SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
77307705
SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
77317706
SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),

‎sound/hda/codecs/side-codecs/Kconfig‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -160,24 +160,3 @@ config SND_HDA_SCODEC_MAX98390_I2C
160160

161161
comment "Set to Y if you want auto-loading the side codec driver"
162162
depends on SND_HDA=y && SND_HDA_SCODEC_MAX98390_I2C=m
163-
164-
config SND_HDA_SCODEC_AW88399
165-
tristate
166-
select SND_HDA_GENERIC
167-
168-
config SND_HDA_SCODEC_AW88399_I2C
169-
tristate "Build AW88399 HD-audio side codec support for I2C Bus"
170-
depends on I2C
171-
depends on ACPI
172-
depends on SND_SOC
173-
select SND_HDA_SCODEC_AW88399
174-
select SND_SOC_AW88399
175-
help
176-
Say Y or M here to include AW88399 I2C HD-audio side codec support
177-
in snd-hda-intel driver, such as ALC287.
178-
179-
This is for systems where the AW88399 smart amplifier is connected
180-
as a side codec to the HDA controller, rather than via SOF/SSP.
181-
182-
comment "Set to Y if you want auto-loading the side codec driver"
183-
depends on SND_HDA=y && SND_HDA_SCODEC_AW88399_I2C=m

‎sound/hda/codecs/side-codecs/Makefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ snd-hda-scodec-tas2781-i2c-y := tas2781_hda_i2c.o
1515
snd-hda-scodec-tas2781-spi-y := tas2781_hda_spi.o
1616
snd-hda-scodec-max98390-y := max98390_hda.o max98390_hda_filters.o
1717
snd-hda-scodec-max98390-i2c-y := max98390_hda_i2c.o
18-
snd-hda-scodec-aw88399-y := aw88399_hda.o
19-
snd-hda-scodec-aw88399-i2c-y := aw88399_hda_i2c.o
2018

2119
obj-$(CONFIG_SND_HDA_CIRRUS_SCODEC) += snd-hda-cirrus-scodec.o
2220
obj-$(CONFIG_SND_HDA_CIRRUS_SCODEC_KUNIT_TEST) += snd-hda-cirrus-scodec-test.o
@@ -32,5 +30,3 @@ obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_I2C) += snd-hda-scodec-tas2781-i2c.o
3230
obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_SPI) += snd-hda-scodec-tas2781-spi.o
3331
obj-$(CONFIG_SND_HDA_SCODEC_MAX98390) += snd-hda-scodec-max98390.o
3432
obj-$(CONFIG_SND_HDA_SCODEC_MAX98390_I2C) += snd-hda-scodec-max98390-i2c.o
35-
obj-$(CONFIG_SND_HDA_SCODEC_AW88399) += snd-hda-scodec-aw88399.o
36-
obj-$(CONFIG_SND_HDA_SCODEC_AW88399_I2C) += snd-hda-scodec-aw88399-i2c.o

0 commit comments

Comments
 (0)