Hi,
On Sat, Jan 15, 2022 at 7:03 AM Brian Norris <briannorris@xxxxxxxxxxxx> wrote:
>
> Now that the cdn-dp driver supports plug-change callbacks, let's wire it
> up.
>
> Signed-off-by: Brian Norris <briannorris@xxxxxxxxxxxx>
> ---
>
> (no changes since v1)
>
> sound/soc/rockchip/rk3399_gru_sound.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
> index e2d52d8d0ff9..eeef3ed70037 100644
> --- a/sound/soc/rockchip/rk3399_gru_sound.c
> +++ b/sound/soc/rockchip/rk3399_gru_sound.c
> @@ -164,6 +164,25 @@ static int rockchip_sound_da7219_hw_params(struct snd_pcm_substream *substream,
> return 0;
> }
>
> +static struct snd_soc_jack cdn_dp_card_jack;
> +
> +static int rockchip_sound_cdndp_init(struct snd_soc_pcm_runtime *rtd)
> +{
> + struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
Using snd_soc_card_get_codec_dai() might be a better choice throughout this
driver. While it will work for the cdn_dp case, because it is the first DAI
in |rockchip_dais[]|, all the invocations for the other codecs are likely
returning the wrong DAI.
For this particular patch it works either way, so
Reviewed-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
> + struct snd_soc_card *card = rtd->card;
> + int ret;
> +
> + /* Enable jack detection. */
> + ret = snd_soc_card_jack_new(card, "DP Jack", SND_JACK_LINEOUT,
> + &cdn_dp_card_jack, NULL, 0);
> + if (ret) {
> + dev_err(card->dev, "Can't create DP Jack %d\n", ret);
> + return ret;
> + }
> +
> + return snd_soc_component_set_jack(component, &cdn_dp_card_jack, NULL);
> +}
> +
> static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd)
> {
> struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
> @@ -315,6 +334,7 @@ static const struct snd_soc_dai_link rockchip_dais[] = {
> [DAILINK_CDNDP] = {
> .name = "DP",
> .stream_name = "DP PCM",
> + .init = rockchip_sound_cdndp_init,
> .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
> SND_SOC_DAIFMT_CBS_CFS,
> SND_SOC_DAILINK_REG(cdndp),
> --
> 2.34.1.703.g22d0c6ccf7-goog
>
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
