Unverified Commit 81dc5f3d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: intel: baytrail: 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 56b03b4c

sound/soc/intel/baytrail/sst-baytrail-pcm.c

+25 −41
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "../common/sst-dsp-priv.h"

#include "../common/sst-dsp.h"



#define DRV_NAME "byt-dai"

#define BYT_PCM_COUNT		2



static const struct snd_pcm_hardware sst_byt_pcm_hardware = {
@@ -69,8 +70,8 @@ static int sst_byt_pcm_hw_params(struct snd_pcm_substream *substream, 
				 struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct sst_byt_priv_data *pdata =

		snd_soc_platform_get_drvdata(rtd->platform);

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

	struct sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];

	struct sst_byt *byt = pdata->byt;

	u32 rate, bits;
@@ -141,8 +142,8 @@ static int sst_byt_pcm_hw_free(struct snd_pcm_substream *substream) 
static int sst_byt_pcm_restore_stream_context(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct sst_byt_priv_data *pdata =

		snd_soc_platform_get_drvdata(rtd->platform);

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

	struct sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];

	struct sst_byt *byt = pdata->byt;

	int ret;
@@ -174,8 +175,8 @@ static void sst_byt_pcm_work(struct work_struct *work) 
static int sst_byt_pcm_trigger(struct snd_pcm_substream *substream, int cmd)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct sst_byt_priv_data *pdata =

		snd_soc_platform_get_drvdata(rtd->platform);

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

	struct sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];

	struct sst_byt *byt = pdata->byt;
@@ -216,8 +217,8 @@ static u32 byt_notify_pointer(struct sst_byt_stream *stream, void *data) 
	struct snd_pcm_substream *substream = pcm_data->substream;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct sst_byt_priv_data *pdata =

		snd_soc_platform_get_drvdata(rtd->platform);

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

	struct sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt *byt = pdata->byt;

	u32 pos, hw_pos;
@@ -238,8 +239,8 @@ static snd_pcm_uframes_t sst_byt_pcm_pointer(struct snd_pcm_substream *substream 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct sst_byt_priv_data *pdata =

		snd_soc_platform_get_drvdata(rtd->platform);

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

	struct sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];



	dev_dbg(rtd->dev, "PCM: DMA pointer %u bytes\n", pcm_data->hw_ptr);
@@ -250,8 +251,8 @@ static snd_pcm_uframes_t sst_byt_pcm_pointer(struct snd_pcm_substream *substream 
static int sst_byt_pcm_open(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct sst_byt_priv_data *pdata =

		snd_soc_platform_get_drvdata(rtd->platform);

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

	struct sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];

	struct sst_byt *byt = pdata->byt;
@@ -278,8 +279,8 @@ static int sst_byt_pcm_open(struct snd_pcm_substream *substream) 
static int sst_byt_pcm_close(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct sst_byt_priv_data *pdata =

		snd_soc_platform_get_drvdata(rtd->platform);

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

	struct sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];

	struct sst_byt *byt = pdata->byt;

	int ret;
@@ -324,8 +325,8 @@ static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd) 
{

	struct snd_pcm *pcm = rtd->pcm;

	size_t size;

	struct snd_soc_platform *platform = rtd->platform;

	struct sst_pdata *pdata = dev_get_platdata(platform->dev);

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

	struct sst_pdata *pdata = dev_get_platdata(component->dev);

	int ret = 0;



	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream ||
@@ -366,21 +367,21 @@ static struct snd_soc_dai_driver byt_dais[] = { 
	},

};



static int sst_byt_pcm_probe(struct snd_soc_platform *platform)

static int sst_byt_pcm_probe(struct snd_soc_component *component)

{

	struct sst_pdata *plat_data = dev_get_platdata(platform->dev);

	struct sst_pdata *plat_data = dev_get_platdata(component->dev);

	struct sst_byt_priv_data *priv_data;

	int i;



	if (!plat_data)

		return -ENODEV;



	priv_data = devm_kzalloc(platform->dev, sizeof(*priv_data),

	priv_data = devm_kzalloc(component->dev, sizeof(*priv_data),

				 GFP_KERNEL);

	if (!priv_data)

		return -ENOMEM;

	priv_data->byt = plat_data->dsp;

	snd_soc_platform_set_drvdata(platform, priv_data);

	snd_soc_component_set_drvdata(component, priv_data);



	for (i = 0; i < BYT_PCM_COUNT; i++) {

		mutex_init(&priv_data->pcm[i].mutex);
@@ -390,22 +391,13 @@ static int sst_byt_pcm_probe(struct snd_soc_platform *platform) 
	return 0;

}



static int sst_byt_pcm_remove(struct snd_soc_platform *platform)

{

	return 0;

}



static const struct snd_soc_platform_driver byt_soc_platform = {

static const struct snd_soc_component_driver byt_dai_component = {

	.name		= DRV_NAME,

	.probe		= sst_byt_pcm_probe,

	.remove		= sst_byt_pcm_remove,

	.ops		= &sst_byt_pcm_ops,

	.pcm_new	= sst_byt_pcm_new,

};



static const struct snd_soc_component_driver byt_dai_component = {

	.name		= "byt-dai",

};



#ifdef CONFIG_PM

static int sst_byt_pcm_dev_suspend_late(struct device *dev)

{
@@ -461,19 +453,13 @@ static int sst_byt_pcm_dev_probe(struct platform_device *pdev) 
	if (ret < 0)

		return -ENODEV;



	ret = snd_soc_register_platform(&pdev->dev, &byt_soc_platform);

	if (ret < 0)

		goto err_plat;



	ret = snd_soc_register_component(&pdev->dev, &byt_dai_component,

	ret = devm_snd_soc_register_component(&pdev->dev, &byt_dai_component,

					 byt_dais, ARRAY_SIZE(byt_dais));

	if (ret < 0)

		goto err_comp;

		goto err_plat;



	return 0;



err_comp:

	snd_soc_unregister_platform(&pdev->dev);

err_plat:

	sst_byt_dsp_free(&pdev->dev, sst_pdata);

	return ret;
@@ -483,8 +469,6 @@ static int sst_byt_pcm_dev_remove(struct platform_device *pdev) 
{

	struct sst_pdata *sst_pdata = dev_get_platdata(&pdev->dev);



	snd_soc_unregister_platform(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);

	sst_byt_dsp_free(&pdev->dev, sst_pdata);



	return 0;