* [v2 1/2] drm: bridge: adv7511: Enable SPDIF DAI
@ 2020-04-13 11:35 ` Bogdan Togorean
2020-04-13 11:35 ` [v2 2/2] drm: bridge: adv7511: Extend list of audio sample rates Bogdan Togorean
2020-04-14 8:23 ` [v2 1/2] drm: bridge: adv7511: Enable SPDIF DAI Andrzej Hajda
0 siblings, 2 replies; 3+ messages in thread
From: Bogdan Togorean @ 2020-04-13 11:35 UTC (permalink / raw)
To: dri-devel
Cc: Jernej Skrabec, Jonas Karlman, David Airlie, Greg Kroah-Hartman,
Neil Armstrong, linux-kernel, Andrzej Hajda, Richard Fontana,
Laurent Pinchart, Thomas Gleixner, Allison Randal,
Bogdan Togorean
ADV7511 support I2S or SPDIF as audio input interfaces. This commit
enable support for SPDIF.
Signed-off-by: Bogdan Togorean <bogdan.togorean@analog.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
---
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [v2 2/2] drm: bridge: adv7511: Extend list of audio sample rates
2020-04-13 11:35 ` [v2 1/2] drm: bridge: adv7511: Enable SPDIF DAI Bogdan Togorean
@ 2020-04-13 11:35 ` Bogdan Togorean
2020-04-14 8:23 ` [v2 1/2] drm: bridge: adv7511: Enable SPDIF DAI Andrzej Hajda
1 sibling, 0 replies; 3+ messages in thread
From: Bogdan Togorean @ 2020-04-13 11:35 UTC (permalink / raw)
To: dri-devel
Cc: Jernej Skrabec, Jonas Karlman, David Airlie, Greg Kroah-Hartman,
Neil Armstrong, linux-kernel, Alexios Zavras, Andrzej Hajda,
Laurent Pinchart, Thomas Gleixner, Bogdan Togorean
ADV7511 support sample rates up to 192kHz. CTS and N parameters should
be computed accordingly so this commit extend the list up to maximum
supported sample rate.
Signed-off-by: Bogdan Togorean <bogdan.togorean@analog.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
---
Changes in v2:
- replaced magic numbers with formula for computation of n
---
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
index 1e9b128d229b..f101dd2819b5 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
@@ -19,13 +19,15 @@ static void adv7511_calc_cts_n(unsigned int f_tmds, unsigned int fs,
{
switch (fs) {
case 32000:
- *n = 4096;
+ case 48000:
+ case 96000:
+ case 192000:
+ *n = fs * 128 / 1000;
break;
case 44100:
- *n = 6272;
- break;
- case 48000:
- *n = 6144;
+ case 88200:
+ case 176400:
+ *n = fs * 128 / 900;
break;
}
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [v2 1/2] drm: bridge: adv7511: Enable SPDIF DAI
2020-04-13 11:35 ` [v2 1/2] drm: bridge: adv7511: Enable SPDIF DAI Bogdan Togorean
2020-04-13 11:35 ` [v2 2/2] drm: bridge: adv7511: Extend list of audio sample rates Bogdan Togorean
@ 2020-04-14 8:23 ` Andrzej Hajda
1 sibling, 0 replies; 3+ messages in thread
From: Andrzej Hajda @ 2020-04-14 8:23 UTC (permalink / raw)
To: Bogdan Togorean, dri-devel
Cc: Jernej Skrabec, Neil Armstrong, David Airlie, Greg Kroah-Hartman,
Jonas Karlman, linux-kernel, Richard Fontana, Laurent Pinchart,
Thomas Gleixner, Allison Randal
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 <bogdan.togorean@analog.com>
> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
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)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-14 8:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CGME20200414070644eucas1p150b35a8ea7531ab5172046b1d913d6f7@eucas1p1.samsung.com>
2020-04-13 11:35 ` [v2 1/2] drm: bridge: adv7511: Enable SPDIF DAI Bogdan Togorean
2020-04-13 11:35 ` [v2 2/2] drm: bridge: adv7511: Extend list of audio sample rates Bogdan Togorean
2020-04-14 8:23 ` [v2 1/2] drm: bridge: adv7511: Enable SPDIF DAI Andrzej Hajda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).