drm: bridge: adv7511: Enable SPDIF DAI
Subsystems (3)
PATCH RESEND 1/2 drm: bridge: adv7511: Enable SPDIF DAI
ADV7511 support I2S or SPDIF as audio input interfaces. This commit enable support for SPDIF.
--- drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +14 -0
@@ -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)
Signature · 1 line
2.25.0
PATCH RESEND 2/2 drm: bridge: adv7511: Extend list of audio sample rates
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.
--- drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +12 -0
@@ -27,6 +27,18 @@ static void adv7511_calc_cts_n(unsigned int f_tmds, unsigned int fs,case 48000 : *n =6144 ;break ; +case 88200 : + *n =12544 ; +break ; +case 96000 : + *n =12288 ; +break ; +case 176400 : + *n =25088 ; +break ; +case 192000 : + *n =24576 ; +break ; } *cts = ((f_tmds * *n) / (128 * fs)) *1000 ;
Signature · 1 line
2.25.0
Re: [RESEND 2/2] drm: bridge: adv7511: Extend list of audio sample rates
Quoted 19 lines · 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 <[email protected]>--- drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +2
-0@@ -27,6 +27,18 @@ static void adv7511_calc_cts_n(unsigned int f_tmds, unsigned int fs,case 48000 : *n =6144 ;break ; +case 88200 : + *n =12544 ;
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c static void adv7511_calc_cts_n(unsigned int f_tmds, unsigned int fs, · line 41
Quoted 10 lines
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +10
-0+break ; +case 96000 : + *n =12288 ; +break ; +case 176400 : + *n =25088 ; +break ; +case 192000 : + *n =24576 ; +break ;
I would put:
case 32000:
case 48000:
case 96000:
case 192000:
*n = fs * 128 / 1000;
break;
case 44100:
case 88200:
case 176400:
*n = fs * 128 / 900;
break;
To uncover the magic. Up to you.
Regards
Andrzej
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c static void adv7511_calc_cts_n(unsigned int f_tmds, unsigned int fs, · line 44
Quoted 3 lines
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +0
-0} *cts = ((f_tmds * *n) / (128 * fs)) *1000 ;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
RE: [RESEND 2/2] drm: bridge: adv7511: Extend list of audio sample rates
Quoted 47 lines
Review
Quoted 10 lines
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 <[email protected]>--- drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.cdrivers/gpu/drm/bridge/adv7511/adv7511_audio.c static void adv7511_calc_cts_n(unsigned int f_tmds,
Quoted 4 lines
index
1e9b128d229b..13e8cee6e827100644drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +0
-0@@ -27,6 +27,18 @@ static void adv7511_calc_cts_n(unsigned int f_tmds,unsigned int fs,
Quoted 5 lines
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +2
-0case 48000 : *n =6144 ;break ; +case 88200 : + *n =12544 ;drivers/gpu/drm/bridge/adv7511/adv7511_audio.c static void adv7511_calc_cts_n(unsigned int f_tmds, unsigned int fs, · line 41
Quoted 10 lines
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +10
-0+break ; +case 96000 : + *n =12288 ; +break ; +case 176400 : + *n =25088 ; +break ; +case 192000 : + *n =24576 ; +break ;I would put:
case 32000:
case 48000:
case 96000:
case 192000:
*n = fs * 128 / 1000;
break;
case 44100:
case 88200:
case 176400:
*n = fs * 128 / 900;
break;
Quoted 1 line
To uncover the magic. Up to you.
Great solution Andrzej,
Thank you for your suggestion.
Regards,
Bogdan
Quoted 10 lines
Reviewed-by Andrzej Hajda <[email protected]>Regards
AndrzejQuoted 3 lines
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +0
-0} *cts = ((f_tmds * *n) / (128 * fs)) *1000 ;