* [d-kernel] [PATCH 0/1] ASoC: Intel: sof_es8336: readd ES8326 support into 5.15.9x @ 2023-02-06 8:09 nickel 2023-02-06 8:09 ` [d-kernel] [PATCH] ASoC: Intel: sof_es8336: readd ES8326 support nickel 0 siblings, 1 reply; 3+ messages in thread From: nickel @ 2023-02-06 8:09 UTC (permalink / raw) To: devel-kernel This patch is intended for p10 un-def, sisyphus std-def 5.15 kernels. [PATCH 1/1] ASoC: Intel: sof_es8336: readd ES8326 support ^ permalink raw reply [flat|nested] 3+ messages in thread
* [d-kernel] [PATCH] ASoC: Intel: sof_es8336: readd ES8326 support 2023-02-06 8:09 [d-kernel] [PATCH 0/1] ASoC: Intel: sof_es8336: readd ES8326 support into 5.15.9x nickel @ 2023-02-06 8:09 ` nickel 2023-02-06 8:27 ` Vitaly Chikunov 0 siblings, 1 reply; 3+ messages in thread From: nickel @ 2023-02-06 8:09 UTC (permalink / raw) To: devel-kernel; +Cc: Vasiliy Kovalev From: Vasiliy Kovalev <kovalev@altlinux.org> Restored support for the driver with the ES8326 codec which was broken during latest driver backport. Fixes: 0a831ff70b13 (ASoC: Intel: sof_es8336: copy driver source code from kernel v6.0.9) Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org> Signed-off-by: Nikolai Kostrigin <nickel@altlinux.org> --- sound/soc/intel/boards/sof_es8336.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index 4499f6b191d95..31b1b16f0eda1 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -688,10 +688,6 @@ static int sof_es8336_probe(struct platform_device *pdev) "i2c-%s", acpi_dev_name(adev)); put_device(&adev->dev); 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; @@ -702,6 +698,12 @@ static int sof_es8336_probe(struct platform_device *pdev) if (ret) return ret; + 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); if (!codec_dev) return -EPROBE_DEFER; -- 2.33.6 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [d-kernel] [PATCH] ASoC: Intel: sof_es8336: readd ES8326 support 2023-02-06 8:09 ` [d-kernel] [PATCH] ASoC: Intel: sof_es8336: readd ES8326 support nickel @ 2023-02-06 8:27 ` Vitaly Chikunov 0 siblings, 0 replies; 3+ messages in thread From: Vitaly Chikunov @ 2023-02-06 8:27 UTC (permalink / raw) To: ALT Linux kernel packages development; +Cc: Vasiliy Kovalev On Mon, Feb 06, 2023 at 11:09:01AM +0300, nickel@altlinux.org wrote: > From: Vasiliy Kovalev <kovalev@altlinux.org> > > Restored support for the driver with the ES8326 codec which was broken > during latest driver backport. > > Fixes: 0a831ff70b13 (ASoC: Intel: sof_es8336: copy driver source code from kernel v6.0.9) > Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org> > Signed-off-by: Nikolai Kostrigin <nickel@altlinux.org> Applied, thanks. [SCM] packages/kernel-image: heads/un-def/p10 [SCM] packages/kernel-image: heads/std-def/sisyphus > --- > sound/soc/intel/boards/sof_es8336.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c > index 4499f6b191d95..31b1b16f0eda1 100644 > --- a/sound/soc/intel/boards/sof_es8336.c > +++ b/sound/soc/intel/boards/sof_es8336.c > @@ -688,10 +688,6 @@ static int sof_es8336_probe(struct platform_device *pdev) > "i2c-%s", acpi_dev_name(adev)); > put_device(&adev->dev); > 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; > @@ -702,6 +698,12 @@ static int sof_es8336_probe(struct platform_device *pdev) > if (ret) > return ret; > > + 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); > if (!codec_dev) > return -EPROBE_DEFER; > -- > 2.33.6 > > _______________________________________________ > devel-kernel mailing list > devel-kernel@lists.altlinux.org > https://lists.altlinux.org/mailman/listinfo/devel-kernel ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-06 8:27 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-02-06 8:09 [d-kernel] [PATCH 0/1] ASoC: Intel: sof_es8336: readd ES8326 support into 5.15.9x nickel 2023-02-06 8:09 ` [d-kernel] [PATCH] ASoC: Intel: sof_es8336: readd ES8326 support nickel 2023-02-06 8:27 ` Vitaly Chikunov
ALT Linux kernel packages development This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/devel-kernel/0 devel-kernel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 devel-kernel devel-kernel/ http://lore.altlinux.org/devel-kernel \ devel-kernel@altlinux.org devel-kernel@altlinux.ru devel-kernel@altlinux.com public-inbox-index devel-kernel Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.devel-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git