Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/amd',... (1740f1dc) · Commits · 戴 / test

Documentation/devicetree/bindings/sound/dmic.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -7,10 +7,12 @@ Required properties:

		Optional properties:
		- dmicen-gpios: GPIO specifier for dmic to control start and stop
		- num-channels: Number of microphones on this DAI

		Example node:

		dmic_codec: dmic@0 {
		compatible = "dmic-codec";
		dmicen-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>;
		num-channels = <1>;
		};

sound/soc/amd/acp-pcm-dma.c

+30 −5

Original line number	Diff line number	Diff line
		@@ -850,6 +850,9 @@ static snd_pcm_uframes_t acp_dma_pointer(struct snd_pcm_substream *substream)
		struct snd_pcm_runtime *runtime = substream->runtime;
		struct audio_substream_data *rtd = runtime->private_data;

		if (!rtd)
		return -EINVAL;

		buffersize = frames_to_bytes(runtime, runtime->buffer_size);
		bytescount = acp_get_byte_count(rtd->acp_mmio, substream->stream);

		@@ -875,6 +878,8 @@ static int acp_dma_prepare(struct snd_pcm_substream *substream)
		struct snd_pcm_runtime *runtime = substream->runtime;
		struct audio_substream_data *rtd = runtime->private_data;

		if (!rtd)
		return -EINVAL;
		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
		config_acp_dma_channel(rtd->acp_mmio, SYSRAM_TO_ACP_CH_NUM,
		PLAYBACK_START_DMA_DESCR_CH12,
		@@ -1091,7 +1096,11 @@ static int acp_audio_probe(struct platform_device *pdev)
		dev_set_drvdata(&pdev->dev, audio_drv_data);

		/* Initialize the ACP */
		acp_init(audio_drv_data->acp_mmio, audio_drv_data->asic_type);
		status = acp_init(audio_drv_data->acp_mmio, audio_drv_data->asic_type);
		if (status) {
		dev_err(&pdev->dev, "ACP Init failed status:%d\n", status);
		return status;
		}

		status = snd_soc_register_platform(&pdev->dev, &acp_asoc_platform);
		if (status != 0) {
		@@ -1108,9 +1117,12 @@ static int acp_audio_probe(struct platform_device *pdev)

		static int acp_audio_remove(struct platform_device *pdev)
		{
		int status;
		struct audio_drv_data *adata = dev_get_drvdata(&pdev->dev);

		acp_deinit(adata->acp_mmio);
		status = acp_deinit(adata->acp_mmio);
		if (status)
		dev_err(&pdev->dev, "ACP Deinit failed status:%d\n", status);
		snd_soc_unregister_platform(&pdev->dev);
		pm_runtime_disable(&pdev->dev);

		@@ -1120,9 +1132,14 @@ static int acp_audio_remove(struct platform_device *pdev)
		static int acp_pcm_resume(struct device *dev)
		{
		u16 bank;
		int status;
		struct audio_drv_data *adata = dev_get_drvdata(dev);

		acp_init(adata->acp_mmio, adata->asic_type);
		status = acp_init(adata->acp_mmio, adata->asic_type);
		if (status) {
		dev_err(dev, "ACP Init failed status:%d\n", status);
		return status;
		}

		if (adata->play_stream && adata->play_stream->runtime) {
		/* For Stoney, Memory gating is disabled,i.e SRAM Banks
		@@ -1154,18 +1171,26 @@ static int acp_pcm_resume(struct device *dev)

		static int acp_pcm_runtime_suspend(struct device *dev)
		{
		int status;
		struct audio_drv_data *adata = dev_get_drvdata(dev);

		acp_deinit(adata->acp_mmio);
		status = acp_deinit(adata->acp_mmio);
		if (status)
		dev_err(dev, "ACP Deinit failed status:%d\n", status);
		acp_reg_write(0, adata->acp_mmio, mmACP_EXTERNAL_INTR_ENB);
		return 0;
		}

		static int acp_pcm_runtime_resume(struct device *dev)
		{
		int status;
		struct audio_drv_data *adata = dev_get_drvdata(dev);

		acp_init(adata->acp_mmio, adata->asic_type);
		status = acp_init(adata->acp_mmio, adata->asic_type);
		if (status) {
		dev_err(dev, "ACP Init failed status:%d\n", status);
		return status;
		}
		acp_reg_write(1, adata->acp_mmio, mmACP_EXTERNAL_INTR_ENB);
		return 0;
		}

sound/soc/atmel/atmel-classd.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -308,15 +308,9 @@ static int atmel_classd_codec_resume(struct snd_soc_codec *codec)
		return regcache_sync(dd->regmap);
		}

		static struct regmap atmel_classd_codec_get_remap(struct device dev)
		{
		return dev_get_regmap(dev, NULL);
		}

		static struct snd_soc_codec_driver soc_codec_dev_classd = {
		.probe = atmel_classd_codec_probe,
		.resume = atmel_classd_codec_resume,
		.get_regmap = atmel_classd_codec_get_remap,
		.component_driver = {
		.controls = atmel_classd_snd_controls,
		.num_controls = ARRAY_SIZE(atmel_classd_snd_controls),

sound/soc/codecs/88pm860x-codec.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -1319,6 +1319,7 @@ static int pm860x_probe(struct snd_soc_codec *codec)
		int i, ret;

		pm860x->codec = codec;
		snd_soc_codec_init_regmap(codec, pm860x->regmap);

		for (i = 0; i < 4; i++) {
		ret = request_threaded_irq(pm860x->irq[i], NULL,
		@@ -1348,18 +1349,10 @@ static int pm860x_remove(struct snd_soc_codec *codec)
		return 0;
		}

		static struct regmap pm860x_get_regmap(struct device dev)
		{
		struct pm860x_priv *pm860x = dev_get_drvdata(dev);

		return pm860x->regmap;
		}

		static const struct snd_soc_codec_driver soc_codec_dev_pm860x = {
		.probe = pm860x_probe,
		.remove = pm860x_remove,
		.set_bias_level = pm860x_set_bias_level,
		.get_regmap = pm860x_get_regmap,

		.component_driver = {
		.controls = pm860x_snd_controls,

sound/soc/codecs/dmic.c

+23 −1

Original line number	Diff line number	Diff line
		@@ -107,8 +107,30 @@ static const struct snd_soc_codec_driver soc_dmic = {

		static int dmic_dev_probe(struct platform_device *pdev)
		{
		int err;
		u32 chans;
		struct snd_soc_dai_driver *dai_drv = &dmic_dai;

		if (pdev->dev.of_node) {
		err = of_property_read_u32(pdev->dev.of_node, "num-channels", &chans);
		if (err && (err != -ENOENT))
		return err;

		if (!err) {
		if (chans < 1 \|\| chans > 8)
		return -EINVAL;

		dai_drv = devm_kzalloc(&pdev->dev, sizeof(*dai_drv), GFP_KERNEL);
		if (!dai_drv)
		return -ENOMEM;

		memcpy(dai_drv, &dmic_dai, sizeof(*dai_drv));
		dai_drv->capture.channels_max = chans;
		}
		}

		return snd_soc_register_codec(&pdev->dev,
		&soc_dmic, &dmic_dai, 1);
		&soc_dmic, dai_drv, 1);
		}

		static int dmic_dev_remove(struct platform_device *pdev)

Admin message