ASoC: Add new module driver for new ASRC
Subsystems (4)
v8 cover ASoC: Add new module driver for new ASRC
Add new module driver for new ASRC in i.MX8MN, several commits are added for new property fsl,asrc-format
Shengjiu Wang (7):
ASoC: fsl_asrc: rename asrc_priv to asrc
ASoC: dt-bindings: fsl_asrc: Add new property fsl,asrc-format
ASoC: fsl-asoc-card: Support new property fsl,asrc-format
ASoC: fsl_asrc: Support new property fsl,asrc-format
ASoC: fsl_asrc: Move common definition to fsl_asrc_common
ASoC: dt-bindings: fsl_easrc: Add document for EASRC
ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers
changes in v8
- change get_pair_priv_size to pair_priv_size variable
changes in v7
- updated according to Nicoin's comments.
- add get_pair_priv_size to replace PAIR_PRIVATE_SIZE
changes in v6
- updated according to Nicoin's and Rob's comments.
changes in v5
- Add new property fsl,asrc-format, rather than change fsl,asrc-width to fsl,asrc-formt.
- code change for above change.
changes in v4
- Add several commit for changing DT binding asrc-width to asrc-format
- rename asrc_priv to asrc
changes in v3
- add new commit "ASoC: fsl_asrc: Change asrc_width to asrc_format"
- modify binding doc to yaml format
- remove fsl_easrc_dma.c, make fsl_asrc_dma.c useable for easrc.
changes in v2
- change i.MX815 to i.MX8MN
- Add changes in Kconfig and Makefile
.../devicetree/bindings/sound/fsl,asrc.txt | 4 + .../devicetree/bindings/sound/fsl,easrc.yaml | 101 + sound/soc/fsl/Kconfig | 11 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl-asoc-card.c | 24 +- sound/soc/fsl/fsl_asrc.c | 305 +-- sound/soc/fsl/fsl_asrc.h | 74 +- sound/soc/fsl/fsl_asrc_common.h | 106 + sound/soc/fsl/fsl_asrc_dma.c | 54 +- sound/soc/fsl/fsl_easrc.c | 2114 +++++++++++++++++ sound/soc/fsl/fsl_easrc.h | 651 +++++ 11 files changed, 3212 insertions(+), 234 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/fsl,easrc.yaml create mode 100644 sound/soc/fsl/fsl_asrc_common.h create mode 100644 sound/soc/fsl/fsl_easrc.c create mode 100644 sound/soc/fsl/fsl_easrc.h
Signature · 1 line
2.21.0
PATCH v8 2/7 ASoC: dt-bindings: fsl_asrc: Add new property fsl,asrc-format
In order to support new EASRC and simplify the code structure, We decide to share the common structure between them. This bring a problem that EASRC accept format directly from devicetree, but ASRC accept width from devicetree.
In order to align with new ESARC, we add new property fsl,asrc-format. The fsl,asrc-format can replace the fsl,asrc-width, then driver can accept format from devicetree, don't need to convert it to format through width.
--- Documentation/devicetree/bindings/sound/fsl,asrc.txt | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/sound/fsl,asrc.txt +4 -0
@@ -51,6 +51,10 @@ Optional properties: will be in use as default. Otherwise, the big endian mode will be in use for all the device registers. + - fsl,asrc-format : Defines a mutual sample format used by DPCM Back + Ends, which can replace the fsl,asrc-width. + The value is 2 (S16_LE), or 6 (S24_LE). + Example: asrc: asrc@2034000 {
Signature · 1 line
2.21.0
PATCH v8 1/7 ASoC: fsl_asrc: rename asrc_priv to asrc
In reply to Shengjiu WangIn order to move common structure to fsl_asrc_common.h we change the name of asrc_priv to asrc, the asrc_priv will be used by new struct fsl_asrc_priv.
--- sound/soc/fsl/fsl_asrc.c | 298 +++++++++++++++++------------------ sound/soc/fsl/fsl_asrc.h | 4 +- sound/soc/fsl/fsl_asrc_dma.c | 24 +-- 3 files changed, 163 insertions(+), 163 deletions(-)
sound/soc/fsl/fsl_asrc.c +149 -149
@@ -21,10 +21,10 @@#define IDEAL_RATIO_DECIMAL_DEPTH 26#define pair_err (fmt, ...) \ - dev_err(&asrc_priv->pdev->dev, "Pair %c: " fmt, 'A' + index, ##__VA_ARGS__) + dev_err(&asrc->pdev->dev, "Pair %c: " fmt, 'A' + index, ##__VA_ARGS__)#define pair_dbg (fmt, ...) \ - dev_dbg(&asrc_priv->pdev->dev, "Pair %c: " fmt, 'A' + index, ##__VA_ARGS__) + dev_dbg(&asrc->pdev->dev, "Pair %c: " fmt, 'A' + index, ##__VA_ARGS__)/* Corresponding to process_option */ static unsigned int supported_asrc_rate[] = {
@@ -157,15 +157,15 @@ static void fsl_asrc_sel_proc(int inrate, int outrate,int fsl_asrc_request_pair (int channels,struct fsl_asrc_pair *pair) {enum asrc_pair_index index =ASRC_INVALID_PAIR ; -struct fsl_asrc *asrc_priv = pair->asrc_priv; -struct device *dev = &asrc_priv->pdev->dev; +struct fsl_asrc *asrc = pair->asrc; +struct device *dev = &asrc->pdev->dev;unsigned long lock_flags;int i, ret =0 ; -spin_lock_irqsave (&asrc_priv->lock, lock_flags); +spin_lock_irqsave (&asrc->lock, lock_flags);for (i =ASRC_PAIR_A ; i <ASRC_PAIR_MAX_NUM ; i++) { -if (asrc_priv->pair[i] !=NULL ) +if (asrc->pair[i] !=NULL )continue ; index = i;
@@ -177,17 +177,17 @@ int fsl_asrc_request_pair(int channels, struct fsl_asrc_pair *pair)if (index ==ASRC_INVALID_PAIR ) {dev_err (dev,"all pairs are busy now\n" ); ret = -EBUSY ; - }else if (asrc_priv->channel_avail < channels) { + }else if (asrc->channel_avail < channels) {dev_err (dev,"can't afford required channels: %d\n" , channels); ret = -EINVAL ; }else { - asrc_priv->channel_avail -= channels; - asrc_priv->pair[index] = pair; + asrc->channel_avail -= channels; + asrc->pair[index] = pair; pair->channels = channels; pair->index = index; } -spin_unlock_irqrestore (&asrc_priv->lock, lock_flags); +spin_unlock_irqrestore (&asrc->lock, lock_flags);return ret; }
@@ -195,25 +195,25 @@ int fsl_asrc_request_pair(int channels, struct fsl_asrc_pair *pair)/** * Release ASRC pair * -* It clears the resource from asrc_priv and releases the occupied channels. +* It clears the resource from asrc and releases the occupied channels. */ void fsl_asrc_release_pair (struct fsl_asrc_pair *pair) { -struct fsl_asrc *asrc_priv = pair->asrc_priv; +struct fsl_asrc *asrc = pair->asrc;enum asrc_pair_index index = pair->index;unsigned long lock_flags;/* Make sure the pair is disabled */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCTR , +regmap_update_bits (asrc->regmap,REG_ASRCTR ,ASRCTR_ASRCEi_MASK (index),0 ); -spin_lock_irqsave (&asrc_priv->lock, lock_flags); +spin_lock_irqsave (&asrc->lock, lock_flags); - asrc_priv->channel_avail += pair->channels; - asrc_priv->pair[index] =NULL ; + asrc->channel_avail += pair->channels; + asrc->pair[index] =NULL ; pair->error =0 ; -spin_unlock_irqrestore (&asrc_priv->lock, lock_flags); +spin_unlock_irqrestore (&asrc->lock, lock_flags); }/**
@@ -221,10 +221,10 @@ void fsl_asrc_release_pair(struct fsl_asrc_pair *pair)*/ static void fsl_asrc_set_watermarks (struct fsl_asrc_pair *pair,u32 in,u32 out) { -struct fsl_asrc *asrc_priv = pair->asrc_priv; +struct fsl_asrc *asrc = pair->asrc;enum asrc_pair_index index = pair->index; - regmap_update_bits(asrc_priv->regmap, REG_ASRMCR(index), + regmap_update_bits(asrc->regmap, REG_ASRMCR(index), ASRMCRi_EXTTHRSHi_MASK | ASRMCRi_INFIFO_THRESHOLD_MASK | ASRMCRi_OUTFIFO_THRESHOLD_MASK,
@@ -257,7 +257,7 @@ static u32 fsl_asrc_cal_asrck_divisor(struct fsl_asrc_pair *pair, u32 div)static int fsl_asrc_set_ideal_ratio (struct fsl_asrc_pair *pair,int inrate,int outrate) { -struct fsl_asrc *asrc_priv = pair->asrc_priv; +struct fsl_asrc *asrc = pair->asrc;enum asrc_pair_index index = pair->index;unsigned long ratio;int i;
@@ -286,8 +286,8 @@ static int fsl_asrc_set_ideal_ratio(struct fsl_asrc_pair *pair,break ; } -regmap_write (asrc_priv->regmap,REG_ASRIDRL (index), ratio); -regmap_write (asrc_priv->regmap,REG_ASRIDRH (index), ratio >>24 ); +regmap_write (asrc->regmap,REG_ASRIDRL (index), ratio); +regmap_write (asrc->regmap,REG_ASRIDRH (index), ratio >>24 );return 0 ; }
@@ -309,7 +309,7 @@ static int fsl_asrc_set_ideal_ratio(struct fsl_asrc_pair *pair,static int fsl_asrc_config_pair (struct fsl_asrc_pair *pair,bool use_ideal_rate) {struct asrc_config *config = pair->config; -struct fsl_asrc *asrc_priv = pair->asrc_priv; +struct fsl_asrc *asrc = pair->asrc;enum asrc_pair_index index = pair->index;enum asrc_word_width input_word_width;enum asrc_word_width output_word_width;
@@ -392,11 +392,11 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair, bool use_ideal_rate) }/* Validate input and output clock sources */ - clk_index[IN ] = asrc_priv->clk_map[IN ][config->inclk]; - clk_index[OUT ] = asrc_priv->clk_map[OUT ][config->outclk]; + clk_index[IN ] = asrc->clk_map[IN ][config->inclk]; + clk_index[OUT ] = asrc->clk_map[OUT ][config->outclk];/* We only have output clock for ideal ratio mode */ - clk = asrc_priv->asrck_clk[clk_index[ideal ?OUT :IN ]]; + clk = asrc->asrck_clk[clk_index[ideal ?OUT :IN ]]; clk_rate =clk_get_rate (clk); rem[IN ] =do_div (clk_rate, inrate);
@@ -417,7 +417,7 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair, bool use_ideal_rate) div[IN ] =min_t (u32,1024 , div[IN ]); - clk = asrc_priv->asrck_clk[clk_index[OUT ]]; + clk = asrc->asrck_clk[clk_index[OUT ]]; clk_rate =clk_get_rate (clk);if (ideal && use_ideal_rate) rem[OUT ] =do_div (clk_rate,IDEAL_RATIO_RATE );
@@ -437,22 +437,22 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair, bool use_ideal_rate)/* Set the channel number */ channels = config->channel_num; -if (asrc_priv->soc->channel_bits <4 ) +if (asrc->soc->channel_bits <4 ) channels /=2 ;/* Update channels for current pair */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCNCR , -ASRCNCR_ANCi_MASK (index, asrc_priv->soc->channel_bits), -ASRCNCR_ANCi (index, channels, asrc_priv->soc->channel_bits)); +regmap_update_bits (asrc->regmap,REG_ASRCNCR , +ASRCNCR_ANCi_MASK (index, asrc->soc->channel_bits), +ASRCNCR_ANCi (index, channels, asrc->soc->channel_bits));/* Default setting: Automatic selection for processing mode */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCTR , +regmap_update_bits (asrc->regmap,REG_ASRCTR ,ASRCTR_ATSi_MASK (index),ASRCTR_ATS (index)); -regmap_update_bits (asrc_priv->regmap,REG_ASRCTR , +regmap_update_bits (asrc->regmap,REG_ASRCTR ,ASRCTR_USRi_MASK (index),0 );/* Set the input and output clock sources */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCSR , +regmap_update_bits (asrc->regmap,REG_ASRCSR ,ASRCSR_AICSi_MASK (index) |ASRCSR_AOCSi_MASK (index),ASRCSR_AICS (index, clk_index[IN ]) |ASRCSR_AOCS (index, clk_index[OUT ]));
@@ -462,19 +462,19 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair, bool use_ideal_rate) outdiv =fsl_asrc_cal_asrck_divisor (pair, div[OUT ]);/* Suppose indiv and outdiv includes prescaler, so add its MASK too */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCDR (index), +regmap_update_bits (asrc->regmap,REG_ASRCDR (index),ASRCDRi_AOCPi_MASK (index) |ASRCDRi_AICPi_MASK (index) |ASRCDRi_AOCDi_MASK (index) |ASRCDRi_AICDi_MASK (index),ASRCDRi_AOCP (index, outdiv) |ASRCDRi_AICP (index, indiv));/* Implement word_width configurations */ -regmap_update_bits (asrc_priv->regmap,REG_ASRMCR1 (index), +regmap_update_bits (asrc->regmap,REG_ASRMCR1 (index), ASRMCR1i_OW16_MASK | ASRMCR1i_IWD_MASK,ASRMCR1i_OW16 (output_word_width) |ASRMCR1i_IWD (input_word_width));/* Enable BUFFER STALL */ -regmap_update_bits (asrc_priv->regmap,REG_ASRMCR (index), +regmap_update_bits (asrc->regmap,REG_ASRMCR (index), ASRMCRi_BUFSTALLi_MASK, ASRMCRi_BUFSTALLi);/* Set default thresholds for input and output FIFO */
@@ -486,18 +486,18 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair, bool use_ideal_rate)return 0 ;/* Clear ASTSx bit to use Ideal Ratio mode */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCTR , +regmap_update_bits (asrc->regmap,REG_ASRCTR ,ASRCTR_ATSi_MASK (index),0 );/* Enable Ideal Ratio mode */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCTR , +regmap_update_bits (asrc->regmap,REG_ASRCTR ,ASRCTR_IDRi_MASK (index) |ASRCTR_USRi_MASK (index),ASRCTR_IDR (index) |ASRCTR_USR (index));fsl_asrc_sel_proc (inrate, outrate, &pre_proc, &post_proc);/* Apply configurations for pre- and post-processing */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCFG , +regmap_update_bits (asrc->regmap,REG_ASRCFG ,ASRCFG_PREMODi_MASK (index) |ASRCFG_POSTMODi_MASK (index),ASRCFG_PREMOD (index, pre_proc) |ASRCFG_POSTMOD (index, post_proc));
@@ -512,28 +512,28 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair, bool use_ideal_rate)*/ static void fsl_asrc_start_pair (struct fsl_asrc_pair *pair) { -struct fsl_asrc *asrc_priv = pair->asrc_priv; +struct fsl_asrc *asrc = pair->asrc;enum asrc_pair_index index = pair->index;int reg, retry =10 , i;/* Enable the current pair */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCTR , +regmap_update_bits (asrc->regmap,REG_ASRCTR ,ASRCTR_ASRCEi_MASK (index),ASRCTR_ASRCE (index));/* Wait for status of initialization */ do {udelay (5 ); -regmap_read (asrc_priv->regmap,REG_ASRCFG , ®); +regmap_read (asrc->regmap,REG_ASRCFG , ®); reg &=ASRCFG_INIRQi_MASK (index); }while (!reg && --retry);/* Make the input fifo to ASRC STALL level */ -regmap_read (asrc_priv->regmap,REG_ASRCNCR , ®); +regmap_read (asrc->regmap,REG_ASRCNCR , ®);for (i =0 ; i < pair->channels *4 ; i++) -regmap_write (asrc_priv->regmap,REG_ASRDI (index),0 ); +regmap_write (asrc->regmap,REG_ASRDI (index),0 );/* Enable overload interrupt */ -regmap_write (asrc_priv->regmap,REG_ASRIER ,ASRIER_AOLIE ); +regmap_write (asrc->regmap,REG_ASRIER ,ASRIER_AOLIE ); }/**
@@ -541,11 +541,11 @@ static void fsl_asrc_start_pair(struct fsl_asrc_pair *pair)*/ static void fsl_asrc_stop_pair (struct fsl_asrc_pair *pair) { -struct fsl_asrc *asrc_priv = pair->asrc_priv; +struct fsl_asrc *asrc = pair->asrc;enum asrc_pair_index index = pair->index;/* Stop the current pair */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCTR , +regmap_update_bits (asrc->regmap,REG_ASRCTR ,ASRCTR_ASRCEi_MASK (index),0 ); }
@@ -554,23 +554,23 @@ static void fsl_asrc_stop_pair(struct fsl_asrc_pair *pair)*/ struct dma_chan *fsl_asrc_get_dma_channel (struct fsl_asrc_pair *pair,bool dir) { -struct fsl_asrc *asrc_priv = pair->asrc_priv; +struct fsl_asrc *asrc = pair->asrc;enum asrc_pair_index index = pair->index;char name[4 ];sprintf (name,"%cx%c" , dir ==IN ?'r' :'t' , index +'a' ); -return dma_request_slave_channel (&asrc_priv->pdev->dev, name); +return dma_request_slave_channel (&asrc->pdev->dev, name); }EXPORT_SYMBOL_GPL (fsl_asrc_get_dma_channel);static int fsl_asrc_dai_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) { -struct fsl_asrc *asrc_priv =snd_soc_dai_get_drvdata (dai); +struct fsl_asrc *asrc =snd_soc_dai_get_drvdata (dai);/* Odd channel number is not valid for older ASRC (channel_bits==3) */ -if (asrc_priv->soc->channel_bits ==3 ) +if (asrc->soc->channel_bits ==3 )snd_pcm_hw_constraint_step (substream->runtime,0 ,SNDRV_PCM_HW_PARAM_CHANNELS ,2 );
@@ -583,7 +583,7 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct fsl_asrc *asrc_priv = snd_soc_dai_get_drvdata(dai); + struct fsl_asrc *asrc = snd_soc_dai_get_drvdata(dai);struct snd_pcm_runtime *runtime = substream->runtime;struct fsl_asrc_pair *pair = runtime->private_data;unsigned int channels =params_channels (params);
@@ -600,7 +600,7 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream, pair->config = &config; -if (asrc_priv->asrc_width ==16 ) +if (asrc->asrc_width ==16 ) format =SNDRV_PCM_FORMAT_S16_LE ;else format =SNDRV_PCM_FORMAT_S24_LE ;
@@ -614,11 +614,11 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream, config.input_format =params_format (params); config.output_format = format; config.input_sample_rate = rate; - config.output_sample_rate = asrc_priv->asrc_rate; + config.output_sample_rate = asrc->asrc_rate; }else { config.input_format = format; config.output_format =params_format (params); - config.input_sample_rate = asrc_priv->asrc_rate; + config.input_sample_rate = asrc->asrc_rate; config.output_sample_rate = rate; }
@@ -676,10 +676,10 @@ static const struct snd_soc_dai_ops fsl_asrc_dai_ops = {static int fsl_asrc_dai_probe (struct snd_soc_dai *dai) { -struct fsl_asrc *asrc_priv =snd_soc_dai_get_drvdata (dai); +struct fsl_asrc *asrc =snd_soc_dai_get_drvdata (dai); -snd_soc_dai_init_dma_data (dai, &asrc_priv->dma_params_tx, - &asrc_priv->dma_params_rx); +snd_soc_dai_init_dma_data (dai, &asrc->dma_params_tx, + &asrc->dma_params_rx);return 0 ; }
@@ -858,30 +858,30 @@ static const struct regmap_config fsl_asrc_regmap_config = {/** * Initialize ASRC registers with a default configurations */ -static int fsl_asrc_init (struct fsl_asrc *asrc_priv) +static int fsl_asrc_init (struct fsl_asrc *asrc) {/* Halt ASRC internal FP when input FIFO needs data for pair A, B, C */ -regmap_write (asrc_priv->regmap,REG_ASRCTR ,ASRCTR_ASRCEN ); +regmap_write (asrc->regmap,REG_ASRCTR ,ASRCTR_ASRCEN );/* Disable interrupt by default */ -regmap_write (asrc_priv->regmap,REG_ASRIER ,0x0 ); +regmap_write (asrc->regmap,REG_ASRIER ,0x0 );/* Apply recommended settings for parameters from Reference Manual */ -regmap_write (asrc_priv->regmap,REG_ASRPM1 ,0x7fffff ); -regmap_write (asrc_priv->regmap,REG_ASRPM2 ,0x255555 ); -regmap_write (asrc_priv->regmap,REG_ASRPM3 ,0xff7280 ); -regmap_write (asrc_priv->regmap,REG_ASRPM4 ,0xff7280 ); -regmap_write (asrc_priv->regmap,REG_ASRPM5 ,0xff7280 ); +regmap_write (asrc->regmap,REG_ASRPM1 ,0x7fffff ); +regmap_write (asrc->regmap,REG_ASRPM2 ,0x255555 ); +regmap_write (asrc->regmap,REG_ASRPM3 ,0xff7280 ); +regmap_write (asrc->regmap,REG_ASRPM4 ,0xff7280 ); +regmap_write (asrc->regmap,REG_ASRPM5 ,0xff7280 );/* Base address for task queue FIFO. Set to 0x7C */ -regmap_update_bits (asrc_priv->regmap,REG_ASRTFR1 , +regmap_update_bits (asrc->regmap,REG_ASRTFR1 ,ASRTFR1_TF_BASE_MASK ,ASRTFR1_TF_BASE (0xfc ));/* Set the processing clock for 76KHz to 133M */ -regmap_write (asrc_priv->regmap,REG_ASR76K ,0x06D6 ); +regmap_write (asrc->regmap,REG_ASR76K ,0x06D6 );/* Set the processing clock for 56KHz to 133M */ -return regmap_write (asrc_priv->regmap,REG_ASR56K ,0x0947 ); +return regmap_write (asrc->regmap,REG_ASR56K ,0x0947 ); }/**
@@ -889,15 +889,15 @@ static int fsl_asrc_init(struct fsl_asrc *asrc_priv)*/ static irqreturn_t fsl_asrc_isr (int irq,void *dev_id) { -struct fsl_asrc *asrc_priv = (struct fsl_asrc *)dev_id; -struct device *dev = &asrc_priv->pdev->dev; +struct fsl_asrc *asrc = (struct fsl_asrc *)dev_id; +struct device *dev = &asrc->pdev->dev;enum asrc_pair_index index;u32 status; -regmap_read (asrc_priv->regmap,REG_ASRSTR , &status); +regmap_read (asrc->regmap,REG_ASRSTR , &status);/* Clean overload error */ -regmap_write (asrc_priv->regmap,REG_ASRSTR ,ASRSTR_AOLE ); +regmap_write (asrc->regmap,REG_ASRSTR ,ASRSTR_AOLE );/* * We here use dev_dbg() for all exceptions because ASRC itself does
@@ -905,31 +905,31 @@ static irqreturn_t fsl_asrc_isr(int irq, void *dev_id)* interrupt would result a ridged conversion. */ for (index =ASRC_PAIR_A ; index <ASRC_PAIR_MAX_NUM ; index++) { -if (!asrc_priv->pair[index]) +if (!asrc->pair[index])continue ;if (status &ASRSTR_ATQOL ) { - asrc_priv->pair[index]->error |=ASRC_TASK_Q_OVERLOAD ; + asrc->pair[index]->error |=ASRC_TASK_Q_OVERLOAD ;dev_dbg (dev,"ASRC Task Queue FIFO overload\n" ); }if (status &ASRSTR_AOOL (index)) { - asrc_priv->pair[index]->error |=ASRC_OUTPUT_TASK_OVERLOAD ; + asrc->pair[index]->error |=ASRC_OUTPUT_TASK_OVERLOAD ;pair_dbg ("Output Task Overload\n" ); }if (status &ASRSTR_AIOL (index)) { - asrc_priv->pair[index]->error |=ASRC_INPUT_TASK_OVERLOAD ; + asrc->pair[index]->error |=ASRC_INPUT_TASK_OVERLOAD ;pair_dbg ("Input Task Overload\n" ); }if (status &ASRSTR_AODO (index)) { - asrc_priv->pair[index]->error |=ASRC_OUTPUT_BUFFER_OVERFLOW ; + asrc->pair[index]->error |=ASRC_OUTPUT_BUFFER_OVERFLOW ;pair_dbg ("Output Data Buffer has overflowed\n" ); }if (status &ASRSTR_AIDU (index)) { - asrc_priv->pair[index]->error |=ASRC_INPUT_BUFFER_UNDERRUN ; + asrc->pair[index]->error |=ASRC_INPUT_BUFFER_UNDERRUN ;pair_dbg ("Input Data Buffer has underflowed\n" ); } }
@@ -940,18 +940,18 @@ static irqreturn_t fsl_asrc_isr(int irq, void *dev_id)static int fsl_asrc_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node; -struct fsl_asrc *asrc_priv; +struct fsl_asrc *asrc;struct resource *res;void __iomem *regs;int irq, ret, i;u32 map_idx;char tmp[16 ]; - asrc_priv =devm_kzalloc (&pdev->dev,sizeof (*asrc_priv),GFP_KERNEL ); -if (!asrc_priv) + asrc =devm_kzalloc (&pdev->dev,sizeof (*asrc),GFP_KERNEL ); +if (!asrc)return -ENOMEM ; - asrc_priv->pdev = pdev; + asrc->pdev = pdev;/* Get the addresses and IRQ */ res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -959,13 +959,13 @@ static int fsl_asrc_probe(struct platform_device *pdev)if (IS_ERR (regs))return PTR_ERR (regs); - asrc_priv->paddr = res->start; + asrc->paddr = res->start; - asrc_priv->regmap =devm_regmap_init_mmio_clk (&pdev->dev,"mem" , regs, - &fsl_asrc_regmap_config); -if (IS_ERR (asrc_priv->regmap)) { + asrc->regmap =devm_regmap_init_mmio_clk (&pdev->dev,"mem" , regs, + &fsl_asrc_regmap_config); +if (IS_ERR (asrc->regmap)) {dev_err (&pdev->dev,"failed to init regmap\n" ); -return PTR_ERR (asrc_priv->regmap); +return PTR_ERR (asrc->regmap); } irq =platform_get_irq (pdev,0 );
@@ -973,49 +973,49 @@ static int fsl_asrc_probe(struct platform_device *pdev)return irq; ret =devm_request_irq (&pdev->dev, irq, fsl_asrc_isr,0 , -dev_name (&pdev->dev), asrc_priv); +dev_name (&pdev->dev), asrc);if (ret) {dev_err (&pdev->dev,"failed to claim irq %u: %d\n" , irq, ret);return ret; } - asrc_priv->mem_clk =devm_clk_get (&pdev->dev,"mem" ); -if (IS_ERR (asrc_priv->mem_clk)) { + asrc->mem_clk =devm_clk_get (&pdev->dev,"mem" ); +if (IS_ERR (asrc->mem_clk)) {dev_err (&pdev->dev,"failed to get mem clock\n" ); -return PTR_ERR (asrc_priv->mem_clk); +return PTR_ERR (asrc->mem_clk); } - asrc_priv->ipg_clk =devm_clk_get (&pdev->dev,"ipg" ); -if (IS_ERR (asrc_priv->ipg_clk)) { + asrc->ipg_clk =devm_clk_get (&pdev->dev,"ipg" ); +if (IS_ERR (asrc->ipg_clk)) {dev_err (&pdev->dev,"failed to get ipg clock\n" ); -return PTR_ERR (asrc_priv->ipg_clk); +return PTR_ERR (asrc->ipg_clk); } - asrc_priv->spba_clk =devm_clk_get (&pdev->dev,"spba" ); -if (IS_ERR (asrc_priv->spba_clk)) + asrc->spba_clk =devm_clk_get (&pdev->dev,"spba" ); +if (IS_ERR (asrc->spba_clk))dev_warn (&pdev->dev,"failed to get spba clock\n" );for (i =0 ; i <ASRC_CLK_MAX_NUM ; i++) {sprintf (tmp,"asrck_%x" , i); - asrc_priv->asrck_clk[i] =devm_clk_get (&pdev->dev, tmp); -if (IS_ERR (asrc_priv->asrck_clk[i])) { + asrc->asrck_clk[i] =devm_clk_get (&pdev->dev, tmp); +if (IS_ERR (asrc->asrck_clk[i])) {dev_err (&pdev->dev,"failed to get %s clock\n" , tmp); -return PTR_ERR (asrc_priv->asrck_clk[i]); +return PTR_ERR (asrc->asrck_clk[i]); } } - asrc_priv->soc =of_device_get_match_data (&pdev->dev); -if (!asrc_priv->soc) { + asrc->soc =of_device_get_match_data (&pdev->dev); +if (!asrc->soc) {dev_err (&pdev->dev,"failed to get soc data\n" );return -ENODEV ; }if (of_device_is_compatible (np,"fsl,imx35-asrc" )) { - asrc_priv->clk_map[IN ] = input_clk_map_imx35; - asrc_priv->clk_map[OUT ] = output_clk_map_imx35; + asrc->clk_map[IN ] = input_clk_map_imx35; + asrc->clk_map[OUT ] = output_clk_map_imx35; }else if (of_device_is_compatible (np,"fsl,imx53-asrc" )) { - asrc_priv->clk_map[IN ] = input_clk_map_imx53; - asrc_priv->clk_map[OUT ] = output_clk_map_imx53; + asrc->clk_map[IN ] = input_clk_map_imx53; + asrc->clk_map[OUT ] = output_clk_map_imx53; }else if (of_device_is_compatible (np,"fsl,imx8qm-asrc" ) ||of_device_is_compatible (np,"fsl,imx8qxp-asrc" )) { ret =of_property_read_u32 (np,"fsl,asrc-clk-map" , &map_idx);
@@ -1029,44 +1029,44 @@ static int fsl_asrc_probe(struct platform_device *pdev)return -EINVAL ; }if (of_device_is_compatible (np,"fsl,imx8qm-asrc" )) { - asrc_priv->clk_map[IN ] = clk_map_imx8qm[map_idx]; - asrc_priv->clk_map[OUT ] = clk_map_imx8qm[map_idx]; + asrc->clk_map[IN ] = clk_map_imx8qm[map_idx]; + asrc->clk_map[OUT ] = clk_map_imx8qm[map_idx]; }else { - asrc_priv->clk_map[IN ] = clk_map_imx8qxp[map_idx]; - asrc_priv->clk_map[OUT ] = clk_map_imx8qxp[map_idx]; + asrc->clk_map[IN ] = clk_map_imx8qxp[map_idx]; + asrc->clk_map[OUT ] = clk_map_imx8qxp[map_idx]; } } - ret =fsl_asrc_init (asrc_priv); + ret =fsl_asrc_init (asrc);if (ret) {dev_err (&pdev->dev,"failed to init asrc %d\n" , ret);return ret; } - asrc_priv->channel_avail =10 ; + asrc->channel_avail =10 ; ret =of_property_read_u32 (np,"fsl,asrc-rate" , - &asrc_priv->asrc_rate); + &asrc->asrc_rate);if (ret) {dev_err (&pdev->dev,"failed to get output rate\n" );return ret; } ret =of_property_read_u32 (np,"fsl,asrc-width" , - &asrc_priv->asrc_width); + &asrc->asrc_width);if (ret) {dev_err (&pdev->dev,"failed to get output width\n" );return ret; } -if (asrc_priv->asrc_width !=16 && asrc_priv->asrc_width !=24 ) { +if (asrc->asrc_width !=16 && asrc->asrc_width !=24 ) {dev_warn (&pdev->dev,"unsupported width, switching to 24bit\n" ); - asrc_priv->asrc_width =24 ; + asrc->asrc_width =24 ; } -platform_set_drvdata (pdev, asrc_priv); +platform_set_drvdata (pdev, asrc);pm_runtime_enable (&pdev->dev); -spin_lock_init (&asrc_priv->lock); +spin_lock_init (&asrc->lock); ret =devm_snd_soc_register_component (&pdev->dev, &fsl_asrc_component, &fsl_asrc_dai,1 );
@@ -1081,22 +1081,22 @@ static int fsl_asrc_probe(struct platform_device *pdev)#ifdef CONFIG_PM static int fsl_asrc_runtime_resume (struct device *dev) { -struct fsl_asrc *asrc_priv =dev_get_drvdata (dev); +struct fsl_asrc *asrc =dev_get_drvdata (dev);int i, ret; - ret =clk_prepare_enable (asrc_priv->mem_clk); + ret =clk_prepare_enable (asrc->mem_clk);if (ret)return ret; - ret =clk_prepare_enable (asrc_priv->ipg_clk); + ret =clk_prepare_enable (asrc->ipg_clk);if (ret) goto disable_mem_clk; -if (!IS_ERR (asrc_priv->spba_clk)) { - ret =clk_prepare_enable (asrc_priv->spba_clk); +if (!IS_ERR (asrc->spba_clk)) { + ret =clk_prepare_enable (asrc->spba_clk);if (ret) goto disable_ipg_clk; }for (i =0 ; i <ASRC_CLK_MAX_NUM ; i++) { - ret =clk_prepare_enable (asrc_priv->asrck_clk[i]); + ret =clk_prepare_enable (asrc->asrck_clk[i]);if (ret) goto disable_asrck_clk; }
@@ -1105,27 +1105,27 @@ static int fsl_asrc_runtime_resume(struct device *dev) disable_asrck_clk:for (i--; i >=0 ; i--) -clk_disable_unprepare (asrc_priv->asrck_clk[i]); -if (!IS_ERR (asrc_priv->spba_clk)) -clk_disable_unprepare (asrc_priv->spba_clk); +clk_disable_unprepare (asrc->asrck_clk[i]); +if (!IS_ERR (asrc->spba_clk)) +clk_disable_unprepare (asrc->spba_clk); disable_ipg_clk: -clk_disable_unprepare (asrc_priv->ipg_clk); +clk_disable_unprepare (asrc->ipg_clk); disable_mem_clk: -clk_disable_unprepare (asrc_priv->mem_clk); +clk_disable_unprepare (asrc->mem_clk);return ret; }static int fsl_asrc_runtime_suspend (struct device *dev) { -struct fsl_asrc *asrc_priv =dev_get_drvdata (dev); +struct fsl_asrc *asrc =dev_get_drvdata (dev);int i;for (i =0 ; i <ASRC_CLK_MAX_NUM ; i++) -clk_disable_unprepare (asrc_priv->asrck_clk[i]); -if (!IS_ERR (asrc_priv->spba_clk)) -clk_disable_unprepare (asrc_priv->spba_clk); -clk_disable_unprepare (asrc_priv->ipg_clk); -clk_disable_unprepare (asrc_priv->mem_clk); +clk_disable_unprepare (asrc->asrck_clk[i]); +if (!IS_ERR (asrc->spba_clk)) +clk_disable_unprepare (asrc->spba_clk); +clk_disable_unprepare (asrc->ipg_clk); +clk_disable_unprepare (asrc->mem_clk);return 0 ; }
@@ -1134,37 +1134,37 @@ static int fsl_asrc_runtime_suspend(struct device *dev)#ifdef CONFIG_PM_SLEEP static int fsl_asrc_suspend (struct device *dev) { -struct fsl_asrc *asrc_priv =dev_get_drvdata (dev); +struct fsl_asrc *asrc =dev_get_drvdata (dev); -regmap_read (asrc_priv->regmap,REG_ASRCFG , - &asrc_priv->regcache_cfg); +regmap_read (asrc->regmap,REG_ASRCFG , + &asrc->regcache_cfg); -regcache_cache_only (asrc_priv->regmap, true); -regcache_mark_dirty (asrc_priv->regmap); +regcache_cache_only (asrc->regmap, true); +regcache_mark_dirty (asrc->regmap);return 0 ; }static int fsl_asrc_resume (struct device *dev) { -struct fsl_asrc *asrc_priv =dev_get_drvdata (dev); +struct fsl_asrc *asrc =dev_get_drvdata (dev);u32 asrctr;/* Stop all pairs provisionally */ -regmap_read (asrc_priv->regmap,REG_ASRCTR , &asrctr); -regmap_update_bits (asrc_priv->regmap,REG_ASRCTR , +regmap_read (asrc->regmap,REG_ASRCTR , &asrctr); +regmap_update_bits (asrc->regmap,REG_ASRCTR , ASRCTR_ASRCEi_ALL_MASK,0 );/* Restore all registers */ -regcache_cache_only (asrc_priv->regmap, false); -regcache_sync (asrc_priv->regmap); +regcache_cache_only (asrc->regmap, false); +regcache_sync (asrc->regmap); -regmap_update_bits (asrc_priv->regmap,REG_ASRCFG , +regmap_update_bits (asrc->regmap,REG_ASRCFG , ASRCFG_NDPRi_ALL_MASK | ASRCFG_POSTMODi_ALL_MASK | - ASRCFG_PREMODi_ALL_MASK, asrc_priv->regcache_cfg); + ASRCFG_PREMODi_ALL_MASK, asrc->regcache_cfg);/* Restart enabled pairs */ -regmap_update_bits (asrc_priv->regmap,REG_ASRCTR , +regmap_update_bits (asrc->regmap,REG_ASRCTR , ASRCTR_ASRCEi_ALL_MASK, asrctr);return 0 ;
sound/soc/fsl/fsl_asrc.h +2 -2
@@ -448,7 +448,7 @@ struct fsl_asrc_soc_data {/** * fsl_asrc_pair: ASRC Pair private data * -* @asrc_priv: pointer to its parent module +* @asrc: pointer to its parent module * @config: configuration profile * @error: error record * @index: pair index (ASRC_PAIR_A, ASRC_PAIR_B, ASRC_PAIR_C)
@@ -460,7 +460,7 @@ struct fsl_asrc_soc_data {* @private: pair private area */ struct fsl_asrc_pair { -struct fsl_asrc *asrc_priv; +struct fsl_asrc *asrc;struct asrc_config *config;unsigned int error;
sound/soc/fsl/fsl_asrc_dma.c +12 -12
@@ -135,7 +135,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,struct snd_dmaengine_dai_dma_data *dma_params_be =NULL ;struct snd_pcm_runtime *runtime = substream->runtime;struct fsl_asrc_pair *pair = runtime->private_data; -struct fsl_asrc *asrc_priv = pair->asrc_priv; +struct fsl_asrc *asrc = pair->asrc;struct dma_slave_config config_fe, config_be;enum asrc_pair_index index = pair->index;struct device *dev = component->dev;
@@ -170,7 +170,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,/* Override dma_data of the Front-End and config its dmaengine */ dma_params_fe =snd_soc_dai_get_dma_data (asoc_rtd_to_cpu (rtd,0 ), substream); - dma_params_fe->addr = asrc_priv->paddr +REG_ASRDx (!dir, index); + dma_params_fe->addr = asrc->paddr +REG_ASRDx (!dir, index); dma_params_fe->maxburst = dma_params_be->maxburst; pair->dma_chan[!dir] =fsl_asrc_get_dma_channel (pair, !dir);
@@ -203,7 +203,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,* need to configure dma_request and dma_request2, but get dma_chan via * dma_request_slave_channel directly with dma name of Front-End device */ -if (!asrc_priv->soc->use_edma) { +if (!asrc->soc->use_edma) {/* Get DMA request of Back-End */ tmp_chan =dma_request_slave_channel (dev_be, tx ?"tx" :"rx" ); tmp_data = tmp_chan->private;
@@ -230,7 +230,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,return -EINVAL ; } -if (asrc_priv->asrc_width ==16 ) +if (asrc->asrc_width ==16 ) buswidth =DMA_SLAVE_BUSWIDTH_2_BYTES ;else buswidth =DMA_SLAVE_BUSWIDTH_4_BYTES ;
@@ -242,10 +242,10 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, config_be.dst_maxburst = dma_params_be->maxburst;if (tx) { - config_be.src_addr = asrc_priv->paddr +REG_ASRDO (index); + config_be.src_addr = asrc->paddr +REG_ASRDO (index); config_be.dst_addr = dma_params_be->addr; }else { - config_be.dst_addr = asrc_priv->paddr +REG_ASRDI (index); + config_be.dst_addr = asrc->paddr +REG_ASRDI (index); config_be.src_addr = dma_params_be->addr; }
@@ -288,7 +288,7 @@ static int fsl_asrc_dma_startup(struct snd_soc_component *component,struct snd_pcm_runtime *runtime = substream->runtime;struct snd_dmaengine_dai_dma_data *dma_data;struct device *dev = component->dev; -struct fsl_asrc *asrc_priv =dev_get_drvdata (dev); +struct fsl_asrc *asrc =dev_get_drvdata (dev);struct fsl_asrc_pair *pair;struct dma_chan *tmp_chan =NULL ;u8 dir = tx ?OUT :IN ;
@@ -306,7 +306,7 @@ static int fsl_asrc_dma_startup(struct snd_soc_component *component,if (!pair)return -ENOMEM ; - pair->asrc_priv = asrc_priv; + pair->asrc = asrc; runtime->private_data = pair;
@@ -361,15 +361,15 @@ static int fsl_asrc_dma_shutdown(struct snd_soc_component *component, {struct snd_pcm_runtime *runtime = substream->runtime;struct fsl_asrc_pair *pair = runtime->private_data; -struct fsl_asrc *asrc_priv; +struct fsl_asrc *asrc;if (!pair)return 0 ; - asrc_priv = pair->asrc_priv; + asrc = pair->asrc; -if (asrc_priv->pair[pair->index] == pair) - asrc_priv->pair[pair->index] =NULL ; +if (asrc->pair[pair->index] == pair) + asrc->pair[pair->index] =NULL ;kfree (pair);
Signature · 1 line
2.21.0
PATCH v8 6/7 ASoC: dt-bindings: fsl_easrc: Add document for EASRC
In reply to Shengjiu WangEASRC (Enhanced Asynchronous Sample Rate Converter) is a new IP module found on i.MX8MN.
--- .../devicetree/bindings/sound/fsl,easrc.yaml | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/fsl,easrc.yaml
Documentation/devicetree/bindings/sound/fsl,easrc.yaml new file +101 -0
@@ -0,0 +1,101 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/fsl,easrc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NXP Asynchronous Sample Rate Converter (ASRC) Controller + +maintainers: + - Shengjiu Wang <[email protected]> + +properties: + $nodename: + pattern: "^easrc@.*" + + compatible: + const: fsl,imx8mn-easrc + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Peripheral clock + + clock-names: + items: + - const: mem + + dmas: + maxItems: 8 + + dma-names: + items: + - const: ctx0_rx + - const: ctx0_tx + - const: ctx1_rx + - const: ctx1_tx + - const: ctx2_rx + - const: ctx2_tx + - const: ctx3_rx + - const: ctx3_tx + + firmware-name: + allOf: + - $ref: /schemas/types.yaml#/definitions/string + - const: imx/easrc/easrc-imx8mn.bin + description: The coefficient table for the filters + + fsl,asrc-rate: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 8000 + - maximum: 192000 + description: Defines a mutual sample rate used by DPCM Back Ends + + fsl,asrc-format: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - enum: [2, 6, 10, 32, 36] + default: 2 + description: + Defines a mutual sample format used by DPCM Back Ends + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - dmas + - dma-names + - firmware-name + - fsl,asrc-rate + - fsl,asrc-format + +examples: + - | + #include <dt-bindings/clock/imx8mn-clock.h> + + easrc: easrc@300C0000 { + compatible = "fsl,imx8mn-easrc"; + reg = <0x0 0x300C0000 0x0 0x10000>; + interrupts = <0x0 122 0x4>; + clocks = <&clk IMX8MN_CLK_ASRC_ROOT>; + clock-names = "mem"; + dmas = <&sdma2 16 23 0> , <&sdma2 17 23 0>, + <&sdma2 18 23 0> , <&sdma2 19 23 0>, + <&sdma2 20 23 0> , <&sdma2 21 23 0>, + <&sdma2 22 23 0> , <&sdma2 23 23 0>; + dma-names = "ctx0_rx", "ctx0_tx", + "ctx1_rx", "ctx1_tx", + "ctx2_rx", "ctx2_tx", + "ctx3_rx", "ctx3_tx"; + firmware-name = "imx/easrc/easrc-imx8mn.bin"; + fsl,asrc-rate = <8000>; + fsl,asrc-format = <2>; + };
Signature · 1 line
2.21.0
PATCH v8 5/7 ASoC: fsl_asrc: Move common definition to fsl_asrc_common
In reply to Shengjiu WangThere is a new ASRC included in i.MX serial platform, there are some common definition can be shared with each other. So move the common definition to a separate header file.
And add fsl_asrc_pair_priv and fsl_asrc_priv for the variable specific for the module, which can be used internally.
--- sound/soc/fsl/fsl_asrc.c | 82 +++++++++++++++--------- sound/soc/fsl/fsl_asrc.h | 74 ++-------------------- sound/soc/fsl/fsl_asrc_common.h | 106 ++++++++++++++++++++++++++++++++ sound/soc/fsl/fsl_asrc_dma.c | 25 ++++---- 4 files changed, 178 insertions(+), 109 deletions(-) create mode 100644 sound/soc/fsl/fsl_asrc_common.h
sound/soc/fsl/fsl_asrc.c +54 -28
@@ -308,8 +308,10 @@ static int fsl_asrc_set_ideal_ratio(struct fsl_asrc_pair *pair,*/ static int fsl_asrc_config_pair (struct fsl_asrc_pair *pair,bool use_ideal_rate) { -struct asrc_config *config = pair->config; +struct fsl_asrc_pair_priv *pair_priv = pair->private; +struct asrc_config *config = pair_priv->config;struct fsl_asrc *asrc = pair->asrc; +struct fsl_asrc_priv *asrc_priv = asrc->private;enum asrc_pair_index index = pair->index;enum asrc_word_width input_word_width;enum asrc_word_width output_word_width;
@@ -392,11 +394,11 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair, bool use_ideal_rate) }/* Validate input and output clock sources */ - clk_index[IN ] = asrc->clk_map[IN ][config->inclk]; - clk_index[OUT ] = asrc->clk_map[OUT ][config->outclk]; + clk_index[IN ] = asrc_priv->clk_map[IN ][config->inclk]; + clk_index[OUT ] = asrc_priv->clk_map[OUT ][config->outclk];/* We only have output clock for ideal ratio mode */ - clk = asrc->asrck_clk[clk_index[ideal ?OUT :IN ]]; + clk = asrc_priv->asrck_clk[clk_index[ideal ?OUT :IN ]]; clk_rate =clk_get_rate (clk); rem[IN ] =do_div (clk_rate, inrate);
@@ -417,7 +419,7 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair, bool use_ideal_rate) div[IN ] =min_t (u32,1024 , div[IN ]); - clk = asrc->asrck_clk[clk_index[OUT ]]; + clk = asrc_priv->asrck_clk[clk_index[OUT ]]; clk_rate =clk_get_rate (clk);if (ideal && use_ideal_rate) rem[OUT ] =do_div (clk_rate,IDEAL_RATIO_RATE );
@@ -437,13 +439,13 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair, bool use_ideal_rate)/* Set the channel number */ channels = config->channel_num; -if (asrc->soc->channel_bits <4 ) +if (asrc_priv->soc->channel_bits <4 ) channels /=2 ;/* Update channels for current pair */ regmap_update_bits (asrc->regmap,REG_ASRCNCR , -ASRCNCR_ANCi_MASK (index, asrc->soc->channel_bits), -ASRCNCR_ANCi (index, channels, asrc->soc->channel_bits)); +ASRCNCR_ANCi_MASK (index, asrc_priv->soc->channel_bits), +ASRCNCR_ANCi (index, channels, asrc_priv->soc->channel_bits));/* Default setting: Automatic selection for processing mode */ regmap_update_bits(asrc->regmap, REG_ASRCTR,
@@ -568,9 +570,10 @@ static int fsl_asrc_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) {struct fsl_asrc *asrc =snd_soc_dai_get_drvdata (dai); +struct fsl_asrc_priv *asrc_priv = asrc->private;/* Odd channel number is not valid for older ASRC (channel_bits==3) */ -if (asrc->soc->channel_bits ==3 ) +if (asrc_priv->soc->channel_bits ==3 )snd_pcm_hw_constraint_step (substream->runtime,0 ,SNDRV_PCM_HW_PARAM_CHANNELS ,2 );
@@ -586,6 +589,7 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,struct fsl_asrc *asrc =snd_soc_dai_get_drvdata (dai);struct snd_pcm_runtime *runtime = substream->runtime;struct fsl_asrc_pair *pair = runtime->private_data; +struct fsl_asrc_pair_priv *pair_priv = pair->private;unsigned int channels =params_channels (params);unsigned int rate =params_rate (params);struct asrc_config config;
@@ -597,7 +601,7 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,return ret; } - pair->config = &config; + pair_priv->config = &config; config.pair = pair->index; config.channel_num = channels;
@@ -931,9 +935,15 @@ static irqreturn_t fsl_asrc_isr(int irq, void *dev_id)return IRQ_HANDLED ; } +static int fsl_asrc_get_fifo_addr (u8 dir,enum asrc_pair_index index) +{ +return REG_ASRDx (dir, index); +} +static int fsl_asrc_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node; +struct fsl_asrc_priv *asrc_priv;struct fsl_asrc *asrc;struct resource *res;void __iomem *regs;
@@ -946,7 +956,12 @@ static int fsl_asrc_probe(struct platform_device *pdev)if (!asrc)return -ENOMEM ; + asrc_priv =devm_kzalloc (&pdev->dev,sizeof (*asrc_priv),GFP_KERNEL ); +if (!asrc_priv) +return -ENOMEM ; + asrc->pdev = pdev; + asrc->private = asrc_priv;/* Get the addresses and IRQ */ res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -992,25 +1007,32 @@ static int fsl_asrc_probe(struct platform_device *pdev)for (i =0 ; i <ASRC_CLK_MAX_NUM ; i++) {sprintf (tmp,"asrck_%x" , i); - asrc->asrck_clk[i] =devm_clk_get (&pdev->dev, tmp); -if (IS_ERR (asrc->asrck_clk[i])) { + asrc_priv->asrck_clk[i] =devm_clk_get (&pdev->dev, tmp); +if (IS_ERR (asrc_priv->asrck_clk[i])) {dev_err (&pdev->dev,"failed to get %s clock\n" , tmp); -return PTR_ERR (asrc->asrck_clk[i]); +return PTR_ERR (asrc_priv->asrck_clk[i]); } } - asrc->soc =of_device_get_match_data (&pdev->dev); -if (!asrc->soc) { + asrc_priv->soc =of_device_get_match_data (&pdev->dev); +if (!asrc_priv->soc) {dev_err (&pdev->dev,"failed to get soc data\n" );return -ENODEV ; } + asrc->use_edma = asrc_priv->soc->use_edma; + asrc->get_dma_channel = fsl_asrc_get_dma_channel; + asrc->request_pair = fsl_asrc_request_pair; + asrc->release_pair = fsl_asrc_release_pair; + asrc->get_fifo_addr = fsl_asrc_get_fifo_addr; + asrc->pair_priv_size =sizeof (struct fsl_asrc_pair_priv ); +if (of_device_is_compatible (np,"fsl,imx35-asrc" )) { - asrc->clk_map[IN ] = input_clk_map_imx35; - asrc->clk_map[OUT ] = output_clk_map_imx35; + asrc_priv->clk_map[IN ] = input_clk_map_imx35; + asrc_priv->clk_map[OUT ] = output_clk_map_imx35; }else if (of_device_is_compatible (np,"fsl,imx53-asrc" )) { - asrc->clk_map[IN ] = input_clk_map_imx53; - asrc->clk_map[OUT ] = output_clk_map_imx53; + asrc_priv->clk_map[IN ] = input_clk_map_imx53; + asrc_priv->clk_map[OUT ] = output_clk_map_imx53; }else if (of_device_is_compatible (np,"fsl,imx8qm-asrc" ) ||of_device_is_compatible (np,"fsl,imx8qxp-asrc" )) { ret =of_property_read_u32 (np,"fsl,asrc-clk-map" , &map_idx);
@@ -1024,11 +1046,11 @@ static int fsl_asrc_probe(struct platform_device *pdev)return -EINVAL ; }if (of_device_is_compatible (np,"fsl,imx8qm-asrc" )) { - asrc->clk_map[IN ] = clk_map_imx8qm[map_idx]; - asrc->clk_map[OUT ] = clk_map_imx8qm[map_idx]; + asrc_priv->clk_map[IN ] = clk_map_imx8qm[map_idx]; + asrc_priv->clk_map[OUT ] = clk_map_imx8qm[map_idx]; }else { - asrc->clk_map[IN ] = clk_map_imx8qxp[map_idx]; - asrc->clk_map[OUT ] = clk_map_imx8qxp[map_idx]; + asrc_priv->clk_map[IN ] = clk_map_imx8qxp[map_idx]; + asrc_priv->clk_map[OUT ] = clk_map_imx8qxp[map_idx]; } }
@@ -1093,6 +1115,7 @@ static int fsl_asrc_probe(struct platform_device *pdev)static int fsl_asrc_runtime_resume (struct device *dev) {struct fsl_asrc *asrc =dev_get_drvdata (dev); +struct fsl_asrc_priv *asrc_priv = asrc->private;int i, ret; ret =clk_prepare_enable (asrc->mem_clk);
@@ -1107,7 +1130,7 @@ static int fsl_asrc_runtime_resume(struct device *dev) goto disable_ipg_clk; }for (i =0 ; i <ASRC_CLK_MAX_NUM ; i++) { - ret =clk_prepare_enable (asrc->asrck_clk[i]); + ret =clk_prepare_enable (asrc_priv->asrck_clk[i]);if (ret) goto disable_asrck_clk; }
@@ -1116,7 +1139,7 @@ static int fsl_asrc_runtime_resume(struct device *dev) disable_asrck_clk:for (i--; i >=0 ; i--) -clk_disable_unprepare (asrc->asrck_clk[i]); +clk_disable_unprepare (asrc_priv->asrck_clk[i]);if (!IS_ERR (asrc->spba_clk))clk_disable_unprepare (asrc->spba_clk); disable_ipg_clk:
@@ -1129,10 +1152,11 @@ static int fsl_asrc_runtime_resume(struct device *dev)static int fsl_asrc_runtime_suspend (struct device *dev) {struct fsl_asrc *asrc =dev_get_drvdata (dev); +struct fsl_asrc_priv *asrc_priv = asrc->private;int i;for (i =0 ; i <ASRC_CLK_MAX_NUM ; i++) -clk_disable_unprepare (asrc->asrck_clk[i]); +clk_disable_unprepare (asrc_priv->asrck_clk[i]);if (!IS_ERR (asrc->spba_clk))clk_disable_unprepare (asrc->spba_clk);clk_disable_unprepare (asrc->ipg_clk);
@@ -1146,9 +1170,10 @@ static int fsl_asrc_runtime_suspend(struct device *dev)static int fsl_asrc_suspend (struct device *dev) {struct fsl_asrc *asrc =dev_get_drvdata (dev); +struct fsl_asrc_priv *asrc_priv = asrc->private;regmap_read (asrc->regmap,REG_ASRCFG , - &asrc->regcache_cfg); + &asrc_priv->regcache_cfg);regcache_cache_only (asrc->regmap, true);regcache_mark_dirty (asrc->regmap);
@@ -1159,6 +1184,7 @@ static int fsl_asrc_suspend(struct device *dev)static int fsl_asrc_resume (struct device *dev) {struct fsl_asrc *asrc =dev_get_drvdata (dev); +struct fsl_asrc_priv *asrc_priv = asrc->private;u32 asrctr;/* Stop all pairs provisionally */
@@ -1172,7 +1198,7 @@ static int fsl_asrc_resume(struct device *dev)regmap_update_bits (asrc->regmap,REG_ASRCFG , ASRCFG_NDPRi_ALL_MASK | ASRCFG_POSTMODi_ALL_MASK | - ASRCFG_PREMODi_ALL_MASK, asrc->regcache_cfg); + ASRCFG_PREMODi_ALL_MASK, asrc_priv->regcache_cfg);/* Restart enabled pairs */ regmap_update_bits(asrc->regmap, REG_ASRCTR,
sound/soc/fsl/fsl_asrc.h +5 -69
110 lines not on this page · raw message
sound/soc/fsl/fsl_asrc_common.h new file +106 -0
106 lines not on this page · raw message
sound/soc/fsl/fsl_asrc_dma.c +13 -12
@@ -12,7 +12,7 @@#include <sound/dmaengine_pcm.h> #include <sound/pcm_params.h> -#include "fsl_asrc.h" +#include "fsl_asrc_common.h" #define FSL_ASRC_DMABUF_SIZE (256 * 1024)
@@ -170,10 +170,10 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,/* Override dma_data of the Front-End and config its dmaengine */ dma_params_fe =snd_soc_dai_get_dma_data (asoc_rtd_to_cpu (rtd,0 ), substream); - dma_params_fe->addr = asrc->paddr +REG_ASRDx (!dir, index); + dma_params_fe->addr = asrc->paddr + asrc->get_fifo_addr (!dir, index); dma_params_fe->maxburst = dma_params_be->maxburst; - pair->dma_chan[!dir] =fsl_asrc_get_dma_channel (pair, !dir); + pair->dma_chan[!dir] = asrc->get_dma_channel (pair, !dir);if (!pair->dma_chan[!dir]) {dev_err (dev,"failed to request DMA channel\n" );return -EINVAL ;
@@ -203,7 +203,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,* need to configure dma_request and dma_request2, but get dma_chan via * dma_request_slave_channel directly with dma name of Front-End device */ -if (!asrc->soc->use_edma) { +if (!asrc->use_edma) {/* Get DMA request of Back-End */ tmp_chan =dma_request_slave_channel (dev_be, tx ?"tx" :"rx" ); tmp_data = tmp_chan->private;
@@ -211,7 +211,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,dma_release_channel (tmp_chan);/* Get DMA request of Front-End */ - tmp_chan =fsl_asrc_get_dma_channel (pair, dir); + tmp_chan = asrc->get_dma_channel (pair, dir); tmp_data = tmp_chan->private; pair->dma_data.dma_request2 = tmp_data->dma_request; pair->dma_data.peripheral_type = tmp_data->peripheral_type;
@@ -222,7 +222,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,dma_request_channel (mask, filter, &pair->dma_data); }else { pair->dma_chan[dir] = -fsl_asrc_get_dma_channel (pair, dir); + asrc->get_dma_channel (pair, dir); }if (!pair->dma_chan[dir]) {
@@ -251,10 +251,10 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, config_be.dst_maxburst = dma_params_be->maxburst;if (tx) { - config_be.src_addr = asrc->paddr +REG_ASRDO (index); + config_be.src_addr = asrc->paddr + asrc->get_fifo_addr (OUT , index); config_be.dst_addr = dma_params_be->addr; }else { - config_be.dst_addr = asrc->paddr +REG_ASRDI (index); + config_be.dst_addr = asrc->paddr + asrc->get_fifo_addr (IN , index); config_be.src_addr = dma_params_be->addr; }
@@ -311,11 +311,12 @@ static int fsl_asrc_dma_startup(struct snd_soc_component *component,return ret; } - pair =kzalloc (sizeof (struct fsl_asrc_pair ),GFP_KERNEL ); + pair =kzalloc (sizeof (*pair) + asrc->pair_priv_size,GFP_KERNEL );if (!pair)return -ENOMEM ; pair->asrc = asrc; + pair->private = (void *)pair +sizeof (struct fsl_asrc_pair ); runtime->private_data = pair;
@@ -323,14 +324,14 @@ static int fsl_asrc_dma_startup(struct snd_soc_component *component,* Request pair function needs channel num as input, for this * dummy pair, we just request "1" channel temporarily. */ - ret =fsl_asrc_request_pair (1 , pair); + ret = asrc->request_pair (1 , pair);if (ret <0 ) {dev_err (dev,"failed to request asrc pair\n" ); goto req_pair_err; }/* Request a dummy dma channel, which will be released later. */ - tmp_chan =fsl_asrc_get_dma_channel (pair, dir); + tmp_chan = asrc->get_dma_channel (pair, dir);if (!tmp_chan) {dev_err (dev,"failed to get dma channel\n" ); ret = -EINVAL ;
@@ -356,7 +357,7 @@ static int fsl_asrc_dma_startup(struct snd_soc_component *component,dma_release_channel (tmp_chan); dma_chan_err: -fsl_asrc_release_pair (pair); + asrc->release_pair (pair); req_pair_err:if (release_pair)
Signature · 1 line
2.21.0
PATCH v8 4/7 ASoC: fsl_asrc: Support new property fsl,asrc-format
In reply to Shengjiu WangIn order to align with new ESARC, we add new property fsl,asrc-format. The fsl,asrc-format can replace the fsl,asrc-width, driver can accept format from devicetree, don't need to convert it to format through width.
--- sound/soc/fsl/fsl_asrc.c | 41 +++++++++++++++++++++++------------- sound/soc/fsl/fsl_asrc.h | 4 ++-- sound/soc/fsl/fsl_asrc_dma.c | 15 ++++++++++--- 3 files changed, 40 insertions(+), 20 deletions(-)
sound/soc/fsl/fsl_asrc.c +26 -15
@@ -589,7 +589,6 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,unsigned int channels =params_channels (params);unsigned int rate =params_rate (params);struct asrc_config config; -snd_pcm_format_t format;int ret; ret =fsl_asrc_request_pair (channels, pair);
@@ -600,11 +599,6 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream, pair->config = &config; -if (asrc->asrc_width ==16 ) - format =SNDRV_PCM_FORMAT_S16_LE ; -else - format =SNDRV_PCM_FORMAT_S24_LE ; - config.pair = pair->index; config.channel_num = channels; config.inclk =INCLK_NONE ;
@@ -612,11 +606,11 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { config.input_format =params_format (params); - config.output_format = format; + config.output_format = asrc->asrc_format; config.input_sample_rate = rate; config.output_sample_rate = asrc->asrc_rate; }else { - config.input_format = format; + config.input_format = asrc->asrc_format; config.output_format =params_format (params); config.input_sample_rate = asrc->asrc_rate; config.output_sample_rate = rate;
@@ -946,6 +940,7 @@ static int fsl_asrc_probe(struct platform_device *pdev)int irq, ret, i;u32 map_idx;char tmp[16 ]; +u32 width; asrc =devm_kzalloc (&pdev->dev,sizeof (*asrc),GFP_KERNEL );if (!asrc)
@@ -1052,16 +1047,32 @@ static int fsl_asrc_probe(struct platform_device *pdev)return ret; } - ret =of_property_read_u32 (np,"fsl,asrc-width" , - &asrc->asrc_width); + ret =of_property_read_u32 (np,"fsl,asrc-format" , &asrc->asrc_format);if (ret) { -dev_err (&pdev->dev,"failed to get output width\n" ); -return ret; + ret =of_property_read_u32 (np,"fsl,asrc-width" , &width); +if (ret) { +dev_err (&pdev->dev,"failed to decide output format\n" ); +return ret; + } + +switch (width) { +case 16 : + asrc->asrc_format =SNDRV_PCM_FORMAT_S16_LE ; +break ; +case 24 : + asrc->asrc_format =SNDRV_PCM_FORMAT_S24_LE ; +break ; +default : +dev_warn (&pdev->dev, +"unsupported width, use default S24_LE\n" ); + asrc->asrc_format =SNDRV_PCM_FORMAT_S24_LE ; +break ; + } } -if (asrc->asrc_width !=16 && asrc->asrc_width !=24 ) { -dev_warn (&pdev->dev,"unsupported width, switching to 24bit\n" ); - asrc->asrc_width =24 ; +if (!(FSL_ASRC_FORMATS & (1ULL << asrc->asrc_format))) { +dev_warn (&pdev->dev,"unsupported width, use default S24_LE\n" ); + asrc->asrc_format =SNDRV_PCM_FORMAT_S24_LE ; }platform_set_drvdata (pdev, asrc);
sound/soc/fsl/fsl_asrc.h +2 -2
@@ -493,7 +493,7 @@ struct fsl_asrc_pair {* @channel_avail: non-occupied channel numbers * @clk_map: clock map for input/output clock * @asrc_rate: default sample rate for ASoC Back-Ends -* @asrc_width: default sample width for ASoC Back-Ends +* @asrc_format: default sample format for ASoC Back-Ends * @regcache_cfg: store register value of REG_ASRCFG */ struct fsl_asrc {
@@ -514,7 +514,7 @@ struct fsl_asrc {unsigned char *clk_map[2 ];int asrc_rate; -int asrc_width; +snd_pcm_format_t asrc_format;u32 regcache_cfg; };
sound/soc/fsl/fsl_asrc_dma.c +12 -3
@@ -146,7 +146,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,struct device *dev_be;u8 dir = tx ?OUT :IN ;dma_cap_mask_t mask; -int ret; +int ret, width;/* Fetch the Back-End dma_data from DPCM */ for_each_dpcm_be (rtd, stream, dpcm) {
@@ -230,10 +230,19 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,return -EINVAL ; } -if (asrc->asrc_width ==16 ) + width =snd_pcm_format_physical_width (asrc->asrc_format); +if (width <8 || width >64 ) +return -EINVAL ; +else if (width ==8 ) + buswidth =DMA_SLAVE_BUSWIDTH_1_BYTE ; +else if (width ==16 ) buswidth =DMA_SLAVE_BUSWIDTH_2_BYTES ; -else +else if (width ==24 ) + buswidth =DMA_SLAVE_BUSWIDTH_3_BYTES ; +else if (width <=32 ) buswidth =DMA_SLAVE_BUSWIDTH_4_BYTES ; +else + buswidth =DMA_SLAVE_BUSWIDTH_8_BYTES ; config_be.direction =DMA_DEV_TO_DEV ; config_be.src_addr_width = buswidth;
Signature · 1 line
2.21.0
PATCH v8 7/7 ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers
In reply to Shengjiu WangEASRC (Enhanced Asynchronous Sample Rate Converter) is a new IP module found on i.MX8MN. It is different with old ASRC module.
The primary features for the EASRC are as follows:
- 4 Contexts - groups of channels with an independent time base
- Fully independent and concurrent context control
- Simultaneous processing of up to 32 audio channels
- Programmable filter charachteristics for each context
- 32, 24, 20, and 16-bit fixed point audio sample support
- 32-bit floating point audio sample support
- 8kHz to 384kHz sample rate
- 1/16 to 8x sample rate conversion ratio
--- sound/soc/fsl/Kconfig | 11 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl_easrc.c | 2114 +++++++++++++++++++++++++++++++++++++ sound/soc/fsl/fsl_easrc.h | 651 ++++++++++++ 4 files changed, 2778 insertions(+) create mode 100644 sound/soc/fsl/fsl_easrc.c create mode 100644 sound/soc/fsl/fsl_easrc.h
sound/soc/fsl/Kconfig +11 -0
@@ -84,6 +84,17 @@ config SND_SOC_FSL_MICFIL Say Y if you want to add Pulse Density Modulation microphone interface (MICFIL) support for NXP. +config SND_SOC_FSL_EASRC + tristate "Enhanced Asynchronous Sample Rate Converter (EASRC) module support" + depends on SND_SOC_FSL_ASRC + select REGMAP_MMIO + select SND_SOC_GENERIC_DMAENGINE_PCM + help + Say Y if you want to add Enhanced ASRC support for NXP. The ASRC is + a digital module that converts audio from a source sample rate to a + destination sample rate. It is a new design module compare with the + old ASRC. + config SND_SOC_FSL_UTILS tristate
sound/soc/fsl/Makefile +2 -0
@@ -24,6 +24,7 @@ snd-soc-fsl-micfil-objs := fsl_micfil.o snd-soc-fsl-utils-objs := fsl_utils.o snd-soc-fsl-dma-objs := fsl_dma.o snd-soc-fsl-mqs-objs := fsl_mqs.o +snd-soc-fsl-easrc-objs := fsl_easrc.o obj-$(CONFIG_SND_SOC_FSL_AUDMIX) += snd-soc-fsl-audmix.o obj-$(CONFIG_SND_SOC_FSL_ASOC_CARD) += snd-soc-fsl-asoc-card.o
@@ -35,6 +36,7 @@ obj-$(CONFIG_SND_SOC_FSL_ESAI) += snd-soc-fsl-esai.o obj-$(CONFIG_SND_SOC_FSL_MICFIL) += snd-soc-fsl-micfil.o obj-$(CONFIG_SND_SOC_FSL_UTILS) += snd-soc-fsl-utils.o obj-$(CONFIG_SND_SOC_FSL_MQS) += snd-soc-fsl-mqs.o +obj-$(CONFIG_SND_SOC_FSL_EASRC) += snd-soc-fsl-easrc.o obj-$(CONFIG_SND_SOC_POWERPC_DMA) += snd-soc-fsl-dma.o # MPC5200 Platform Support
sound/soc/fsl/fsl_easrc.c new file +2114 -0
2,114 lines not on this page · raw message
sound/soc/fsl/fsl_easrc.h new file +651 -0
651 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v8 3/7 ASoC: fsl-asoc-card: Support new property fsl,asrc-format
In reply to Shengjiu WangIn order to align with new ESARC, we add new property fsl,asrc-format. The fsl,asrc-format can replace the fsl,asrc-width, driver can accept format from devicetree, don't need to convert it to format through width.
--- sound/soc/fsl/fsl-asoc-card.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
sound/soc/fsl/fsl-asoc-card.c +15 -9
@@ -680,17 +680,23 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) goto asrc_fail; } - ret =of_property_read_u32 (asrc_np,"fsl,asrc-width" , &width); + ret =of_property_read_u32 (asrc_np,"fsl,asrc-format" , + &priv->asrc_format);if (ret) { -dev_err (&pdev->dev,"failed to get output rate\n" ); - ret = -EINVAL ; - goto asrc_fail; - } +/* Fallback to old binding; translate to asrc_format */ + ret =of_property_read_u32 (asrc_np,"fsl,asrc-width" , + &width); +if (ret) { +dev_err (&pdev->dev, +"failed to decide output format\n" ); + goto asrc_fail; + } -if (width ==24 ) - priv->asrc_format =SNDRV_PCM_FORMAT_S24_LE ; -else - priv->asrc_format =SNDRV_PCM_FORMAT_S16_LE ; +if (width ==24 ) + priv->asrc_format =SNDRV_PCM_FORMAT_S24_LE ; +else + priv->asrc_format =SNDRV_PCM_FORMAT_S16_LE ; + } }/* Finish card registering */
Signature · 1 line
2.21.0
Re: [PATCH v8 6/7] ASoC: dt-bindings: fsl_easrc: Add document for EASRC
In reply to Shengjiu WangQuoted 9 lines · Shengjiu Wang
EASRC (Enhanced Asynchronous Sample Rate Converter) is a new IP module found on i.MX8MN.
Signed-off-by Shengjiu Wang <[email protected]>--- .../devicetree/bindings/sound/fsl,easrc.yaml | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/fsl,easrc.yaml
Mark Brown
maintainerQuoted 12 lines · Shengjiu Wang
Add new module driver for new ASRC in i.MX8MN, several commits are added for new property fsl,asrc-format
Shengjiu Wang (7):
ASoC:fsl_asrc: renameasrc_privto asrc
ASoC: dt-bindings:fsl_asrc: Add new property fsl,asrc-format
ASoC: fsl-asoc-card: Support new property fsl,asrc-format
ASoC:fsl_asrc: Support new property fsl,asrc-format
ASoC:fsl_asrc: Move common definition tofsl_asrc_common
ASoC: dt-bindings:fsl_easrc: Add document for EASRC
ASoC:fsl_easrc: Add EASRC ASoC CPU DAI drivers
Quoted 1 line
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.8
Thanks!
[1/7] ASoC: fsl_asrc: rename asrc_priv to asrc
commit: 7470704d8b425c4c7045884690f92cf015563aac
[2/7] ASoC: dt-bindings: fsl_asrc: Add new property fsl, asrc-format
commit: b84b4c9a688d803b0e7cf91fec9a5d8b3ba47768
[3/7] ASoC: fsl-asoc-card: Support new property fsl, asrc-format
commit: 859e364302c510cfdd9abda13a3c4c1d1bc68c57
[4/7] ASoC: fsl_asrc: Support new property fsl,asrc-format
commit: 4520af41fd21863d026d53c7e1eb987509cb3c24
[5/7] ASoC: fsl_asrc: Move common definition to fsl_asrc_common
commit: be7bd03f0201b5a513ced98c08444a140eab92ea
[6/7] ASoC: dt-bindings: fsl_easrc: Add document for EASRC
commit: a960de4da241d409a73e318ab19e6b5fdcd95a83
[7/7] ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers
commit: 955ac624058f91172b3b8820280556e699e1e0ffAll being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark