On Thu, Mar 02, 2023 at 12:03:27PM +0000, Srinivas Kandagatla wrote:
If the soundcard does not specify the dapm pins, let the common code add these pins for jack.
Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org
Looks like this one was lost somewhere.
Any chance we can get this into 6.5 as it's needed for audio on the Lenovo ThinkPad X13s?
Tested-by: Johan Hovold johan+linaro@kernel.org
Johan
sound/soc/qcom/common.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index c1f24af17506..555feb845c41 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -8,6 +8,11 @@ #include "qdsp6/q6afe.h" #include "common.h"
+static const struct snd_soc_dapm_widget qcom_jack_snd_widgets[] = {
- SND_SOC_DAPM_HP("Headphone Jack", NULL),
- SND_SOC_DAPM_MIC("Mic Jack", NULL),
+};
int qcom_snd_parse_of(struct snd_soc_card *card) { struct device_node *np; @@ -169,6 +174,11 @@ int qcom_snd_parse_of(struct snd_soc_card *card) of_node_put(platform); }
- if (!card->dapm_widgets) {
card->dapm_widgets = qcom_jack_snd_widgets;card->num_dapm_widgets = ARRAY_SIZE(qcom_jack_snd_widgets);- }
- return 0;
err: of_node_put(cpu);