hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: mc13783 codec cleanups 

Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Philippe Rétornaz 2012-05-16 12:49:19 +02:00 committed by Mark Brown
parent 6b0a795a17
commit b77458da95
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sound/soc/codecs/mc13783.c
View File

@ -580,7 +580,6 @@ static struct snd_kcontrol_new mc13783_control_list[] = {
static int mc13783_probe(struct snd_soc_codec *codec) static int mc13783_probe(struct snd_soc_codec *codec)
{ {
struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec); struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);
struct snd_soc_dapm_context *dapm = &codec->dapm;
mc13xxx_lock(priv->mc13xxx); mc13xxx_lock(priv->mc13xxx);
@ -592,14 +591,6 @@ static int mc13783_probe(struct snd_soc_codec *codec)
mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_CODEC, 0x180027); mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_CODEC, 0x180027);
mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_DAC, 0x0e0004); mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_DAC, 0x0e0004);
snd_soc_add_codec_controls(codec, mc13783_control_list,
ARRAY_SIZE(mc13783_control_list));
snd_soc_dapm_new_controls(dapm, mc13783_dapm_widgets,
ARRAY_SIZE(mc13783_dapm_widgets));
snd_soc_dapm_add_routes(dapm, mc13783_routes,
ARRAY_SIZE(mc13783_routes));
if (priv->adc_ssi_port == MC13783_SSI1_PORT) if (priv->adc_ssi_port == MC13783_SSI1_PORT)
mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_CODEC, mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_CODEC,
AUDIO_SSI_SEL, 0); AUDIO_SSI_SEL, 0);
@ -721,6 +712,12 @@ static struct snd_soc_codec_driver soc_codec_dev_mc13783 = {
.remove = mc13783_remove, .remove = mc13783_remove,
.read = mc13783_read, .read = mc13783_read,
.write = mc13783_write, .write = mc13783_write,
.controls = mc13783_control_list,
.num_controls = ARRAY_SIZE(mc13783_control_list),
.dapm_widgets = mc13783_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(mc13783_dapm_widgets),
.dapm_routes = mc13783_routes,
.num_dapm_routes = ARRAY_SIZE(mc13783_routes),
}; };
static int mc13783_codec_probe(struct platform_device *pdev) static int mc13783_codec_probe(struct platform_device *pdev)
@ -781,18 +778,7 @@ static struct platform_driver mc13783_codec_driver = {
.remove = __devexit_p(mc13783_codec_remove), .remove = __devexit_p(mc13783_codec_remove),
}; };
static __init int mc13783_init(void) module_platform_driver(mc13783_codec_driver);
{
return platform_driver_register(&mc13783_codec_driver);
}
static __exit void mc13783_exit(void)
{
platform_driver_unregister(&mc13783_codec_driver);
}
module_init(mc13783_init);
module_exit(mc13783_exit);
MODULE_DESCRIPTION("ASoC MC13783 driver"); MODULE_DESCRIPTION("ASoC MC13783 driver");
MODULE_AUTHOR("Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>"); MODULE_AUTHOR("Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>");