Patch now included upstream
This commit is contained in:
@@ -1,57 +0,0 @@
|
||||
From 09b0835977b5fa955e35147513ed770e6bf0229d Mon Sep 17 00:00:00 2001
|
||||
From: Charles Keepax <ckeepax@opensource.cirrus.com>
|
||||
Date: Mon, 15 Dec 2025 15:36:49 +0000
|
||||
Subject: [PATCH 02/17] ASoC: SDCA: Add ASoC jack hookup in class driver
|
||||
|
||||
Add the necessary calls to the class driver to connect the ASoC jack
|
||||
from the machine driver.
|
||||
|
||||
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
|
||||
Link: https://patch.msgid.link/20251215153650.3913117-4-ckeepax@opensource.cirrus.com
|
||||
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
|
||||
Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
---
|
||||
sound/soc/sdca/sdca_class_function.c | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/sound/soc/sdca/sdca_class_function.c b/sound/soc/sdca/sdca_class_function.c
|
||||
index 0028482a1e75..416948cfb5cb 100644
|
||||
--- a/sound/soc/sdca/sdca_class_function.c
|
||||
+++ b/sound/soc/sdca/sdca_class_function.c
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <sound/sdca_fdl.h>
|
||||
#include <sound/sdca_function.h>
|
||||
#include <sound/sdca_interrupts.h>
|
||||
+#include <sound/sdca_jack.h>
|
||||
#include <sound/sdca_regmap.h>
|
||||
#include <sound/sdw.h>
|
||||
#include <sound/soc-component.h>
|
||||
@@ -195,6 +196,15 @@ static int class_function_component_probe(struct snd_soc_component *component)
|
||||
return sdca_irq_populate(drv->function, component, core->irq_info);
|
||||
}
|
||||
|
||||
+static int class_function_set_jack(struct snd_soc_component *component,
|
||||
+ struct snd_soc_jack *jack, void *d)
|
||||
+{
|
||||
+ struct class_function_drv *drv = snd_soc_component_get_drvdata(component);
|
||||
+ struct sdca_class_drv *core = drv->core;
|
||||
+
|
||||
+ return sdca_jack_set_jack(core->irq_info, jack);
|
||||
+}
|
||||
+
|
||||
static const struct snd_soc_component_driver class_function_component_drv = {
|
||||
.probe = class_function_component_probe,
|
||||
.endianness = 1,
|
||||
@@ -351,6 +361,9 @@ static int class_function_probe(struct auxiliary_device *auxdev,
|
||||
return dev_err_probe(dev, PTR_ERR(drv->regmap),
|
||||
"failed to create regmap");
|
||||
|
||||
+ if (desc->type == SDCA_FUNCTION_TYPE_UAJ)
|
||||
+ cmp_drv->set_jack = class_function_set_jack;
|
||||
+
|
||||
ret = sdca_asoc_populate_component(dev, drv->function, cmp_drv,
|
||||
&dais, &num_dais,
|
||||
&class_function_sdw_ops);
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -31,7 +31,6 @@ source=(
|
||||
https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
|
||||
$url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig}
|
||||
0001-ASoC-SDCA-functions-Fix-confusing-cleanup.h-syntax.patch
|
||||
0002-ASoC-SDCA-Add-ASoC-jack-hookup-in-class-driver.patch
|
||||
0003-ASoC-SDCA-Replace-use-of-system_wq-with-system_dfl_w.patch
|
||||
0004-ASoC-SDCA-Add-SDCA-IRQ-enable-disable-helpers.patch
|
||||
0005-ASoC-SDCA-Add-basic-system-suspend-support.patch
|
||||
@@ -62,7 +61,7 @@ b2sums=('64c2a0003d8080f268772d36923ff6ef8b2d55320ea08b77ad39384c98c9a5c1a8e7142
|
||||
'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP')
|
||||
'SKIP' 'SKIP')
|
||||
b2sums_x86_64=('9742088ab0381d8196046e42e8acb4ce01ea77461fada77dc90d197e859631e73b06ead4d512f15ab619b33ebad7bca58a10d4506d66916a99c40f9f52708a53')
|
||||
|
||||
# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
|
||||
@@ -72,7 +71,7 @@ sha256sums=('cde8bf6739be4a0777fedbbba5330b8188c55680c45a922a4dfa289cbec6f185'
|
||||
'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP')
|
||||
'SKIP' 'SKIP')
|
||||
|
||||
export KBUILD_BUILD_HOST=archlinux
|
||||
export KBUILD_BUILD_USER=$pkgbase
|
||||
|
||||
Reference in New Issue
Block a user