Unverified Commit 324081ab authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'asoc-5.15' into asoc-5.16

parents 43041505 5ba8ecf2

sound/soc/rockchip/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -2,14 +2,13 @@ 
# ROCKCHIP Platform Support

snd-soc-rockchip-i2s-objs := rockchip_i2s.o

snd-soc-rockchip-i2s-tdm-objs := rockchip_i2s_tdm.o

snd-soc-rockchip-pcm-objs := rockchip_pcm.o

snd-soc-rockchip-pdm-objs := rockchip_pdm.o

snd-soc-rockchip-spdif-objs := rockchip_spdif.o



obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o snd-soc-rockchip-pcm.o

obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S_TDM) += snd-soc-rockchip-i2s-tdm.o

obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o

obj-$(CONFIG_SND_SOC_ROCKCHIP_PDM) += snd-soc-rockchip-pdm.o

obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o

obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S_TDM) += snd-soc-rockchip-i2s-tdm.o



snd-soc-rockchip-max98090-objs := rockchip_max98090.o

snd-soc-rockchip-rt5645-objs := rockchip_rt5645.o

sound/soc/rockchip/rockchip_i2s.c

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <sound/dmaengine_pcm.h>



#include "rockchip_i2s.h"

#include "rockchip_pcm.h"



#define DRV_NAME "rockchip-i2s"
@@ -756,7 +755,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) 
		goto err_suspend;

	}



	ret = rockchip_pcm_platform_register(&pdev->dev);

	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);

	if (ret) {

		dev_err(&pdev->dev, "Could not register PCM\n");

		goto err_suspend;

sound/soc/rockchip/rockchip_pcm.c

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2018 Rockchip Electronics Co. Ltd.

 */



#include <linux/device.h>

#include <linux/init.h>

#include <linux/module.h>



#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/soc.h>

#include <sound/dmaengine_pcm.h>



#include "rockchip_pcm.h"



static const struct snd_pcm_hardware snd_rockchip_hardware = {

	.info			= SNDRV_PCM_INFO_MMAP |

				  SNDRV_PCM_INFO_MMAP_VALID |

				  SNDRV_PCM_INFO_PAUSE |

				  SNDRV_PCM_INFO_RESUME |

				  SNDRV_PCM_INFO_INTERLEAVED,

	.period_bytes_min	= 32,

	.period_bytes_max	= 8192,

	.periods_min		= 1,

	.periods_max		= 52,

	.buffer_bytes_max	= 64 * 1024,

	.fifo_size		= 32,

};



static const struct snd_dmaengine_pcm_config rk_dmaengine_pcm_config = {

	.pcm_hardware = &snd_rockchip_hardware,

	.prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,

	.prealloc_buffer_size = 32 * 1024,

};



int rockchip_pcm_platform_register(struct device *dev)

{

	return devm_snd_dmaengine_pcm_register(dev, &rk_dmaengine_pcm_config,

		SND_DMAENGINE_PCM_FLAG_COMPAT);

}

EXPORT_SYMBOL_GPL(rockchip_pcm_platform_register);



MODULE_LICENSE("GPL v2");

sound/soc/rockchip/rockchip_pcm.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2018 Rockchip Electronics Co. Ltd.

 */



#ifndef _ROCKCHIP_PCM_H

#define _ROCKCHIP_PCM_H



int rockchip_pcm_platform_register(struct device *dev);



#endif