diff options
Diffstat (limited to 'sound/soc/cirrus')
| -rw-r--r-- | sound/soc/cirrus/Kconfig | 3 | ||||
| -rw-r--r-- | sound/soc/cirrus/edb93xx.c | 1 | ||||
| -rw-r--r-- | sound/soc/cirrus/ep93xx-ac97.c | 3 | ||||
| -rw-r--r-- | sound/soc/cirrus/ep93xx-i2s.c | 1 | ||||
| -rw-r--r-- | sound/soc/cirrus/simone.c | 1 | ||||
| -rw-r--r-- | sound/soc/cirrus/snappercl15.c | 1 |
6 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/cirrus/Kconfig b/sound/soc/cirrus/Kconfig index 5477c5475923..7b7fbcd49e5e 100644 --- a/sound/soc/cirrus/Kconfig +++ b/sound/soc/cirrus/Kconfig @@ -36,7 +36,8 @@ config SND_EP93XX_SOC_EDB93XX tristate "SoC Audio support for Cirrus Logic EDB93xx boards" depends on SND_EP93XX_SOC && (MACH_EDB9301 || MACH_EDB9302 || MACH_EDB9302A || MACH_EDB9307A || MACH_EDB9315A) select SND_EP93XX_SOC_I2S - select SND_SOC_CS4271 + select SND_SOC_CS4271_I2C if I2C + select SND_SOC_CS4271_SPI if SPI_MASTER help Say Y or M here if you want to add support for I2S audio on the Cirrus Logic EDB93xx boards. diff --git a/sound/soc/cirrus/edb93xx.c b/sound/soc/cirrus/edb93xx.c index 4f900efc437c..85962657aabe 100644 --- a/sound/soc/cirrus/edb93xx.c +++ b/sound/soc/cirrus/edb93xx.c @@ -113,7 +113,6 @@ static int edb93xx_remove(struct platform_device *pdev) static struct platform_driver edb93xx_driver = { .driver = { .name = "edb93xx-audio", - .owner = THIS_MODULE, }, .probe = edb93xx_probe, .remove = edb93xx_remove, diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index f30dadf85b99..bbf7a9266a99 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -338,7 +338,7 @@ static const struct snd_soc_dai_ops ep93xx_ac97_dai_ops = { static struct snd_soc_dai_driver ep93xx_ac97_dai = { .name = "ep93xx-ac97", .id = 0, - .ac97_control = 1, + .bus_control = true, .probe = ep93xx_ac97_dai_probe, .playback = { .stream_name = "AC97 Playback", @@ -439,7 +439,6 @@ static struct platform_driver ep93xx_ac97_driver = { .remove = ep93xx_ac97_remove, .driver = { .name = "ep93xx-ac97", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 943145f9d1b6..934f8aefdd90 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -451,7 +451,6 @@ static struct platform_driver ep93xx_i2s_driver = { .remove = ep93xx_i2s_remove, .driver = { .name = "ep93xx-i2s", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/cirrus/simone.c b/sound/soc/cirrus/simone.c index 822a19a89e74..1ec661834e5a 100644 --- a/sound/soc/cirrus/simone.c +++ b/sound/soc/cirrus/simone.c @@ -74,7 +74,6 @@ static int simone_remove(struct platform_device *pdev) static struct platform_driver simone_driver = { .driver = { .name = "simone-audio", - .owner = THIS_MODULE, }, .probe = simone_probe, .remove = simone_remove, diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c index 5b68b106cfc2..98089df08df6 100644 --- a/sound/soc/cirrus/snappercl15.c +++ b/sound/soc/cirrus/snappercl15.c @@ -123,7 +123,6 @@ static int snappercl15_remove(struct platform_device *pdev) static struct platform_driver snappercl15_driver = { .driver = { .name = "snappercl15-audio", - .owner = THIS_MODULE, }, .probe = snappercl15_probe, .remove = snappercl15_remove, |