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

Commit ede38884 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: SPEAr: get rid of spear-pcm-audio struct device 



Modify the SPEAr PCM driver so that it's a utility library that can be
registered on each DAI, rather than a separate struct device. This is
more in line with how many recent DT-converted platforms operate, and
avoids the need for yet another struct device.

This is also required as a pre-cursor to removing
spear_pcm_request_chan().

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d71b3ef4

sound/soc/spear/spdif_in.c

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

#include <sound/spear_spdif.h>

#include "spdif_in_regs.h"

#include "spear_pcm.h"



struct spdif_in_params {

	u32 format;
@@ -257,8 +258,12 @@ static int spdif_in_probe(struct platform_device *pdev) 
		return ret;

	}



	return devm_snd_soc_register_component(&pdev->dev, &spdif_in_component,

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

					      &spdif_in_dai, 1);

	if (ret)

		return ret;



	return devm_spear_pcm_platform_register(&pdev->dev);

}



static struct platform_driver spdif_in_driver = {

sound/soc/spear/spdif_out.c

+8 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <sound/spear_dma.h>

#include <sound/spear_spdif.h>

#include "spdif_out_regs.h"

#include "spear_pcm.h"



struct spdif_out_params {

	u32 rate;
@@ -280,6 +281,7 @@ static int spdif_out_probe(struct platform_device *pdev) 
	struct spdif_out_dev *host;

	struct spear_spdif_platform_data *pdata;

	struct resource *res;

	int ret;



	host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);

	if (!host) {
@@ -306,8 +308,12 @@ static int spdif_out_probe(struct platform_device *pdev) 


	dev_set_drvdata(&pdev->dev, host);



	return devm_snd_soc_register_component(&pdev->dev, &spdif_out_component,

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

					      &spdif_out_dai, 1);

	if (ret)

		return ret;



	return devm_spear_pcm_platform_register(&pdev->dev);

}



#ifdef CONFIG_PM

sound/soc/spear/spear_pcm.c

+4 −14
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <sound/pcm.h>

#include <sound/soc.h>

#include <sound/spear_dma.h>

#include "spear_pcm.h"



static const struct snd_pcm_hardware spear_pcm_hardware = {

	.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -47,26 +48,15 @@ static const struct snd_dmaengine_pcm_config spear_dmaengine_pcm_config = { 
	.prealloc_buffer_size = 16 * 1024,

};



static int spear_soc_platform_probe(struct platform_device *pdev)

int devm_spear_pcm_platform_register(struct device *dev)

{

	return devm_snd_dmaengine_pcm_register(&pdev->dev,

	return devm_snd_dmaengine_pcm_register(dev,

		&spear_dmaengine_pcm_config,

		SND_DMAENGINE_PCM_FLAG_NO_DT |

		SND_DMAENGINE_PCM_FLAG_COMPAT);

}



static struct platform_driver spear_pcm_driver = {

	.driver = {

		.name = "spear-pcm-audio",

		.owner = THIS_MODULE,

	},



	.probe = spear_soc_platform_probe,

};



module_platform_driver(spear_pcm_driver);

EXPORT_SYMBOL_GPL(devm_spear_pcm_platform_register);



MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar@st.com>");

MODULE_DESCRIPTION("SPEAr PCM DMA module");

MODULE_LICENSE("GPL");
 
MODULE_ALIAS("platform:spear-pcm-audio");

sound/soc/spear/spear_pcm.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifndef __SPEAR_PCM_H__

#define __SPEAR_PCM_H__



int devm_spear_pcm_platform_register(struct device *dev);



#endif