lkml.org 
[lkml]   [2019]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 4/6] ASoC: rockchip_max98090: Add HDMI jack support
    Date
    In machine driver, create a jack and let hdmi-codec report jack status.

    Signed-off-by: Cheng-Yi Chiang <cychiang@chromium.org>
    ---
    sound/soc/rockchip/Kconfig | 3 ++-
    sound/soc/rockchip/rockchip_max98090.c | 21 +++++++++++++++++++++
    2 files changed, 23 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
    index b43657e6e655..d610b553ea3b 100644
    --- a/sound/soc/rockchip/Kconfig
    +++ b/sound/soc/rockchip/Kconfig
    @@ -40,9 +40,10 @@ config SND_SOC_ROCKCHIP_MAX98090
    select SND_SOC_ROCKCHIP_I2S
    select SND_SOC_MAX98090
    select SND_SOC_TS3A227E
    + select SND_SOC_HDMI_CODEC
    help
    Say Y or M here if you want to add support for SoC audio on Rockchip
    - boards using the MAX98090 codec, such as Veyron.
    + boards using the MAX98090 codec and HDMI codec, such as Veyron.

    config SND_SOC_ROCKCHIP_RT5645
    tristate "ASoC support for Rockchip boards using a RT5645/RT5650 codec"
    diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
    index 550e57789719..fdd1d9921a4e 100644
    --- a/sound/soc/rockchip/rockchip_max98090.c
    +++ b/sound/soc/rockchip/rockchip_max98090.c
    @@ -230,6 +230,25 @@ enum {
    DAILINK_HDMI,
    };

    +static struct snd_soc_jack rk_hdmi_jack;
    +
    +static int rk_hdmi_init(struct snd_soc_pcm_runtime *runtime)
    +{
    + struct snd_soc_card *card = runtime->card;
    + struct snd_soc_component *component = runtime->codec_dai->component;
    + int ret;
    +
    + /* enable jack detection */
    + ret = snd_soc_card_jack_new(card, "HDMI Jack", SND_JACK_LINEOUT,
    + &rk_hdmi_jack, NULL, 0);
    + if (ret) {
    + dev_err(card->dev, "Can't new HDMI Jack %d\n", ret);
    + return ret;
    + }
    +
    + return hdmi_codec_set_jack_detect(component, &rk_hdmi_jack);
    +}
    +
    /* max98090 dai_link */
    static struct snd_soc_dai_link rk_max98090_dailinks[] = {
    {
    @@ -249,6 +268,7 @@ static struct snd_soc_dai_link rk_hdmi_dailinks[] = {
    {
    .name = "HDMI",
    .stream_name = "HDMI",
    + .init = rk_hdmi_init,
    .ops = &rk_aif1_ops,
    .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
    SND_SOC_DAIFMT_CBS_CFS,
    @@ -271,6 +291,7 @@ static struct snd_soc_dai_link rk_max98090_hdmi_dailinks[] = {
    [DAILINK_HDMI] = {
    .name = "HDMI",
    .stream_name = "HDMI",
    + .init = rk_hdmi_init,
    .ops = &rk_aif1_ops,
    .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
    SND_SOC_DAIFMT_CBS_CFS,
    --
    2.24.0.rc0.303.g954a862665-goog
    \
     
     \ /
      Last update: 2019-10-25 15:32    [W:3.474 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site