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

Commit 1f7f8e04 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next

parents a6f849f7 de0022d4

sound/soc/samsung/bells.c

+1 −0
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ static struct snd_soc_dapm_widget bells_widgets[] = { 


static struct snd_soc_dapm_route bells_routes[] = {

	{ "Sub CLK_SYS", NULL, "OPCLK" },

	{ "CLKIN", NULL, "OPCLK" },



	{ "DMIC", NULL, "MICBIAS2" },

	{ "IN2L", NULL, "DMIC" },

sound/soc/samsung/i2s.c

+7 −7
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) 
	i2s->i2s_dai_drv.ops = &samsung_i2s_dai_ops;

	i2s->i2s_dai_drv.suspend = i2s_suspend;

	i2s->i2s_dai_drv.resume = i2s_resume;

	i2s->i2s_dai_drv.playback.channels_min = 2;

	i2s->i2s_dai_drv.playback.channels_min = 1;

	i2s->i2s_dai_drv.playback.channels_max = 2;

	i2s->i2s_dai_drv.playback.rates = SAMSUNG_I2S_RATES;

	i2s->i2s_dai_drv.playback.formats = SAMSUNG_I2S_FMTS;
@@ -1138,7 +1138,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
			dev_err(&pdev->dev, "Unable to get drvdata\n");

			return -EFAULT;

		}

		snd_soc_register_component(&sec_dai->pdev->dev,

		devm_snd_soc_register_component(&sec_dai->pdev->dev,

						&samsung_i2s_component,

						&sec_dai->i2s_dai_drv, 1);

		samsung_asoc_dma_platform_register(&pdev->dev);
@@ -1253,7 +1253,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
		goto err;

	}



	snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component,

	devm_snd_soc_register_component(&pri_dai->pdev->dev,

					&samsung_i2s_component,

					&pri_dai->i2s_dai_drv, 1);



	pm_runtime_enable(&pdev->dev);
@@ -1289,7 +1290,6 @@ static int samsung_i2s_remove(struct platform_device *pdev) 
	i2s->sec_dai = NULL;



	samsung_asoc_dma_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	return 0;

}

sound/soc/samsung/smdk_wm8994.c

+3 −11
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include "../codecs/wm8994.h"

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>
@@ -193,7 +194,7 @@ static int smdk_audio_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, board);



	ret = snd_soc_register_card(card);

	ret = devm_snd_soc_register_card(&pdev->dev, card);



	if (ret)

		dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret);
@@ -201,23 +202,14 @@ static int smdk_audio_probe(struct platform_device *pdev) 
	return ret;

}



static int smdk_audio_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);



	return 0;

}



static struct platform_driver smdk_audio_driver = {

	.driver		= {

		.name	= "smdk-audio-wm8894",

		.owner	= THIS_MODULE,

		.of_match_table = of_match_ptr(samsung_wm8994_of_match),

		.pm	= &snd_soc_pm_ops,

	},

	.probe		= smdk_audio_probe,

	.remove		= smdk_audio_remove,

};



module_platform_driver(smdk_audio_driver);