From 2c5010feca77df4a8516f988f4c0fa6240f6ac48 Mon Sep 17 00:00:00 2001
From: Vipul Kumar <vipul_kumar@mentor.com>
Date: Wed, 5 Dec 2018 17:51:01 +0530
Subject: [PATCH] ASoC: fsl_mqs: replace codec to component
This patch replace codec to component.
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>
---
sound/soc/codecs/fsl_mqs.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/sound/soc/codecs/fsl_mqs.c b/sound/soc/codecs/fsl_mqs.c
index f96c166f10f2fa..a7ef37e1e4e50e 100644
--- a/sound/soc/codecs/fsl_mqs.c
+++ b/sound/soc/codecs/fsl_mqs.c
@@ -48,8 +48,8 @@ static int fsl_mqs_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
{
- struct snd_soc_codec *codec = dai->codec;
- struct fsl_mqs *mqs_priv = snd_soc_codec_get_drvdata(codec);
+ struct snd_soc_component *component = dai->component;
+ struct fsl_mqs *mqs_priv = snd_soc_component_get_drvdata(component);
int div, res;
mqs_priv->mclk_rate = clk_get_rate(mqs_priv->mclk);
@@ -105,8 +105,8 @@ static int fsl_mqs_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
static int fsl_mqs_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
unsigned int freq, int dir)
{
- struct snd_soc_codec *codec = dai->codec;
- struct fsl_mqs *mqs_priv = snd_soc_codec_get_drvdata(codec);
+ struct snd_soc_component *component = dai->component;
+ struct fsl_mqs *mqs_priv = snd_soc_component_get_drvdata(component);
mqs_priv->sysclk_rate = freq;
@@ -116,8 +116,8 @@ static int fsl_mqs_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
static int fsl_mqs_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
- struct snd_soc_codec *codec = dai->codec;
- struct fsl_mqs *mqs_priv = snd_soc_codec_get_drvdata(codec);
+ struct snd_soc_component *component = dai->component;
+ struct fsl_mqs *mqs_priv = snd_soc_component_get_drvdata(component);
regmap_update_bits(mqs_priv->gpr, IOMUXC_GPR2, IMX6SX_GPR2_MQS_EN_MASK,
1 << IMX6SX_GPR2_MQS_EN_SHIFT);
@@ -127,8 +127,8 @@ static int fsl_mqs_startup(struct snd_pcm_substream *substream,
static void fsl_mqs_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
- struct snd_soc_codec *codec = dai->codec;
- struct fsl_mqs *mqs_priv = snd_soc_codec_get_drvdata(codec);
+ struct snd_soc_component *component = dai->component;
+ struct fsl_mqs *mqs_priv = snd_soc_component_get_drvdata(component);
regmap_update_bits(mqs_priv->gpr, IOMUXC_GPR2,
IMX6SX_GPR2_MQS_EN_MASK, 0);
@@ -136,7 +136,7 @@ static void fsl_mqs_shutdown(struct snd_pcm_substream *substream,
}
-static struct snd_soc_codec_driver soc_codec_fsl_mqs;
+static struct snd_soc_component_driver soc_codec_fsl_mqs;
static const struct snd_soc_dai_ops fsl_mqs_dai_ops = {
.startup = fsl_mqs_startup,
@@ -196,7 +196,7 @@ static int fsl_mqs_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, mqs_priv);
pm_runtime_enable(&pdev->dev);
- return snd_soc_register_codec(&pdev->dev, &soc_codec_fsl_mqs,
+ return devm_snd_soc_register_component(&pdev->dev, &soc_codec_fsl_mqs,
&fsl_mqs_dai, 1);
out:
@@ -208,7 +208,6 @@ out:
static int fsl_mqs_remove(struct platform_device *pdev)
{
- snd_soc_unregister_codec(&pdev->dev);
return 0;
}
--
GitLab