]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: qcom: sc8280xp: add Display port Jack
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Thu, 6 Jun 2024 10:49:21 +0000 (11:49 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 18 Jun 2024 13:20:10 +0000 (14:20 +0100)
Add support for Display Port Jack events.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> # X13s
Link: https://msgid.link/r/20240606104922.114229-4-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/sc8280xp.c

index 06fd47c4178ff313d7fb238b6902ca1f9333725c..922ecada1cd8d9192cea1d9edf18ef9f6cf3e84d 100644 (file)
@@ -19,6 +19,7 @@ struct sc8280xp_snd_data {
        struct snd_soc_card *card;
        struct sdw_stream_runtime *sruntime[AFE_PORT_MAX];
        struct snd_soc_jack jack;
+       struct snd_soc_jack dp_jack[8];
        bool jack_setup;
 };
 
@@ -27,6 +28,8 @@ static int sc8280xp_snd_init(struct snd_soc_pcm_runtime *rtd)
        struct sc8280xp_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
        struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
        struct snd_soc_card *card = rtd->card;
+       struct snd_soc_jack *dp_jack  = NULL;
+       int dp_pcm_id = 0;
 
        switch (cpu_dai->id) {
        case WSA_CODEC_DMA_RX_0:
@@ -41,10 +44,22 @@ static int sc8280xp_snd_init(struct snd_soc_pcm_runtime *rtd)
                snd_soc_limit_volume(card, "SpkrLeft PA Volume", 17);
                snd_soc_limit_volume(card, "SpkrRight PA Volume", 17);
                break;
+       case DISPLAY_PORT_RX_0:
+               /* DISPLAY_PORT dai ids are not contiguous */
+               dp_pcm_id = 0;
+               dp_jack = &data->dp_jack[dp_pcm_id];
+               break;
+       case DISPLAY_PORT_RX_1 ... DISPLAY_PORT_RX_7:
+               dp_pcm_id = cpu_dai->id - DISPLAY_PORT_RX_1 + 1;
+               dp_jack = &data->dp_jack[dp_pcm_id];
+               break;
        default:
                break;
        }
 
+       if (dp_jack)
+               return qcom_snd_dp_jack_setup(rtd, dp_jack, dp_pcm_id);
+
        return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup);
 }