Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 121de3b4 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: qcom: lpass-platform: replace platform to component 



Now platform can be replaced to component, let's do it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0717e66f

sound/soc/qcom/lpass-platform.c

+23 −19
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include "lpass-lpaif-reg.h"

#include "lpass.h"



#define DRV_NAME "lpass-platform"



struct lpass_pcm_data {

	int dma_ch;

	int i2s_port;
@@ -61,8 +63,8 @@ static int lpass_platform_pcmops_open(struct snd_pcm_substream *substream) 
	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai;

	struct lpass_data *drvdata =

		snd_soc_platform_get_drvdata(soc_runtime->platform);

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(soc_runtime, DRV_NAME);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct lpass_variant *v = drvdata->variant;

	int ret, dma_ch, dir = substream->stream;

	struct lpass_pcm_data *data;
@@ -115,8 +117,8 @@ static int lpass_platform_pcmops_close(struct snd_pcm_substream *substream) 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct lpass_data *drvdata =

		snd_soc_platform_get_drvdata(soc_runtime->platform);

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(soc_runtime, DRV_NAME);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct lpass_variant *v = drvdata->variant;

	struct lpass_pcm_data *data;
@@ -132,8 +134,8 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream, 
		struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct lpass_data *drvdata =

		snd_soc_platform_get_drvdata(soc_runtime->platform);

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(soc_runtime, DRV_NAME);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;
@@ -225,8 +227,8 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream, 
static int lpass_platform_pcmops_hw_free(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct lpass_data *drvdata =

		snd_soc_platform_get_drvdata(soc_runtime->platform);

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(soc_runtime, DRV_NAME);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;
@@ -246,8 +248,8 @@ static int lpass_platform_pcmops_prepare(struct snd_pcm_substream *substream) 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct lpass_data *drvdata =

		snd_soc_platform_get_drvdata(soc_runtime->platform);

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(soc_runtime, DRV_NAME);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;
@@ -298,8 +300,8 @@ static int lpass_platform_pcmops_trigger(struct snd_pcm_substream *substream, 
		int cmd)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct lpass_data *drvdata =

		snd_soc_platform_get_drvdata(soc_runtime->platform);

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(soc_runtime, DRV_NAME);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;
@@ -372,8 +374,8 @@ static snd_pcm_uframes_t lpass_platform_pcmops_pointer( 
		struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct lpass_data *drvdata =

			snd_soc_platform_get_drvdata(soc_runtime->platform);

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(soc_runtime, DRV_NAME);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;

	struct lpass_variant *v = drvdata->variant;
@@ -509,13 +511,14 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) 
{

	struct snd_pcm *pcm = soc_runtime->pcm;

	struct snd_pcm_substream *psubstream, *csubstream;

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(soc_runtime, DRV_NAME);

	int ret = -EINVAL;

	size_t size = lpass_platform_pcm_hardware.buffer_bytes_max;



	psubstream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;

	if (psubstream) {

		ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,

					soc_runtime->platform->dev,

					component->dev,

					size, &psubstream->dma_buffer);

		if (ret) {

			dev_err(soc_runtime->dev, "Cannot allocate buffer(s)\n");
@@ -526,7 +529,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) 
	csubstream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream;

	if (csubstream) {

		ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,

					soc_runtime->platform->dev,

					component->dev,

					size, &csubstream->dma_buffer);

		if (ret) {

			dev_err(soc_runtime->dev, "Cannot allocate buffer(s)\n");
@@ -555,7 +558,8 @@ static void lpass_platform_pcm_free(struct snd_pcm *pcm) 
	}

}



static const struct snd_soc_platform_driver lpass_platform_driver = {

static const struct snd_soc_component_driver lpass_component_driver = {

	.name		= DRV_NAME,

	.pcm_new	= lpass_platform_pcm_new,

	.pcm_free	= lpass_platform_pcm_free,

	.ops		= &lpass_platform_pcm_ops,
@@ -591,8 +595,8 @@ int asoc_qcom_lpass_platform_register(struct platform_device *pdev) 
	}





	return devm_snd_soc_register_platform(&pdev->dev,

			&lpass_platform_driver);

	return devm_snd_soc_register_component(&pdev->dev,

			&lpass_component_driver, NULL, 0);

}

EXPORT_SYMBOL_GPL(asoc_qcom_lpass_platform_register);