mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
ASoC: au1x: update db1200 machine to the new way of things
The use of the "soc-audio" platform device is no longer en vogue, update the code to the newer, simpler way of doing things. Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com> Acked-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
5b0912be7a
commit
adbc7a5a61
2 changed files with 56 additions and 24 deletions
|
@ -422,6 +422,7 @@ static struct resource au1200_psc1_res[] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* AC97 or I2S device */
|
||||||
static struct platform_device db1200_audio_dev = {
|
static struct platform_device db1200_audio_dev = {
|
||||||
/* name assigned later based on switch setting */
|
/* name assigned later based on switch setting */
|
||||||
.id = 1, /* PSC ID */
|
.id = 1, /* PSC ID */
|
||||||
|
@ -429,6 +430,12 @@ static struct platform_device db1200_audio_dev = {
|
||||||
.resource = au1200_psc1_res,
|
.resource = au1200_psc1_res,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* DB1200 ASoC card device */
|
||||||
|
static struct platform_device db1200_sound_dev = {
|
||||||
|
/* name assigned later based on switch setting */
|
||||||
|
.id = 1, /* PSC ID */
|
||||||
|
};
|
||||||
|
|
||||||
static struct platform_device db1200_stac_dev = {
|
static struct platform_device db1200_stac_dev = {
|
||||||
.name = "ac97-codec",
|
.name = "ac97-codec",
|
||||||
.id = 1, /* on PSC1 */
|
.id = 1, /* on PSC1 */
|
||||||
|
@ -448,6 +455,7 @@ static struct platform_device *db1200_devs[] __initdata = {
|
||||||
&db1200_audiodma_dev,
|
&db1200_audiodma_dev,
|
||||||
&db1200_audio_dev,
|
&db1200_audio_dev,
|
||||||
&db1200_stac_dev,
|
&db1200_stac_dev,
|
||||||
|
&db1200_sound_dev,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init db1200_dev_init(void)
|
static int __init db1200_dev_init(void)
|
||||||
|
@ -507,10 +515,12 @@ static int __init db1200_dev_init(void)
|
||||||
if (sw == BCSR_SWITCHES_DIP_8) {
|
if (sw == BCSR_SWITCHES_DIP_8) {
|
||||||
bcsr_mod(BCSR_RESETS, 0, BCSR_RESETS_PSC1MUX);
|
bcsr_mod(BCSR_RESETS, 0, BCSR_RESETS_PSC1MUX);
|
||||||
db1200_audio_dev.name = "au1xpsc_i2s";
|
db1200_audio_dev.name = "au1xpsc_i2s";
|
||||||
|
db1200_sound_dev.name = "db1200-i2s";
|
||||||
printk(KERN_INFO " S6.7 ON : PSC1 mode I2S\n");
|
printk(KERN_INFO " S6.7 ON : PSC1 mode I2S\n");
|
||||||
} else {
|
} else {
|
||||||
bcsr_mod(BCSR_RESETS, BCSR_RESETS_PSC1MUX, 0);
|
bcsr_mod(BCSR_RESETS, BCSR_RESETS_PSC1MUX, 0);
|
||||||
db1200_audio_dev.name = "au1xpsc_ac97";
|
db1200_audio_dev.name = "au1xpsc_ac97";
|
||||||
|
db1200_sound_dev.name = "db1200-ac97";
|
||||||
printk(KERN_INFO " S6.7 OFF: PSC1 mode AC97\n");
|
printk(KERN_INFO " S6.7 OFF: PSC1 mode AC97\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* DB1200 ASoC audio fabric support code.
|
* DB1200 ASoC audio fabric support code.
|
||||||
*
|
*
|
||||||
* (c) 2008-9 Manuel Lauss <manuel.lauss@gmail.com>
|
* (c) 2008-2011 Manuel Lauss <manuel.lauss@googlemail.com>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -21,6 +21,17 @@
|
||||||
#include "../codecs/wm8731.h"
|
#include "../codecs/wm8731.h"
|
||||||
#include "psc.h"
|
#include "psc.h"
|
||||||
|
|
||||||
|
static struct platform_device_id db1200_pids[] = {
|
||||||
|
{
|
||||||
|
.name = "db1200-ac97",
|
||||||
|
.driver_data = 0,
|
||||||
|
}, {
|
||||||
|
.name = "db1200-i2s",
|
||||||
|
.driver_data = 1,
|
||||||
|
},
|
||||||
|
{},
|
||||||
|
};
|
||||||
|
|
||||||
/*------------------------- AC97 PART ---------------------------*/
|
/*------------------------- AC97 PART ---------------------------*/
|
||||||
|
|
||||||
static struct snd_soc_dai_link db1200_ac97_dai = {
|
static struct snd_soc_dai_link db1200_ac97_dai = {
|
||||||
|
@ -89,36 +100,47 @@ static struct snd_soc_card db1200_i2s_machine = {
|
||||||
|
|
||||||
/*------------------------- COMMON PART ---------------------------*/
|
/*------------------------- COMMON PART ---------------------------*/
|
||||||
|
|
||||||
static struct platform_device *db1200_asoc_dev;
|
static struct snd_soc_card *db1200_cards[] __devinitdata = {
|
||||||
|
&db1200_ac97_machine,
|
||||||
|
&db1200_i2s_machine,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int __devinit db1200_audio_probe(struct platform_device *pdev)
|
||||||
|
{
|
||||||
|
const struct platform_device_id *pid = platform_get_device_id(pdev);
|
||||||
|
struct snd_soc_card *card;
|
||||||
|
|
||||||
|
card = db1200_cards[pid->driver_data];
|
||||||
|
card->dev = &pdev->dev;
|
||||||
|
return snd_soc_register_card(card);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int __devexit db1200_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 db1200_audio_driver = {
|
||||||
|
.driver = {
|
||||||
|
.name = "db1200-ac97",
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
.pm = &snd_soc_pm_ops,
|
||||||
|
},
|
||||||
|
.id_table = db1200_pids,
|
||||||
|
.probe = db1200_audio_probe,
|
||||||
|
.remove = __devexit_p(db1200_audio_remove),
|
||||||
|
};
|
||||||
|
|
||||||
static int __init db1200_audio_load(void)
|
static int __init db1200_audio_load(void)
|
||||||
{
|
{
|
||||||
int ret;
|
return platform_driver_register(&db1200_audio_driver);
|
||||||
|
|
||||||
ret = -ENOMEM;
|
|
||||||
db1200_asoc_dev = platform_device_alloc("soc-audio", 1); /* PSC1 */
|
|
||||||
if (!db1200_asoc_dev)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
/* DB1200 board setup set PSC1MUX to preferred audio device */
|
|
||||||
if (bcsr_read(BCSR_RESETS) & BCSR_RESETS_PSC1MUX)
|
|
||||||
platform_set_drvdata(db1200_asoc_dev, &db1200_i2s_machine);
|
|
||||||
else
|
|
||||||
platform_set_drvdata(db1200_asoc_dev, &db1200_ac97_machine);
|
|
||||||
|
|
||||||
ret = platform_device_add(db1200_asoc_dev);
|
|
||||||
|
|
||||||
if (ret) {
|
|
||||||
platform_device_put(db1200_asoc_dev);
|
|
||||||
db1200_asoc_dev = NULL;
|
|
||||||
}
|
|
||||||
out:
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __exit db1200_audio_unload(void)
|
static void __exit db1200_audio_unload(void)
|
||||||
{
|
{
|
||||||
platform_device_unregister(db1200_asoc_dev);
|
platform_driver_unregister(&db1200_audio_driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
module_init(db1200_audio_load);
|
module_init(db1200_audio_load);
|
||||||
|
|
Loading…
Reference in a new issue