diff options
author | Ryan Mallon <rmallon@gmail.com> | 2012-01-10 19:04:42 -0500 |
---|---|---|
committer | Ryan Mallon <rmallon@gmail.com> | 2012-03-13 20:41:08 -0400 |
commit | f15855bfaad29b2badd4a5c30ad73e0542a19d16 (patch) | |
tree | 3e3b4680725ae0cc5935d9fc031c1b705a6fa6a9 /sound | |
parent | 258249ec0eaea479eead856ee49e336415f4b1df (diff) |
ep93xx: Don't use system controller defines in audio drivers
Both the Snapper CL15 and EDB93xx audio drivers set the same audio
configuration in ep93xx_i2s_acquire. Remove the arguments to
ep93xx_i2s_acquire so that the audio drivers no longer need the
EP93XX_SYSCON defines exported.
Signed-off-by: Ryan Mallon <rmallon@gmail.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Reviewed-by: Mika Westerberg <mika.westerberg@iki.fi>
Acked-by: Hartley Sweeten <hsweeten@visionengravers.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/ep93xx/edb93xx.c | 4 | ||||
-rw-r--r-- | sound/soc/ep93xx/snappercl15.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/ep93xx/edb93xx.c b/sound/soc/ep93xx/edb93xx.c index bae5cbbbd2b2..e01cb02abd3a 100644 --- a/sound/soc/ep93xx/edb93xx.c +++ b/sound/soc/ep93xx/edb93xx.c | |||
@@ -85,9 +85,7 @@ static int __devinit edb93xx_probe(struct platform_device *pdev) | |||
85 | struct snd_soc_card *card = &snd_soc_edb93xx; | 85 | struct snd_soc_card *card = &snd_soc_edb93xx; |
86 | int ret; | 86 | int ret; |
87 | 87 | ||
88 | ret = ep93xx_i2s_acquire(EP93XX_SYSCON_DEVCFG_I2SONAC97, | 88 | ret = ep93xx_i2s_acquire(); |
89 | EP93XX_SYSCON_I2SCLKDIV_ORIDE | | ||
90 | EP93XX_SYSCON_I2SCLKDIV_SPOL); | ||
91 | if (ret) | 89 | if (ret) |
92 | return ret; | 90 | return ret; |
93 | 91 | ||
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c index ccae34a3f280..a193cea3cf3c 100644 --- a/sound/soc/ep93xx/snappercl15.c +++ b/sound/soc/ep93xx/snappercl15.c | |||
@@ -103,9 +103,7 @@ static int __devinit snappercl15_probe(struct platform_device *pdev) | |||
103 | struct snd_soc_card *card = &snd_soc_snappercl15; | 103 | struct snd_soc_card *card = &snd_soc_snappercl15; |
104 | int ret; | 104 | int ret; |
105 | 105 | ||
106 | ret = ep93xx_i2s_acquire(EP93XX_SYSCON_DEVCFG_I2SONAC97, | 106 | ret = ep93xx_i2s_acquire(); |
107 | EP93XX_SYSCON_I2SCLKDIV_ORIDE | | ||
108 | EP93XX_SYSCON_I2SCLKDIV_SPOL); | ||
109 | if (ret) | 107 | if (ret) |
110 | return ret; | 108 | return ret; |
111 | 109 | ||