ASoC: fsl_asrc: Support new property fsl,asrc-format (4520af41) · Commits · 戴 / test

sound/soc/fsl/fsl_asrc.c

+26 −15

Original line number	Diff line number	Diff line
		@@ -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) {
		ret = of_property_read_u32(np, "fsl,asrc-width", &width);
		if (ret) {
		dev_err(&pdev->dev, "failed to get output width\n");
		dev_err(&pdev->dev, "failed to decide output format\n");
		return ret;
		}

		if (asrc->asrc_width != 16 && asrc->asrc_width != 24) {
		dev_warn(&pdev->dev, "unsupported width, switching to 24bit\n");
		asrc->asrc_width = 24;
		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 (!(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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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;

Admin message