diff options
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 36 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-ac97.h | 6 |
2 files changed, 0 insertions, 42 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 130b12118d4f..885ba012557e 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c | |||
@@ -193,38 +193,6 @@ static struct snd_soc_card snd_soc_at91sam9g20ek = { | |||
193 | .set_bias_level = at91sam9g20ek_set_bias_level, | 193 | .set_bias_level = at91sam9g20ek_set_bias_level, |
194 | }; | 194 | }; |
195 | 195 | ||
196 | /* | ||
197 | * FIXME: This is a temporary bodge to avoid cross-tree merge issues. | ||
198 | * New drivers should register the wm8731 I2C device in the machine | ||
199 | * setup code (under arch/arm for ARM systems). | ||
200 | */ | ||
201 | static int wm8731_i2c_register(void) | ||
202 | { | ||
203 | struct i2c_board_info info; | ||
204 | struct i2c_adapter *adapter; | ||
205 | struct i2c_client *client; | ||
206 | |||
207 | memset(&info, 0, sizeof(struct i2c_board_info)); | ||
208 | info.addr = 0x1b; | ||
209 | strlcpy(info.type, "wm8731", I2C_NAME_SIZE); | ||
210 | |||
211 | adapter = i2c_get_adapter(0); | ||
212 | if (!adapter) { | ||
213 | printk(KERN_ERR "can't get i2c adapter 0\n"); | ||
214 | return -ENODEV; | ||
215 | } | ||
216 | |||
217 | client = i2c_new_device(adapter, &info); | ||
218 | i2c_put_adapter(adapter); | ||
219 | if (!client) { | ||
220 | printk(KERN_ERR "can't add i2c device at 0x%x\n", | ||
221 | (unsigned int)info.addr); | ||
222 | return -ENODEV; | ||
223 | } | ||
224 | |||
225 | return 0; | ||
226 | } | ||
227 | |||
228 | static struct snd_soc_device at91sam9g20ek_snd_devdata = { | 196 | static struct snd_soc_device at91sam9g20ek_snd_devdata = { |
229 | .card = &snd_soc_at91sam9g20ek, | 197 | .card = &snd_soc_at91sam9g20ek, |
230 | .codec_dev = &soc_codec_dev_wm8731, | 198 | .codec_dev = &soc_codec_dev_wm8731, |
@@ -279,10 +247,6 @@ static int __init at91sam9g20ek_init(void) | |||
279 | } | 247 | } |
280 | ssc_p->ssc = ssc; | 248 | ssc_p->ssc = ssc; |
281 | 249 | ||
282 | ret = wm8731_i2c_register(); | ||
283 | if (ret != 0) | ||
284 | goto err_ssc; | ||
285 | |||
286 | at91sam9g20ek_snd_device = platform_device_alloc("soc-audio", -1); | 250 | at91sam9g20ek_snd_device = platform_device_alloc("soc-audio", -1); |
287 | if (!at91sam9g20ek_snd_device) { | 251 | if (!at91sam9g20ek_snd_device) { |
288 | printk(KERN_ERR "ASoC: Platform device allocation failed\n"); | 252 | printk(KERN_ERR "ASoC: Platform device allocation failed\n"); |
diff --git a/sound/soc/s3c24xx/s3c24xx-ac97.h b/sound/soc/s3c24xx/s3c24xx-ac97.h index a96dcadf28b4..e96f941a810b 100644 --- a/sound/soc/s3c24xx/s3c24xx-ac97.h +++ b/sound/soc/s3c24xx/s3c24xx-ac97.h | |||
@@ -20,12 +20,6 @@ | |||
20 | #define AC_CMD_ADDR(x) (x << 16) | 20 | #define AC_CMD_ADDR(x) (x << 16) |
21 | #define AC_CMD_DATA(x) (x & 0xffff) | 21 | #define AC_CMD_DATA(x) (x & 0xffff) |
22 | 22 | ||
23 | #ifdef CONFIG_CPU_S3C2440 | ||
24 | #define IRQ_S3C244x_AC97 IRQ_S3C2440_AC97 | ||
25 | #else | ||
26 | #define IRQ_S3C244x_AC97 IRQ_S3C2443_AC97 | ||
27 | #endif | ||
28 | |||
29 | extern struct snd_soc_dai s3c2443_ac97_dai[]; | 23 | extern struct snd_soc_dai s3c2443_ac97_dai[]; |
30 | 24 | ||
31 | #endif /*S3C24XXAC97_H_*/ | 25 | #endif /*S3C24XXAC97_H_*/ |