* [PATCH 1/2] ASoC: spdif_transmitter: Allow 192kHz sample rate @ 2014-06-15 23:56 Anssi Hannula 2014-06-15 23:56 ` [PATCH 2/2] ASoC: fsl_spdif: Add support for output sample rates 96kHz and 192kHz Anssi Hannula 2014-06-17 14:35 ` [PATCH 1/2] ASoC: spdif_transmitter: Allow 192kHz sample rate Mark Brown 0 siblings, 2 replies; 5+ messages in thread From: Anssi Hannula @ 2014-06-15 23:56 UTC (permalink / raw) To: Mark Brown; +Cc: alsa-devel Transmitters and receivers may support a 192kHz sample rate. Tested with a Cubox-i imx6 system and an Onkyo TX-SR607 receiver. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> --- sound/soc/codecs/spdif_transmitter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/spdif_transmitter.c b/sound/soc/codecs/spdif_transmitter.c index a078aa31052a..e0df537dd4b7 100644 --- a/sound/soc/codecs/spdif_transmitter.c +++ b/sound/soc/codecs/spdif_transmitter.c @@ -24,7 +24,7 @@ #define DRV_NAME "spdif-dit" -#define STUB_RATES SNDRV_PCM_RATE_8000_96000 +#define STUB_RATES SNDRV_PCM_RATE_8000_192000 #define STUB_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S20_3LE | \ SNDRV_PCM_FMTBIT_S24_LE) -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ASoC: fsl_spdif: Add support for output sample rates 96kHz and 192kHz 2014-06-15 23:56 [PATCH 1/2] ASoC: spdif_transmitter: Allow 192kHz sample rate Anssi Hannula @ 2014-06-15 23:56 ` Anssi Hannula 2014-06-16 2:33 ` Nicolin Chen 2014-06-17 14:37 ` Mark Brown 2014-06-17 14:35 ` [PATCH 1/2] ASoC: spdif_transmitter: Allow 192kHz sample rate Mark Brown 1 sibling, 2 replies; 5+ messages in thread From: Anssi Hannula @ 2014-06-15 23:56 UTC (permalink / raw) To: Mark Brown; +Cc: alsa-devel, Nicolin Chen Add support for the output sample rates 96kHz and 192kHz. Tested with a Cubox-i imx6 system and an Onkyo TX-SR607 receiver. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> Cc: Nicolin Chen <Guangyu.Chen@freescale.com> --- Unless there was some special reason to not have this? It seems to work at least. sound/soc/fsl/fsl_spdif.c | 14 +++++++++++--- sound/soc/fsl/fsl_spdif.h | 8 ++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index b912d45a2a4c..71f6a117f46e 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -96,7 +96,7 @@ struct fsl_spdif_priv { struct platform_device *pdev; struct regmap *regmap; bool dpll_locked; - u16 txrate[SPDIF_TXRATE_MAX]; + u32 txrate[SPDIF_TXRATE_MAX]; u8 txclk_df[SPDIF_TXRATE_MAX]; u8 sysclk_df[SPDIF_TXRATE_MAX]; u8 txclk_src[SPDIF_TXRATE_MAX]; @@ -390,6 +390,14 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream, rate = SPDIF_TXRATE_48000; csfs = IEC958_AES3_CON_FS_48000; break; + case 96000: + rate = SPDIF_TXRATE_96000; + csfs = IEC958_AES3_CON_FS_96000; + break; + case 192000: + rate = SPDIF_TXRATE_192000; + csfs = IEC958_AES3_CON_FS_192000; + break; default: dev_err(&pdev->dev, "unsupported sample rate %d\n", sample_rate); return -EINVAL; @@ -1046,7 +1054,7 @@ static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv *spdif_priv, struct clk *clk, u64 savesub, enum spdif_txrate index, bool round) { - const u32 rate[] = { 32000, 44100, 48000 }; + const u32 rate[] = { 32000, 44100, 48000, 96000, 192000 }; bool is_sysclk = clk == spdif_priv->sysclk; u64 rate_ideal, rate_actual, sub; u32 sysclk_dfmin, sysclk_dfmax; @@ -1105,7 +1113,7 @@ out: static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv, enum spdif_txrate index) { - const u32 rate[] = { 32000, 44100, 48000 }; + const u32 rate[] = { 32000, 44100, 48000, 96000, 192000 }; struct platform_device *pdev = spdif_priv->pdev; struct device *dev = &pdev->dev; u64 savesub = 100000, ret; diff --git a/sound/soc/fsl/fsl_spdif.h b/sound/soc/fsl/fsl_spdif.h index 16fde4b927d3..5f5a3c41db25 100644 --- a/sound/soc/fsl/fsl_spdif.h +++ b/sound/soc/fsl/fsl_spdif.h @@ -164,8 +164,10 @@ enum spdif_txrate { SPDIF_TXRATE_32000 = 0, SPDIF_TXRATE_44100, SPDIF_TXRATE_48000, + SPDIF_TXRATE_96000, + SPDIF_TXRATE_192000, }; -#define SPDIF_TXRATE_MAX (SPDIF_TXRATE_48000 + 1) +#define SPDIF_TXRATE_MAX (SPDIF_TXRATE_192000 + 1) #define SPDIF_CSTATUS_BYTE 6 @@ -175,7 +177,9 @@ enum spdif_txrate { #define FSL_SPDIF_RATES_PLAYBACK (SNDRV_PCM_RATE_32000 | \ SNDRV_PCM_RATE_44100 | \ - SNDRV_PCM_RATE_48000) + SNDRV_PCM_RATE_48000 | \ + SNDRV_PCM_RATE_96000 | \ + SNDRV_PCM_RATE_192000) #define FSL_SPDIF_RATES_CAPTURE (SNDRV_PCM_RATE_16000 | \ SNDRV_PCM_RATE_32000 | \ -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ASoC: fsl_spdif: Add support for output sample rates 96kHz and 192kHz 2014-06-15 23:56 ` [PATCH 2/2] ASoC: fsl_spdif: Add support for output sample rates 96kHz and 192kHz Anssi Hannula @ 2014-06-16 2:33 ` Nicolin Chen 2014-06-17 14:37 ` Mark Brown 1 sibling, 0 replies; 5+ messages in thread From: Nicolin Chen @ 2014-06-16 2:33 UTC (permalink / raw) To: Anssi Hannula; +Cc: alsa-devel, Mark Brown On Mon, Jun 16, 2014 at 02:56:42AM +0300, Anssi Hannula wrote: > Add support for the output sample rates 96kHz and 192kHz. > > Tested with a Cubox-i imx6 system and an Onkyo TX-SR607 receiver. > > Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> > Cc: Nicolin Chen <Guangyu.Chen@freescale.com> Great, thank you. Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> > --- > > Unless there was some special reason to not have this? > > It seems to work at least. > > sound/soc/fsl/fsl_spdif.c | 14 +++++++++++--- > sound/soc/fsl/fsl_spdif.h | 8 ++++++-- > 2 files changed, 17 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c > index b912d45a2a4c..71f6a117f46e 100644 > --- a/sound/soc/fsl/fsl_spdif.c > +++ b/sound/soc/fsl/fsl_spdif.c > @@ -96,7 +96,7 @@ struct fsl_spdif_priv { > struct platform_device *pdev; > struct regmap *regmap; > bool dpll_locked; > - u16 txrate[SPDIF_TXRATE_MAX]; > + u32 txrate[SPDIF_TXRATE_MAX]; > u8 txclk_df[SPDIF_TXRATE_MAX]; > u8 sysclk_df[SPDIF_TXRATE_MAX]; > u8 txclk_src[SPDIF_TXRATE_MAX]; > @@ -390,6 +390,14 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream, > rate = SPDIF_TXRATE_48000; > csfs = IEC958_AES3_CON_FS_48000; > break; > + case 96000: > + rate = SPDIF_TXRATE_96000; > + csfs = IEC958_AES3_CON_FS_96000; > + break; > + case 192000: > + rate = SPDIF_TXRATE_192000; > + csfs = IEC958_AES3_CON_FS_192000; > + break; > default: > dev_err(&pdev->dev, "unsupported sample rate %d\n", sample_rate); > return -EINVAL; > @@ -1046,7 +1054,7 @@ static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv *spdif_priv, > struct clk *clk, u64 savesub, > enum spdif_txrate index, bool round) > { > - const u32 rate[] = { 32000, 44100, 48000 }; > + const u32 rate[] = { 32000, 44100, 48000, 96000, 192000 }; > bool is_sysclk = clk == spdif_priv->sysclk; > u64 rate_ideal, rate_actual, sub; > u32 sysclk_dfmin, sysclk_dfmax; > @@ -1105,7 +1113,7 @@ out: > static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv, > enum spdif_txrate index) > { > - const u32 rate[] = { 32000, 44100, 48000 }; > + const u32 rate[] = { 32000, 44100, 48000, 96000, 192000 }; > struct platform_device *pdev = spdif_priv->pdev; > struct device *dev = &pdev->dev; > u64 savesub = 100000, ret; > diff --git a/sound/soc/fsl/fsl_spdif.h b/sound/soc/fsl/fsl_spdif.h > index 16fde4b927d3..5f5a3c41db25 100644 > --- a/sound/soc/fsl/fsl_spdif.h > +++ b/sound/soc/fsl/fsl_spdif.h > @@ -164,8 +164,10 @@ enum spdif_txrate { > SPDIF_TXRATE_32000 = 0, > SPDIF_TXRATE_44100, > SPDIF_TXRATE_48000, > + SPDIF_TXRATE_96000, > + SPDIF_TXRATE_192000, > }; > -#define SPDIF_TXRATE_MAX (SPDIF_TXRATE_48000 + 1) > +#define SPDIF_TXRATE_MAX (SPDIF_TXRATE_192000 + 1) > > > #define SPDIF_CSTATUS_BYTE 6 > @@ -175,7 +177,9 @@ enum spdif_txrate { > > #define FSL_SPDIF_RATES_PLAYBACK (SNDRV_PCM_RATE_32000 | \ > SNDRV_PCM_RATE_44100 | \ > - SNDRV_PCM_RATE_48000) > + SNDRV_PCM_RATE_48000 | \ > + SNDRV_PCM_RATE_96000 | \ > + SNDRV_PCM_RATE_192000) > > #define FSL_SPDIF_RATES_CAPTURE (SNDRV_PCM_RATE_16000 | \ > SNDRV_PCM_RATE_32000 | \ > -- > 1.8.4.5 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ASoC: fsl_spdif: Add support for output sample rates 96kHz and 192kHz 2014-06-15 23:56 ` [PATCH 2/2] ASoC: fsl_spdif: Add support for output sample rates 96kHz and 192kHz Anssi Hannula 2014-06-16 2:33 ` Nicolin Chen @ 2014-06-17 14:37 ` Mark Brown 1 sibling, 0 replies; 5+ messages in thread From: Mark Brown @ 2014-06-17 14:37 UTC (permalink / raw) To: Anssi Hannula; +Cc: alsa-devel, Nicolin Chen [-- Attachment #1.1: Type: text/plain, Size: 141 bytes --] On Mon, Jun 16, 2014 at 02:56:42AM +0300, Anssi Hannula wrote: > Add support for the output sample rates 96kHz and 192kHz. Applied, thanks. [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ASoC: spdif_transmitter: Allow 192kHz sample rate 2014-06-15 23:56 [PATCH 1/2] ASoC: spdif_transmitter: Allow 192kHz sample rate Anssi Hannula 2014-06-15 23:56 ` [PATCH 2/2] ASoC: fsl_spdif: Add support for output sample rates 96kHz and 192kHz Anssi Hannula @ 2014-06-17 14:35 ` Mark Brown 1 sibling, 0 replies; 5+ messages in thread From: Mark Brown @ 2014-06-17 14:35 UTC (permalink / raw) To: Anssi Hannula; +Cc: alsa-devel [-- Attachment #1.1: Type: text/plain, Size: 144 bytes --] On Mon, Jun 16, 2014 at 02:56:41AM +0300, Anssi Hannula wrote: > Transmitters and receivers may support a 192kHz sample rate. Applied, thanks. [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-06-17 14:37 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-06-15 23:56 [PATCH 1/2] ASoC: spdif_transmitter: Allow 192kHz sample rate Anssi Hannula 2014-06-15 23:56 ` [PATCH 2/2] ASoC: fsl_spdif: Add support for output sample rates 96kHz and 192kHz Anssi Hannula 2014-06-16 2:33 ` Nicolin Chen 2014-06-17 14:37 ` Mark Brown 2014-06-17 14:35 ` [PATCH 1/2] ASoC: spdif_transmitter: Allow 192kHz sample rate Mark Brown
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.