[d-kernel] [PATCH 1/9] Revert "ASoC: Intel: sof_es8336: add ES8326 component support"
kovalev на altlinux.org
kovalev на altlinux.org
Пт Дек 8 20:09:31 MSK 2023
From: Vasiliy Kovalev <kovalev на altlinux.org>
This reverts commit 15942fcf7b5fa138e8e7b597f327d252f7895d2c.
We remove our changes before applying a set of patches from the upstream.
Signed-off-by: Vasiliy Kovalev <kovalev на altlinux.org
---
sound/soc/intel/boards/sof_es8336.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c
index 6b8b4596e62e92..e22d767b6e97a3 100644
--- a/sound/soc/intel/boards/sof_es8336.c
+++ b/sound/soc/intel/boards/sof_es8336.c
@@ -682,17 +682,15 @@ static int sof_es8336_probe(struct platform_device *pdev)
snprintf(codec_name, sizeof(codec_name),
"i2c-%s", acpi_dev_name(adev));
dai_links[0].codecs->name = codec_name;
+
+ /* also fixup codec dai name if relevant */
+ if (!strncmp(mach->id, "ESSX8326", SND_ACPI_I2C_ID_LEN))
+ dai_links[0].codecs->dai_name = "ES8326 HiFi";
} else {
dev_err(dev, "Error cannot find '%s' dev\n", mach->id);
return -ENXIO;
}
- card->components = devm_kasprintf(dev, GFP_KERNEL, "spk:es83%d6",
- strstr(codec_name, "ESSX8326")
- ? 1 : 2);
- if (!card->components)
- return -ENOMEM;
-
codec_dev = acpi_get_first_physical_node(adev);
acpi_dev_put(adev);
if (!codec_dev)
--
2.33.8
Подробная информация о списке рассылки devel-kernel