2020-04-14 05:40:52

by Togorean, Bogdan

Subject: [v2 1/2] drm: bridge: adv7511: Enable SPDIF DAI

ADV7511 support I2S or SPDIF as audio input interfaces. This commit
enable support for SPDIF.

Signed-off-by: Bogdan Togorean <[email protected]>
Reviewed-by: Andrzej Hajda <[email protected]>
---
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
index a428185be2c1..1e9b128d229b 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
@@ -119,6 +119,9 @@ int adv7511_hdmi_hw_params(struct device *dev, void *data,
audio_source = ADV7511_AUDIO_SOURCE_I2S;
i2s_format = ADV7511_I2S_FORMAT_LEFT_J;
break;
+ case HDMI_SPDIF:
+ audio_source = ADV7511_AUDIO_SOURCE_SPDIF;
+ break;
default:
return -EINVAL;
}
@@ -175,11 +178,21 @@ static int audio_startup(struct device *dev, void *data)
/* use Audio infoframe updated info */
regmap_update_bits(adv7511->regmap, ADV7511_REG_GC(1),
BIT(5), 0);
+ /* enable SPDIF receiver */
+ if (adv7511->audio_source == ADV7511_AUDIO_SOURCE_SPDIF)
+ regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG,
+ BIT(7), BIT(7));
+
return 0;
}

static void audio_shutdown(struct device *dev, void *data)
{
+ struct adv7511 *adv7511 = dev_get_drvdata(dev);
+
+ if (adv7511->audio_source == ADV7511_AUDIO_SOURCE_SPDIF)
+ regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG,
+ BIT(7), 0);
}

static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component,
@@ -213,6 +226,7 @@ static const struct hdmi_codec_pdata codec_data = {
.ops = &adv7511_codec_ops,
.max_i2s_channels = 2,
.i2s = 1,
+ .spdif = 1,
};

int adv7511_audio_init(struct device *dev, struct adv7511 *adv7511)
--
2.17.1

2020-04-14 15:06:13

by Andrzej Hajda

Subject: Re: [v2 1/2] drm: bridge: adv7511: Enable SPDIF DAI

On 13.04.2020 13:35, Bogdan Togorean wrote:
> ADV7511 support I2S or SPDIF as audio input interfaces. This commit
> enable support for SPDIF.
>
> Signed-off-by: Bogdan Togorean <[email protected]>
> Reviewed-by: Andrzej Hajda <[email protected]>

Queued both patches to next.


Regards

Andrzej

> ---
> drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
> index a428185be2c1..1e9b128d229b 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
> @@ -119,6 +119,9 @@ int adv7511_hdmi_hw_params(struct device *dev, void *data,
> audio_source = ADV7511_AUDIO_SOURCE_I2S;
> i2s_format = ADV7511_I2S_FORMAT_LEFT_J;
> break;
> + case HDMI_SPDIF:
> + audio_source = ADV7511_AUDIO_SOURCE_SPDIF;
> + break;
> default:
> return -EINVAL;
> }
> @@ -175,11 +178,21 @@ static int audio_startup(struct device *dev, void *data)
> /* use Audio infoframe updated info */
> regmap_update_bits(adv7511->regmap, ADV7511_REG_GC(1),
> BIT(5), 0);
> + /* enable SPDIF receiver */
> + if (adv7511->audio_source == ADV7511_AUDIO_SOURCE_SPDIF)
> + regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG,
> + BIT(7), BIT(7));
> +
> return 0;
> }
>
> static void audio_shutdown(struct device *dev, void *data)
> {
> + struct adv7511 *adv7511 = dev_get_drvdata(dev);
> +
> + if (adv7511->audio_source == ADV7511_AUDIO_SOURCE_SPDIF)
> + regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG,
> + BIT(7), 0);
> }
>
> static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component,
> @@ -213,6 +226,7 @@ static const struct hdmi_codec_pdata codec_data = {
> .ops = &adv7511_codec_ops,
> .max_i2s_channels = 2,
> .i2s = 1,
> + .spdif = 1,
> };
>
> int adv7511_audio_init(struct device *dev, struct adv7511 *adv7511)