Re: [PATCH] ASoC: fsl_spdif: Add support for higher sample rates
On Tue, Oct 13, 2020 at 1:49 PM Shengjiu Wang wrote: > > On Tue, Oct 13, 2020 at 6:42 PM Daniel Baluta wrote: > > > > On Tue, Oct 13, 2020 at 12:29 PM Nicolin Chen > > wrote: > > > > > > Hi Shengjiu, > > > > > > On Mon, Oct 12, 2020 at 04:49:42PM +0800, Shengjiu Wang wrote: > > > > Add 88200Hz and 176400Hz sample rates support for TX. > > > > Add 88200Hz, 176400Hz, 192000Hz sample rates support for RX. > > > > > > > > Signed-off-by: Shengjiu Wang > > > > Signed-off-by: Viorel Suman > > > > > > Probably should put your own Signed-off at the bottom? > > > > Hi Shengjiu, > > > > Also please keep the original author of the patch. You can change that > > using git commit --amend --author="Viorel Suman ". > > Actually I combined my commit with viorel suman's commit to one commit, > not only viorel suman's. I see. Ok then :) Reviewed-by: Daniel Baluta
Re: [PATCH] ASoC: fsl_spdif: Add support for higher sample rates
On Tue, Oct 13, 2020 at 6:42 PM Daniel Baluta wrote: > > On Tue, Oct 13, 2020 at 12:29 PM Nicolin Chen wrote: > > > > Hi Shengjiu, > > > > On Mon, Oct 12, 2020 at 04:49:42PM +0800, Shengjiu Wang wrote: > > > Add 88200Hz and 176400Hz sample rates support for TX. > > > Add 88200Hz, 176400Hz, 192000Hz sample rates support for RX. > > > > > > Signed-off-by: Shengjiu Wang > > > Signed-off-by: Viorel Suman > > > > Probably should put your own Signed-off at the bottom? > > Hi Shengjiu, > > Also please keep the original author of the patch. You can change that > using git commit --amend --author="Viorel Suman ". Actually I combined my commit with viorel suman's commit to one commit, not only viorel suman's. > > With that, > > Reviewed-by: Daniel Baluta
Re: [PATCH] ASoC: fsl_spdif: Add support for higher sample rates
On Tue, Oct 13, 2020 at 12:29 PM Nicolin Chen wrote: > > Hi Shengjiu, > > On Mon, Oct 12, 2020 at 04:49:42PM +0800, Shengjiu Wang wrote: > > Add 88200Hz and 176400Hz sample rates support for TX. > > Add 88200Hz, 176400Hz, 192000Hz sample rates support for RX. > > > > Signed-off-by: Shengjiu Wang > > Signed-off-by: Viorel Suman > > Probably should put your own Signed-off at the bottom? Hi Shengjiu, Also please keep the original author of the patch. You can change that using git commit --amend --author="Viorel Suman ". With that, Reviewed-by: Daniel Baluta
Re: [PATCH] ASoC: fsl_spdif: Add support for higher sample rates
On Tue, Oct 13, 2020 at 3:09 AM Nicolin Chen wrote: > > Hi Shengjiu, > > On Mon, Oct 12, 2020 at 04:49:42PM +0800, Shengjiu Wang wrote: > > Add 88200Hz and 176400Hz sample rates support for TX. > > Add 88200Hz, 176400Hz, 192000Hz sample rates support for RX. > > > > Signed-off-by: Shengjiu Wang > > Signed-off-by: Viorel Suman > > Probably should put your own Signed-off at the bottom? will update in v2. > > Anyway: > Acked-by: Nicolin Chen
Re: [PATCH] ASoC: fsl_spdif: Add support for higher sample rates
Hi Shengjiu, On Mon, Oct 12, 2020 at 04:49:42PM +0800, Shengjiu Wang wrote: > Add 88200Hz and 176400Hz sample rates support for TX. > Add 88200Hz, 176400Hz, 192000Hz sample rates support for RX. > > Signed-off-by: Shengjiu Wang > Signed-off-by: Viorel Suman Probably should put your own Signed-off at the bottom? Anyway: Acked-by: Nicolin Chen
[PATCH] ASoC: fsl_spdif: Add support for higher sample rates
Add 88200Hz and 176400Hz sample rates support for TX.
Add 88200Hz, 176400Hz, 192000Hz sample rates support for RX.
Signed-off-by: Shengjiu Wang
Signed-off-by: Viorel Suman
---
sound/soc/fsl/fsl_spdif.c | 16 +---
sound/soc/fsl/fsl_spdif.h | 9 -
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index b0f643fefe1e..f41496cf5b63 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -429,10 +429,18 @@ static int spdif_set_sample_rate(struct snd_pcm_substream
*substream,
rate = SPDIF_TXRATE_48000;
csfs = IEC958_AES3_CON_FS_48000;
break;
+ case 88200:
+ rate = SPDIF_TXRATE_88200;
+ csfs = IEC958_AES3_CON_FS_88200;
+ break;
case 96000:
rate = SPDIF_TXRATE_96000;
csfs = IEC958_AES3_CON_FS_96000;
break;
+ case 176400:
+ rate = SPDIF_TXRATE_176400;
+ csfs = IEC958_AES3_CON_FS_176400;
+ break;
case 192000:
rate = SPDIF_TXRATE_192000;
csfs = IEC958_AES3_CON_FS_192000;
@@ -827,7 +835,7 @@ static int fsl_spdif_rxrate_info(struct snd_kcontrol
*kcontrol,
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 1;
uinfo->value.integer.min = 16000;
- uinfo->value.integer.max = 96000;
+ uinfo->value.integer.max = 192000;
return 0;
}
@@ -1145,7 +1153,8 @@ static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv
*spdif_priv,
struct clk *clk, u64 savesub,
enum spdif_txrate index, bool round)
{
- static const u32 rate[] = { 32000, 44100, 48000, 96000, 192000 };
+ static const u32 rate[] = { 32000, 44100, 48000, 88200, 96000, 176400,
+ 192000, };
bool is_sysclk = clk_is_match(clk, spdif_priv->sysclk);
u64 rate_ideal, rate_actual, sub;
u32 arate;
@@ -1205,7 +1214,8 @@ static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv
*spdif_priv,
static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv,
enum spdif_txrate index)
{
- static const u32 rate[] = { 32000, 44100, 48000, 96000, 192000 };
+ static const u32 rate[] = { 32000, 44100, 48000, 88200, 96000, 176400,
+ 192000, };
struct platform_device *pdev = spdif_priv->pdev;
struct device *dev = >dev;
u64 savesub = 10, ret;
diff --git a/sound/soc/fsl/fsl_spdif.h b/sound/soc/fsl/fsl_spdif.h
index e6c61e07bc1a..d5f1dfd58740 100644
--- a/sound/soc/fsl/fsl_spdif.h
+++ b/sound/soc/fsl/fsl_spdif.h
@@ -163,7 +163,9 @@ enum spdif_txrate {
SPDIF_TXRATE_32000 = 0,
SPDIF_TXRATE_44100,
SPDIF_TXRATE_48000,
+ SPDIF_TXRATE_88200,
SPDIF_TXRATE_96000,
+ SPDIF_TXRATE_176400,
SPDIF_TXRATE_192000,
};
#define SPDIF_TXRATE_MAX (SPDIF_TXRATE_192000 + 1)
@@ -177,15 +179,20 @@ enum spdif_txrate {
#define FSL_SPDIF_RATES_PLAYBACK (SNDRV_PCM_RATE_32000 | \
SNDRV_PCM_RATE_44100 | \
SNDRV_PCM_RATE_48000 | \
+SNDRV_PCM_RATE_88200 | \
SNDRV_PCM_RATE_96000 | \
+SNDRV_PCM_RATE_176400 | \
SNDRV_PCM_RATE_192000)
#define FSL_SPDIF_RATES_CAPTURE(SNDRV_PCM_RATE_16000 | \
SNDRV_PCM_RATE_32000 | \
SNDRV_PCM_RATE_44100 | \
SNDRV_PCM_RATE_48000 | \
+SNDRV_PCM_RATE_88200 | \
SNDRV_PCM_RATE_64000 | \
-SNDRV_PCM_RATE_96000)
+SNDRV_PCM_RATE_96000 | \
+SNDRV_PCM_RATE_176400 | \
+SNDRV_PCM_RATE_192000)
#define FSL_SPDIF_FORMATS_PLAYBACK (SNDRV_PCM_FMTBIT_S16_LE | \
SNDRV_PCM_FMTBIT_S20_3LE | \
--
2.27.0
