diff options
Diffstat (limited to 'sound')
201 files changed, 33723 insertions, 4005 deletions
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index fbf5c933baa4..586965f9605f 100644 --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c | |||
@@ -1037,7 +1037,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) | |||
1037 | } | 1037 | } |
1038 | ldev->selfptr_headphone.ptr = ldev; | 1038 | ldev->selfptr_headphone.ptr = ldev; |
1039 | ldev->selfptr_lineout.ptr = ldev; | 1039 | ldev->selfptr_lineout.ptr = ldev; |
1040 | sdev->ofdev.dev.driver_data = ldev; | 1040 | dev_set_drvdata(&sdev->ofdev.dev, ldev); |
1041 | list_add(&ldev->list, &layouts_list); | 1041 | list_add(&ldev->list, &layouts_list); |
1042 | layouts_list_items++; | 1042 | layouts_list_items++; |
1043 | 1043 | ||
@@ -1081,7 +1081,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) | |||
1081 | 1081 | ||
1082 | static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) | 1082 | static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) |
1083 | { | 1083 | { |
1084 | struct layout_dev *ldev = sdev->ofdev.dev.driver_data; | 1084 | struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); |
1085 | int i; | 1085 | int i; |
1086 | 1086 | ||
1087 | for (i=0; i<MAX_CODECS_PER_BUS; i++) { | 1087 | for (i=0; i<MAX_CODECS_PER_BUS; i++) { |
@@ -1114,7 +1114,7 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) | |||
1114 | #ifdef CONFIG_PM | 1114 | #ifdef CONFIG_PM |
1115 | static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t state) | 1115 | static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t state) |
1116 | { | 1116 | { |
1117 | struct layout_dev *ldev = sdev->ofdev.dev.driver_data; | 1117 | struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); |
1118 | 1118 | ||
1119 | if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off) | 1119 | if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off) |
1120 | ldev->gpio.methods->all_amps_off(&ldev->gpio); | 1120 | ldev->gpio.methods->all_amps_off(&ldev->gpio); |
@@ -1124,7 +1124,7 @@ static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t sta | |||
1124 | 1124 | ||
1125 | static int aoa_fabric_layout_resume(struct soundbus_dev *sdev) | 1125 | static int aoa_fabric_layout_resume(struct soundbus_dev *sdev) |
1126 | { | 1126 | { |
1127 | struct layout_dev *ldev = sdev->ofdev.dev.driver_data; | 1127 | struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); |
1128 | 1128 | ||
1129 | if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off) | 1129 | if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off) |
1130 | ldev->gpio.methods->all_amps_restore(&ldev->gpio); | 1130 | ldev->gpio.methods->all_amps_restore(&ldev->gpio); |
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 418c84c99d69..4e3b819d4993 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c | |||
@@ -358,14 +358,14 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match) | |||
358 | return -ENODEV; | 358 | return -ENODEV; |
359 | } | 359 | } |
360 | 360 | ||
361 | dev->ofdev.dev.driver_data = control; | 361 | dev_set_drvdata(&dev->ofdev.dev, control); |
362 | 362 | ||
363 | return 0; | 363 | return 0; |
364 | } | 364 | } |
365 | 365 | ||
366 | static int i2sbus_remove(struct macio_dev* dev) | 366 | static int i2sbus_remove(struct macio_dev* dev) |
367 | { | 367 | { |
368 | struct i2sbus_control *control = dev->ofdev.dev.driver_data; | 368 | struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev); |
369 | struct i2sbus_dev *i2sdev, *tmp; | 369 | struct i2sbus_dev *i2sdev, *tmp; |
370 | 370 | ||
371 | list_for_each_entry_safe(i2sdev, tmp, &control->list, item) | 371 | list_for_each_entry_safe(i2sdev, tmp, &control->list, item) |
@@ -377,7 +377,7 @@ static int i2sbus_remove(struct macio_dev* dev) | |||
377 | #ifdef CONFIG_PM | 377 | #ifdef CONFIG_PM |
378 | static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state) | 378 | static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state) |
379 | { | 379 | { |
380 | struct i2sbus_control *control = dev->ofdev.dev.driver_data; | 380 | struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev); |
381 | struct codec_info_item *cii; | 381 | struct codec_info_item *cii; |
382 | struct i2sbus_dev* i2sdev; | 382 | struct i2sbus_dev* i2sdev; |
383 | int err, ret = 0; | 383 | int err, ret = 0; |
@@ -407,7 +407,7 @@ static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state) | |||
407 | 407 | ||
408 | static int i2sbus_resume(struct macio_dev* dev) | 408 | static int i2sbus_resume(struct macio_dev* dev) |
409 | { | 409 | { |
410 | struct i2sbus_control *control = dev->ofdev.dev.driver_data; | 410 | struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev); |
411 | struct codec_info_item *cii; | 411 | struct codec_info_item *cii; |
412 | struct i2sbus_dev* i2sdev; | 412 | struct i2sbus_dev* i2sdev; |
413 | int err, ret = 0; | 413 | int err, ret = 0; |
diff --git a/sound/core/Kconfig b/sound/core/Kconfig index 7bbdda041a99..6061fb5f4e1c 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig | |||
@@ -205,3 +205,5 @@ config SND_PCM_XRUN_DEBUG | |||
205 | 205 | ||
206 | config SND_VMASTER | 206 | config SND_VMASTER |
207 | bool | 207 | bool |
208 | |||
209 | source "sound/core/seq/Kconfig" | ||
diff --git a/sound/core/init.c b/sound/core/init.c index fd56afe846ed..d5d40d78c409 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -152,15 +152,8 @@ int snd_card_create(int idx, const char *xid, | |||
152 | card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL); | 152 | card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL); |
153 | if (!card) | 153 | if (!card) |
154 | return -ENOMEM; | 154 | return -ENOMEM; |
155 | if (xid) { | 155 | if (xid) |
156 | if (!snd_info_check_reserved_words(xid)) { | ||
157 | snd_printk(KERN_ERR | ||
158 | "given id string '%s' is reserved.\n", xid); | ||
159 | err = -EBUSY; | ||
160 | goto __error; | ||
161 | } | ||
162 | strlcpy(card->id, xid, sizeof(card->id)); | 156 | strlcpy(card->id, xid, sizeof(card->id)); |
163 | } | ||
164 | err = 0; | 157 | err = 0; |
165 | mutex_lock(&snd_card_mutex); | 158 | mutex_lock(&snd_card_mutex); |
166 | if (idx < 0) { | 159 | if (idx < 0) { |
@@ -483,22 +476,28 @@ int snd_card_free(struct snd_card *card) | |||
483 | 476 | ||
484 | EXPORT_SYMBOL(snd_card_free); | 477 | EXPORT_SYMBOL(snd_card_free); |
485 | 478 | ||
486 | static void choose_default_id(struct snd_card *card) | 479 | static void snd_card_set_id_no_lock(struct snd_card *card, const char *nid) |
487 | { | 480 | { |
488 | int i, len, idx_flag = 0, loops = SNDRV_CARDS; | 481 | int i, len, idx_flag = 0, loops = SNDRV_CARDS; |
489 | char *id, *spos; | 482 | const char *spos, *src; |
483 | char *id; | ||
490 | 484 | ||
491 | id = spos = card->shortname; | 485 | if (nid == NULL) { |
492 | while (*id != '\0') { | 486 | id = card->shortname; |
493 | if (*id == ' ') | 487 | spos = src = id; |
494 | spos = id + 1; | 488 | while (*id != '\0') { |
495 | id++; | 489 | if (*id == ' ') |
490 | spos = id + 1; | ||
491 | id++; | ||
492 | } | ||
493 | } else { | ||
494 | spos = src = nid; | ||
496 | } | 495 | } |
497 | id = card->id; | 496 | id = card->id; |
498 | while (*spos != '\0' && !isalnum(*spos)) | 497 | while (*spos != '\0' && !isalnum(*spos)) |
499 | spos++; | 498 | spos++; |
500 | if (isdigit(*spos)) | 499 | if (isdigit(*spos)) |
501 | *id++ = isalpha(card->shortname[0]) ? card->shortname[0] : 'D'; | 500 | *id++ = isalpha(src[0]) ? src[0] : 'D'; |
502 | while (*spos != '\0' && (size_t)(id - card->id) < sizeof(card->id) - 1) { | 501 | while (*spos != '\0' && (size_t)(id - card->id) < sizeof(card->id) - 1) { |
503 | if (isalnum(*spos)) | 502 | if (isalnum(*spos)) |
504 | *id++ = *spos; | 503 | *id++ = *spos; |
@@ -513,7 +512,7 @@ static void choose_default_id(struct snd_card *card) | |||
513 | 512 | ||
514 | while (1) { | 513 | while (1) { |
515 | if (loops-- == 0) { | 514 | if (loops-- == 0) { |
516 | snd_printk(KERN_ERR "unable to choose default card id (%s)\n", id); | 515 | snd_printk(KERN_ERR "unable to set card id (%s)\n", id); |
517 | strcpy(card->id, card->proc_root->name); | 516 | strcpy(card->id, card->proc_root->name); |
518 | return; | 517 | return; |
519 | } | 518 | } |
@@ -539,14 +538,33 @@ static void choose_default_id(struct snd_card *card) | |||
539 | spos = id + len - 2; | 538 | spos = id + len - 2; |
540 | if ((size_t)len <= sizeof(card->id) - 2) | 539 | if ((size_t)len <= sizeof(card->id) - 2) |
541 | spos++; | 540 | spos++; |
542 | *spos++ = '_'; | 541 | *(char *)spos++ = '_'; |
543 | *spos++ = '1'; | 542 | *(char *)spos++ = '1'; |
544 | *spos++ = '\0'; | 543 | *(char *)spos++ = '\0'; |
545 | idx_flag++; | 544 | idx_flag++; |
546 | } | 545 | } |
547 | } | 546 | } |
548 | } | 547 | } |
549 | 548 | ||
549 | /** | ||
550 | * snd_card_set_id - set card identification name | ||
551 | * @card: soundcard structure | ||
552 | * @nid: new identification string | ||
553 | * | ||
554 | * This function sets the card identification and checks for name | ||
555 | * collisions. | ||
556 | */ | ||
557 | void snd_card_set_id(struct snd_card *card, const char *nid) | ||
558 | { | ||
559 | /* check if user specified own card->id */ | ||
560 | if (card->id[0] != '\0') | ||
561 | return; | ||
562 | mutex_lock(&snd_card_mutex); | ||
563 | snd_card_set_id_no_lock(card, nid); | ||
564 | mutex_unlock(&snd_card_mutex); | ||
565 | } | ||
566 | EXPORT_SYMBOL(snd_card_set_id); | ||
567 | |||
550 | #ifndef CONFIG_SYSFS_DEPRECATED | 568 | #ifndef CONFIG_SYSFS_DEPRECATED |
551 | static ssize_t | 569 | static ssize_t |
552 | card_id_show_attr(struct device *dev, | 570 | card_id_show_attr(struct device *dev, |
@@ -640,8 +658,7 @@ int snd_card_register(struct snd_card *card) | |||
640 | mutex_unlock(&snd_card_mutex); | 658 | mutex_unlock(&snd_card_mutex); |
641 | return 0; | 659 | return 0; |
642 | } | 660 | } |
643 | if (card->id[0] == '\0') | 661 | snd_card_set_id_no_lock(card, card->id[0] == '\0' ? NULL : card->id); |
644 | choose_default_id(card); | ||
645 | snd_cards[card->number] = card; | 662 | snd_cards[card->number] = card; |
646 | mutex_unlock(&snd_card_mutex); | 663 | mutex_unlock(&snd_card_mutex); |
647 | init_info_for_card(card); | 664 | init_info_for_card(card); |
diff --git a/sound/core/jack.c b/sound/core/jack.c index d54d1a05fe65..f705eec7372a 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c | |||
@@ -63,7 +63,7 @@ static int snd_jack_dev_register(struct snd_device *device) | |||
63 | 63 | ||
64 | /* Default to the sound card device. */ | 64 | /* Default to the sound card device. */ |
65 | if (!jack->input_dev->dev.parent) | 65 | if (!jack->input_dev->dev.parent) |
66 | jack->input_dev->dev.parent = card->dev; | 66 | jack->input_dev->dev.parent = snd_card_get_device_link(card); |
67 | 67 | ||
68 | err = input_register_device(jack->input_dev); | 68 | err = input_register_device(jack->input_dev); |
69 | if (err == 0) | 69 | if (err == 0) |
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index dda000b9684c..dbe406b82591 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/time.h> | 31 | #include <linux/time.h> |
32 | #include <linux/vmalloc.h> | 32 | #include <linux/vmalloc.h> |
33 | #include <linux/moduleparam.h> | 33 | #include <linux/moduleparam.h> |
34 | #include <linux/math64.h> | ||
34 | #include <linux/string.h> | 35 | #include <linux/string.h> |
35 | #include <sound/core.h> | 36 | #include <sound/core.h> |
36 | #include <sound/minors.h> | 37 | #include <sound/minors.h> |
@@ -617,9 +618,7 @@ static long snd_pcm_oss_bytes(struct snd_pcm_substream *substream, long frames) | |||
617 | #else | 618 | #else |
618 | { | 619 | { |
619 | u64 bsize = (u64)runtime->oss.buffer_bytes * (u64)bytes; | 620 | u64 bsize = (u64)runtime->oss.buffer_bytes * (u64)bytes; |
620 | u32 rem; | 621 | return div_u64(bsize, buffer_size); |
621 | div64_32(&bsize, buffer_size, &rem); | ||
622 | return (long)bsize; | ||
623 | } | 622 | } |
624 | #endif | 623 | #endif |
625 | } | 624 | } |
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index d659995ac3ac..333e4dd29450 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
24 | #include <linux/time.h> | 24 | #include <linux/time.h> |
25 | #include <linux/math64.h> | ||
25 | #include <sound/core.h> | 26 | #include <sound/core.h> |
26 | #include <sound/control.h> | 27 | #include <sound/control.h> |
27 | #include <sound/info.h> | 28 | #include <sound/info.h> |
@@ -126,24 +127,37 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram | |||
126 | } | 127 | } |
127 | 128 | ||
128 | #ifdef CONFIG_SND_PCM_XRUN_DEBUG | 129 | #ifdef CONFIG_SND_PCM_XRUN_DEBUG |
129 | #define xrun_debug(substream) ((substream)->pstr->xrun_debug) | 130 | #define xrun_debug(substream, mask) ((substream)->pstr->xrun_debug & (mask)) |
130 | #else | 131 | #else |
131 | #define xrun_debug(substream) 0 | 132 | #define xrun_debug(substream, mask) 0 |
132 | #endif | 133 | #endif |
133 | 134 | ||
134 | #define dump_stack_on_xrun(substream) do { \ | 135 | #define dump_stack_on_xrun(substream) do { \ |
135 | if (xrun_debug(substream) > 1) \ | 136 | if (xrun_debug(substream, 2)) \ |
136 | dump_stack(); \ | 137 | dump_stack(); \ |
137 | } while (0) | 138 | } while (0) |
138 | 139 | ||
140 | static void pcm_debug_name(struct snd_pcm_substream *substream, | ||
141 | char *name, size_t len) | ||
142 | { | ||
143 | snprintf(name, len, "pcmC%dD%d%c:%d", | ||
144 | substream->pcm->card->number, | ||
145 | substream->pcm->device, | ||
146 | substream->stream ? 'c' : 'p', | ||
147 | substream->number); | ||
148 | } | ||
149 | |||
139 | static void xrun(struct snd_pcm_substream *substream) | 150 | static void xrun(struct snd_pcm_substream *substream) |
140 | { | 151 | { |
152 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
153 | |||
154 | if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) | ||
155 | snd_pcm_gettime(runtime, (struct timespec *)&runtime->status->tstamp); | ||
141 | snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); | 156 | snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); |
142 | if (xrun_debug(substream)) { | 157 | if (xrun_debug(substream, 1)) { |
143 | snd_printd(KERN_DEBUG "XRUN: pcmC%dD%d%c\n", | 158 | char name[16]; |
144 | substream->pcm->card->number, | 159 | pcm_debug_name(substream, name, sizeof(name)); |
145 | substream->pcm->device, | 160 | snd_printd(KERN_DEBUG "XRUN: %s\n", name); |
146 | substream->stream ? 'c' : 'p'); | ||
147 | dump_stack_on_xrun(substream); | 161 | dump_stack_on_xrun(substream); |
148 | } | 162 | } |
149 | } | 163 | } |
@@ -154,16 +168,16 @@ snd_pcm_update_hw_ptr_pos(struct snd_pcm_substream *substream, | |||
154 | { | 168 | { |
155 | snd_pcm_uframes_t pos; | 169 | snd_pcm_uframes_t pos; |
156 | 170 | ||
157 | if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) | ||
158 | snd_pcm_gettime(runtime, (struct timespec *)&runtime->status->tstamp); | ||
159 | pos = substream->ops->pointer(substream); | 171 | pos = substream->ops->pointer(substream); |
160 | if (pos == SNDRV_PCM_POS_XRUN) | 172 | if (pos == SNDRV_PCM_POS_XRUN) |
161 | return pos; /* XRUN */ | 173 | return pos; /* XRUN */ |
162 | if (pos >= runtime->buffer_size) { | 174 | if (pos >= runtime->buffer_size) { |
163 | if (printk_ratelimit()) { | 175 | if (printk_ratelimit()) { |
164 | snd_printd(KERN_ERR "BUG: stream = %i, pos = 0x%lx, " | 176 | char name[16]; |
177 | pcm_debug_name(substream, name, sizeof(name)); | ||
178 | snd_printd(KERN_ERR "BUG: %s, pos = 0x%lx, " | ||
165 | "buffer size = 0x%lx, period size = 0x%lx\n", | 179 | "buffer size = 0x%lx, period size = 0x%lx\n", |
166 | substream->stream, pos, runtime->buffer_size, | 180 | name, pos, runtime->buffer_size, |
167 | runtime->period_size); | 181 | runtime->period_size); |
168 | } | 182 | } |
169 | pos = 0; | 183 | pos = 0; |
@@ -197,7 +211,7 @@ static int snd_pcm_update_hw_ptr_post(struct snd_pcm_substream *substream, | |||
197 | 211 | ||
198 | #define hw_ptr_error(substream, fmt, args...) \ | 212 | #define hw_ptr_error(substream, fmt, args...) \ |
199 | do { \ | 213 | do { \ |
200 | if (xrun_debug(substream)) { \ | 214 | if (xrun_debug(substream, 1)) { \ |
201 | if (printk_ratelimit()) { \ | 215 | if (printk_ratelimit()) { \ |
202 | snd_printd("PCM: " fmt, ##args); \ | 216 | snd_printd("PCM: " fmt, ##args); \ |
203 | } \ | 217 | } \ |
@@ -251,7 +265,7 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) | |||
251 | } | 265 | } |
252 | 266 | ||
253 | /* Do jiffies check only in xrun_debug mode */ | 267 | /* Do jiffies check only in xrun_debug mode */ |
254 | if (!xrun_debug(substream)) | 268 | if (!xrun_debug(substream, 4)) |
255 | goto no_jiffies_check; | 269 | goto no_jiffies_check; |
256 | 270 | ||
257 | /* Skip the jiffies check for hardwares with BATCH flag. | 271 | /* Skip the jiffies check for hardwares with BATCH flag. |
@@ -261,6 +275,9 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) | |||
261 | if (runtime->hw.info & SNDRV_PCM_INFO_BATCH) | 275 | if (runtime->hw.info & SNDRV_PCM_INFO_BATCH) |
262 | goto no_jiffies_check; | 276 | goto no_jiffies_check; |
263 | hdelta = new_hw_ptr - old_hw_ptr; | 277 | hdelta = new_hw_ptr - old_hw_ptr; |
278 | if (hdelta < runtime->delay) | ||
279 | goto no_jiffies_check; | ||
280 | hdelta -= runtime->delay; | ||
264 | jdelta = jiffies - runtime->hw_ptr_jiffies; | 281 | jdelta = jiffies - runtime->hw_ptr_jiffies; |
265 | if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) { | 282 | if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) { |
266 | delta = jdelta / | 283 | delta = jdelta / |
@@ -294,14 +311,20 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) | |||
294 | hw_ptr_interrupt = | 311 | hw_ptr_interrupt = |
295 | new_hw_ptr - new_hw_ptr % runtime->period_size; | 312 | new_hw_ptr - new_hw_ptr % runtime->period_size; |
296 | } | 313 | } |
314 | runtime->hw_ptr_interrupt = hw_ptr_interrupt; | ||
315 | |||
297 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && | 316 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && |
298 | runtime->silence_size > 0) | 317 | runtime->silence_size > 0) |
299 | snd_pcm_playback_silence(substream, new_hw_ptr); | 318 | snd_pcm_playback_silence(substream, new_hw_ptr); |
300 | 319 | ||
320 | if (runtime->status->hw_ptr == new_hw_ptr) | ||
321 | return 0; | ||
322 | |||
301 | runtime->hw_ptr_base = hw_base; | 323 | runtime->hw_ptr_base = hw_base; |
302 | runtime->status->hw_ptr = new_hw_ptr; | 324 | runtime->status->hw_ptr = new_hw_ptr; |
303 | runtime->hw_ptr_jiffies = jiffies; | 325 | runtime->hw_ptr_jiffies = jiffies; |
304 | runtime->hw_ptr_interrupt = hw_ptr_interrupt; | 326 | if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) |
327 | snd_pcm_gettime(runtime, (struct timespec *)&runtime->status->tstamp); | ||
305 | 328 | ||
306 | return snd_pcm_update_hw_ptr_post(substream, runtime); | 329 | return snd_pcm_update_hw_ptr_post(substream, runtime); |
307 | } | 330 | } |
@@ -342,8 +365,12 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream) | |||
342 | new_hw_ptr = hw_base + pos; | 365 | new_hw_ptr = hw_base + pos; |
343 | } | 366 | } |
344 | /* Do jiffies check only in xrun_debug mode */ | 367 | /* Do jiffies check only in xrun_debug mode */ |
345 | if (xrun_debug(substream) && | 368 | if (!xrun_debug(substream, 4)) |
346 | ((delta * HZ) / runtime->rate) > jdelta + HZ/100) { | 369 | goto no_jiffies_check; |
370 | if (delta < runtime->delay) | ||
371 | goto no_jiffies_check; | ||
372 | delta -= runtime->delay; | ||
373 | if (((delta * HZ) / runtime->rate) > jdelta + HZ/100) { | ||
347 | hw_ptr_error(substream, | 374 | hw_ptr_error(substream, |
348 | "hw_ptr skipping! " | 375 | "hw_ptr skipping! " |
349 | "(pos=%ld, delta=%ld, period=%ld, jdelta=%lu/%lu)\n", | 376 | "(pos=%ld, delta=%ld, period=%ld, jdelta=%lu/%lu)\n", |
@@ -352,13 +379,19 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream) | |||
352 | ((delta * HZ) / runtime->rate)); | 379 | ((delta * HZ) / runtime->rate)); |
353 | return 0; | 380 | return 0; |
354 | } | 381 | } |
382 | no_jiffies_check: | ||
355 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && | 383 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && |
356 | runtime->silence_size > 0) | 384 | runtime->silence_size > 0) |
357 | snd_pcm_playback_silence(substream, new_hw_ptr); | 385 | snd_pcm_playback_silence(substream, new_hw_ptr); |
358 | 386 | ||
387 | if (runtime->status->hw_ptr == new_hw_ptr) | ||
388 | return 0; | ||
389 | |||
359 | runtime->hw_ptr_base = hw_base; | 390 | runtime->hw_ptr_base = hw_base; |
360 | runtime->status->hw_ptr = new_hw_ptr; | 391 | runtime->status->hw_ptr = new_hw_ptr; |
361 | runtime->hw_ptr_jiffies = jiffies; | 392 | runtime->hw_ptr_jiffies = jiffies; |
393 | if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) | ||
394 | snd_pcm_gettime(runtime, (struct timespec *)&runtime->status->tstamp); | ||
362 | 395 | ||
363 | return snd_pcm_update_hw_ptr_post(substream, runtime); | 396 | return snd_pcm_update_hw_ptr_post(substream, runtime); |
364 | } | 397 | } |
@@ -452,7 +485,7 @@ static inline unsigned int muldiv32(unsigned int a, unsigned int b, | |||
452 | *r = 0; | 485 | *r = 0; |
453 | return UINT_MAX; | 486 | return UINT_MAX; |
454 | } | 487 | } |
455 | div64_32(&n, c, r); | 488 | n = div_u64_rem(n, c, r); |
456 | if (n >= UINT_MAX) { | 489 | if (n >= UINT_MAX) { |
457 | *r = 0; | 490 | *r = 0; |
458 | return UINT_MAX; | 491 | return UINT_MAX; |
@@ -1524,6 +1557,23 @@ static int snd_pcm_lib_ioctl_channel_info(struct snd_pcm_substream *substream, | |||
1524 | return 0; | 1557 | return 0; |
1525 | } | 1558 | } |
1526 | 1559 | ||
1560 | static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream, | ||
1561 | void *arg) | ||
1562 | { | ||
1563 | struct snd_pcm_hw_params *params = arg; | ||
1564 | snd_pcm_format_t format; | ||
1565 | int channels, width; | ||
1566 | |||
1567 | params->fifo_size = substream->runtime->hw.fifo_size; | ||
1568 | if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_FIFO_IN_FRAMES)) { | ||
1569 | format = params_format(params); | ||
1570 | channels = params_channels(params); | ||
1571 | width = snd_pcm_format_physical_width(format); | ||
1572 | params->fifo_size /= width * channels; | ||
1573 | } | ||
1574 | return 0; | ||
1575 | } | ||
1576 | |||
1527 | /** | 1577 | /** |
1528 | * snd_pcm_lib_ioctl - a generic PCM ioctl callback | 1578 | * snd_pcm_lib_ioctl - a generic PCM ioctl callback |
1529 | * @substream: the pcm substream instance | 1579 | * @substream: the pcm substream instance |
@@ -1545,6 +1595,8 @@ int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream, | |||
1545 | return snd_pcm_lib_ioctl_reset(substream, arg); | 1595 | return snd_pcm_lib_ioctl_reset(substream, arg); |
1546 | case SNDRV_PCM_IOCTL1_CHANNEL_INFO: | 1596 | case SNDRV_PCM_IOCTL1_CHANNEL_INFO: |
1547 | return snd_pcm_lib_ioctl_channel_info(substream, arg); | 1597 | return snd_pcm_lib_ioctl_channel_info(substream, arg); |
1598 | case SNDRV_PCM_IOCTL1_FIFO_SIZE: | ||
1599 | return snd_pcm_lib_ioctl_fifo_size(substream, arg); | ||
1548 | } | 1600 | } |
1549 | return -ENXIO; | 1601 | return -ENXIO; |
1550 | } | 1602 | } |
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index b5da656d1ece..ac2150e0670d 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
@@ -312,9 +312,18 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, | |||
312 | 312 | ||
313 | hw = &substream->runtime->hw; | 313 | hw = &substream->runtime->hw; |
314 | if (!params->info) | 314 | if (!params->info) |
315 | params->info = hw->info; | 315 | params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES; |
316 | if (!params->fifo_size) | 316 | if (!params->fifo_size) { |
317 | params->fifo_size = hw->fifo_size; | 317 | if (snd_mask_min(¶ms->masks[SNDRV_PCM_HW_PARAM_FORMAT]) == |
318 | snd_mask_max(¶ms->masks[SNDRV_PCM_HW_PARAM_FORMAT]) && | ||
319 | snd_mask_min(¶ms->masks[SNDRV_PCM_HW_PARAM_CHANNELS]) == | ||
320 | snd_mask_max(¶ms->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) { | ||
321 | changed = substream->ops->ioctl(substream, | ||
322 | SNDRV_PCM_IOCTL1_FIFO_SIZE, params); | ||
323 | if (changed < 0) | ||
324 | return changed; | ||
325 | } | ||
326 | } | ||
318 | params->rmask = 0; | 327 | params->rmask = 0; |
319 | return 0; | 328 | return 0; |
320 | } | 329 | } |
@@ -587,14 +596,15 @@ int snd_pcm_status(struct snd_pcm_substream *substream, | |||
587 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { | 596 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { |
588 | status->avail = snd_pcm_playback_avail(runtime); | 597 | status->avail = snd_pcm_playback_avail(runtime); |
589 | if (runtime->status->state == SNDRV_PCM_STATE_RUNNING || | 598 | if (runtime->status->state == SNDRV_PCM_STATE_RUNNING || |
590 | runtime->status->state == SNDRV_PCM_STATE_DRAINING) | 599 | runtime->status->state == SNDRV_PCM_STATE_DRAINING) { |
591 | status->delay = runtime->buffer_size - status->avail; | 600 | status->delay = runtime->buffer_size - status->avail; |
592 | else | 601 | status->delay += runtime->delay; |
602 | } else | ||
593 | status->delay = 0; | 603 | status->delay = 0; |
594 | } else { | 604 | } else { |
595 | status->avail = snd_pcm_capture_avail(runtime); | 605 | status->avail = snd_pcm_capture_avail(runtime); |
596 | if (runtime->status->state == SNDRV_PCM_STATE_RUNNING) | 606 | if (runtime->status->state == SNDRV_PCM_STATE_RUNNING) |
597 | status->delay = status->avail; | 607 | status->delay = status->avail + runtime->delay; |
598 | else | 608 | else |
599 | status->delay = 0; | 609 | status->delay = 0; |
600 | } | 610 | } |
@@ -2410,6 +2420,7 @@ static int snd_pcm_delay(struct snd_pcm_substream *substream, | |||
2410 | n = snd_pcm_playback_hw_avail(runtime); | 2420 | n = snd_pcm_playback_hw_avail(runtime); |
2411 | else | 2421 | else |
2412 | n = snd_pcm_capture_avail(runtime); | 2422 | n = snd_pcm_capture_avail(runtime); |
2423 | n += runtime->delay; | ||
2413 | break; | 2424 | break; |
2414 | case SNDRV_PCM_STATE_XRUN: | 2425 | case SNDRV_PCM_STATE_XRUN: |
2415 | err = -EPIPE; | 2426 | err = -EPIPE; |
diff --git a/sound/core/seq/Kconfig b/sound/core/seq/Kconfig new file mode 100644 index 000000000000..b851fd890a89 --- /dev/null +++ b/sound/core/seq/Kconfig | |||
@@ -0,0 +1,16 @@ | |||
1 | # define SND_XXX_SEQ to min(SND_SEQUENCER,SND_XXX) | ||
2 | |||
3 | config SND_RAWMIDI_SEQ | ||
4 | def_tristate SND_SEQUENCER && SND_RAWMIDI | ||
5 | |||
6 | config SND_OPL3_LIB_SEQ | ||
7 | def_tristate SND_SEQUENCER && SND_OPL3_LIB | ||
8 | |||
9 | config SND_OPL4_LIB_SEQ | ||
10 | def_tristate SND_SEQUENCER && SND_OPL4_LIB | ||
11 | |||
12 | config SND_SBAWE_SEQ | ||
13 | def_tristate SND_SEQUENCER && SND_SBAWE | ||
14 | |||
15 | config SND_EMU10K1_SEQ | ||
16 | def_tristate SND_SEQUENCER && SND_EMU10K1 | ||
diff --git a/sound/core/seq/Makefile b/sound/core/seq/Makefile index 069593717fba..1bcb360330e5 100644 --- a/sound/core/seq/Makefile +++ b/sound/core/seq/Makefile | |||
@@ -17,14 +17,6 @@ snd-seq-midi-event-objs := seq_midi_event.o | |||
17 | snd-seq-dummy-objs := seq_dummy.o | 17 | snd-seq-dummy-objs := seq_dummy.o |
18 | snd-seq-virmidi-objs := seq_virmidi.o | 18 | snd-seq-virmidi-objs := seq_virmidi.o |
19 | 19 | ||
20 | # | ||
21 | # this function returns: | ||
22 | # "m" - CONFIG_SND_SEQUENCER is m | ||
23 | # <empty string> - CONFIG_SND_SEQUENCER is undefined | ||
24 | # otherwise parameter #1 value | ||
25 | # | ||
26 | sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) | ||
27 | |||
28 | obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o snd-seq-device.o | 20 | obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o snd-seq-device.o |
29 | ifeq ($(CONFIG_SND_SEQUENCER_OSS),y) | 21 | ifeq ($(CONFIG_SND_SEQUENCER_OSS),y) |
30 | obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o | 22 | obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o |
@@ -33,8 +25,8 @@ obj-$(CONFIG_SND_SEQ_DUMMY) += snd-seq-dummy.o | |||
33 | 25 | ||
34 | # Toplevel Module Dependency | 26 | # Toplevel Module Dependency |
35 | obj-$(CONFIG_SND_VIRMIDI) += snd-seq-virmidi.o snd-seq-midi-event.o | 27 | obj-$(CONFIG_SND_VIRMIDI) += snd-seq-virmidi.o snd-seq-midi-event.o |
36 | obj-$(call sequencer,$(CONFIG_SND_RAWMIDI)) += snd-seq-midi.o snd-seq-midi-event.o | 28 | obj-$(CONFIG_SND_RAWMIDI_SEQ) += snd-seq-midi.o snd-seq-midi-event.o |
37 | obj-$(call sequencer,$(CONFIG_SND_OPL3_LIB)) += snd-seq-midi-event.o snd-seq-midi-emul.o | 29 | obj-$(CONFIG_SND_OPL3_LIB_SEQ) += snd-seq-midi-event.o snd-seq-midi-emul.o |
38 | obj-$(call sequencer,$(CONFIG_SND_OPL4_LIB)) += snd-seq-midi-event.o snd-seq-midi-emul.o | 30 | obj-$(CONFIG_SND_OPL4_LIB_SEQ) += snd-seq-midi-event.o snd-seq-midi-emul.o |
39 | obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-seq-midi-emul.o snd-seq-virmidi.o | 31 | obj-$(CONFIG_SND_SBAWE_SEQ) += snd-seq-midi-emul.o snd-seq-virmidi.o |
40 | obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-seq-midi-emul.o snd-seq-virmidi.o | 32 | obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-seq-midi-emul.o snd-seq-virmidi.o |
diff --git a/sound/drivers/opl3/Makefile b/sound/drivers/opl3/Makefile index 19767a6a5c54..7f2c2a10c4e5 100644 --- a/sound/drivers/opl3/Makefile +++ b/sound/drivers/opl3/Makefile | |||
@@ -7,14 +7,6 @@ snd-opl3-lib-objs := opl3_lib.o opl3_synth.o | |||
7 | snd-opl3-synth-y := opl3_seq.o opl3_midi.o opl3_drums.o | 7 | snd-opl3-synth-y := opl3_seq.o opl3_midi.o opl3_drums.o |
8 | snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o | 8 | snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o |
9 | 9 | ||
10 | # | ||
11 | # this function returns: | ||
12 | # "m" - CONFIG_SND_SEQUENCER is m | ||
13 | # <empty string> - CONFIG_SND_SEQUENCER is undefined | ||
14 | # otherwise parameter #1 value | ||
15 | # | ||
16 | sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) | ||
17 | |||
18 | obj-$(CONFIG_SND_OPL3_LIB) += snd-opl3-lib.o | 10 | obj-$(CONFIG_SND_OPL3_LIB) += snd-opl3-lib.o |
19 | obj-$(CONFIG_SND_OPL4_LIB) += snd-opl3-lib.o | 11 | obj-$(CONFIG_SND_OPL4_LIB) += snd-opl3-lib.o |
20 | obj-$(call sequencer,$(CONFIG_SND_OPL3_LIB)) += snd-opl3-synth.o | 12 | obj-$(CONFIG_SND_OPL3_LIB_SEQ) += snd-opl3-synth.o |
diff --git a/sound/drivers/opl4/Makefile b/sound/drivers/opl4/Makefile index d178b39ffa60..b94009b0b19f 100644 --- a/sound/drivers/opl4/Makefile +++ b/sound/drivers/opl4/Makefile | |||
@@ -6,13 +6,5 @@ | |||
6 | snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o opl4_proc.o | 6 | snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o opl4_proc.o |
7 | snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o | 7 | snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o |
8 | 8 | ||
9 | # | ||
10 | # this function returns: | ||
11 | # "m" - CONFIG_SND_SEQUENCER is m | ||
12 | # <empty string> - CONFIG_SND_SEQUENCER is undefined | ||
13 | # otherwise parameter #1 value | ||
14 | # | ||
15 | sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) | ||
16 | |||
17 | obj-$(CONFIG_SND_OPL4_LIB) += snd-opl4-lib.o | 9 | obj-$(CONFIG_SND_OPL4_LIB) += snd-opl4-lib.o |
18 | obj-$(call sequencer,$(CONFIG_SND_OPL4_LIB)) += snd-opl4-synth.o | 10 | obj-$(CONFIG_SND_OPL4_LIB_SEQ) += snd-opl4-synth.o |
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index c6942a4de99b..51a7e3777e17 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig | |||
@@ -177,15 +177,18 @@ config SND_ES18XX | |||
177 | will be called snd-es18xx. | 177 | will be called snd-es18xx. |
178 | 178 | ||
179 | config SND_SC6000 | 179 | config SND_SC6000 |
180 | tristate "Gallant SC-6000, Audio Excel DSP 16" | 180 | tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16" |
181 | depends on HAS_IOPORT | 181 | depends on HAS_IOPORT |
182 | select SND_WSS_LIB | 182 | select SND_WSS_LIB |
183 | select SND_OPL3_LIB | 183 | select SND_OPL3_LIB |
184 | select SND_MPU401_UART | 184 | select SND_MPU401_UART |
185 | help | 185 | help |
186 | Say Y here to include support for Gallant SC-6000 card and clones: | 186 | Say Y here to include support for Gallant SC-6000, SC-6600, SC-7000 |
187 | cards and clones: | ||
187 | Audio Excel DSP 16 and Zoltrix AV302. | 188 | Audio Excel DSP 16 and Zoltrix AV302. |
188 | 189 | ||
190 | These cards are based on CompuMedia ASC-9308 or ASC-9408 chips. | ||
191 | |||
189 | To compile this driver as a module, choose M here: the module | 192 | To compile this driver as a module, choose M here: the module |
190 | will be called snd-sc6000. | 193 | will be called snd-sc6000. |
191 | 194 | ||
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c index 442b081cafb7..07df201ed8fa 100644 --- a/sound/isa/es1688/es1688.c +++ b/sound/isa/es1688/es1688.c | |||
@@ -193,7 +193,7 @@ static int __devexit snd_es1688_remove(struct device *dev, unsigned int n) | |||
193 | static struct isa_driver snd_es1688_driver = { | 193 | static struct isa_driver snd_es1688_driver = { |
194 | .match = snd_es1688_match, | 194 | .match = snd_es1688_match, |
195 | .probe = snd_es1688_probe, | 195 | .probe = snd_es1688_probe, |
196 | .remove = snd_es1688_remove, | 196 | .remove = __devexit_p(snd_es1688_remove), |
197 | #if 0 /* FIXME */ | 197 | #if 0 /* FIXME */ |
198 | .suspend = snd_es1688_suspend, | 198 | .suspend = snd_es1688_suspend, |
199 | .resume = snd_es1688_resume, | 199 | .resume = snd_es1688_resume, |
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c index 180a8dea6bd9..65e4b18581a6 100644 --- a/sound/isa/gus/gusextreme.c +++ b/sound/isa/gus/gusextreme.c | |||
@@ -348,7 +348,7 @@ static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n) | |||
348 | static struct isa_driver snd_gusextreme_driver = { | 348 | static struct isa_driver snd_gusextreme_driver = { |
349 | .match = snd_gusextreme_match, | 349 | .match = snd_gusextreme_match, |
350 | .probe = snd_gusextreme_probe, | 350 | .probe = snd_gusextreme_probe, |
351 | .remove = snd_gusextreme_remove, | 351 | .remove = __devexit_p(snd_gusextreme_remove), |
352 | #if 0 /* FIXME */ | 352 | #if 0 /* FIXME */ |
353 | .suspend = snd_gusextreme_suspend, | 353 | .suspend = snd_gusextreme_suspend, |
354 | .resume = snd_gusextreme_resume, | 354 | .resume = snd_gusextreme_resume, |
diff --git a/sound/isa/sb/Makefile b/sound/isa/sb/Makefile index 1098a56b2f4b..faeffceb01b7 100644 --- a/sound/isa/sb/Makefile +++ b/sound/isa/sb/Makefile | |||
@@ -13,14 +13,6 @@ snd-sbawe-objs := sbawe.o emu8000.o | |||
13 | snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o | 13 | snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o |
14 | snd-es968-objs := es968.o | 14 | snd-es968-objs := es968.o |
15 | 15 | ||
16 | # | ||
17 | # this function returns: | ||
18 | # "m" - CONFIG_SND_SEQUENCER is m | ||
19 | # <empty string> - CONFIG_SND_SEQUENCER is undefined | ||
20 | # otherwise parameter #1 value | ||
21 | # | ||
22 | sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) | ||
23 | |||
24 | # Toplevel Module Dependency | 16 | # Toplevel Module Dependency |
25 | obj-$(CONFIG_SND_SB_COMMON) += snd-sb-common.o | 17 | obj-$(CONFIG_SND_SB_COMMON) += snd-sb-common.o |
26 | obj-$(CONFIG_SND_SB16_DSP) += snd-sb16-dsp.o | 18 | obj-$(CONFIG_SND_SB16_DSP) += snd-sb16-dsp.o |
@@ -33,4 +25,4 @@ ifeq ($(CONFIG_SND_SB16_CSP),y) | |||
33 | obj-$(CONFIG_SND_SB16) += snd-sb16-csp.o | 25 | obj-$(CONFIG_SND_SB16) += snd-sb16-csp.o |
34 | obj-$(CONFIG_SND_SBAWE) += snd-sb16-csp.o | 26 | obj-$(CONFIG_SND_SBAWE) += snd-sb16-csp.o |
35 | endif | 27 | endif |
36 | obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-emu8000-synth.o | 28 | obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emu8000-synth.o |
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c index 782010608ef4..9a8bbf6dd62a 100644 --- a/sound/isa/sc6000.c +++ b/sound/isa/sc6000.c | |||
@@ -2,6 +2,8 @@ | |||
2 | * Driver for Gallant SC-6000 soundcard. This card is also known as | 2 | * Driver for Gallant SC-6000 soundcard. This card is also known as |
3 | * Audio Excel DSP 16 or Zoltrix AV302. | 3 | * Audio Excel DSP 16 or Zoltrix AV302. |
4 | * These cards use CompuMedia ASC-9308 chip + AD1848 codec. | 4 | * These cards use CompuMedia ASC-9308 chip + AD1848 codec. |
5 | * SC-6600 and SC-7000 cards are also supported. They are based on | ||
6 | * CompuMedia ASC-9408 chip and CS4231 codec. | ||
5 | * | 7 | * |
6 | * Copyright (C) 2007 Krzysztof Helt <krzysztof.h1@wp.pl> | 8 | * Copyright (C) 2007 Krzysztof Helt <krzysztof.h1@wp.pl> |
7 | * | 9 | * |
@@ -54,6 +56,7 @@ static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; | |||
54 | /* 0x300, 0x310, 0x320, 0x330 */ | 56 | /* 0x300, 0x310, 0x320, 0x330 */ |
55 | static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5, 7, 9, 10, 0 */ | 57 | static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5, 7, 9, 10, 0 */ |
56 | static int dma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0, 1, 3 */ | 58 | static int dma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0, 1, 3 */ |
59 | static bool joystick[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = false }; | ||
57 | 60 | ||
58 | module_param_array(index, int, NULL, 0444); | 61 | module_param_array(index, int, NULL, 0444); |
59 | MODULE_PARM_DESC(index, "Index value for sc-6000 based soundcard."); | 62 | MODULE_PARM_DESC(index, "Index value for sc-6000 based soundcard."); |
@@ -73,6 +76,8 @@ module_param_array(mpu_irq, int, NULL, 0444); | |||
73 | MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for sc-6000 driver."); | 76 | MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for sc-6000 driver."); |
74 | module_param_array(dma, int, NULL, 0444); | 77 | module_param_array(dma, int, NULL, 0444); |
75 | MODULE_PARM_DESC(dma, "DMA # for sc-6000 driver."); | 78 | MODULE_PARM_DESC(dma, "DMA # for sc-6000 driver."); |
79 | module_param_array(joystick, bool, NULL, 0444); | ||
80 | MODULE_PARM_DESC(joystick, "Enable gameport."); | ||
76 | 81 | ||
77 | /* | 82 | /* |
78 | * Commands of SC6000's DSP (SBPRO+special). | 83 | * Commands of SC6000's DSP (SBPRO+special). |
@@ -191,7 +196,7 @@ static __devinit unsigned char sc6000_mpu_irq_to_softcfg(int mpu_irq) | |||
191 | return val; | 196 | return val; |
192 | } | 197 | } |
193 | 198 | ||
194 | static __devinit int sc6000_wait_data(char __iomem *vport) | 199 | static int sc6000_wait_data(char __iomem *vport) |
195 | { | 200 | { |
196 | int loop = 1000; | 201 | int loop = 1000; |
197 | unsigned char val = 0; | 202 | unsigned char val = 0; |
@@ -206,7 +211,7 @@ static __devinit int sc6000_wait_data(char __iomem *vport) | |||
206 | return -EAGAIN; | 211 | return -EAGAIN; |
207 | } | 212 | } |
208 | 213 | ||
209 | static __devinit int sc6000_read(char __iomem *vport) | 214 | static int sc6000_read(char __iomem *vport) |
210 | { | 215 | { |
211 | if (sc6000_wait_data(vport)) | 216 | if (sc6000_wait_data(vport)) |
212 | return -EBUSY; | 217 | return -EBUSY; |
@@ -215,7 +220,7 @@ static __devinit int sc6000_read(char __iomem *vport) | |||
215 | 220 | ||
216 | } | 221 | } |
217 | 222 | ||
218 | static __devinit int sc6000_write(char __iomem *vport, int cmd) | 223 | static int sc6000_write(char __iomem *vport, int cmd) |
219 | { | 224 | { |
220 | unsigned char val; | 225 | unsigned char val; |
221 | int loop = 500000; | 226 | int loop = 500000; |
@@ -276,8 +281,33 @@ static int __devinit sc6000_dsp_reset(char __iomem *vport) | |||
276 | } | 281 | } |
277 | 282 | ||
278 | /* detection and initialization */ | 283 | /* detection and initialization */ |
279 | static int __devinit sc6000_cfg_write(char __iomem *vport, | 284 | static int __devinit sc6000_hw_cfg_write(char __iomem *vport, const int *cfg) |
280 | unsigned char softcfg) | 285 | { |
286 | if (sc6000_write(vport, COMMAND_6C) < 0) { | ||
287 | snd_printk(KERN_WARNING "CMD 0x%x: failed!\n", COMMAND_6C); | ||
288 | return -EIO; | ||
289 | } | ||
290 | if (sc6000_write(vport, COMMAND_5C) < 0) { | ||
291 | snd_printk(KERN_ERR "CMD 0x%x: failed!\n", COMMAND_5C); | ||
292 | return -EIO; | ||
293 | } | ||
294 | if (sc6000_write(vport, cfg[0]) < 0) { | ||
295 | snd_printk(KERN_ERR "DATA 0x%x: failed!\n", cfg[0]); | ||
296 | return -EIO; | ||
297 | } | ||
298 | if (sc6000_write(vport, cfg[1]) < 0) { | ||
299 | snd_printk(KERN_ERR "DATA 0x%x: failed!\n", cfg[1]); | ||
300 | return -EIO; | ||
301 | } | ||
302 | if (sc6000_write(vport, COMMAND_C5) < 0) { | ||
303 | snd_printk(KERN_ERR "CMD 0x%x: failed!\n", COMMAND_C5); | ||
304 | return -EIO; | ||
305 | } | ||
306 | |||
307 | return 0; | ||
308 | } | ||
309 | |||
310 | static int sc6000_cfg_write(char __iomem *vport, unsigned char softcfg) | ||
281 | { | 311 | { |
282 | 312 | ||
283 | if (sc6000_write(vport, WRITE_MDIRQ_CFG)) { | 313 | if (sc6000_write(vport, WRITE_MDIRQ_CFG)) { |
@@ -291,7 +321,7 @@ static int __devinit sc6000_cfg_write(char __iomem *vport, | |||
291 | return 0; | 321 | return 0; |
292 | } | 322 | } |
293 | 323 | ||
294 | static int __devinit sc6000_setup_board(char __iomem *vport, int config) | 324 | static int sc6000_setup_board(char __iomem *vport, int config) |
295 | { | 325 | { |
296 | int loop = 10; | 326 | int loop = 10; |
297 | 327 | ||
@@ -334,16 +364,39 @@ static int __devinit sc6000_init_mss(char __iomem *vport, int config, | |||
334 | return 0; | 364 | return 0; |
335 | } | 365 | } |
336 | 366 | ||
337 | static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma, | 367 | static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg, |
338 | char __iomem *vmss_port, int mpu_irq) | 368 | long xport, long xmpu, |
369 | long xmss_port, int joystick) | ||
370 | { | ||
371 | cfg[0] = 0; | ||
372 | cfg[1] = 0; | ||
373 | if (xport == 0x240) | ||
374 | cfg[0] |= 1; | ||
375 | if (xmpu != SNDRV_AUTO_PORT) { | ||
376 | cfg[0] |= (xmpu & 0x30) >> 2; | ||
377 | cfg[1] |= 0x20; | ||
378 | } | ||
379 | if (xmss_port == 0xe80) | ||
380 | cfg[0] |= 0x10; | ||
381 | cfg[0] |= 0x40; /* always set */ | ||
382 | if (!joystick) | ||
383 | cfg[0] |= 0x02; | ||
384 | cfg[1] |= 0x80; /* enable WSS system */ | ||
385 | cfg[1] &= ~0x40; /* disable IDE */ | ||
386 | snd_printd("hw cfg %x, %x\n", cfg[0], cfg[1]); | ||
387 | } | ||
388 | |||
389 | static int __devinit sc6000_init_board(char __iomem *vport, | ||
390 | char __iomem *vmss_port, int dev) | ||
339 | { | 391 | { |
340 | char answer[15]; | 392 | char answer[15]; |
341 | char version[2]; | 393 | char version[2]; |
342 | int mss_config = sc6000_irq_to_softcfg(irq) | | 394 | int mss_config = sc6000_irq_to_softcfg(irq[dev]) | |
343 | sc6000_dma_to_softcfg(dma); | 395 | sc6000_dma_to_softcfg(dma[dev]); |
344 | int config = mss_config | | 396 | int config = mss_config | |
345 | sc6000_mpu_irq_to_softcfg(mpu_irq); | 397 | sc6000_mpu_irq_to_softcfg(mpu_irq[dev]); |
346 | int err; | 398 | int err; |
399 | int old = 0; | ||
347 | 400 | ||
348 | err = sc6000_dsp_reset(vport); | 401 | err = sc6000_dsp_reset(vport); |
349 | if (err < 0) { | 402 | if (err < 0) { |
@@ -360,7 +413,6 @@ static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma, | |||
360 | /* | 413 | /* |
361 | * My SC-6000 card return "SC-6000" in DSPCopyright, so | 414 | * My SC-6000 card return "SC-6000" in DSPCopyright, so |
362 | * if we have something different, we have to be warned. | 415 | * if we have something different, we have to be warned. |
363 | * Mine returns "SC-6000A " - KH | ||
364 | */ | 416 | */ |
365 | if (strncmp("SC-6000", answer, 7)) | 417 | if (strncmp("SC-6000", answer, 7)) |
366 | snd_printk(KERN_WARNING "Warning: non SC-6000 audio card!\n"); | 418 | snd_printk(KERN_WARNING "Warning: non SC-6000 audio card!\n"); |
@@ -372,13 +424,32 @@ static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma, | |||
372 | printk(KERN_INFO PFX "Detected model: %s, DSP version %d.%d\n", | 424 | printk(KERN_INFO PFX "Detected model: %s, DSP version %d.%d\n", |
373 | answer, version[0], version[1]); | 425 | answer, version[0], version[1]); |
374 | 426 | ||
375 | /* | 427 | /* set configuration */ |
376 | * 0x0A == (IRQ 7, DMA 1, MIRQ 0) | 428 | sc6000_write(vport, COMMAND_5C); |
377 | */ | 429 | if (sc6000_read(vport) < 0) |
378 | err = sc6000_cfg_write(vport, 0x0a); | 430 | old = 1; |
431 | |||
432 | if (!old) { | ||
433 | int cfg[2]; | ||
434 | sc6000_hw_cfg_encode(vport, &cfg[0], port[dev], mpu_port[dev], | ||
435 | mss_port[dev], joystick[dev]); | ||
436 | if (sc6000_hw_cfg_write(vport, cfg) < 0) { | ||
437 | snd_printk(KERN_ERR "sc6000_hw_cfg_write: failed!\n"); | ||
438 | return -EIO; | ||
439 | } | ||
440 | } | ||
441 | err = sc6000_setup_board(vport, config); | ||
379 | if (err < 0) { | 442 | if (err < 0) { |
380 | snd_printk(KERN_ERR "sc6000_cfg_write: failed!\n"); | 443 | snd_printk(KERN_ERR "sc6000_setup_board: failed!\n"); |
381 | return -EFAULT; | 444 | return -ENODEV; |
445 | } | ||
446 | |||
447 | sc6000_dsp_reset(vport); | ||
448 | |||
449 | if (!old) { | ||
450 | sc6000_write(vport, COMMAND_60); | ||
451 | sc6000_write(vport, 0x02); | ||
452 | sc6000_dsp_reset(vport); | ||
382 | } | 453 | } |
383 | 454 | ||
384 | err = sc6000_setup_board(vport, config); | 455 | err = sc6000_setup_board(vport, config); |
@@ -386,10 +457,9 @@ static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma, | |||
386 | snd_printk(KERN_ERR "sc6000_setup_board: failed!\n"); | 457 | snd_printk(KERN_ERR "sc6000_setup_board: failed!\n"); |
387 | return -ENODEV; | 458 | return -ENODEV; |
388 | } | 459 | } |
389 | |||
390 | err = sc6000_init_mss(vport, config, vmss_port, mss_config); | 460 | err = sc6000_init_mss(vport, config, vmss_port, mss_config); |
391 | if (err < 0) { | 461 | if (err < 0) { |
392 | snd_printk(KERN_ERR "Can not initialize " | 462 | snd_printk(KERN_ERR "Cannot initialize " |
393 | "Microsoft Sound System mode.\n"); | 463 | "Microsoft Sound System mode.\n"); |
394 | return -ENODEV; | 464 | return -ENODEV; |
395 | } | 465 | } |
@@ -485,14 +555,16 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) | |||
485 | struct snd_card *card; | 555 | struct snd_card *card; |
486 | struct snd_wss *chip; | 556 | struct snd_wss *chip; |
487 | struct snd_opl3 *opl3; | 557 | struct snd_opl3 *opl3; |
488 | char __iomem *vport; | 558 | char __iomem **vport; |
489 | char __iomem *vmss_port; | 559 | char __iomem *vmss_port; |
490 | 560 | ||
491 | 561 | ||
492 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | 562 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, sizeof(vport), |
563 | &card); | ||
493 | if (err < 0) | 564 | if (err < 0) |
494 | return err; | 565 | return err; |
495 | 566 | ||
567 | vport = card->private_data; | ||
496 | if (xirq == SNDRV_AUTO_IRQ) { | 568 | if (xirq == SNDRV_AUTO_IRQ) { |
497 | xirq = snd_legacy_find_free_irq(possible_irqs); | 569 | xirq = snd_legacy_find_free_irq(possible_irqs); |
498 | if (xirq < 0) { | 570 | if (xirq < 0) { |
@@ -517,8 +589,8 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) | |||
517 | err = -EBUSY; | 589 | err = -EBUSY; |
518 | goto err_exit; | 590 | goto err_exit; |
519 | } | 591 | } |
520 | vport = devm_ioport_map(devptr, port[dev], 0x10); | 592 | *vport = devm_ioport_map(devptr, port[dev], 0x10); |
521 | if (!vport) { | 593 | if (*vport == NULL) { |
522 | snd_printk(KERN_ERR PFX | 594 | snd_printk(KERN_ERR PFX |
523 | "I/O port cannot be iomaped.\n"); | 595 | "I/O port cannot be iomaped.\n"); |
524 | err = -EBUSY; | 596 | err = -EBUSY; |
@@ -533,7 +605,7 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) | |||
533 | goto err_unmap1; | 605 | goto err_unmap1; |
534 | } | 606 | } |
535 | vmss_port = devm_ioport_map(devptr, mss_port[dev], 4); | 607 | vmss_port = devm_ioport_map(devptr, mss_port[dev], 4); |
536 | if (!vport) { | 608 | if (!vmss_port) { |
537 | snd_printk(KERN_ERR PFX | 609 | snd_printk(KERN_ERR PFX |
538 | "MSS port I/O cannot be iomaped.\n"); | 610 | "MSS port I/O cannot be iomaped.\n"); |
539 | err = -EBUSY; | 611 | err = -EBUSY; |
@@ -544,7 +616,7 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) | |||
544 | port[dev], xirq, xdma, | 616 | port[dev], xirq, xdma, |
545 | mpu_irq[dev] == SNDRV_AUTO_IRQ ? 0 : mpu_irq[dev]); | 617 | mpu_irq[dev] == SNDRV_AUTO_IRQ ? 0 : mpu_irq[dev]); |
546 | 618 | ||
547 | err = sc6000_init_board(vport, xirq, xdma, vmss_port, mpu_irq[dev]); | 619 | err = sc6000_init_board(*vport, vmss_port, dev); |
548 | if (err < 0) | 620 | if (err < 0) |
549 | goto err_unmap2; | 621 | goto err_unmap2; |
550 | 622 | ||
@@ -552,7 +624,6 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) | |||
552 | WSS_HW_DETECT, 0, &chip); | 624 | WSS_HW_DETECT, 0, &chip); |
553 | if (err < 0) | 625 | if (err < 0) |
554 | goto err_unmap2; | 626 | goto err_unmap2; |
555 | card->private_data = chip; | ||
556 | 627 | ||
557 | err = snd_wss_pcm(chip, 0, NULL); | 628 | err = snd_wss_pcm(chip, 0, NULL); |
558 | if (err < 0) { | 629 | if (err < 0) { |
@@ -608,6 +679,7 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) | |||
608 | return 0; | 679 | return 0; |
609 | 680 | ||
610 | err_unmap2: | 681 | err_unmap2: |
682 | sc6000_setup_board(*vport, 0); | ||
611 | release_region(mss_port[dev], 4); | 683 | release_region(mss_port[dev], 4); |
612 | err_unmap1: | 684 | err_unmap1: |
613 | release_region(port[dev], 0x10); | 685 | release_region(port[dev], 0x10); |
@@ -618,11 +690,17 @@ err_exit: | |||
618 | 690 | ||
619 | static int __devexit snd_sc6000_remove(struct device *devptr, unsigned int dev) | 691 | static int __devexit snd_sc6000_remove(struct device *devptr, unsigned int dev) |
620 | { | 692 | { |
693 | struct snd_card *card = dev_get_drvdata(devptr); | ||
694 | char __iomem **vport = card->private_data; | ||
695 | |||
696 | if (sc6000_setup_board(*vport, 0) < 0) | ||
697 | snd_printk(KERN_WARNING "sc6000_setup_board failed on exit!\n"); | ||
698 | |||
621 | release_region(port[dev], 0x10); | 699 | release_region(port[dev], 0x10); |
622 | release_region(mss_port[dev], 4); | 700 | release_region(mss_port[dev], 4); |
623 | 701 | ||
624 | snd_card_free(dev_get_drvdata(devptr)); | ||
625 | dev_set_drvdata(devptr, NULL); | 702 | dev_set_drvdata(devptr, NULL); |
703 | snd_card_free(card); | ||
626 | return 0; | 704 | return 0; |
627 | } | 705 | } |
628 | 706 | ||
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index 66f3b48ceafc..e497525bc11b 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c | |||
@@ -619,8 +619,7 @@ static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream, | |||
619 | /* hw_free callback */ | 619 | /* hw_free callback */ |
620 | static int snd_sgio2audio_pcm_hw_free(struct snd_pcm_substream *substream) | 620 | static int snd_sgio2audio_pcm_hw_free(struct snd_pcm_substream *substream) |
621 | { | 621 | { |
622 | if (substream->runtime->dma_area) | 622 | vfree(substream->runtime->dma_area); |
623 | vfree(substream->runtime->dma_area); | ||
624 | substream->runtime->dma_area = NULL; | 623 | substream->runtime->dma_area = NULL; |
625 | return 0; | 624 | return 0; |
626 | } | 625 | } |
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index 6055fd6d3b38..e924492df21d 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c | |||
@@ -935,7 +935,7 @@ snd_harmony_create(struct snd_card *card, | |||
935 | h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE); | 935 | h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE); |
936 | if (h->iobase == NULL) { | 936 | if (h->iobase == NULL) { |
937 | printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n", | 937 | printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n", |
938 | padev->hpa.start); | 938 | (unsigned long)padev->hpa.start); |
939 | err = -EBUSY; | 939 | err = -EBUSY; |
940 | goto free_and_ret; | 940 | goto free_and_ret; |
941 | } | 941 | } |
@@ -1020,7 +1020,7 @@ static struct parisc_driver snd_harmony_driver = { | |||
1020 | .name = "harmony", | 1020 | .name = "harmony", |
1021 | .id_table = snd_harmony_devtable, | 1021 | .id_table = snd_harmony_devtable, |
1022 | .probe = snd_harmony_probe, | 1022 | .probe = snd_harmony_probe, |
1023 | .remove = snd_harmony_remove, | 1023 | .remove = __devexit_p(snd_harmony_remove), |
1024 | }; | 1024 | }; |
1025 | 1025 | ||
1026 | static int __init | 1026 | static int __init |
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 93422e3a3f0c..748f6b7d90b7 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -275,6 +275,16 @@ config SND_CS5535AUDIO | |||
275 | To compile this driver as a module, choose M here: the module | 275 | To compile this driver as a module, choose M here: the module |
276 | will be called snd-cs5535audio. | 276 | will be called snd-cs5535audio. |
277 | 277 | ||
278 | config SND_CTXFI | ||
279 | tristate "Creative Sound Blaster X-Fi" | ||
280 | select SND_PCM | ||
281 | help | ||
282 | If you want to use soundcards based on Creative Sound Blastr X-Fi | ||
283 | boards with 20k1 or 20k2 chips, say Y here. | ||
284 | |||
285 | To compile this driver as a module, choose M here: the module | ||
286 | will be called snd-ctxfi. | ||
287 | |||
278 | config SND_DARLA20 | 288 | config SND_DARLA20 |
279 | tristate "(Echoaudio) Darla20" | 289 | tristate "(Echoaudio) Darla20" |
280 | select FW_LOADER | 290 | select FW_LOADER |
@@ -532,6 +542,9 @@ config SND_HDSP | |||
532 | To compile this driver as a module, choose M here: the module | 542 | To compile this driver as a module, choose M here: the module |
533 | will be called snd-hdsp. | 543 | will be called snd-hdsp. |
534 | 544 | ||
545 | comment "Don't forget to add built-in firmwares for HDSP driver" | ||
546 | depends on SND_HDSP=y | ||
547 | |||
535 | config SND_HDSPM | 548 | config SND_HDSPM |
536 | tristate "RME Hammerfall DSP MADI" | 549 | tristate "RME Hammerfall DSP MADI" |
537 | select SND_HWDEP | 550 | select SND_HWDEP |
@@ -622,6 +635,16 @@ config SND_KORG1212 | |||
622 | To compile this driver as a module, choose M here: the module | 635 | To compile this driver as a module, choose M here: the module |
623 | will be called snd-korg1212. | 636 | will be called snd-korg1212. |
624 | 637 | ||
638 | config SND_LX6464ES | ||
639 | tristate "Digigram LX6464ES" | ||
640 | select SND_PCM | ||
641 | help | ||
642 | Say Y here to include support for Digigram LX6464ES boards. | ||
643 | |||
644 | To compile this driver as a module, choose M here: the module | ||
645 | will be called snd-lx6464es. | ||
646 | |||
647 | |||
625 | config SND_MAESTRO3 | 648 | config SND_MAESTRO3 |
626 | tristate "ESS Allegro/Maestro3" | 649 | tristate "ESS Allegro/Maestro3" |
627 | select SND_AC97_CODEC | 650 | select SND_AC97_CODEC |
@@ -764,8 +787,8 @@ config SND_VIRTUOSO | |||
764 | select SND_OXYGEN_LIB | 787 | select SND_OXYGEN_LIB |
765 | help | 788 | help |
766 | Say Y here to include support for sound cards based on the | 789 | Say Y here to include support for sound cards based on the |
767 | Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, and | 790 | Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, |
768 | Essence STX. | 791 | Essence ST (Deluxe), and Essence STX. |
769 | Support for the HDAV1.3 (Deluxe) is very experimental. | 792 | Support for the HDAV1.3 (Deluxe) is very experimental. |
770 | 793 | ||
771 | To compile this driver as a module, choose M here: the module | 794 | To compile this driver as a module, choose M here: the module |
diff --git a/sound/pci/Makefile b/sound/pci/Makefile index 65b25d221cd2..ecfc609d2b9f 100644 --- a/sound/pci/Makefile +++ b/sound/pci/Makefile | |||
@@ -59,9 +59,11 @@ obj-$(CONFIG_SND) += \ | |||
59 | ali5451/ \ | 59 | ali5451/ \ |
60 | au88x0/ \ | 60 | au88x0/ \ |
61 | aw2/ \ | 61 | aw2/ \ |
62 | ctxfi/ \ | ||
62 | ca0106/ \ | 63 | ca0106/ \ |
63 | cs46xx/ \ | 64 | cs46xx/ \ |
64 | cs5535audio/ \ | 65 | cs5535audio/ \ |
66 | lx6464es/ \ | ||
65 | echoaudio/ \ | 67 | echoaudio/ \ |
66 | emu10k1/ \ | 68 | emu10k1/ \ |
67 | hda/ \ | 69 | hda/ \ |
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index 3906f5afe27a..23f49f356e0f 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c | |||
@@ -1255,8 +1255,8 @@ static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma) | |||
1255 | int temp; | 1255 | int temp; |
1256 | 1256 | ||
1257 | temp = hwread(vortex->mmio, VORTEX_ADBDMA_STAT + (adbdma << 2)); | 1257 | temp = hwread(vortex->mmio, VORTEX_ADBDMA_STAT + (adbdma << 2)); |
1258 | temp = (dma->period_virt * dma->period_bytes) + (temp & POS_MASK); | 1258 | temp = (dma->period_virt * dma->period_bytes) + (temp & (dma->period_bytes - 1)); |
1259 | return (temp); | 1259 | return temp; |
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma) | 1262 | static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma) |
@@ -1504,8 +1504,7 @@ static int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma) | |||
1504 | int temp; | 1504 | int temp; |
1505 | 1505 | ||
1506 | temp = hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2)); | 1506 | temp = hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2)); |
1507 | //temp = (temp & POS_MASK) + (((temp>>WT_SUBBUF_SHIFT) & WT_SUBBUF_MASK)*(dma->cfg0&POS_MASK)); | 1507 | temp = (dma->period_virt * dma->period_bytes) + (temp & (dma->period_bytes - 1)); |
1508 | temp = (temp & POS_MASK) + ((dma->period_virt) * (dma->period_bytes)); | ||
1509 | return temp; | 1508 | return temp; |
1510 | } | 1509 | } |
1511 | 1510 | ||
@@ -2441,7 +2440,8 @@ static irqreturn_t vortex_interrupt(int irq, void *dev_id) | |||
2441 | spin_lock(&vortex->lock); | 2440 | spin_lock(&vortex->lock); |
2442 | for (i = 0; i < NR_ADB; i++) { | 2441 | for (i = 0; i < NR_ADB; i++) { |
2443 | if (vortex->dma_adb[i].fifo_status == FIFO_START) { | 2442 | if (vortex->dma_adb[i].fifo_status == FIFO_START) { |
2444 | if (vortex_adbdma_bufshift(vortex, i)) ; | 2443 | if (!vortex_adbdma_bufshift(vortex, i)) |
2444 | continue; | ||
2445 | spin_unlock(&vortex->lock); | 2445 | spin_unlock(&vortex->lock); |
2446 | snd_pcm_period_elapsed(vortex->dma_adb[i]. | 2446 | snd_pcm_period_elapsed(vortex->dma_adb[i]. |
2447 | substream); | 2447 | substream); |
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index ce3f2e90f4d7..24585c6c6d01 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
@@ -810,6 +810,8 @@ static struct pci_device_id snd_bt87x_ids[] = { | |||
810 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, GENERIC), | 810 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, GENERIC), |
811 | /* Voodoo TV 200 */ | 811 | /* Voodoo TV 200 */ |
812 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x121a, 0x3000, GENERIC), | 812 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x121a, 0x3000, GENERIC), |
813 | /* Askey Computer Corp. MagicTView'99 */ | ||
814 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x144f, 0x3000, GENERIC), | ||
813 | /* AVerMedia Studio No. 103, 203, ...? */ | 815 | /* AVerMedia Studio No. 103, 203, ...? */ |
814 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, AVPHONE98), | 816 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, AVPHONE98), |
815 | /* Prolink PixelView PV-M4900 */ | 817 | /* Prolink PixelView PV-M4900 */ |
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index bfac30f7929f..57b992a5c057 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -1319,7 +1319,6 @@ static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device) | |||
1319 | } | 1319 | } |
1320 | 1320 | ||
1321 | pcm->info_flags = 0; | 1321 | pcm->info_flags = 0; |
1322 | pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX; | ||
1323 | strcpy(pcm->name, "CA0106"); | 1322 | strcpy(pcm->name, "CA0106"); |
1324 | 1323 | ||
1325 | for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; | 1324 | for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; |
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index c111efe61c3c..c8c6f437f5b3 100644 --- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c | |||
@@ -739,7 +739,7 @@ static int __devinit rename_ctl(struct snd_card *card, const char *src, const ch | |||
739 | } while (0) | 739 | } while (0) |
740 | 740 | ||
741 | static __devinitdata | 741 | static __devinitdata |
742 | DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 50, 1); | 742 | DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 25, 1); |
743 | 743 | ||
744 | static char *slave_vols[] __devinitdata = { | 744 | static char *slave_vols[] __devinitdata = { |
745 | "Analog Front Playback Volume", | 745 | "Analog Front Playback Volume", |
@@ -841,6 +841,9 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) | |||
841 | snd_ca0106_master_db_scale); | 841 | snd_ca0106_master_db_scale); |
842 | if (!vmaster) | 842 | if (!vmaster) |
843 | return -ENOMEM; | 843 | return -ENOMEM; |
844 | err = snd_ctl_add(card, vmaster); | ||
845 | if (err < 0) | ||
846 | return err; | ||
844 | add_slaves(card, vmaster, slave_vols); | 847 | add_slaves(card, vmaster, slave_vols); |
845 | 848 | ||
846 | if (emu->details->spi_dac == 1) { | 849 | if (emu->details->spi_dac == 1) { |
@@ -848,8 +851,13 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) | |||
848 | NULL); | 851 | NULL); |
849 | if (!vmaster) | 852 | if (!vmaster) |
850 | return -ENOMEM; | 853 | return -ENOMEM; |
854 | err = snd_ctl_add(card, vmaster); | ||
855 | if (err < 0) | ||
856 | return err; | ||
851 | add_slaves(card, vmaster, slave_sws); | 857 | add_slaves(card, vmaster, slave_sws); |
852 | } | 858 | } |
859 | |||
860 | strcpy(card->mixername, "CA0106"); | ||
853 | return 0; | 861 | return 0; |
854 | } | 862 | } |
855 | 863 | ||
diff --git a/sound/pci/ctxfi/Makefile b/sound/pci/ctxfi/Makefile new file mode 100644 index 000000000000..15075f89e98a --- /dev/null +++ b/sound/pci/ctxfi/Makefile | |||
@@ -0,0 +1,5 @@ | |||
1 | snd-ctxfi-objs := xfi.o ctatc.o ctvmem.o ctpcm.o ctmixer.o ctresource.o \ | ||
2 | ctsrc.o ctamixer.o ctdaio.o ctimap.o cthardware.o cttimer.o \ | ||
3 | cthw20k2.o cthw20k1.o | ||
4 | |||
5 | obj-$(CONFIG_SND_CTXFI) += snd-ctxfi.o | ||
diff --git a/sound/pci/ctxfi/ct20k1reg.h b/sound/pci/ctxfi/ct20k1reg.h new file mode 100644 index 000000000000..f2e34e3f27ee --- /dev/null +++ b/sound/pci/ctxfi/ct20k1reg.h | |||
@@ -0,0 +1,636 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | */ | ||
8 | |||
9 | #ifndef CT20K1REG_H | ||
10 | #define CT20k1REG_H | ||
11 | |||
12 | /* 20k1 registers */ | ||
13 | #define DSPXRAM_START 0x000000 | ||
14 | #define DSPXRAM_END 0x013FFC | ||
15 | #define DSPAXRAM_START 0x020000 | ||
16 | #define DSPAXRAM_END 0x023FFC | ||
17 | #define DSPYRAM_START 0x040000 | ||
18 | #define DSPYRAM_END 0x04FFFC | ||
19 | #define DSPAYRAM_START 0x020000 | ||
20 | #define DSPAYRAM_END 0x063FFC | ||
21 | #define DSPMICRO_START 0x080000 | ||
22 | #define DSPMICRO_END 0x0B3FFC | ||
23 | #define DSP0IO_START 0x100000 | ||
24 | #define DSP0IO_END 0x101FFC | ||
25 | #define AUDIORINGIPDSP0_START 0x100000 | ||
26 | #define AUDIORINGIPDSP0_END 0x1003FC | ||
27 | #define AUDIORINGOPDSP0_START 0x100400 | ||
28 | #define AUDIORINGOPDSP0_END 0x1007FC | ||
29 | #define AUDPARARINGIODSP0_START 0x100800 | ||
30 | #define AUDPARARINGIODSP0_END 0x100BFC | ||
31 | #define DSP0LOCALHWREG_START 0x100C00 | ||
32 | #define DSP0LOCALHWREG_END 0x100C3C | ||
33 | #define DSP0XYRAMAGINDEX_START 0x100C40 | ||
34 | #define DSP0XYRAMAGINDEX_END 0x100C5C | ||
35 | #define DSP0XYRAMAGMDFR_START 0x100C60 | ||
36 | #define DSP0XYRAMAGMDFR_END 0x100C7C | ||
37 | #define DSP0INTCONTLVEC_START 0x100C80 | ||
38 | #define DSP0INTCONTLVEC_END 0x100CD8 | ||
39 | #define INTCONTLGLOBALREG_START 0x100D1C | ||
40 | #define INTCONTLGLOBALREG_END 0x100D3C | ||
41 | #define HOSTINTFPORTADDRCONTDSP0 0x100D40 | ||
42 | #define HOSTINTFPORTDATADSP0 0x100D44 | ||
43 | #define TIME0PERENBDSP0 0x100D60 | ||
44 | #define TIME0COUNTERDSP0 0x100D64 | ||
45 | #define TIME1PERENBDSP0 0x100D68 | ||
46 | #define TIME1COUNTERDSP0 0x100D6C | ||
47 | #define TIME2PERENBDSP0 0x100D70 | ||
48 | #define TIME2COUNTERDSP0 0x100D74 | ||
49 | #define TIME3PERENBDSP0 0x100D78 | ||
50 | #define TIME3COUNTERDSP0 0x100D7C | ||
51 | #define XRAMINDOPERREFNOUP_STARTDSP0 0x100D80 | ||
52 | #define XRAMINDOPERREFNOUP_ENDDSP0 0x100D9C | ||
53 | #define XRAMINDOPERREFUP_STARTDSP0 0x100DA0 | ||
54 | #define XRAMINDOPERREFUP_ENDDSP0 0x100DBC | ||
55 | #define YRAMINDOPERREFNOUP_STARTDSP0 0x100DC0 | ||
56 | #define YRAMINDOPERREFNOUP_ENDDSP0 0x100DDC | ||
57 | #define YRAMINDOPERREFUP_STARTDSP0 0x100DE0 | ||
58 | #define YRAMINDOPERREFUP_ENDDSP0 0x100DFC | ||
59 | #define DSP0CONDCODE 0x100E00 | ||
60 | #define DSP0STACKFLAG 0x100E04 | ||
61 | #define DSP0PROGCOUNTSTACKPTREG 0x100E08 | ||
62 | #define DSP0PROGCOUNTSTACKDATAREG 0x100E0C | ||
63 | #define DSP0CURLOOPADDRREG 0x100E10 | ||
64 | #define DSP0CURLOOPCOUNT 0x100E14 | ||
65 | #define DSP0TOPLOOPCOUNTSTACK 0x100E18 | ||
66 | #define DSP0TOPLOOPADDRSTACK 0x100E1C | ||
67 | #define DSP0LOOPSTACKPTR 0x100E20 | ||
68 | #define DSP0STASSTACKDATAREG 0x100E24 | ||
69 | #define DSP0STASSTACKPTR 0x100E28 | ||
70 | #define DSP0PROGCOUNT 0x100E2C | ||
71 | #define GLOBDSPDEBGREG 0x100E30 | ||
72 | #define GLOBDSPBREPTRREG 0x100E30 | ||
73 | #define DSP0XYRAMBASE_START 0x100EA0 | ||
74 | #define DSP0XYRAMBASE_END 0x100EBC | ||
75 | #define DSP0XYRAMLENG_START 0x100EC0 | ||
76 | #define DSP0XYRAMLENG_END 0x100EDC | ||
77 | #define SEMAPHOREREGDSP0 0x100EE0 | ||
78 | #define DSP0INTCONTMASKREG 0x100EE4 | ||
79 | #define DSP0INTCONTPENDREG 0x100EE8 | ||
80 | #define DSP0INTCONTSERVINT 0x100EEC | ||
81 | #define DSPINTCONTEXTINTMODREG 0x100EEC | ||
82 | #define GPIODSP0 0x100EFC | ||
83 | #define DMADSPBASEADDRREG_STARTDSP0 0x100F00 | ||
84 | #define DMADSPBASEADDRREG_ENDDSP0 0x100F1C | ||
85 | #define DMAHOSTBASEADDRREG_STARTDSP0 0x100F20 | ||
86 | #define DMAHOSTBASEADDRREG_ENDDSP0 0x100F3C | ||
87 | #define DMADSPCURADDRREG_STARTDSP0 0x100F40 | ||
88 | #define DMADSPCURADDRREG_ENDDSP0 0x100F5C | ||
89 | #define DMAHOSTCURADDRREG_STARTDSP0 0x100F60 | ||
90 | #define DMAHOSTCURADDRREG_ENDDSP0 0x100F7C | ||
91 | #define DMATANXCOUNTREG_STARTDSP0 0x100F80 | ||
92 | #define DMATANXCOUNTREG_ENDDSP0 0x100F9C | ||
93 | #define DMATIMEBUGREG_STARTDSP0 0x100FA0 | ||
94 | #define DMATIMEBUGREG_ENDDSP0 0x100FAC | ||
95 | #define DMACNTLMODFREG_STARTDSP0 0x100FA0 | ||
96 | #define DMACNTLMODFREG_ENDDSP0 0x100FAC | ||
97 | |||
98 | #define DMAGLOBSTATSREGDSP0 0x100FEC | ||
99 | #define DSP0XGPRAM_START 0x101000 | ||
100 | #define DSP0XGPRAM_END 0x1017FC | ||
101 | #define DSP0YGPRAM_START 0x101800 | ||
102 | #define DSP0YGPRAM_END 0x101FFC | ||
103 | |||
104 | |||
105 | |||
106 | |||
107 | #define AUDIORINGIPDSP1_START 0x102000 | ||
108 | #define AUDIORINGIPDSP1_END 0x1023FC | ||
109 | #define AUDIORINGOPDSP1_START 0x102400 | ||
110 | #define AUDIORINGOPDSP1_END 0x1027FC | ||
111 | #define AUDPARARINGIODSP1_START 0x102800 | ||
112 | #define AUDPARARINGIODSP1_END 0x102BFC | ||
113 | #define DSP1LOCALHWREG_START 0x102C00 | ||
114 | #define DSP1LOCALHWREG_END 0x102C3C | ||
115 | #define DSP1XYRAMAGINDEX_START 0x102C40 | ||
116 | #define DSP1XYRAMAGINDEX_END 0x102C5C | ||
117 | #define DSP1XYRAMAGMDFR_START 0x102C60 | ||
118 | #define DSP1XYRAMAGMDFR_END 0x102C7C | ||
119 | #define DSP1INTCONTLVEC_START 0x102C80 | ||
120 | #define DSP1INTCONTLVEC_END 0x102CD8 | ||
121 | #define HOSTINTFPORTADDRCONTDSP1 0x102D40 | ||
122 | #define HOSTINTFPORTDATADSP1 0x102D44 | ||
123 | #define TIME0PERENBDSP1 0x102D60 | ||
124 | #define TIME0COUNTERDSP1 0x102D64 | ||
125 | #define TIME1PERENBDSP1 0x102D68 | ||
126 | #define TIME1COUNTERDSP1 0x102D6C | ||
127 | #define TIME2PERENBDSP1 0x102D70 | ||
128 | #define TIME2COUNTERDSP1 0x102D74 | ||
129 | #define TIME3PERENBDSP1 0x102D78 | ||
130 | #define TIME3COUNTERDSP1 0x102D7C | ||
131 | #define XRAMINDOPERREFNOUP_STARTDSP1 0x102D80 | ||
132 | #define XRAMINDOPERREFNOUP_ENDDSP1 0x102D9C | ||
133 | #define XRAMINDOPERREFUP_STARTDSP1 0x102DA0 | ||
134 | #define XRAMINDOPERREFUP_ENDDSP1 0x102DBC | ||
135 | #define YRAMINDOPERREFNOUP_STARTDSP1 0x102DC0 | ||
136 | #define YRAMINDOPERREFNOUP_ENDDSP1 0x102DDC | ||
137 | #define YRAMINDOPERREFUP_STARTDSP1 0x102DE0 | ||
138 | #define YRAMINDOPERREFUP_ENDDSP1 0x102DFC | ||
139 | |||
140 | #define DSP1CONDCODE 0x102E00 | ||
141 | #define DSP1STACKFLAG 0x102E04 | ||
142 | #define DSP1PROGCOUNTSTACKPTREG 0x102E08 | ||
143 | #define DSP1PROGCOUNTSTACKDATAREG 0x102E0C | ||
144 | #define DSP1CURLOOPADDRREG 0x102E10 | ||
145 | #define DSP1CURLOOPCOUNT 0x102E14 | ||
146 | #define DSP1TOPLOOPCOUNTSTACK 0x102E18 | ||
147 | #define DSP1TOPLOOPADDRSTACK 0x102E1C | ||
148 | #define DSP1LOOPSTACKPTR 0x102E20 | ||
149 | #define DSP1STASSTACKDATAREG 0x102E24 | ||
150 | #define DSP1STASSTACKPTR 0x102E28 | ||
151 | #define DSP1PROGCOUNT 0x102E2C | ||
152 | #define DSP1XYRAMBASE_START 0x102EA0 | ||
153 | #define DSP1XYRAMBASE_END 0x102EBC | ||
154 | #define DSP1XYRAMLENG_START 0x102EC0 | ||
155 | #define DSP1XYRAMLENG_END 0x102EDC | ||
156 | #define SEMAPHOREREGDSP1 0x102EE0 | ||
157 | #define DSP1INTCONTMASKREG 0x102EE4 | ||
158 | #define DSP1INTCONTPENDREG 0x102EE8 | ||
159 | #define DSP1INTCONTSERVINT 0x102EEC | ||
160 | #define GPIODSP1 0x102EFC | ||
161 | #define DMADSPBASEADDRREG_STARTDSP1 0x102F00 | ||
162 | #define DMADSPBASEADDRREG_ENDDSP1 0x102F1C | ||
163 | #define DMAHOSTBASEADDRREG_STARTDSP1 0x102F20 | ||
164 | #define DMAHOSTBASEADDRREG_ENDDSP1 0x102F3C | ||
165 | #define DMADSPCURADDRREG_STARTDSP1 0x102F40 | ||
166 | #define DMADSPCURADDRREG_ENDDSP1 0x102F5C | ||
167 | #define DMAHOSTCURADDRREG_STARTDSP1 0x102F60 | ||
168 | #define DMAHOSTCURADDRREG_ENDDSP1 0x102F7C | ||
169 | #define DMATANXCOUNTREG_STARTDSP1 0x102F80 | ||
170 | #define DMATANXCOUNTREG_ENDDSP1 0x102F9C | ||
171 | #define DMATIMEBUGREG_STARTDSP1 0x102FA0 | ||
172 | #define DMATIMEBUGREG_ENDDSP1 0x102FAC | ||
173 | #define DMACNTLMODFREG_STARTDSP1 0x102FA0 | ||
174 | #define DMACNTLMODFREG_ENDDSP1 0x102FAC | ||
175 | |||
176 | #define DMAGLOBSTATSREGDSP1 0x102FEC | ||
177 | #define DSP1XGPRAM_START 0x103000 | ||
178 | #define DSP1XGPRAM_END 0x1033FC | ||
179 | #define DSP1YGPRAM_START 0x103400 | ||
180 | #define DSP1YGPRAM_END 0x1037FC | ||
181 | |||
182 | |||
183 | |||
184 | #define AUDIORINGIPDSP2_START 0x104000 | ||
185 | #define AUDIORINGIPDSP2_END 0x1043FC | ||
186 | #define AUDIORINGOPDSP2_START 0x104400 | ||
187 | #define AUDIORINGOPDSP2_END 0x1047FC | ||
188 | #define AUDPARARINGIODSP2_START 0x104800 | ||
189 | #define AUDPARARINGIODSP2_END 0x104BFC | ||
190 | #define DSP2LOCALHWREG_START 0x104C00 | ||
191 | #define DSP2LOCALHWREG_END 0x104C3C | ||
192 | #define DSP2XYRAMAGINDEX_START 0x104C40 | ||
193 | #define DSP2XYRAMAGINDEX_END 0x104C5C | ||
194 | #define DSP2XYRAMAGMDFR_START 0x104C60 | ||
195 | #define DSP2XYRAMAGMDFR_END 0x104C7C | ||
196 | #define DSP2INTCONTLVEC_START 0x104C80 | ||
197 | #define DSP2INTCONTLVEC_END 0x104CD8 | ||
198 | #define HOSTINTFPORTADDRCONTDSP2 0x104D40 | ||
199 | #define HOSTINTFPORTDATADSP2 0x104D44 | ||
200 | #define TIME0PERENBDSP2 0x104D60 | ||
201 | #define TIME0COUNTERDSP2 0x104D64 | ||
202 | #define TIME1PERENBDSP2 0x104D68 | ||
203 | #define TIME1COUNTERDSP2 0x104D6C | ||
204 | #define TIME2PERENBDSP2 0x104D70 | ||
205 | #define TIME2COUNTERDSP2 0x104D74 | ||
206 | #define TIME3PERENBDSP2 0x104D78 | ||
207 | #define TIME3COUNTERDSP2 0x104D7C | ||
208 | #define XRAMINDOPERREFNOUP_STARTDSP2 0x104D80 | ||
209 | #define XRAMINDOPERREFNOUP_ENDDSP2 0x104D9C | ||
210 | #define XRAMINDOPERREFUP_STARTDSP2 0x104DA0 | ||
211 | #define XRAMINDOPERREFUP_ENDDSP2 0x104DBC | ||
212 | #define YRAMINDOPERREFNOUP_STARTDSP2 0x104DC0 | ||
213 | #define YRAMINDOPERREFNOUP_ENDDSP2 0x104DDC | ||
214 | #define YRAMINDOPERREFUP_STARTDSP2 0x104DE0 | ||
215 | #define YRAMINDOPERREFUP_ENDDSP2 0x104DFC | ||
216 | #define DSP2CONDCODE 0x104E00 | ||
217 | #define DSP2STACKFLAG 0x104E04 | ||
218 | #define DSP2PROGCOUNTSTACKPTREG 0x104E08 | ||
219 | #define DSP2PROGCOUNTSTACKDATAREG 0x104E0C | ||
220 | #define DSP2CURLOOPADDRREG 0x104E10 | ||
221 | #define DSP2CURLOOPCOUNT 0x104E14 | ||
222 | #define DSP2TOPLOOPCOUNTSTACK 0x104E18 | ||
223 | #define DSP2TOPLOOPADDRSTACK 0x104E1C | ||
224 | #define DSP2LOOPSTACKPTR 0x104E20 | ||
225 | #define DSP2STASSTACKDATAREG 0x104E24 | ||
226 | #define DSP2STASSTACKPTR 0x104E28 | ||
227 | #define DSP2PROGCOUNT 0x104E2C | ||
228 | #define DSP2XYRAMBASE_START 0x104EA0 | ||
229 | #define DSP2XYRAMBASE_END 0x104EBC | ||
230 | #define DSP2XYRAMLENG_START 0x104EC0 | ||
231 | #define DSP2XYRAMLENG_END 0x104EDC | ||
232 | #define SEMAPHOREREGDSP2 0x104EE0 | ||
233 | #define DSP2INTCONTMASKREG 0x104EE4 | ||
234 | #define DSP2INTCONTPENDREG 0x104EE8 | ||
235 | #define DSP2INTCONTSERVINT 0x104EEC | ||
236 | #define GPIODSP2 0x104EFC | ||
237 | #define DMADSPBASEADDRREG_STARTDSP2 0x104F00 | ||
238 | #define DMADSPBASEADDRREG_ENDDSP2 0x104F1C | ||
239 | #define DMAHOSTBASEADDRREG_STARTDSP2 0x104F20 | ||
240 | #define DMAHOSTBASEADDRREG_ENDDSP2 0x104F3C | ||
241 | #define DMADSPCURADDRREG_STARTDSP2 0x104F40 | ||
242 | #define DMADSPCURADDRREG_ENDDSP2 0x104F5C | ||
243 | #define DMAHOSTCURADDRREG_STARTDSP2 0x104F60 | ||
244 | #define DMAHOSTCURADDRREG_ENDDSP2 0x104F7C | ||
245 | #define DMATANXCOUNTREG_STARTDSP2 0x104F80 | ||
246 | #define DMATANXCOUNTREG_ENDDSP2 0x104F9C | ||
247 | #define DMATIMEBUGREG_STARTDSP2 0x104FA0 | ||
248 | #define DMATIMEBUGREG_ENDDSP2 0x104FAC | ||
249 | #define DMACNTLMODFREG_STARTDSP2 0x104FA0 | ||
250 | #define DMACNTLMODFREG_ENDDSP2 0x104FAC | ||
251 | |||
252 | #define DMAGLOBSTATSREGDSP2 0x104FEC | ||
253 | #define DSP2XGPRAM_START 0x105000 | ||
254 | #define DSP2XGPRAM_END 0x1051FC | ||
255 | #define DSP2YGPRAM_START 0x105800 | ||
256 | #define DSP2YGPRAM_END 0x1059FC | ||
257 | |||
258 | |||
259 | |||
260 | #define AUDIORINGIPDSP3_START 0x106000 | ||
261 | #define AUDIORINGIPDSP3_END 0x1063FC | ||
262 | #define AUDIORINGOPDSP3_START 0x106400 | ||
263 | #define AUDIORINGOPDSP3_END 0x1067FC | ||
264 | #define AUDPARARINGIODSP3_START 0x106800 | ||
265 | #define AUDPARARINGIODSP3_END 0x106BFC | ||
266 | #define DSP3LOCALHWREG_START 0x106C00 | ||
267 | #define DSP3LOCALHWREG_END 0x106C3C | ||
268 | #define DSP3XYRAMAGINDEX_START 0x106C40 | ||
269 | #define DSP3XYRAMAGINDEX_END 0x106C5C | ||
270 | #define DSP3XYRAMAGMDFR_START 0x106C60 | ||
271 | #define DSP3XYRAMAGMDFR_END 0x106C7C | ||
272 | #define DSP3INTCONTLVEC_START 0x106C80 | ||
273 | #define DSP3INTCONTLVEC_END 0x106CD8 | ||
274 | #define HOSTINTFPORTADDRCONTDSP3 0x106D40 | ||
275 | #define HOSTINTFPORTDATADSP3 0x106D44 | ||
276 | #define TIME0PERENBDSP3 0x106D60 | ||
277 | #define TIME0COUNTERDSP3 0x106D64 | ||
278 | #define TIME1PERENBDSP3 0x106D68 | ||
279 | #define TIME1COUNTERDSP3 0x106D6C | ||
280 | #define TIME2PERENBDSP3 0x106D70 | ||
281 | #define TIME2COUNTERDSP3 0x106D74 | ||
282 | #define TIME3PERENBDSP3 0x106D78 | ||
283 | #define TIME3COUNTERDSP3 0x106D7C | ||
284 | #define XRAMINDOPERREFNOUP_STARTDSP3 0x106D80 | ||
285 | #define XRAMINDOPERREFNOUP_ENDDSP3 0x106D9C | ||
286 | #define XRAMINDOPERREFUP_STARTDSP3 0x106DA0 | ||
287 | #define XRAMINDOPERREFUP_ENDDSP3 0x106DBC | ||
288 | #define YRAMINDOPERREFNOUP_STARTDSP3 0x106DC0 | ||
289 | #define YRAMINDOPERREFNOUP_ENDDSP3 0x106DDC | ||
290 | #define YRAMINDOPERREFUP_STARTDSP3 0x106DE0 | ||
291 | #define YRAMINDOPERREFUP_ENDDSP3 0x100DFC | ||
292 | |||
293 | #define DSP3CONDCODE 0x106E00 | ||
294 | #define DSP3STACKFLAG 0x106E04 | ||
295 | #define DSP3PROGCOUNTSTACKPTREG 0x106E08 | ||
296 | #define DSP3PROGCOUNTSTACKDATAREG 0x106E0C | ||
297 | #define DSP3CURLOOPADDRREG 0x106E10 | ||
298 | #define DSP3CURLOOPCOUNT 0x106E14 | ||
299 | #define DSP3TOPLOOPCOUNTSTACK 0x106E18 | ||
300 | #define DSP3TOPLOOPADDRSTACK 0x106E1C | ||
301 | #define DSP3LOOPSTACKPTR 0x106E20 | ||
302 | #define DSP3STASSTACKDATAREG 0x106E24 | ||
303 | #define DSP3STASSTACKPTR 0x106E28 | ||
304 | #define DSP3PROGCOUNT 0x106E2C | ||
305 | #define DSP3XYRAMBASE_START 0x106EA0 | ||
306 | #define DSP3XYRAMBASE_END 0x106EBC | ||
307 | #define DSP3XYRAMLENG_START 0x106EC0 | ||
308 | #define DSP3XYRAMLENG_END 0x106EDC | ||
309 | #define SEMAPHOREREGDSP3 0x106EE0 | ||
310 | #define DSP3INTCONTMASKREG 0x106EE4 | ||
311 | #define DSP3INTCONTPENDREG 0x106EE8 | ||
312 | #define DSP3INTCONTSERVINT 0x106EEC | ||
313 | #define GPIODSP3 0x106EFC | ||
314 | #define DMADSPBASEADDRREG_STARTDSP3 0x106F00 | ||
315 | #define DMADSPBASEADDRREG_ENDDSP3 0x106F1C | ||
316 | #define DMAHOSTBASEADDRREG_STARTDSP3 0x106F20 | ||
317 | #define DMAHOSTBASEADDRREG_ENDDSP3 0x106F3C | ||
318 | #define DMADSPCURADDRREG_STARTDSP3 0x106F40 | ||
319 | #define DMADSPCURADDRREG_ENDDSP3 0x106F5C | ||
320 | #define DMAHOSTCURADDRREG_STARTDSP3 0x106F60 | ||
321 | #define DMAHOSTCURADDRREG_ENDDSP3 0x106F7C | ||
322 | #define DMATANXCOUNTREG_STARTDSP3 0x106F80 | ||
323 | #define DMATANXCOUNTREG_ENDDSP3 0x106F9C | ||
324 | #define DMATIMEBUGREG_STARTDSP3 0x106FA0 | ||
325 | #define DMATIMEBUGREG_ENDDSP3 0x106FAC | ||
326 | #define DMACNTLMODFREG_STARTDSP3 0x106FA0 | ||
327 | #define DMACNTLMODFREG_ENDDSP3 0x106FAC | ||
328 | |||
329 | #define DMAGLOBSTATSREGDSP3 0x106FEC | ||
330 | #define DSP3XGPRAM_START 0x107000 | ||
331 | #define DSP3XGPRAM_END 0x1071FC | ||
332 | #define DSP3YGPRAM_START 0x107800 | ||
333 | #define DSP3YGPRAM_END 0x1079FC | ||
334 | |||
335 | /* end of DSP reg definitions */ | ||
336 | |||
337 | #define DSPAIMAP_START 0x108000 | ||
338 | #define DSPAIMAP_END 0x1083FC | ||
339 | #define DSPPIMAP_START 0x108400 | ||
340 | #define DSPPIMAP_END 0x1087FC | ||
341 | #define DSPPOMAP_START 0x108800 | ||
342 | #define DSPPOMAP_END 0x108BFC | ||
343 | #define DSPPOCTL 0x108C00 | ||
344 | #define TKCTL_START 0x110000 | ||
345 | #define TKCTL_END 0x110FFC | ||
346 | #define TKCC_START 0x111000 | ||
347 | #define TKCC_END 0x111FFC | ||
348 | #define TKIMAP_START 0x112000 | ||
349 | #define TKIMAP_END 0x112FFC | ||
350 | #define TKDCTR16 0x113000 | ||
351 | #define TKPB16 0x113004 | ||
352 | #define TKBS16 0x113008 | ||
353 | #define TKDCTR32 0x11300C | ||
354 | #define TKPB32 0x113010 | ||
355 | #define TKBS32 0x113014 | ||
356 | #define ICDCTR16 0x113018 | ||
357 | #define ITBS16 0x11301C | ||
358 | #define ICDCTR32 0x113020 | ||
359 | #define ITBS32 0x113024 | ||
360 | #define ITSTART 0x113028 | ||
361 | #define TKSQ 0x11302C | ||
362 | |||
363 | #define TKSCCTL_START 0x114000 | ||
364 | #define TKSCCTL_END 0x11403C | ||
365 | #define TKSCADR_START 0x114100 | ||
366 | #define TKSCADR_END 0x11413C | ||
367 | #define TKSCDATAX_START 0x114800 | ||
368 | #define TKSCDATAX_END 0x1149FC | ||
369 | #define TKPCDATAX_START 0x120000 | ||
370 | #define TKPCDATAX_END 0x12FFFC | ||
371 | |||
372 | #define MALSA 0x130000 | ||
373 | #define MAPPHA 0x130004 | ||
374 | #define MAPPLA 0x130008 | ||
375 | #define MALSB 0x130010 | ||
376 | #define MAPPHB 0x130014 | ||
377 | #define MAPPLB 0x130018 | ||
378 | |||
379 | #define TANSPORTMAPABREGS_START 0x130020 | ||
380 | #define TANSPORTMAPABREGS_END 0x13A2FC | ||
381 | |||
382 | #define PTPAHX 0x13B000 | ||
383 | #define PTPALX 0x13B004 | ||
384 | |||
385 | #define TANSPPAGETABLEPHYADDR015_START 0x13B008 | ||
386 | #define TANSPPAGETABLEPHYADDR015_END 0x13B07C | ||
387 | #define TRNQADRX_START 0x13B100 | ||
388 | #define TRNQADRX_END 0x13B13C | ||
389 | #define TRNQTIMX_START 0x13B200 | ||
390 | #define TRNQTIMX_END 0x13B23C | ||
391 | #define TRNQAPARMX_START 0x13B300 | ||
392 | #define TRNQAPARMX_END 0x13B33C | ||
393 | |||
394 | #define TRNQCNT 0x13B400 | ||
395 | #define TRNCTL 0x13B404 | ||
396 | #define TRNIS 0x13B408 | ||
397 | #define TRNCURTS 0x13B40C | ||
398 | |||
399 | #define AMOP_START 0x140000 | ||
400 | #define AMOPLO 0x140000 | ||
401 | #define AMOPHI 0x140004 | ||
402 | #define AMOP_END 0x147FFC | ||
403 | #define PMOP_START 0x148000 | ||
404 | #define PMOPLO 0x148000 | ||
405 | #define PMOPHI 0x148004 | ||
406 | #define PMOP_END 0x14FFFC | ||
407 | #define PCURR_START 0x150000 | ||
408 | #define PCURR_END 0x153FFC | ||
409 | #define PTRAG_START 0x154000 | ||
410 | #define PTRAG_END 0x157FFC | ||
411 | #define PSR_START 0x158000 | ||
412 | #define PSR_END 0x15BFFC | ||
413 | |||
414 | #define PFSTAT4SEG_START 0x160000 | ||
415 | #define PFSTAT4SEG_END 0x160BFC | ||
416 | #define PFSTAT2SEG_START 0x160C00 | ||
417 | #define PFSTAT2SEG_END 0x1617FC | ||
418 | #define PFTARG4SEG_START 0x164000 | ||
419 | #define PFTARG4SEG_END 0x164BFC | ||
420 | #define PFTARG2SEG_START 0x164C00 | ||
421 | #define PFTARG2SEG_END 0x1657FC | ||
422 | #define PFSR4SEG_START 0x168000 | ||
423 | #define PFSR4SEG_END 0x168BFC | ||
424 | #define PFSR2SEG_START 0x168C00 | ||
425 | #define PFSR2SEG_END 0x1697FC | ||
426 | #define PCURRMS4SEG_START 0x16C000 | ||
427 | #define PCURRMS4SEG_END 0x16CCFC | ||
428 | #define PCURRMS2SEG_START 0x16CC00 | ||
429 | #define PCURRMS2SEG_END 0x16D7FC | ||
430 | #define PTARGMS4SEG_START 0x170000 | ||
431 | #define PTARGMS4SEG_END 0x172FFC | ||
432 | #define PTARGMS2SEG_START 0x173000 | ||
433 | #define PTARGMS2SEG_END 0x1747FC | ||
434 | #define PSRMS4SEG_START 0x170000 | ||
435 | #define PSRMS4SEG_END 0x172FFC | ||
436 | #define PSRMS2SEG_START 0x173000 | ||
437 | #define PSRMS2SEG_END 0x1747FC | ||
438 | |||
439 | #define PRING_LO_START 0x190000 | ||
440 | #define PRING_LO_END 0x193FFC | ||
441 | #define PRING_HI_START 0x194000 | ||
442 | #define PRING_HI_END 0x197FFC | ||
443 | #define PRING_LO_HI_START 0x198000 | ||
444 | #define PRING_LO_HI 0x198000 | ||
445 | #define PRING_LO_HI_END 0x19BFFC | ||
446 | |||
447 | #define PINTFIFO 0x1A0000 | ||
448 | #define SRCCTL 0x1B0000 | ||
449 | #define SRCCCR 0x1B0004 | ||
450 | #define SRCIMAP 0x1B0008 | ||
451 | #define SRCODDC 0x1B000C | ||
452 | #define SRCCA 0x1B0010 | ||
453 | #define SRCCF 0x1B0014 | ||
454 | #define SRCSA 0x1B0018 | ||
455 | #define SRCLA 0x1B001C | ||
456 | #define SRCCTLSWR 0x1B0020 | ||
457 | |||
458 | /* SRC HERE */ | ||
459 | #define SRCALBA 0x1B002C | ||
460 | #define SRCMCTL 0x1B012C | ||
461 | #define SRCCERR 0x1B022C | ||
462 | #define SRCITB 0x1B032C | ||
463 | #define SRCIPM 0x1B082C | ||
464 | #define SRCIP 0x1B102C | ||
465 | #define SRCENBSTAT 0x1B202C | ||
466 | #define SRCENBLO 0x1B212C | ||
467 | #define SRCENBHI 0x1B222C | ||
468 | #define SRCENBS 0x1B232C | ||
469 | #define SRCENB 0x1B282C | ||
470 | #define SRCENB07 0x1B282C | ||
471 | #define SRCENBS07 0x1B302C | ||
472 | |||
473 | #define SRCDN0Z 0x1B0030 | ||
474 | #define SRCDN0Z0 0x1B0030 | ||
475 | #define SRCDN0Z1 0x1B0034 | ||
476 | #define SRCDN0Z2 0x1B0038 | ||
477 | #define SRCDN0Z3 0x1B003C | ||
478 | #define SRCDN1Z 0x1B0040 | ||
479 | #define SRCDN1Z0 0x1B0040 | ||
480 | #define SRCDN1Z1 0x1B0044 | ||
481 | #define SRCDN1Z2 0x1B0048 | ||
482 | #define SRCDN1Z3 0x1B004C | ||
483 | #define SRCDN1Z4 0x1B0050 | ||
484 | #define SRCDN1Z5 0x1B0054 | ||
485 | #define SRCDN1Z6 0x1B0058 | ||
486 | #define SRCDN1Z7 0x1B005C | ||
487 | #define SRCUPZ 0x1B0060 | ||
488 | #define SRCUPZ0 0x1B0060 | ||
489 | #define SRCUPZ1 0x1B0064 | ||
490 | #define SRCUPZ2 0x1B0068 | ||
491 | #define SRCUPZ3 0x1B006C | ||
492 | #define SRCUPZ4 0x1B0070 | ||
493 | #define SRCUPZ5 0x1B0074 | ||
494 | #define SRCUPZ6 0x1B0078 | ||
495 | #define SRCUPZ7 0x1B007C | ||
496 | #define SRCCD0 0x1B0080 | ||
497 | #define SRCCD1 0x1B0084 | ||
498 | #define SRCCD2 0x1B0088 | ||
499 | #define SRCCD3 0x1B008C | ||
500 | #define SRCCD4 0x1B0090 | ||
501 | #define SRCCD5 0x1B0094 | ||
502 | #define SRCCD6 0x1B0098 | ||
503 | #define SRCCD7 0x1B009C | ||
504 | #define SRCCD8 0x1B00A0 | ||
505 | #define SRCCD9 0x1B00A4 | ||
506 | #define SRCCDA 0x1B00A8 | ||
507 | #define SRCCDB 0x1B00AC | ||
508 | #define SRCCDC 0x1B00B0 | ||
509 | #define SRCCDD 0x1B00B4 | ||
510 | #define SRCCDE 0x1B00B8 | ||
511 | #define SRCCDF 0x1B00BC | ||
512 | #define SRCCD10 0x1B00C0 | ||
513 | #define SRCCD11 0x1B00C4 | ||
514 | #define SRCCD12 0x1B00C8 | ||
515 | #define SRCCD13 0x1B00CC | ||
516 | #define SRCCD14 0x1B00D0 | ||
517 | #define SRCCD15 0x1B00D4 | ||
518 | #define SRCCD16 0x1B00D8 | ||
519 | #define SRCCD17 0x1B00DC | ||
520 | #define SRCCD18 0x1B00E0 | ||
521 | #define SRCCD19 0x1B00E4 | ||
522 | #define SRCCD1A 0x1B00E8 | ||
523 | #define SRCCD1B 0x1B00EC | ||
524 | #define SRCCD1C 0x1B00F0 | ||
525 | #define SRCCD1D 0x1B00F4 | ||
526 | #define SRCCD1E 0x1B00F8 | ||
527 | #define SRCCD1F 0x1B00FC | ||
528 | |||
529 | #define SRCCONTRBLOCK_START 0x1B0100 | ||
530 | #define SRCCONTRBLOCK_END 0x1BFFFC | ||
531 | #define FILTOP_START 0x1C0000 | ||
532 | #define FILTOP_END 0x1C05FC | ||
533 | #define FILTIMAP_START 0x1C0800 | ||
534 | #define FILTIMAP_END 0x1C0DFC | ||
535 | #define FILTZ1_START 0x1C1000 | ||
536 | #define FILTZ1_END 0x1C15FC | ||
537 | #define FILTZ2_START 0x1C1800 | ||
538 | #define FILTZ2_END 0x1C1DFC | ||
539 | #define DAOIMAP_START 0x1C5000 | ||
540 | #define DAOIMAP 0x1C5000 | ||
541 | #define DAOIMAP_END 0x1C5124 | ||
542 | |||
543 | #define AC97D 0x1C5400 | ||
544 | #define AC97A 0x1C5404 | ||
545 | #define AC97CTL 0x1C5408 | ||
546 | #define I2SCTL 0x1C5420 | ||
547 | |||
548 | #define SPOS 0x1C5440 | ||
549 | #define SPOSA 0x1C5440 | ||
550 | #define SPOSB 0x1C5444 | ||
551 | #define SPOSC 0x1C5448 | ||
552 | #define SPOSD 0x1C544C | ||
553 | |||
554 | #define SPISA 0x1C5450 | ||
555 | #define SPISB 0x1C5454 | ||
556 | #define SPISC 0x1C5458 | ||
557 | #define SPISD 0x1C545C | ||
558 | |||
559 | #define SPFSCTL 0x1C5460 | ||
560 | |||
561 | #define SPFS0 0x1C5468 | ||
562 | #define SPFS1 0x1C546C | ||
563 | #define SPFS2 0x1C5470 | ||
564 | #define SPFS3 0x1C5474 | ||
565 | #define SPFS4 0x1C5478 | ||
566 | #define SPFS5 0x1C547C | ||
567 | |||
568 | #define SPOCTL 0x1C5480 | ||
569 | #define SPICTL 0x1C5484 | ||
570 | #define SPISTS 0x1C5488 | ||
571 | #define SPINTP 0x1C548C | ||
572 | #define SPINTE 0x1C5490 | ||
573 | #define SPUTCTLAB 0x1C5494 | ||
574 | #define SPUTCTLCD 0x1C5498 | ||
575 | |||
576 | #define SRTSPA 0x1C54C0 | ||
577 | #define SRTSPB 0x1C54C4 | ||
578 | #define SRTSPC 0x1C54C8 | ||
579 | #define SRTSPD 0x1C54CC | ||
580 | |||
581 | #define SRTSCTL 0x1C54D0 | ||
582 | #define SRTSCTLA 0x1C54D0 | ||
583 | #define SRTSCTLB 0x1C54D4 | ||
584 | #define SRTSCTLC 0x1C54D8 | ||
585 | #define SRTSCTLD 0x1C54DC | ||
586 | |||
587 | #define SRTI2S 0x1C54E0 | ||
588 | #define SRTICTL 0x1C54F0 | ||
589 | |||
590 | #define WC 0x1C6000 | ||
591 | #define TIMR 0x1C6004 | ||
592 | # define TIMR_IE (1<<15) | ||
593 | # define TIMR_IP (1<<14) | ||
594 | |||
595 | #define GIP 0x1C6010 | ||
596 | #define GIE 0x1C6014 | ||
597 | #define DIE 0x1C6018 | ||
598 | #define DIC 0x1C601C | ||
599 | #define GPIO 0x1C6020 | ||
600 | #define GPIOCTL 0x1C6024 | ||
601 | #define GPIP 0x1C6028 | ||
602 | #define GPIE 0x1C602C | ||
603 | #define DSPINT0 0x1C6030 | ||
604 | #define DSPEIOC 0x1C6034 | ||
605 | #define MUADAT 0x1C6040 | ||
606 | #define MUACMD 0x1C6044 | ||
607 | #define MUASTAT 0x1C6044 | ||
608 | #define MUBDAT 0x1C6048 | ||
609 | #define MUBCMD 0x1C604C | ||
610 | #define MUBSTAT 0x1C604C | ||
611 | #define UARTCMA 0x1C6050 | ||
612 | #define UARTCMB 0x1C6054 | ||
613 | #define UARTIP 0x1C6058 | ||
614 | #define UARTIE 0x1C605C | ||
615 | #define PLLCTL 0x1C6060 | ||
616 | #define PLLDCD 0x1C6064 | ||
617 | #define GCTL 0x1C6070 | ||
618 | #define ID0 0x1C6080 | ||
619 | #define ID1 0x1C6084 | ||
620 | #define ID2 0x1C6088 | ||
621 | #define ID3 0x1C608C | ||
622 | #define SDRCTL 0x1C7000 | ||
623 | |||
624 | |||
625 | #define I2SA_L 0x0L | ||
626 | #define I2SA_R 0x1L | ||
627 | #define I2SB_L 0x8L | ||
628 | #define I2SB_R 0x9L | ||
629 | #define I2SC_L 0x10L | ||
630 | #define I2SC_R 0x11L | ||
631 | #define I2SD_L 0x18L | ||
632 | #define I2SD_R 0x19L | ||
633 | |||
634 | #endif /* CT20K1REG_H */ | ||
635 | |||
636 | |||
diff --git a/sound/pci/ctxfi/ct20k2reg.h b/sound/pci/ctxfi/ct20k2reg.h new file mode 100644 index 000000000000..2d07986f57cc --- /dev/null +++ b/sound/pci/ctxfi/ct20k2reg.h | |||
@@ -0,0 +1,85 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | */ | ||
8 | |||
9 | #ifndef _20K2REGISTERS_H_ | ||
10 | #define _20K2REGISTERS_H_ | ||
11 | |||
12 | |||
13 | /* Timer Registers */ | ||
14 | #define TIMER_TIMR 0x1B7004 | ||
15 | #define INTERRUPT_GIP 0x1B7010 | ||
16 | #define INTERRUPT_GIE 0x1B7014 | ||
17 | |||
18 | /* I2C Registers */ | ||
19 | #define I2C_IF_ADDRESS 0x1B9000 | ||
20 | #define I2C_IF_WDATA 0x1B9004 | ||
21 | #define I2C_IF_RDATA 0x1B9008 | ||
22 | #define I2C_IF_STATUS 0x1B900C | ||
23 | #define I2C_IF_WLOCK 0x1B9010 | ||
24 | |||
25 | /* Global Control Registers */ | ||
26 | #define GLOBAL_CNTL_GCTL 0x1B7090 | ||
27 | |||
28 | /* PLL Registers */ | ||
29 | #define PLL_CTL 0x1B7080 | ||
30 | #define PLL_STAT 0x1B7084 | ||
31 | #define PLL_ENB 0x1B7088 | ||
32 | |||
33 | /* SRC Registers */ | ||
34 | #define SRC_CTL 0x1A0000 /* 0x1A0000 + (256 * Chn) */ | ||
35 | #define SRC_CCR 0x1A0004 /* 0x1A0004 + (256 * Chn) */ | ||
36 | #define SRC_IMAP 0x1A0008 /* 0x1A0008 + (256 * Chn) */ | ||
37 | #define SRC_CA 0x1A0010 /* 0x1A0010 + (256 * Chn) */ | ||
38 | #define SRC_CF 0x1A0014 /* 0x1A0014 + (256 * Chn) */ | ||
39 | #define SRC_SA 0x1A0018 /* 0x1A0018 + (256 * Chn) */ | ||
40 | #define SRC_LA 0x1A001C /* 0x1A001C + (256 * Chn) */ | ||
41 | #define SRC_CTLSWR 0x1A0020 /* 0x1A0020 + (256 * Chn) */ | ||
42 | #define SRC_CD 0x1A0080 /* 0x1A0080 + (256 * Chn) + (4 * Regn) */ | ||
43 | #define SRC_MCTL 0x1A012C | ||
44 | #define SRC_IP 0x1A102C /* 0x1A102C + (256 * Regn) */ | ||
45 | #define SRC_ENB 0x1A282C /* 0x1A282C + (256 * Regn) */ | ||
46 | #define SRC_ENBSTAT 0x1A202C | ||
47 | #define SRC_ENBSA 0x1A232C | ||
48 | #define SRC_DN0Z 0x1A0030 | ||
49 | #define SRC_DN1Z 0x1A0040 | ||
50 | #define SRC_UPZ 0x1A0060 | ||
51 | |||
52 | /* GPIO Registers */ | ||
53 | #define GPIO_DATA 0x1B7020 | ||
54 | #define GPIO_CTRL 0x1B7024 | ||
55 | |||
56 | /* Virtual memory registers */ | ||
57 | #define VMEM_PTPAL 0x1C6300 /* 0x1C6300 + (16 * Chn) */ | ||
58 | #define VMEM_PTPAH 0x1C6304 /* 0x1C6304 + (16 * Chn) */ | ||
59 | #define VMEM_CTL 0x1C7000 | ||
60 | |||
61 | /* Transport Registers */ | ||
62 | #define TRANSPORT_ENB 0x1B6000 | ||
63 | #define TRANSPORT_CTL 0x1B6004 | ||
64 | #define TRANSPORT_INT 0x1B6008 | ||
65 | |||
66 | /* Audio IO */ | ||
67 | #define AUDIO_IO_AIM 0x1B5000 /* 0x1B5000 + (0x04 * Chn) */ | ||
68 | #define AUDIO_IO_TX_CTL 0x1B5400 /* 0x1B5400 + (0x40 * Chn) */ | ||
69 | #define AUDIO_IO_TX_CSTAT_L 0x1B5408 /* 0x1B5408 + (0x40 * Chn) */ | ||
70 | #define AUDIO_IO_TX_CSTAT_H 0x1B540C /* 0x1B540C + (0x40 * Chn) */ | ||
71 | #define AUDIO_IO_RX_CTL 0x1B5410 /* 0x1B5410 + (0x40 * Chn) */ | ||
72 | #define AUDIO_IO_RX_SRT_CTL 0x1B5420 /* 0x1B5420 + (0x40 * Chn) */ | ||
73 | #define AUDIO_IO_MCLK 0x1B5600 | ||
74 | #define AUDIO_IO_TX_BLRCLK 0x1B5604 | ||
75 | #define AUDIO_IO_RX_BLRCLK 0x1B5608 | ||
76 | |||
77 | /* Mixer */ | ||
78 | #define MIXER_AMOPLO 0x130000 /* 0x130000 + (8 * Chn) [4095 : 0] */ | ||
79 | #define MIXER_AMOPHI 0x130004 /* 0x130004 + (8 * Chn) [4095 : 0] */ | ||
80 | #define MIXER_PRING_LO_HI 0x188000 /* 0x188000 + (4 * Chn) [4095 : 0] */ | ||
81 | #define MIXER_PMOPLO 0x138000 /* 0x138000 + (8 * Chn) [4095 : 0] */ | ||
82 | #define MIXER_PMOPHI 0x138004 /* 0x138004 + (8 * Chn) [4095 : 0] */ | ||
83 | #define MIXER_AR_ENABLE 0x19000C | ||
84 | |||
85 | #endif | ||
diff --git a/sound/pci/ctxfi/ctamixer.c b/sound/pci/ctxfi/ctamixer.c new file mode 100644 index 000000000000..a1db51b3ead8 --- /dev/null +++ b/sound/pci/ctxfi/ctamixer.c | |||
@@ -0,0 +1,488 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctamixer.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of the Audio Mixer | ||
12 | * resource management object. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date May 21 2008 | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #include "ctamixer.h" | ||
20 | #include "cthardware.h" | ||
21 | #include <linux/slab.h> | ||
22 | |||
23 | #define AMIXER_RESOURCE_NUM 256 | ||
24 | #define SUM_RESOURCE_NUM 256 | ||
25 | |||
26 | #define AMIXER_Y_IMMEDIATE 1 | ||
27 | |||
28 | #define BLANK_SLOT 4094 | ||
29 | |||
30 | static int amixer_master(struct rsc *rsc) | ||
31 | { | ||
32 | rsc->conj = 0; | ||
33 | return rsc->idx = container_of(rsc, struct amixer, rsc)->idx[0]; | ||
34 | } | ||
35 | |||
36 | static int amixer_next_conj(struct rsc *rsc) | ||
37 | { | ||
38 | rsc->conj++; | ||
39 | return container_of(rsc, struct amixer, rsc)->idx[rsc->conj]; | ||
40 | } | ||
41 | |||
42 | static int amixer_index(const struct rsc *rsc) | ||
43 | { | ||
44 | return container_of(rsc, struct amixer, rsc)->idx[rsc->conj]; | ||
45 | } | ||
46 | |||
47 | static int amixer_output_slot(const struct rsc *rsc) | ||
48 | { | ||
49 | return (amixer_index(rsc) << 4) + 0x4; | ||
50 | } | ||
51 | |||
52 | static struct rsc_ops amixer_basic_rsc_ops = { | ||
53 | .master = amixer_master, | ||
54 | .next_conj = amixer_next_conj, | ||
55 | .index = amixer_index, | ||
56 | .output_slot = amixer_output_slot, | ||
57 | }; | ||
58 | |||
59 | static int amixer_set_input(struct amixer *amixer, struct rsc *rsc) | ||
60 | { | ||
61 | struct hw *hw; | ||
62 | |||
63 | hw = amixer->rsc.hw; | ||
64 | hw->amixer_set_mode(amixer->rsc.ctrl_blk, AMIXER_Y_IMMEDIATE); | ||
65 | amixer->input = rsc; | ||
66 | if (NULL == rsc) | ||
67 | hw->amixer_set_x(amixer->rsc.ctrl_blk, BLANK_SLOT); | ||
68 | else | ||
69 | hw->amixer_set_x(amixer->rsc.ctrl_blk, | ||
70 | rsc->ops->output_slot(rsc)); | ||
71 | |||
72 | return 0; | ||
73 | } | ||
74 | |||
75 | /* y is a 14-bit immediate constant */ | ||
76 | static int amixer_set_y(struct amixer *amixer, unsigned int y) | ||
77 | { | ||
78 | struct hw *hw; | ||
79 | |||
80 | hw = amixer->rsc.hw; | ||
81 | hw->amixer_set_y(amixer->rsc.ctrl_blk, y); | ||
82 | |||
83 | return 0; | ||
84 | } | ||
85 | |||
86 | static int amixer_set_invalid_squash(struct amixer *amixer, unsigned int iv) | ||
87 | { | ||
88 | struct hw *hw; | ||
89 | |||
90 | hw = amixer->rsc.hw; | ||
91 | hw->amixer_set_iv(amixer->rsc.ctrl_blk, iv); | ||
92 | |||
93 | return 0; | ||
94 | } | ||
95 | |||
96 | static int amixer_set_sum(struct amixer *amixer, struct sum *sum) | ||
97 | { | ||
98 | struct hw *hw; | ||
99 | |||
100 | hw = amixer->rsc.hw; | ||
101 | amixer->sum = sum; | ||
102 | if (NULL == sum) { | ||
103 | hw->amixer_set_se(amixer->rsc.ctrl_blk, 0); | ||
104 | } else { | ||
105 | hw->amixer_set_se(amixer->rsc.ctrl_blk, 1); | ||
106 | hw->amixer_set_sadr(amixer->rsc.ctrl_blk, | ||
107 | sum->rsc.ops->index(&sum->rsc)); | ||
108 | } | ||
109 | |||
110 | return 0; | ||
111 | } | ||
112 | |||
113 | static int amixer_commit_write(struct amixer *amixer) | ||
114 | { | ||
115 | struct hw *hw; | ||
116 | unsigned int index; | ||
117 | int i; | ||
118 | struct rsc *input; | ||
119 | struct sum *sum; | ||
120 | |||
121 | hw = amixer->rsc.hw; | ||
122 | input = amixer->input; | ||
123 | sum = amixer->sum; | ||
124 | |||
125 | /* Program master and conjugate resources */ | ||
126 | amixer->rsc.ops->master(&amixer->rsc); | ||
127 | if (NULL != input) | ||
128 | input->ops->master(input); | ||
129 | |||
130 | if (NULL != sum) | ||
131 | sum->rsc.ops->master(&sum->rsc); | ||
132 | |||
133 | for (i = 0; i < amixer->rsc.msr; i++) { | ||
134 | hw->amixer_set_dirty_all(amixer->rsc.ctrl_blk); | ||
135 | if (NULL != input) { | ||
136 | hw->amixer_set_x(amixer->rsc.ctrl_blk, | ||
137 | input->ops->output_slot(input)); | ||
138 | input->ops->next_conj(input); | ||
139 | } | ||
140 | if (NULL != sum) { | ||
141 | hw->amixer_set_sadr(amixer->rsc.ctrl_blk, | ||
142 | sum->rsc.ops->index(&sum->rsc)); | ||
143 | sum->rsc.ops->next_conj(&sum->rsc); | ||
144 | } | ||
145 | index = amixer->rsc.ops->output_slot(&amixer->rsc); | ||
146 | hw->amixer_commit_write(hw, index, amixer->rsc.ctrl_blk); | ||
147 | amixer->rsc.ops->next_conj(&amixer->rsc); | ||
148 | } | ||
149 | amixer->rsc.ops->master(&amixer->rsc); | ||
150 | if (NULL != input) | ||
151 | input->ops->master(input); | ||
152 | |||
153 | if (NULL != sum) | ||
154 | sum->rsc.ops->master(&sum->rsc); | ||
155 | |||
156 | return 0; | ||
157 | } | ||
158 | |||
159 | static int amixer_commit_raw_write(struct amixer *amixer) | ||
160 | { | ||
161 | struct hw *hw; | ||
162 | unsigned int index; | ||
163 | |||
164 | hw = amixer->rsc.hw; | ||
165 | index = amixer->rsc.ops->output_slot(&amixer->rsc); | ||
166 | hw->amixer_commit_write(hw, index, amixer->rsc.ctrl_blk); | ||
167 | |||
168 | return 0; | ||
169 | } | ||
170 | |||
171 | static int amixer_get_y(struct amixer *amixer) | ||
172 | { | ||
173 | struct hw *hw; | ||
174 | |||
175 | hw = amixer->rsc.hw; | ||
176 | return hw->amixer_get_y(amixer->rsc.ctrl_blk); | ||
177 | } | ||
178 | |||
179 | static int amixer_setup(struct amixer *amixer, struct rsc *input, | ||
180 | unsigned int scale, struct sum *sum) | ||
181 | { | ||
182 | amixer_set_input(amixer, input); | ||
183 | amixer_set_y(amixer, scale); | ||
184 | amixer_set_sum(amixer, sum); | ||
185 | amixer_commit_write(amixer); | ||
186 | return 0; | ||
187 | } | ||
188 | |||
189 | static struct amixer_rsc_ops amixer_ops = { | ||
190 | .set_input = amixer_set_input, | ||
191 | .set_invalid_squash = amixer_set_invalid_squash, | ||
192 | .set_scale = amixer_set_y, | ||
193 | .set_sum = amixer_set_sum, | ||
194 | .commit_write = amixer_commit_write, | ||
195 | .commit_raw_write = amixer_commit_raw_write, | ||
196 | .setup = amixer_setup, | ||
197 | .get_scale = amixer_get_y, | ||
198 | }; | ||
199 | |||
200 | static int amixer_rsc_init(struct amixer *amixer, | ||
201 | const struct amixer_desc *desc, | ||
202 | struct amixer_mgr *mgr) | ||
203 | { | ||
204 | int err; | ||
205 | |||
206 | err = rsc_init(&amixer->rsc, amixer->idx[0], | ||
207 | AMIXER, desc->msr, mgr->mgr.hw); | ||
208 | if (err) | ||
209 | return err; | ||
210 | |||
211 | /* Set amixer specific operations */ | ||
212 | amixer->rsc.ops = &amixer_basic_rsc_ops; | ||
213 | amixer->ops = &amixer_ops; | ||
214 | amixer->input = NULL; | ||
215 | amixer->sum = NULL; | ||
216 | |||
217 | amixer_setup(amixer, NULL, 0, NULL); | ||
218 | |||
219 | return 0; | ||
220 | } | ||
221 | |||
222 | static int amixer_rsc_uninit(struct amixer *amixer) | ||
223 | { | ||
224 | amixer_setup(amixer, NULL, 0, NULL); | ||
225 | rsc_uninit(&amixer->rsc); | ||
226 | amixer->ops = NULL; | ||
227 | amixer->input = NULL; | ||
228 | amixer->sum = NULL; | ||
229 | return 0; | ||
230 | } | ||
231 | |||
232 | static int get_amixer_rsc(struct amixer_mgr *mgr, | ||
233 | const struct amixer_desc *desc, | ||
234 | struct amixer **ramixer) | ||
235 | { | ||
236 | int err, i; | ||
237 | unsigned int idx; | ||
238 | struct amixer *amixer; | ||
239 | unsigned long flags; | ||
240 | |||
241 | *ramixer = NULL; | ||
242 | |||
243 | /* Allocate mem for amixer resource */ | ||
244 | amixer = kzalloc(sizeof(*amixer), GFP_KERNEL); | ||
245 | if (NULL == amixer) { | ||
246 | err = -ENOMEM; | ||
247 | return err; | ||
248 | } | ||
249 | |||
250 | /* Check whether there are sufficient | ||
251 | * amixer resources to meet request. */ | ||
252 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
253 | for (i = 0; i < desc->msr; i++) { | ||
254 | err = mgr_get_resource(&mgr->mgr, 1, &idx); | ||
255 | if (err) | ||
256 | break; | ||
257 | |||
258 | amixer->idx[i] = idx; | ||
259 | } | ||
260 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
261 | if (err) { | ||
262 | printk(KERN_ERR "ctxfi: Can't meet AMIXER resource request!\n"); | ||
263 | goto error; | ||
264 | } | ||
265 | |||
266 | err = amixer_rsc_init(amixer, desc, mgr); | ||
267 | if (err) | ||
268 | goto error; | ||
269 | |||
270 | *ramixer = amixer; | ||
271 | |||
272 | return 0; | ||
273 | |||
274 | error: | ||
275 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
276 | for (i--; i >= 0; i--) | ||
277 | mgr_put_resource(&mgr->mgr, 1, amixer->idx[i]); | ||
278 | |||
279 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
280 | kfree(amixer); | ||
281 | return err; | ||
282 | } | ||
283 | |||
284 | static int put_amixer_rsc(struct amixer_mgr *mgr, struct amixer *amixer) | ||
285 | { | ||
286 | unsigned long flags; | ||
287 | int i; | ||
288 | |||
289 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
290 | for (i = 0; i < amixer->rsc.msr; i++) | ||
291 | mgr_put_resource(&mgr->mgr, 1, amixer->idx[i]); | ||
292 | |||
293 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
294 | amixer_rsc_uninit(amixer); | ||
295 | kfree(amixer); | ||
296 | |||
297 | return 0; | ||
298 | } | ||
299 | |||
300 | int amixer_mgr_create(void *hw, struct amixer_mgr **ramixer_mgr) | ||
301 | { | ||
302 | int err; | ||
303 | struct amixer_mgr *amixer_mgr; | ||
304 | |||
305 | *ramixer_mgr = NULL; | ||
306 | amixer_mgr = kzalloc(sizeof(*amixer_mgr), GFP_KERNEL); | ||
307 | if (NULL == amixer_mgr) | ||
308 | return -ENOMEM; | ||
309 | |||
310 | err = rsc_mgr_init(&amixer_mgr->mgr, AMIXER, AMIXER_RESOURCE_NUM, hw); | ||
311 | if (err) | ||
312 | goto error; | ||
313 | |||
314 | spin_lock_init(&amixer_mgr->mgr_lock); | ||
315 | |||
316 | amixer_mgr->get_amixer = get_amixer_rsc; | ||
317 | amixer_mgr->put_amixer = put_amixer_rsc; | ||
318 | |||
319 | *ramixer_mgr = amixer_mgr; | ||
320 | |||
321 | return 0; | ||
322 | |||
323 | error: | ||
324 | kfree(amixer_mgr); | ||
325 | return err; | ||
326 | } | ||
327 | |||
328 | int amixer_mgr_destroy(struct amixer_mgr *amixer_mgr) | ||
329 | { | ||
330 | rsc_mgr_uninit(&amixer_mgr->mgr); | ||
331 | kfree(amixer_mgr); | ||
332 | return 0; | ||
333 | } | ||
334 | |||
335 | /* SUM resource management */ | ||
336 | |||
337 | static int sum_master(struct rsc *rsc) | ||
338 | { | ||
339 | rsc->conj = 0; | ||
340 | return rsc->idx = container_of(rsc, struct sum, rsc)->idx[0]; | ||
341 | } | ||
342 | |||
343 | static int sum_next_conj(struct rsc *rsc) | ||
344 | { | ||
345 | rsc->conj++; | ||
346 | return container_of(rsc, struct sum, rsc)->idx[rsc->conj]; | ||
347 | } | ||
348 | |||
349 | static int sum_index(const struct rsc *rsc) | ||
350 | { | ||
351 | return container_of(rsc, struct sum, rsc)->idx[rsc->conj]; | ||
352 | } | ||
353 | |||
354 | static int sum_output_slot(const struct rsc *rsc) | ||
355 | { | ||
356 | return (sum_index(rsc) << 4) + 0xc; | ||
357 | } | ||
358 | |||
359 | static struct rsc_ops sum_basic_rsc_ops = { | ||
360 | .master = sum_master, | ||
361 | .next_conj = sum_next_conj, | ||
362 | .index = sum_index, | ||
363 | .output_slot = sum_output_slot, | ||
364 | }; | ||
365 | |||
366 | static int sum_rsc_init(struct sum *sum, | ||
367 | const struct sum_desc *desc, | ||
368 | struct sum_mgr *mgr) | ||
369 | { | ||
370 | int err; | ||
371 | |||
372 | err = rsc_init(&sum->rsc, sum->idx[0], SUM, desc->msr, mgr->mgr.hw); | ||
373 | if (err) | ||
374 | return err; | ||
375 | |||
376 | sum->rsc.ops = &sum_basic_rsc_ops; | ||
377 | |||
378 | return 0; | ||
379 | } | ||
380 | |||
381 | static int sum_rsc_uninit(struct sum *sum) | ||
382 | { | ||
383 | rsc_uninit(&sum->rsc); | ||
384 | return 0; | ||
385 | } | ||
386 | |||
387 | static int get_sum_rsc(struct sum_mgr *mgr, | ||
388 | const struct sum_desc *desc, | ||
389 | struct sum **rsum) | ||
390 | { | ||
391 | int err, i; | ||
392 | unsigned int idx; | ||
393 | struct sum *sum; | ||
394 | unsigned long flags; | ||
395 | |||
396 | *rsum = NULL; | ||
397 | |||
398 | /* Allocate mem for sum resource */ | ||
399 | sum = kzalloc(sizeof(*sum), GFP_KERNEL); | ||
400 | if (NULL == sum) { | ||
401 | err = -ENOMEM; | ||
402 | return err; | ||
403 | } | ||
404 | |||
405 | /* Check whether there are sufficient sum resources to meet request. */ | ||
406 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
407 | for (i = 0; i < desc->msr; i++) { | ||
408 | err = mgr_get_resource(&mgr->mgr, 1, &idx); | ||
409 | if (err) | ||
410 | break; | ||
411 | |||
412 | sum->idx[i] = idx; | ||
413 | } | ||
414 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
415 | if (err) { | ||
416 | printk(KERN_ERR "ctxfi: Can't meet SUM resource request!\n"); | ||
417 | goto error; | ||
418 | } | ||
419 | |||
420 | err = sum_rsc_init(sum, desc, mgr); | ||
421 | if (err) | ||
422 | goto error; | ||
423 | |||
424 | *rsum = sum; | ||
425 | |||
426 | return 0; | ||
427 | |||
428 | error: | ||
429 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
430 | for (i--; i >= 0; i--) | ||
431 | mgr_put_resource(&mgr->mgr, 1, sum->idx[i]); | ||
432 | |||
433 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
434 | kfree(sum); | ||
435 | return err; | ||
436 | } | ||
437 | |||
438 | static int put_sum_rsc(struct sum_mgr *mgr, struct sum *sum) | ||
439 | { | ||
440 | unsigned long flags; | ||
441 | int i; | ||
442 | |||
443 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
444 | for (i = 0; i < sum->rsc.msr; i++) | ||
445 | mgr_put_resource(&mgr->mgr, 1, sum->idx[i]); | ||
446 | |||
447 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
448 | sum_rsc_uninit(sum); | ||
449 | kfree(sum); | ||
450 | |||
451 | return 0; | ||
452 | } | ||
453 | |||
454 | int sum_mgr_create(void *hw, struct sum_mgr **rsum_mgr) | ||
455 | { | ||
456 | int err; | ||
457 | struct sum_mgr *sum_mgr; | ||
458 | |||
459 | *rsum_mgr = NULL; | ||
460 | sum_mgr = kzalloc(sizeof(*sum_mgr), GFP_KERNEL); | ||
461 | if (NULL == sum_mgr) | ||
462 | return -ENOMEM; | ||
463 | |||
464 | err = rsc_mgr_init(&sum_mgr->mgr, SUM, SUM_RESOURCE_NUM, hw); | ||
465 | if (err) | ||
466 | goto error; | ||
467 | |||
468 | spin_lock_init(&sum_mgr->mgr_lock); | ||
469 | |||
470 | sum_mgr->get_sum = get_sum_rsc; | ||
471 | sum_mgr->put_sum = put_sum_rsc; | ||
472 | |||
473 | *rsum_mgr = sum_mgr; | ||
474 | |||
475 | return 0; | ||
476 | |||
477 | error: | ||
478 | kfree(sum_mgr); | ||
479 | return err; | ||
480 | } | ||
481 | |||
482 | int sum_mgr_destroy(struct sum_mgr *sum_mgr) | ||
483 | { | ||
484 | rsc_mgr_uninit(&sum_mgr->mgr); | ||
485 | kfree(sum_mgr); | ||
486 | return 0; | ||
487 | } | ||
488 | |||
diff --git a/sound/pci/ctxfi/ctamixer.h b/sound/pci/ctxfi/ctamixer.h new file mode 100644 index 000000000000..cc49e5ab4750 --- /dev/null +++ b/sound/pci/ctxfi/ctamixer.h | |||
@@ -0,0 +1,96 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctamixer.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of the Audio Mixer | ||
12 | * resource management object. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date May 21 2008 | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #ifndef CTAMIXER_H | ||
20 | #define CTAMIXER_H | ||
21 | |||
22 | #include "ctresource.h" | ||
23 | #include <linux/spinlock.h> | ||
24 | |||
25 | /* Define the descriptor of a summation node resource */ | ||
26 | struct sum { | ||
27 | struct rsc rsc; /* Basic resource info */ | ||
28 | unsigned char idx[8]; | ||
29 | }; | ||
30 | |||
31 | /* Define sum resource request description info */ | ||
32 | struct sum_desc { | ||
33 | unsigned int msr; | ||
34 | }; | ||
35 | |||
36 | struct sum_mgr { | ||
37 | struct rsc_mgr mgr; /* Basic resource manager info */ | ||
38 | spinlock_t mgr_lock; | ||
39 | |||
40 | /* request one sum resource */ | ||
41 | int (*get_sum)(struct sum_mgr *mgr, | ||
42 | const struct sum_desc *desc, struct sum **rsum); | ||
43 | /* return one sum resource */ | ||
44 | int (*put_sum)(struct sum_mgr *mgr, struct sum *sum); | ||
45 | }; | ||
46 | |||
47 | /* Constructor and destructor of daio resource manager */ | ||
48 | int sum_mgr_create(void *hw, struct sum_mgr **rsum_mgr); | ||
49 | int sum_mgr_destroy(struct sum_mgr *sum_mgr); | ||
50 | |||
51 | /* Define the descriptor of a amixer resource */ | ||
52 | struct amixer_rsc_ops; | ||
53 | |||
54 | struct amixer { | ||
55 | struct rsc rsc; /* Basic resource info */ | ||
56 | unsigned char idx[8]; | ||
57 | struct rsc *input; /* pointer to a resource acting as source */ | ||
58 | struct sum *sum; /* Put amixer output to this summation node */ | ||
59 | struct amixer_rsc_ops *ops; /* AMixer specific operations */ | ||
60 | }; | ||
61 | |||
62 | struct amixer_rsc_ops { | ||
63 | int (*set_input)(struct amixer *amixer, struct rsc *rsc); | ||
64 | int (*set_scale)(struct amixer *amixer, unsigned int scale); | ||
65 | int (*set_invalid_squash)(struct amixer *amixer, unsigned int iv); | ||
66 | int (*set_sum)(struct amixer *amixer, struct sum *sum); | ||
67 | int (*commit_write)(struct amixer *amixer); | ||
68 | /* Only for interleaved recording */ | ||
69 | int (*commit_raw_write)(struct amixer *amixer); | ||
70 | int (*setup)(struct amixer *amixer, struct rsc *input, | ||
71 | unsigned int scale, struct sum *sum); | ||
72 | int (*get_scale)(struct amixer *amixer); | ||
73 | }; | ||
74 | |||
75 | /* Define amixer resource request description info */ | ||
76 | struct amixer_desc { | ||
77 | unsigned int msr; | ||
78 | }; | ||
79 | |||
80 | struct amixer_mgr { | ||
81 | struct rsc_mgr mgr; /* Basic resource manager info */ | ||
82 | spinlock_t mgr_lock; | ||
83 | |||
84 | /* request one amixer resource */ | ||
85 | int (*get_amixer)(struct amixer_mgr *mgr, | ||
86 | const struct amixer_desc *desc, | ||
87 | struct amixer **ramixer); | ||
88 | /* return one amixer resource */ | ||
89 | int (*put_amixer)(struct amixer_mgr *mgr, struct amixer *amixer); | ||
90 | }; | ||
91 | |||
92 | /* Constructor and destructor of amixer resource manager */ | ||
93 | int amixer_mgr_create(void *hw, struct amixer_mgr **ramixer_mgr); | ||
94 | int amixer_mgr_destroy(struct amixer_mgr *amixer_mgr); | ||
95 | |||
96 | #endif /* CTAMIXER_H */ | ||
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c new file mode 100644 index 000000000000..a49c76647307 --- /dev/null +++ b/sound/pci/ctxfi/ctatc.c | |||
@@ -0,0 +1,1713 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctatc.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of the device resource management | ||
12 | * object. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date Mar 28 2008 | ||
16 | */ | ||
17 | |||
18 | #include "ctatc.h" | ||
19 | #include "ctpcm.h" | ||
20 | #include "ctmixer.h" | ||
21 | #include "cthardware.h" | ||
22 | #include "ctsrc.h" | ||
23 | #include "ctamixer.h" | ||
24 | #include "ctdaio.h" | ||
25 | #include "cttimer.h" | ||
26 | #include <linux/delay.h> | ||
27 | #include <sound/pcm.h> | ||
28 | #include <sound/control.h> | ||
29 | #include <sound/asoundef.h> | ||
30 | |||
31 | #define MONO_SUM_SCALE 0x19a8 /* 2^(-0.5) in 14-bit floating format */ | ||
32 | #define DAIONUM 7 | ||
33 | #define MAX_MULTI_CHN 8 | ||
34 | |||
35 | #define IEC958_DEFAULT_CON ((IEC958_AES0_NONAUDIO \ | ||
36 | | IEC958_AES0_CON_NOT_COPYRIGHT) \ | ||
37 | | ((IEC958_AES1_CON_MIXER \ | ||
38 | | IEC958_AES1_CON_ORIGINAL) << 8) \ | ||
39 | | (0x10 << 16) \ | ||
40 | | ((IEC958_AES3_CON_FS_48000) << 24)) | ||
41 | |||
42 | static struct snd_pci_quirk __devinitdata subsys_20k1_list[] = { | ||
43 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0022, "SB055x", CTSB055X), | ||
44 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X), | ||
45 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X), | ||
46 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0031, "SB073x", CTSB073X), | ||
47 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_CREATIVE, 0xf000, 0x6000, | ||
48 | "UAA", CTUAA), | ||
49 | { } /* terminator */ | ||
50 | }; | ||
51 | |||
52 | static struct snd_pci_quirk __devinitdata subsys_20k2_list[] = { | ||
53 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, PCI_SUBDEVICE_ID_CREATIVE_SB0760, | ||
54 | "SB0760", CTSB0760), | ||
55 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, PCI_SUBDEVICE_ID_CREATIVE_SB08801, | ||
56 | "SB0880", CTSB0880), | ||
57 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, PCI_SUBDEVICE_ID_CREATIVE_SB08802, | ||
58 | "SB0880", CTSB0880), | ||
59 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, PCI_SUBDEVICE_ID_CREATIVE_SB08803, | ||
60 | "SB0880", CTSB0880), | ||
61 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_CREATIVE, 0xf000, | ||
62 | PCI_SUBDEVICE_ID_CREATIVE_HENDRIX, "HENDRIX", | ||
63 | CTHENDRIX), | ||
64 | { } /* terminator */ | ||
65 | }; | ||
66 | |||
67 | static const char *ct_subsys_name[NUM_CTCARDS] = { | ||
68 | /* 20k1 models */ | ||
69 | [CTSB055X] = "SB055x", | ||
70 | [CTSB073X] = "SB073x", | ||
71 | [CTUAA] = "UAA", | ||
72 | [CT20K1_UNKNOWN] = "Unknown", | ||
73 | /* 20k2 models */ | ||
74 | [CTSB0760] = "SB076x", | ||
75 | [CTHENDRIX] = "Hendrix", | ||
76 | [CTSB0880] = "SB0880", | ||
77 | [CT20K2_UNKNOWN] = "Unknown", | ||
78 | }; | ||
79 | |||
80 | static struct { | ||
81 | int (*create)(struct ct_atc *atc, | ||
82 | enum CTALSADEVS device, const char *device_name); | ||
83 | int (*destroy)(void *alsa_dev); | ||
84 | const char *public_name; | ||
85 | } alsa_dev_funcs[NUM_CTALSADEVS] = { | ||
86 | [FRONT] = { .create = ct_alsa_pcm_create, | ||
87 | .destroy = NULL, | ||
88 | .public_name = "Front/WaveIn"}, | ||
89 | [SURROUND] = { .create = ct_alsa_pcm_create, | ||
90 | .destroy = NULL, | ||
91 | .public_name = "Surround"}, | ||
92 | [CLFE] = { .create = ct_alsa_pcm_create, | ||
93 | .destroy = NULL, | ||
94 | .public_name = "Center/LFE"}, | ||
95 | [SIDE] = { .create = ct_alsa_pcm_create, | ||
96 | .destroy = NULL, | ||
97 | .public_name = "Side"}, | ||
98 | [IEC958] = { .create = ct_alsa_pcm_create, | ||
99 | .destroy = NULL, | ||
100 | .public_name = "IEC958 Non-audio"}, | ||
101 | |||
102 | [MIXER] = { .create = ct_alsa_mix_create, | ||
103 | .destroy = NULL, | ||
104 | .public_name = "Mixer"} | ||
105 | }; | ||
106 | |||
107 | typedef int (*create_t)(void *, void **); | ||
108 | typedef int (*destroy_t)(void *); | ||
109 | |||
110 | static struct { | ||
111 | int (*create)(void *hw, void **rmgr); | ||
112 | int (*destroy)(void *mgr); | ||
113 | } rsc_mgr_funcs[NUM_RSCTYP] = { | ||
114 | [SRC] = { .create = (create_t)src_mgr_create, | ||
115 | .destroy = (destroy_t)src_mgr_destroy }, | ||
116 | [SRCIMP] = { .create = (create_t)srcimp_mgr_create, | ||
117 | .destroy = (destroy_t)srcimp_mgr_destroy }, | ||
118 | [AMIXER] = { .create = (create_t)amixer_mgr_create, | ||
119 | .destroy = (destroy_t)amixer_mgr_destroy }, | ||
120 | [SUM] = { .create = (create_t)sum_mgr_create, | ||
121 | .destroy = (destroy_t)sum_mgr_destroy }, | ||
122 | [DAIO] = { .create = (create_t)daio_mgr_create, | ||
123 | .destroy = (destroy_t)daio_mgr_destroy } | ||
124 | }; | ||
125 | |||
126 | static int | ||
127 | atc_pcm_release_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm); | ||
128 | |||
129 | /* * | ||
130 | * Only mono and interleaved modes are supported now. | ||
131 | * Always allocates a contiguous channel block. | ||
132 | * */ | ||
133 | |||
134 | static int ct_map_audio_buffer(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
135 | { | ||
136 | struct snd_pcm_runtime *runtime; | ||
137 | struct ct_vm *vm; | ||
138 | |||
139 | if (NULL == apcm->substream) | ||
140 | return 0; | ||
141 | |||
142 | runtime = apcm->substream->runtime; | ||
143 | vm = atc->vm; | ||
144 | |||
145 | apcm->vm_block = vm->map(vm, apcm->substream, runtime->dma_bytes); | ||
146 | |||
147 | if (NULL == apcm->vm_block) | ||
148 | return -ENOENT; | ||
149 | |||
150 | return 0; | ||
151 | } | ||
152 | |||
153 | static void ct_unmap_audio_buffer(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
154 | { | ||
155 | struct ct_vm *vm; | ||
156 | |||
157 | if (NULL == apcm->vm_block) | ||
158 | return; | ||
159 | |||
160 | vm = atc->vm; | ||
161 | |||
162 | vm->unmap(vm, apcm->vm_block); | ||
163 | |||
164 | apcm->vm_block = NULL; | ||
165 | } | ||
166 | |||
167 | static unsigned long atc_get_ptp_phys(struct ct_atc *atc, int index) | ||
168 | { | ||
169 | struct ct_vm *vm; | ||
170 | void *kvirt_addr; | ||
171 | unsigned long phys_addr; | ||
172 | |||
173 | vm = atc->vm; | ||
174 | kvirt_addr = vm->get_ptp_virt(vm, index); | ||
175 | if (kvirt_addr == NULL) | ||
176 | phys_addr = (~0UL); | ||
177 | else | ||
178 | phys_addr = virt_to_phys(kvirt_addr); | ||
179 | |||
180 | return phys_addr; | ||
181 | } | ||
182 | |||
183 | static unsigned int convert_format(snd_pcm_format_t snd_format) | ||
184 | { | ||
185 | switch (snd_format) { | ||
186 | case SNDRV_PCM_FORMAT_U8: | ||
187 | return SRC_SF_U8; | ||
188 | case SNDRV_PCM_FORMAT_S16_LE: | ||
189 | return SRC_SF_S16; | ||
190 | case SNDRV_PCM_FORMAT_S24_3LE: | ||
191 | return SRC_SF_S24; | ||
192 | case SNDRV_PCM_FORMAT_S32_LE: | ||
193 | return SRC_SF_S32; | ||
194 | case SNDRV_PCM_FORMAT_FLOAT_LE: | ||
195 | return SRC_SF_F32; | ||
196 | default: | ||
197 | printk(KERN_ERR "ctxfi: not recognized snd format is %d \n", | ||
198 | snd_format); | ||
199 | return SRC_SF_S16; | ||
200 | } | ||
201 | } | ||
202 | |||
203 | static unsigned int | ||
204 | atc_get_pitch(unsigned int input_rate, unsigned int output_rate) | ||
205 | { | ||
206 | unsigned int pitch; | ||
207 | int b; | ||
208 | |||
209 | /* get pitch and convert to fixed-point 8.24 format. */ | ||
210 | pitch = (input_rate / output_rate) << 24; | ||
211 | input_rate %= output_rate; | ||
212 | input_rate /= 100; | ||
213 | output_rate /= 100; | ||
214 | for (b = 31; ((b >= 0) && !(input_rate >> b)); ) | ||
215 | b--; | ||
216 | |||
217 | if (b >= 0) { | ||
218 | input_rate <<= (31 - b); | ||
219 | input_rate /= output_rate; | ||
220 | b = 24 - (31 - b); | ||
221 | if (b >= 0) | ||
222 | input_rate <<= b; | ||
223 | else | ||
224 | input_rate >>= -b; | ||
225 | |||
226 | pitch |= input_rate; | ||
227 | } | ||
228 | |||
229 | return pitch; | ||
230 | } | ||
231 | |||
232 | static int select_rom(unsigned int pitch) | ||
233 | { | ||
234 | if ((pitch > 0x00428f5c) && (pitch < 0x01b851ec)) { | ||
235 | /* 0.26 <= pitch <= 1.72 */ | ||
236 | return 1; | ||
237 | } else if ((0x01d66666 == pitch) || (0x01d66667 == pitch)) { | ||
238 | /* pitch == 1.8375 */ | ||
239 | return 2; | ||
240 | } else if (0x02000000 == pitch) { | ||
241 | /* pitch == 2 */ | ||
242 | return 3; | ||
243 | } else if ((pitch >= 0x0) && (pitch <= 0x08000000)) { | ||
244 | /* 0 <= pitch <= 8 */ | ||
245 | return 0; | ||
246 | } else { | ||
247 | return -ENOENT; | ||
248 | } | ||
249 | } | ||
250 | |||
251 | static int atc_pcm_playback_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
252 | { | ||
253 | struct src_mgr *src_mgr = atc->rsc_mgrs[SRC]; | ||
254 | struct amixer_mgr *amixer_mgr = atc->rsc_mgrs[AMIXER]; | ||
255 | struct src_desc desc = {0}; | ||
256 | struct amixer_desc mix_dsc = {0}; | ||
257 | struct src *src; | ||
258 | struct amixer *amixer; | ||
259 | int err; | ||
260 | int n_amixer = apcm->substream->runtime->channels, i = 0; | ||
261 | int device = apcm->substream->pcm->device; | ||
262 | unsigned int pitch; | ||
263 | |||
264 | /* first release old resources */ | ||
265 | atc_pcm_release_resources(atc, apcm); | ||
266 | |||
267 | /* Get SRC resource */ | ||
268 | desc.multi = apcm->substream->runtime->channels; | ||
269 | desc.msr = atc->msr; | ||
270 | desc.mode = MEMRD; | ||
271 | err = src_mgr->get_src(src_mgr, &desc, (struct src **)&apcm->src); | ||
272 | if (err) | ||
273 | goto error1; | ||
274 | |||
275 | pitch = atc_get_pitch(apcm->substream->runtime->rate, | ||
276 | (atc->rsr * atc->msr)); | ||
277 | src = apcm->src; | ||
278 | src->ops->set_pitch(src, pitch); | ||
279 | src->ops->set_rom(src, select_rom(pitch)); | ||
280 | src->ops->set_sf(src, convert_format(apcm->substream->runtime->format)); | ||
281 | src->ops->set_pm(src, (src->ops->next_interleave(src) != NULL)); | ||
282 | |||
283 | /* Get AMIXER resource */ | ||
284 | n_amixer = (n_amixer < 2) ? 2 : n_amixer; | ||
285 | apcm->amixers = kzalloc(sizeof(void *)*n_amixer, GFP_KERNEL); | ||
286 | if (NULL == apcm->amixers) { | ||
287 | err = -ENOMEM; | ||
288 | goto error1; | ||
289 | } | ||
290 | mix_dsc.msr = atc->msr; | ||
291 | for (i = 0, apcm->n_amixer = 0; i < n_amixer; i++) { | ||
292 | err = amixer_mgr->get_amixer(amixer_mgr, &mix_dsc, | ||
293 | (struct amixer **)&apcm->amixers[i]); | ||
294 | if (err) | ||
295 | goto error1; | ||
296 | |||
297 | apcm->n_amixer++; | ||
298 | } | ||
299 | |||
300 | /* Set up device virtual mem map */ | ||
301 | err = ct_map_audio_buffer(atc, apcm); | ||
302 | if (err < 0) | ||
303 | goto error1; | ||
304 | |||
305 | /* Connect resources */ | ||
306 | src = apcm->src; | ||
307 | for (i = 0; i < n_amixer; i++) { | ||
308 | amixer = apcm->amixers[i]; | ||
309 | mutex_lock(&atc->atc_mutex); | ||
310 | amixer->ops->setup(amixer, &src->rsc, | ||
311 | INIT_VOL, atc->pcm[i+device*2]); | ||
312 | mutex_unlock(&atc->atc_mutex); | ||
313 | src = src->ops->next_interleave(src); | ||
314 | if (NULL == src) | ||
315 | src = apcm->src; | ||
316 | } | ||
317 | |||
318 | ct_timer_prepare(apcm->timer); | ||
319 | |||
320 | return 0; | ||
321 | |||
322 | error1: | ||
323 | atc_pcm_release_resources(atc, apcm); | ||
324 | return err; | ||
325 | } | ||
326 | |||
327 | static int | ||
328 | atc_pcm_release_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
329 | { | ||
330 | struct src_mgr *src_mgr = atc->rsc_mgrs[SRC]; | ||
331 | struct srcimp_mgr *srcimp_mgr = atc->rsc_mgrs[SRCIMP]; | ||
332 | struct amixer_mgr *amixer_mgr = atc->rsc_mgrs[AMIXER]; | ||
333 | struct sum_mgr *sum_mgr = atc->rsc_mgrs[SUM]; | ||
334 | struct srcimp *srcimp; | ||
335 | int i; | ||
336 | |||
337 | if (NULL != apcm->srcimps) { | ||
338 | for (i = 0; i < apcm->n_srcimp; i++) { | ||
339 | srcimp = apcm->srcimps[i]; | ||
340 | srcimp->ops->unmap(srcimp); | ||
341 | srcimp_mgr->put_srcimp(srcimp_mgr, srcimp); | ||
342 | apcm->srcimps[i] = NULL; | ||
343 | } | ||
344 | kfree(apcm->srcimps); | ||
345 | apcm->srcimps = NULL; | ||
346 | } | ||
347 | |||
348 | if (NULL != apcm->srccs) { | ||
349 | for (i = 0; i < apcm->n_srcc; i++) { | ||
350 | src_mgr->put_src(src_mgr, apcm->srccs[i]); | ||
351 | apcm->srccs[i] = NULL; | ||
352 | } | ||
353 | kfree(apcm->srccs); | ||
354 | apcm->srccs = NULL; | ||
355 | } | ||
356 | |||
357 | if (NULL != apcm->amixers) { | ||
358 | for (i = 0; i < apcm->n_amixer; i++) { | ||
359 | amixer_mgr->put_amixer(amixer_mgr, apcm->amixers[i]); | ||
360 | apcm->amixers[i] = NULL; | ||
361 | } | ||
362 | kfree(apcm->amixers); | ||
363 | apcm->amixers = NULL; | ||
364 | } | ||
365 | |||
366 | if (NULL != apcm->mono) { | ||
367 | sum_mgr->put_sum(sum_mgr, apcm->mono); | ||
368 | apcm->mono = NULL; | ||
369 | } | ||
370 | |||
371 | if (NULL != apcm->src) { | ||
372 | src_mgr->put_src(src_mgr, apcm->src); | ||
373 | apcm->src = NULL; | ||
374 | } | ||
375 | |||
376 | if (NULL != apcm->vm_block) { | ||
377 | /* Undo device virtual mem map */ | ||
378 | ct_unmap_audio_buffer(atc, apcm); | ||
379 | apcm->vm_block = NULL; | ||
380 | } | ||
381 | |||
382 | return 0; | ||
383 | } | ||
384 | |||
385 | static int atc_pcm_playback_start(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
386 | { | ||
387 | unsigned int max_cisz; | ||
388 | struct src *src = apcm->src; | ||
389 | |||
390 | if (apcm->started) | ||
391 | return 0; | ||
392 | apcm->started = 1; | ||
393 | |||
394 | max_cisz = src->multi * src->rsc.msr; | ||
395 | max_cisz = 0x80 * (max_cisz < 8 ? max_cisz : 8); | ||
396 | |||
397 | src->ops->set_sa(src, apcm->vm_block->addr); | ||
398 | src->ops->set_la(src, apcm->vm_block->addr + apcm->vm_block->size); | ||
399 | src->ops->set_ca(src, apcm->vm_block->addr + max_cisz); | ||
400 | src->ops->set_cisz(src, max_cisz); | ||
401 | |||
402 | src->ops->set_bm(src, 1); | ||
403 | src->ops->set_state(src, SRC_STATE_INIT); | ||
404 | src->ops->commit_write(src); | ||
405 | |||
406 | ct_timer_start(apcm->timer); | ||
407 | return 0; | ||
408 | } | ||
409 | |||
410 | static int atc_pcm_stop(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
411 | { | ||
412 | struct src *src; | ||
413 | int i; | ||
414 | |||
415 | ct_timer_stop(apcm->timer); | ||
416 | |||
417 | src = apcm->src; | ||
418 | src->ops->set_bm(src, 0); | ||
419 | src->ops->set_state(src, SRC_STATE_OFF); | ||
420 | src->ops->commit_write(src); | ||
421 | |||
422 | if (NULL != apcm->srccs) { | ||
423 | for (i = 0; i < apcm->n_srcc; i++) { | ||
424 | src = apcm->srccs[i]; | ||
425 | src->ops->set_bm(src, 0); | ||
426 | src->ops->set_state(src, SRC_STATE_OFF); | ||
427 | src->ops->commit_write(src); | ||
428 | } | ||
429 | } | ||
430 | |||
431 | apcm->started = 0; | ||
432 | |||
433 | return 0; | ||
434 | } | ||
435 | |||
436 | static int | ||
437 | atc_pcm_playback_position(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
438 | { | ||
439 | struct src *src = apcm->src; | ||
440 | u32 size, max_cisz; | ||
441 | int position; | ||
442 | |||
443 | if (!src) | ||
444 | return 0; | ||
445 | position = src->ops->get_ca(src); | ||
446 | |||
447 | size = apcm->vm_block->size; | ||
448 | max_cisz = src->multi * src->rsc.msr; | ||
449 | max_cisz = 128 * (max_cisz < 8 ? max_cisz : 8); | ||
450 | |||
451 | return (position + size - max_cisz - apcm->vm_block->addr) % size; | ||
452 | } | ||
453 | |||
454 | struct src_node_conf_t { | ||
455 | unsigned int pitch; | ||
456 | unsigned int msr:8; | ||
457 | unsigned int mix_msr:8; | ||
458 | unsigned int imp_msr:8; | ||
459 | unsigned int vo:1; | ||
460 | }; | ||
461 | |||
462 | static void setup_src_node_conf(struct ct_atc *atc, struct ct_atc_pcm *apcm, | ||
463 | struct src_node_conf_t *conf, int *n_srcc) | ||
464 | { | ||
465 | unsigned int pitch; | ||
466 | |||
467 | /* get pitch and convert to fixed-point 8.24 format. */ | ||
468 | pitch = atc_get_pitch((atc->rsr * atc->msr), | ||
469 | apcm->substream->runtime->rate); | ||
470 | *n_srcc = 0; | ||
471 | |||
472 | if (1 == atc->msr) { | ||
473 | *n_srcc = apcm->substream->runtime->channels; | ||
474 | conf[0].pitch = pitch; | ||
475 | conf[0].mix_msr = conf[0].imp_msr = conf[0].msr = 1; | ||
476 | conf[0].vo = 1; | ||
477 | } else if (2 == atc->msr) { | ||
478 | if (0x8000000 < pitch) { | ||
479 | /* Need two-stage SRCs, SRCIMPs and | ||
480 | * AMIXERs for converting format */ | ||
481 | conf[0].pitch = (atc->msr << 24); | ||
482 | conf[0].msr = conf[0].mix_msr = 1; | ||
483 | conf[0].imp_msr = atc->msr; | ||
484 | conf[0].vo = 0; | ||
485 | conf[1].pitch = atc_get_pitch(atc->rsr, | ||
486 | apcm->substream->runtime->rate); | ||
487 | conf[1].msr = conf[1].mix_msr = conf[1].imp_msr = 1; | ||
488 | conf[1].vo = 1; | ||
489 | *n_srcc = apcm->substream->runtime->channels * 2; | ||
490 | } else if (0x1000000 < pitch) { | ||
491 | /* Need one-stage SRCs, SRCIMPs and | ||
492 | * AMIXERs for converting format */ | ||
493 | conf[0].pitch = pitch; | ||
494 | conf[0].msr = conf[0].mix_msr | ||
495 | = conf[0].imp_msr = atc->msr; | ||
496 | conf[0].vo = 1; | ||
497 | *n_srcc = apcm->substream->runtime->channels; | ||
498 | } | ||
499 | } | ||
500 | } | ||
501 | |||
502 | static int | ||
503 | atc_pcm_capture_get_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
504 | { | ||
505 | struct src_mgr *src_mgr = atc->rsc_mgrs[SRC]; | ||
506 | struct srcimp_mgr *srcimp_mgr = atc->rsc_mgrs[SRCIMP]; | ||
507 | struct amixer_mgr *amixer_mgr = atc->rsc_mgrs[AMIXER]; | ||
508 | struct sum_mgr *sum_mgr = atc->rsc_mgrs[SUM]; | ||
509 | struct src_desc src_dsc = {0}; | ||
510 | struct src *src; | ||
511 | struct srcimp_desc srcimp_dsc = {0}; | ||
512 | struct srcimp *srcimp; | ||
513 | struct amixer_desc mix_dsc = {0}; | ||
514 | struct sum_desc sum_dsc = {0}; | ||
515 | unsigned int pitch; | ||
516 | int multi, err, i; | ||
517 | int n_srcimp, n_amixer, n_srcc, n_sum; | ||
518 | struct src_node_conf_t src_node_conf[2] = {{0} }; | ||
519 | |||
520 | /* first release old resources */ | ||
521 | atc_pcm_release_resources(atc, apcm); | ||
522 | |||
523 | /* The numbers of converting SRCs and SRCIMPs should be determined | ||
524 | * by pitch value. */ | ||
525 | |||
526 | multi = apcm->substream->runtime->channels; | ||
527 | |||
528 | /* get pitch and convert to fixed-point 8.24 format. */ | ||
529 | pitch = atc_get_pitch((atc->rsr * atc->msr), | ||
530 | apcm->substream->runtime->rate); | ||
531 | |||
532 | setup_src_node_conf(atc, apcm, src_node_conf, &n_srcc); | ||
533 | n_sum = (1 == multi) ? 1 : 0; | ||
534 | n_amixer = n_sum * 2 + n_srcc; | ||
535 | n_srcimp = n_srcc; | ||
536 | if ((multi > 1) && (0x8000000 >= pitch)) { | ||
537 | /* Need extra AMIXERs and SRCIMPs for special treatment | ||
538 | * of interleaved recording of conjugate channels */ | ||
539 | n_amixer += multi * atc->msr; | ||
540 | n_srcimp += multi * atc->msr; | ||
541 | } else { | ||
542 | n_srcimp += multi; | ||
543 | } | ||
544 | |||
545 | if (n_srcc) { | ||
546 | apcm->srccs = kzalloc(sizeof(void *)*n_srcc, GFP_KERNEL); | ||
547 | if (NULL == apcm->srccs) | ||
548 | return -ENOMEM; | ||
549 | } | ||
550 | if (n_amixer) { | ||
551 | apcm->amixers = kzalloc(sizeof(void *)*n_amixer, GFP_KERNEL); | ||
552 | if (NULL == apcm->amixers) { | ||
553 | err = -ENOMEM; | ||
554 | goto error1; | ||
555 | } | ||
556 | } | ||
557 | apcm->srcimps = kzalloc(sizeof(void *)*n_srcimp, GFP_KERNEL); | ||
558 | if (NULL == apcm->srcimps) { | ||
559 | err = -ENOMEM; | ||
560 | goto error1; | ||
561 | } | ||
562 | |||
563 | /* Allocate SRCs for sample rate conversion if needed */ | ||
564 | src_dsc.multi = 1; | ||
565 | src_dsc.mode = ARCRW; | ||
566 | for (i = 0, apcm->n_srcc = 0; i < n_srcc; i++) { | ||
567 | src_dsc.msr = src_node_conf[i/multi].msr; | ||
568 | err = src_mgr->get_src(src_mgr, &src_dsc, | ||
569 | (struct src **)&apcm->srccs[i]); | ||
570 | if (err) | ||
571 | goto error1; | ||
572 | |||
573 | src = apcm->srccs[i]; | ||
574 | pitch = src_node_conf[i/multi].pitch; | ||
575 | src->ops->set_pitch(src, pitch); | ||
576 | src->ops->set_rom(src, select_rom(pitch)); | ||
577 | src->ops->set_vo(src, src_node_conf[i/multi].vo); | ||
578 | |||
579 | apcm->n_srcc++; | ||
580 | } | ||
581 | |||
582 | /* Allocate AMIXERs for routing SRCs of conversion if needed */ | ||
583 | for (i = 0, apcm->n_amixer = 0; i < n_amixer; i++) { | ||
584 | if (i < (n_sum*2)) | ||
585 | mix_dsc.msr = atc->msr; | ||
586 | else if (i < (n_sum*2+n_srcc)) | ||
587 | mix_dsc.msr = src_node_conf[(i-n_sum*2)/multi].mix_msr; | ||
588 | else | ||
589 | mix_dsc.msr = 1; | ||
590 | |||
591 | err = amixer_mgr->get_amixer(amixer_mgr, &mix_dsc, | ||
592 | (struct amixer **)&apcm->amixers[i]); | ||
593 | if (err) | ||
594 | goto error1; | ||
595 | |||
596 | apcm->n_amixer++; | ||
597 | } | ||
598 | |||
599 | /* Allocate a SUM resource to mix all input channels together */ | ||
600 | sum_dsc.msr = atc->msr; | ||
601 | err = sum_mgr->get_sum(sum_mgr, &sum_dsc, (struct sum **)&apcm->mono); | ||
602 | if (err) | ||
603 | goto error1; | ||
604 | |||
605 | pitch = atc_get_pitch((atc->rsr * atc->msr), | ||
606 | apcm->substream->runtime->rate); | ||
607 | /* Allocate SRCIMP resources */ | ||
608 | for (i = 0, apcm->n_srcimp = 0; i < n_srcimp; i++) { | ||
609 | if (i < (n_srcc)) | ||
610 | srcimp_dsc.msr = src_node_conf[i/multi].imp_msr; | ||
611 | else if (1 == multi) | ||
612 | srcimp_dsc.msr = (pitch <= 0x8000000) ? atc->msr : 1; | ||
613 | else | ||
614 | srcimp_dsc.msr = 1; | ||
615 | |||
616 | err = srcimp_mgr->get_srcimp(srcimp_mgr, &srcimp_dsc, &srcimp); | ||
617 | if (err) | ||
618 | goto error1; | ||
619 | |||
620 | apcm->srcimps[i] = srcimp; | ||
621 | apcm->n_srcimp++; | ||
622 | } | ||
623 | |||
624 | /* Allocate a SRC for writing data to host memory */ | ||
625 | src_dsc.multi = apcm->substream->runtime->channels; | ||
626 | src_dsc.msr = 1; | ||
627 | src_dsc.mode = MEMWR; | ||
628 | err = src_mgr->get_src(src_mgr, &src_dsc, (struct src **)&apcm->src); | ||
629 | if (err) | ||
630 | goto error1; | ||
631 | |||
632 | src = apcm->src; | ||
633 | src->ops->set_pitch(src, pitch); | ||
634 | |||
635 | /* Set up device virtual mem map */ | ||
636 | err = ct_map_audio_buffer(atc, apcm); | ||
637 | if (err < 0) | ||
638 | goto error1; | ||
639 | |||
640 | return 0; | ||
641 | |||
642 | error1: | ||
643 | atc_pcm_release_resources(atc, apcm); | ||
644 | return err; | ||
645 | } | ||
646 | |||
647 | static int atc_pcm_capture_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
648 | { | ||
649 | struct src *src; | ||
650 | struct amixer *amixer; | ||
651 | struct srcimp *srcimp; | ||
652 | struct ct_mixer *mixer = atc->mixer; | ||
653 | struct sum *mono; | ||
654 | struct rsc *out_ports[8] = {NULL}; | ||
655 | int err, i, j, n_sum, multi; | ||
656 | unsigned int pitch; | ||
657 | int mix_base = 0, imp_base = 0; | ||
658 | |||
659 | atc_pcm_release_resources(atc, apcm); | ||
660 | |||
661 | /* Get needed resources. */ | ||
662 | err = atc_pcm_capture_get_resources(atc, apcm); | ||
663 | if (err) | ||
664 | return err; | ||
665 | |||
666 | /* Connect resources */ | ||
667 | mixer->get_output_ports(mixer, MIX_PCMO_FRONT, | ||
668 | &out_ports[0], &out_ports[1]); | ||
669 | |||
670 | multi = apcm->substream->runtime->channels; | ||
671 | if (1 == multi) { | ||
672 | mono = apcm->mono; | ||
673 | for (i = 0; i < 2; i++) { | ||
674 | amixer = apcm->amixers[i]; | ||
675 | amixer->ops->setup(amixer, out_ports[i], | ||
676 | MONO_SUM_SCALE, mono); | ||
677 | } | ||
678 | out_ports[0] = &mono->rsc; | ||
679 | n_sum = 1; | ||
680 | mix_base = n_sum * 2; | ||
681 | } | ||
682 | |||
683 | for (i = 0; i < apcm->n_srcc; i++) { | ||
684 | src = apcm->srccs[i]; | ||
685 | srcimp = apcm->srcimps[imp_base+i]; | ||
686 | amixer = apcm->amixers[mix_base+i]; | ||
687 | srcimp->ops->map(srcimp, src, out_ports[i%multi]); | ||
688 | amixer->ops->setup(amixer, &src->rsc, INIT_VOL, NULL); | ||
689 | out_ports[i%multi] = &amixer->rsc; | ||
690 | } | ||
691 | |||
692 | pitch = atc_get_pitch((atc->rsr * atc->msr), | ||
693 | apcm->substream->runtime->rate); | ||
694 | |||
695 | if ((multi > 1) && (pitch <= 0x8000000)) { | ||
696 | /* Special connection for interleaved | ||
697 | * recording with conjugate channels */ | ||
698 | for (i = 0; i < multi; i++) { | ||
699 | out_ports[i]->ops->master(out_ports[i]); | ||
700 | for (j = 0; j < atc->msr; j++) { | ||
701 | amixer = apcm->amixers[apcm->n_srcc+j*multi+i]; | ||
702 | amixer->ops->set_input(amixer, out_ports[i]); | ||
703 | amixer->ops->set_scale(amixer, INIT_VOL); | ||
704 | amixer->ops->set_sum(amixer, NULL); | ||
705 | amixer->ops->commit_raw_write(amixer); | ||
706 | out_ports[i]->ops->next_conj(out_ports[i]); | ||
707 | |||
708 | srcimp = apcm->srcimps[apcm->n_srcc+j*multi+i]; | ||
709 | srcimp->ops->map(srcimp, apcm->src, | ||
710 | &amixer->rsc); | ||
711 | } | ||
712 | } | ||
713 | } else { | ||
714 | for (i = 0; i < multi; i++) { | ||
715 | srcimp = apcm->srcimps[apcm->n_srcc+i]; | ||
716 | srcimp->ops->map(srcimp, apcm->src, out_ports[i]); | ||
717 | } | ||
718 | } | ||
719 | |||
720 | ct_timer_prepare(apcm->timer); | ||
721 | |||
722 | return 0; | ||
723 | } | ||
724 | |||
725 | static int atc_pcm_capture_start(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
726 | { | ||
727 | struct src *src; | ||
728 | struct src_mgr *src_mgr = atc->rsc_mgrs[SRC]; | ||
729 | int i, multi; | ||
730 | |||
731 | if (apcm->started) | ||
732 | return 0; | ||
733 | |||
734 | apcm->started = 1; | ||
735 | multi = apcm->substream->runtime->channels; | ||
736 | /* Set up converting SRCs */ | ||
737 | for (i = 0; i < apcm->n_srcc; i++) { | ||
738 | src = apcm->srccs[i]; | ||
739 | src->ops->set_pm(src, ((i%multi) != (multi-1))); | ||
740 | src_mgr->src_disable(src_mgr, src); | ||
741 | } | ||
742 | |||
743 | /* Set up recording SRC */ | ||
744 | src = apcm->src; | ||
745 | src->ops->set_sf(src, convert_format(apcm->substream->runtime->format)); | ||
746 | src->ops->set_sa(src, apcm->vm_block->addr); | ||
747 | src->ops->set_la(src, apcm->vm_block->addr + apcm->vm_block->size); | ||
748 | src->ops->set_ca(src, apcm->vm_block->addr); | ||
749 | src_mgr->src_disable(src_mgr, src); | ||
750 | |||
751 | /* Disable relevant SRCs firstly */ | ||
752 | src_mgr->commit_write(src_mgr); | ||
753 | |||
754 | /* Enable SRCs respectively */ | ||
755 | for (i = 0; i < apcm->n_srcc; i++) { | ||
756 | src = apcm->srccs[i]; | ||
757 | src->ops->set_state(src, SRC_STATE_RUN); | ||
758 | src->ops->commit_write(src); | ||
759 | src_mgr->src_enable_s(src_mgr, src); | ||
760 | } | ||
761 | src = apcm->src; | ||
762 | src->ops->set_bm(src, 1); | ||
763 | src->ops->set_state(src, SRC_STATE_RUN); | ||
764 | src->ops->commit_write(src); | ||
765 | src_mgr->src_enable_s(src_mgr, src); | ||
766 | |||
767 | /* Enable relevant SRCs synchronously */ | ||
768 | src_mgr->commit_write(src_mgr); | ||
769 | |||
770 | ct_timer_start(apcm->timer); | ||
771 | return 0; | ||
772 | } | ||
773 | |||
774 | static int | ||
775 | atc_pcm_capture_position(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
776 | { | ||
777 | struct src *src = apcm->src; | ||
778 | |||
779 | if (!src) | ||
780 | return 0; | ||
781 | return src->ops->get_ca(src) - apcm->vm_block->addr; | ||
782 | } | ||
783 | |||
784 | static int spdif_passthru_playback_get_resources(struct ct_atc *atc, | ||
785 | struct ct_atc_pcm *apcm) | ||
786 | { | ||
787 | struct src_mgr *src_mgr = atc->rsc_mgrs[SRC]; | ||
788 | struct amixer_mgr *amixer_mgr = atc->rsc_mgrs[AMIXER]; | ||
789 | struct src_desc desc = {0}; | ||
790 | struct amixer_desc mix_dsc = {0}; | ||
791 | struct src *src; | ||
792 | int err; | ||
793 | int n_amixer = apcm->substream->runtime->channels, i; | ||
794 | unsigned int pitch, rsr = atc->pll_rate; | ||
795 | |||
796 | /* first release old resources */ | ||
797 | atc_pcm_release_resources(atc, apcm); | ||
798 | |||
799 | /* Get SRC resource */ | ||
800 | desc.multi = apcm->substream->runtime->channels; | ||
801 | desc.msr = 1; | ||
802 | while (apcm->substream->runtime->rate > (rsr * desc.msr)) | ||
803 | desc.msr <<= 1; | ||
804 | |||
805 | desc.mode = MEMRD; | ||
806 | err = src_mgr->get_src(src_mgr, &desc, (struct src **)&apcm->src); | ||
807 | if (err) | ||
808 | goto error1; | ||
809 | |||
810 | pitch = atc_get_pitch(apcm->substream->runtime->rate, (rsr * desc.msr)); | ||
811 | src = apcm->src; | ||
812 | src->ops->set_pitch(src, pitch); | ||
813 | src->ops->set_rom(src, select_rom(pitch)); | ||
814 | src->ops->set_sf(src, convert_format(apcm->substream->runtime->format)); | ||
815 | src->ops->set_pm(src, (src->ops->next_interleave(src) != NULL)); | ||
816 | src->ops->set_bp(src, 1); | ||
817 | |||
818 | /* Get AMIXER resource */ | ||
819 | n_amixer = (n_amixer < 2) ? 2 : n_amixer; | ||
820 | apcm->amixers = kzalloc(sizeof(void *)*n_amixer, GFP_KERNEL); | ||
821 | if (NULL == apcm->amixers) { | ||
822 | err = -ENOMEM; | ||
823 | goto error1; | ||
824 | } | ||
825 | mix_dsc.msr = desc.msr; | ||
826 | for (i = 0, apcm->n_amixer = 0; i < n_amixer; i++) { | ||
827 | err = amixer_mgr->get_amixer(amixer_mgr, &mix_dsc, | ||
828 | (struct amixer **)&apcm->amixers[i]); | ||
829 | if (err) | ||
830 | goto error1; | ||
831 | |||
832 | apcm->n_amixer++; | ||
833 | } | ||
834 | |||
835 | /* Set up device virtual mem map */ | ||
836 | err = ct_map_audio_buffer(atc, apcm); | ||
837 | if (err < 0) | ||
838 | goto error1; | ||
839 | |||
840 | return 0; | ||
841 | |||
842 | error1: | ||
843 | atc_pcm_release_resources(atc, apcm); | ||
844 | return err; | ||
845 | } | ||
846 | |||
847 | static int atc_pll_init(struct ct_atc *atc, int rate) | ||
848 | { | ||
849 | struct hw *hw = atc->hw; | ||
850 | int err; | ||
851 | err = hw->pll_init(hw, rate); | ||
852 | atc->pll_rate = err ? 0 : rate; | ||
853 | return err; | ||
854 | } | ||
855 | |||
856 | static int | ||
857 | spdif_passthru_playback_setup(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
858 | { | ||
859 | struct dao *dao = container_of(atc->daios[SPDIFOO], struct dao, daio); | ||
860 | unsigned int rate = apcm->substream->runtime->rate; | ||
861 | unsigned int status; | ||
862 | int err = 0; | ||
863 | unsigned char iec958_con_fs; | ||
864 | |||
865 | switch (rate) { | ||
866 | case 48000: | ||
867 | iec958_con_fs = IEC958_AES3_CON_FS_48000; | ||
868 | break; | ||
869 | case 44100: | ||
870 | iec958_con_fs = IEC958_AES3_CON_FS_44100; | ||
871 | break; | ||
872 | case 32000: | ||
873 | iec958_con_fs = IEC958_AES3_CON_FS_32000; | ||
874 | break; | ||
875 | default: | ||
876 | return -ENOENT; | ||
877 | } | ||
878 | |||
879 | mutex_lock(&atc->atc_mutex); | ||
880 | dao->ops->get_spos(dao, &status); | ||
881 | if (((status >> 24) & IEC958_AES3_CON_FS) != iec958_con_fs) { | ||
882 | status &= ((~IEC958_AES3_CON_FS) << 24); | ||
883 | status |= (iec958_con_fs << 24); | ||
884 | dao->ops->set_spos(dao, status); | ||
885 | dao->ops->commit_write(dao); | ||
886 | } | ||
887 | if ((rate != atc->pll_rate) && (32000 != rate)) | ||
888 | err = atc_pll_init(atc, rate); | ||
889 | mutex_unlock(&atc->atc_mutex); | ||
890 | |||
891 | return err; | ||
892 | } | ||
893 | |||
894 | static int | ||
895 | spdif_passthru_playback_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm) | ||
896 | { | ||
897 | struct src *src; | ||
898 | struct amixer *amixer; | ||
899 | struct dao *dao; | ||
900 | int err; | ||
901 | int i; | ||
902 | |||
903 | atc_pcm_release_resources(atc, apcm); | ||
904 | |||
905 | /* Configure SPDIFOO and PLL to passthrough mode; | ||
906 | * determine pll_rate. */ | ||
907 | err = spdif_passthru_playback_setup(atc, apcm); | ||
908 | if (err) | ||
909 | return err; | ||
910 | |||
911 | /* Get needed resources. */ | ||
912 | err = spdif_passthru_playback_get_resources(atc, apcm); | ||
913 | if (err) | ||
914 | return err; | ||
915 | |||
916 | /* Connect resources */ | ||
917 | src = apcm->src; | ||
918 | for (i = 0; i < apcm->n_amixer; i++) { | ||
919 | amixer = apcm->amixers[i]; | ||
920 | amixer->ops->setup(amixer, &src->rsc, INIT_VOL, NULL); | ||
921 | src = src->ops->next_interleave(src); | ||
922 | if (NULL == src) | ||
923 | src = apcm->src; | ||
924 | } | ||
925 | /* Connect to SPDIFOO */ | ||
926 | mutex_lock(&atc->atc_mutex); | ||
927 | dao = container_of(atc->daios[SPDIFOO], struct dao, daio); | ||
928 | amixer = apcm->amixers[0]; | ||
929 | dao->ops->set_left_input(dao, &amixer->rsc); | ||
930 | amixer = apcm->amixers[1]; | ||
931 | dao->ops->set_right_input(dao, &amixer->rsc); | ||
932 | mutex_unlock(&atc->atc_mutex); | ||
933 | |||
934 | ct_timer_prepare(apcm->timer); | ||
935 | |||
936 | return 0; | ||
937 | } | ||
938 | |||
939 | static int atc_select_line_in(struct ct_atc *atc) | ||
940 | { | ||
941 | struct hw *hw = atc->hw; | ||
942 | struct ct_mixer *mixer = atc->mixer; | ||
943 | struct src *src; | ||
944 | |||
945 | if (hw->is_adc_source_selected(hw, ADC_LINEIN)) | ||
946 | return 0; | ||
947 | |||
948 | mixer->set_input_left(mixer, MIX_MIC_IN, NULL); | ||
949 | mixer->set_input_right(mixer, MIX_MIC_IN, NULL); | ||
950 | |||
951 | hw->select_adc_source(hw, ADC_LINEIN); | ||
952 | |||
953 | src = atc->srcs[2]; | ||
954 | mixer->set_input_left(mixer, MIX_LINE_IN, &src->rsc); | ||
955 | src = atc->srcs[3]; | ||
956 | mixer->set_input_right(mixer, MIX_LINE_IN, &src->rsc); | ||
957 | |||
958 | return 0; | ||
959 | } | ||
960 | |||
961 | static int atc_select_mic_in(struct ct_atc *atc) | ||
962 | { | ||
963 | struct hw *hw = atc->hw; | ||
964 | struct ct_mixer *mixer = atc->mixer; | ||
965 | struct src *src; | ||
966 | |||
967 | if (hw->is_adc_source_selected(hw, ADC_MICIN)) | ||
968 | return 0; | ||
969 | |||
970 | mixer->set_input_left(mixer, MIX_LINE_IN, NULL); | ||
971 | mixer->set_input_right(mixer, MIX_LINE_IN, NULL); | ||
972 | |||
973 | hw->select_adc_source(hw, ADC_MICIN); | ||
974 | |||
975 | src = atc->srcs[2]; | ||
976 | mixer->set_input_left(mixer, MIX_MIC_IN, &src->rsc); | ||
977 | src = atc->srcs[3]; | ||
978 | mixer->set_input_right(mixer, MIX_MIC_IN, &src->rsc); | ||
979 | |||
980 | return 0; | ||
981 | } | ||
982 | |||
983 | static int atc_have_digit_io_switch(struct ct_atc *atc) | ||
984 | { | ||
985 | struct hw *hw = atc->hw; | ||
986 | |||
987 | return hw->have_digit_io_switch(hw); | ||
988 | } | ||
989 | |||
990 | static int atc_select_digit_io(struct ct_atc *atc) | ||
991 | { | ||
992 | struct hw *hw = atc->hw; | ||
993 | |||
994 | if (hw->is_adc_source_selected(hw, ADC_NONE)) | ||
995 | return 0; | ||
996 | |||
997 | hw->select_adc_source(hw, ADC_NONE); | ||
998 | |||
999 | return 0; | ||
1000 | } | ||
1001 | |||
1002 | static int atc_daio_unmute(struct ct_atc *atc, unsigned char state, int type) | ||
1003 | { | ||
1004 | struct daio_mgr *daio_mgr = atc->rsc_mgrs[DAIO]; | ||
1005 | |||
1006 | if (state) | ||
1007 | daio_mgr->daio_enable(daio_mgr, atc->daios[type]); | ||
1008 | else | ||
1009 | daio_mgr->daio_disable(daio_mgr, atc->daios[type]); | ||
1010 | |||
1011 | daio_mgr->commit_write(daio_mgr); | ||
1012 | |||
1013 | return 0; | ||
1014 | } | ||
1015 | |||
1016 | static int | ||
1017 | atc_dao_get_status(struct ct_atc *atc, unsigned int *status, int type) | ||
1018 | { | ||
1019 | struct dao *dao = container_of(atc->daios[type], struct dao, daio); | ||
1020 | return dao->ops->get_spos(dao, status); | ||
1021 | } | ||
1022 | |||
1023 | static int | ||
1024 | atc_dao_set_status(struct ct_atc *atc, unsigned int status, int type) | ||
1025 | { | ||
1026 | struct dao *dao = container_of(atc->daios[type], struct dao, daio); | ||
1027 | |||
1028 | dao->ops->set_spos(dao, status); | ||
1029 | dao->ops->commit_write(dao); | ||
1030 | return 0; | ||
1031 | } | ||
1032 | |||
1033 | static int atc_line_front_unmute(struct ct_atc *atc, unsigned char state) | ||
1034 | { | ||
1035 | return atc_daio_unmute(atc, state, LINEO1); | ||
1036 | } | ||
1037 | |||
1038 | static int atc_line_surround_unmute(struct ct_atc *atc, unsigned char state) | ||
1039 | { | ||
1040 | return atc_daio_unmute(atc, state, LINEO4); | ||
1041 | } | ||
1042 | |||
1043 | static int atc_line_clfe_unmute(struct ct_atc *atc, unsigned char state) | ||
1044 | { | ||
1045 | return atc_daio_unmute(atc, state, LINEO3); | ||
1046 | } | ||
1047 | |||
1048 | static int atc_line_rear_unmute(struct ct_atc *atc, unsigned char state) | ||
1049 | { | ||
1050 | return atc_daio_unmute(atc, state, LINEO2); | ||
1051 | } | ||
1052 | |||
1053 | static int atc_line_in_unmute(struct ct_atc *atc, unsigned char state) | ||
1054 | { | ||
1055 | return atc_daio_unmute(atc, state, LINEIM); | ||
1056 | } | ||
1057 | |||
1058 | static int atc_spdif_out_unmute(struct ct_atc *atc, unsigned char state) | ||
1059 | { | ||
1060 | return atc_daio_unmute(atc, state, SPDIFOO); | ||
1061 | } | ||
1062 | |||
1063 | static int atc_spdif_in_unmute(struct ct_atc *atc, unsigned char state) | ||
1064 | { | ||
1065 | return atc_daio_unmute(atc, state, SPDIFIO); | ||
1066 | } | ||
1067 | |||
1068 | static int atc_spdif_out_get_status(struct ct_atc *atc, unsigned int *status) | ||
1069 | { | ||
1070 | return atc_dao_get_status(atc, status, SPDIFOO); | ||
1071 | } | ||
1072 | |||
1073 | static int atc_spdif_out_set_status(struct ct_atc *atc, unsigned int status) | ||
1074 | { | ||
1075 | return atc_dao_set_status(atc, status, SPDIFOO); | ||
1076 | } | ||
1077 | |||
1078 | static int atc_spdif_out_passthru(struct ct_atc *atc, unsigned char state) | ||
1079 | { | ||
1080 | struct dao_desc da_dsc = {0}; | ||
1081 | struct dao *dao; | ||
1082 | int err; | ||
1083 | struct ct_mixer *mixer = atc->mixer; | ||
1084 | struct rsc *rscs[2] = {NULL}; | ||
1085 | unsigned int spos = 0; | ||
1086 | |||
1087 | mutex_lock(&atc->atc_mutex); | ||
1088 | dao = container_of(atc->daios[SPDIFOO], struct dao, daio); | ||
1089 | da_dsc.msr = state ? 1 : atc->msr; | ||
1090 | da_dsc.passthru = state ? 1 : 0; | ||
1091 | err = dao->ops->reinit(dao, &da_dsc); | ||
1092 | if (state) { | ||
1093 | spos = IEC958_DEFAULT_CON; | ||
1094 | } else { | ||
1095 | mixer->get_output_ports(mixer, MIX_SPDIF_OUT, | ||
1096 | &rscs[0], &rscs[1]); | ||
1097 | dao->ops->set_left_input(dao, rscs[0]); | ||
1098 | dao->ops->set_right_input(dao, rscs[1]); | ||
1099 | /* Restore PLL to atc->rsr if needed. */ | ||
1100 | if (atc->pll_rate != atc->rsr) | ||
1101 | err = atc_pll_init(atc, atc->rsr); | ||
1102 | } | ||
1103 | dao->ops->set_spos(dao, spos); | ||
1104 | dao->ops->commit_write(dao); | ||
1105 | mutex_unlock(&atc->atc_mutex); | ||
1106 | |||
1107 | return err; | ||
1108 | } | ||
1109 | |||
1110 | static int atc_release_resources(struct ct_atc *atc) | ||
1111 | { | ||
1112 | int i; | ||
1113 | struct daio_mgr *daio_mgr = NULL; | ||
1114 | struct dao *dao = NULL; | ||
1115 | struct dai *dai = NULL; | ||
1116 | struct daio *daio = NULL; | ||
1117 | struct sum_mgr *sum_mgr = NULL; | ||
1118 | struct src_mgr *src_mgr = NULL; | ||
1119 | struct srcimp_mgr *srcimp_mgr = NULL; | ||
1120 | struct srcimp *srcimp = NULL; | ||
1121 | struct ct_mixer *mixer = NULL; | ||
1122 | |||
1123 | /* disconnect internal mixer objects */ | ||
1124 | if (NULL != atc->mixer) { | ||
1125 | mixer = atc->mixer; | ||
1126 | mixer->set_input_left(mixer, MIX_LINE_IN, NULL); | ||
1127 | mixer->set_input_right(mixer, MIX_LINE_IN, NULL); | ||
1128 | mixer->set_input_left(mixer, MIX_MIC_IN, NULL); | ||
1129 | mixer->set_input_right(mixer, MIX_MIC_IN, NULL); | ||
1130 | mixer->set_input_left(mixer, MIX_SPDIF_IN, NULL); | ||
1131 | mixer->set_input_right(mixer, MIX_SPDIF_IN, NULL); | ||
1132 | } | ||
1133 | |||
1134 | if (NULL != atc->daios) { | ||
1135 | daio_mgr = (struct daio_mgr *)atc->rsc_mgrs[DAIO]; | ||
1136 | for (i = 0; i < atc->n_daio; i++) { | ||
1137 | daio = atc->daios[i]; | ||
1138 | if (daio->type < LINEIM) { | ||
1139 | dao = container_of(daio, struct dao, daio); | ||
1140 | dao->ops->clear_left_input(dao); | ||
1141 | dao->ops->clear_right_input(dao); | ||
1142 | } else { | ||
1143 | dai = container_of(daio, struct dai, daio); | ||
1144 | /* some thing to do for dai ... */ | ||
1145 | } | ||
1146 | daio_mgr->put_daio(daio_mgr, daio); | ||
1147 | } | ||
1148 | kfree(atc->daios); | ||
1149 | atc->daios = NULL; | ||
1150 | } | ||
1151 | |||
1152 | if (NULL != atc->pcm) { | ||
1153 | sum_mgr = atc->rsc_mgrs[SUM]; | ||
1154 | for (i = 0; i < atc->n_pcm; i++) | ||
1155 | sum_mgr->put_sum(sum_mgr, atc->pcm[i]); | ||
1156 | |||
1157 | kfree(atc->pcm); | ||
1158 | atc->pcm = NULL; | ||
1159 | } | ||
1160 | |||
1161 | if (NULL != atc->srcs) { | ||
1162 | src_mgr = atc->rsc_mgrs[SRC]; | ||
1163 | for (i = 0; i < atc->n_src; i++) | ||
1164 | src_mgr->put_src(src_mgr, atc->srcs[i]); | ||
1165 | |||
1166 | kfree(atc->srcs); | ||
1167 | atc->srcs = NULL; | ||
1168 | } | ||
1169 | |||
1170 | if (NULL != atc->srcimps) { | ||
1171 | srcimp_mgr = atc->rsc_mgrs[SRCIMP]; | ||
1172 | for (i = 0; i < atc->n_srcimp; i++) { | ||
1173 | srcimp = atc->srcimps[i]; | ||
1174 | srcimp->ops->unmap(srcimp); | ||
1175 | srcimp_mgr->put_srcimp(srcimp_mgr, atc->srcimps[i]); | ||
1176 | } | ||
1177 | kfree(atc->srcimps); | ||
1178 | atc->srcimps = NULL; | ||
1179 | } | ||
1180 | |||
1181 | return 0; | ||
1182 | } | ||
1183 | |||
1184 | static int ct_atc_destroy(struct ct_atc *atc) | ||
1185 | { | ||
1186 | int i = 0; | ||
1187 | |||
1188 | if (NULL == atc) | ||
1189 | return 0; | ||
1190 | |||
1191 | if (atc->timer) { | ||
1192 | ct_timer_free(atc->timer); | ||
1193 | atc->timer = NULL; | ||
1194 | } | ||
1195 | |||
1196 | atc_release_resources(atc); | ||
1197 | |||
1198 | /* Destroy internal mixer objects */ | ||
1199 | if (NULL != atc->mixer) | ||
1200 | ct_mixer_destroy(atc->mixer); | ||
1201 | |||
1202 | for (i = 0; i < NUM_RSCTYP; i++) { | ||
1203 | if ((NULL != rsc_mgr_funcs[i].destroy) && | ||
1204 | (NULL != atc->rsc_mgrs[i])) | ||
1205 | rsc_mgr_funcs[i].destroy(atc->rsc_mgrs[i]); | ||
1206 | |||
1207 | } | ||
1208 | |||
1209 | if (NULL != atc->hw) | ||
1210 | destroy_hw_obj((struct hw *)atc->hw); | ||
1211 | |||
1212 | /* Destroy device virtual memory manager object */ | ||
1213 | if (NULL != atc->vm) { | ||
1214 | ct_vm_destroy(atc->vm); | ||
1215 | atc->vm = NULL; | ||
1216 | } | ||
1217 | |||
1218 | kfree(atc); | ||
1219 | |||
1220 | return 0; | ||
1221 | } | ||
1222 | |||
1223 | static int atc_dev_free(struct snd_device *dev) | ||
1224 | { | ||
1225 | struct ct_atc *atc = dev->device_data; | ||
1226 | return ct_atc_destroy(atc); | ||
1227 | } | ||
1228 | |||
1229 | static int __devinit atc_identify_card(struct ct_atc *atc) | ||
1230 | { | ||
1231 | const struct snd_pci_quirk *p; | ||
1232 | const struct snd_pci_quirk *list; | ||
1233 | |||
1234 | switch (atc->chip_type) { | ||
1235 | case ATC20K1: | ||
1236 | atc->chip_name = "20K1"; | ||
1237 | list = subsys_20k1_list; | ||
1238 | break; | ||
1239 | case ATC20K2: | ||
1240 | atc->chip_name = "20K2"; | ||
1241 | list = subsys_20k2_list; | ||
1242 | break; | ||
1243 | default: | ||
1244 | return -ENOENT; | ||
1245 | } | ||
1246 | p = snd_pci_quirk_lookup(atc->pci, list); | ||
1247 | if (p) { | ||
1248 | if (p->value < 0) { | ||
1249 | printk(KERN_ERR "ctxfi: " | ||
1250 | "Device %04x:%04x is black-listed\n", | ||
1251 | atc->pci->subsystem_vendor, | ||
1252 | atc->pci->subsystem_device); | ||
1253 | return -ENOENT; | ||
1254 | } | ||
1255 | atc->model = p->value; | ||
1256 | } else { | ||
1257 | if (atc->chip_type == ATC20K1) | ||
1258 | atc->model = CT20K1_UNKNOWN; | ||
1259 | else | ||
1260 | atc->model = CT20K2_UNKNOWN; | ||
1261 | } | ||
1262 | atc->model_name = ct_subsys_name[atc->model]; | ||
1263 | snd_printd("ctxfi: chip %s model %s (%04x:%04x) is found\n", | ||
1264 | atc->chip_name, atc->model_name, | ||
1265 | atc->pci->subsystem_vendor, | ||
1266 | atc->pci->subsystem_device); | ||
1267 | return 0; | ||
1268 | } | ||
1269 | |||
1270 | int __devinit ct_atc_create_alsa_devs(struct ct_atc *atc) | ||
1271 | { | ||
1272 | enum CTALSADEVS i; | ||
1273 | int err; | ||
1274 | |||
1275 | alsa_dev_funcs[MIXER].public_name = atc->chip_name; | ||
1276 | |||
1277 | for (i = 0; i < NUM_CTALSADEVS; i++) { | ||
1278 | if (NULL == alsa_dev_funcs[i].create) | ||
1279 | continue; | ||
1280 | |||
1281 | err = alsa_dev_funcs[i].create(atc, i, | ||
1282 | alsa_dev_funcs[i].public_name); | ||
1283 | if (err) { | ||
1284 | printk(KERN_ERR "ctxfi: " | ||
1285 | "Creating alsa device %d failed!\n", i); | ||
1286 | return err; | ||
1287 | } | ||
1288 | } | ||
1289 | |||
1290 | return 0; | ||
1291 | } | ||
1292 | |||
1293 | static int __devinit atc_create_hw_devs(struct ct_atc *atc) | ||
1294 | { | ||
1295 | struct hw *hw; | ||
1296 | struct card_conf info = {0}; | ||
1297 | int i, err; | ||
1298 | |||
1299 | err = create_hw_obj(atc->pci, atc->chip_type, atc->model, &hw); | ||
1300 | if (err) { | ||
1301 | printk(KERN_ERR "Failed to create hw obj!!!\n"); | ||
1302 | return err; | ||
1303 | } | ||
1304 | atc->hw = hw; | ||
1305 | |||
1306 | /* Initialize card hardware. */ | ||
1307 | info.rsr = atc->rsr; | ||
1308 | info.msr = atc->msr; | ||
1309 | info.vm_pgt_phys = atc_get_ptp_phys(atc, 0); | ||
1310 | err = hw->card_init(hw, &info); | ||
1311 | if (err < 0) | ||
1312 | return err; | ||
1313 | |||
1314 | for (i = 0; i < NUM_RSCTYP; i++) { | ||
1315 | if (NULL == rsc_mgr_funcs[i].create) | ||
1316 | continue; | ||
1317 | |||
1318 | err = rsc_mgr_funcs[i].create(atc->hw, &atc->rsc_mgrs[i]); | ||
1319 | if (err) { | ||
1320 | printk(KERN_ERR "ctxfi: " | ||
1321 | "Failed to create rsc_mgr %d!!!\n", i); | ||
1322 | return err; | ||
1323 | } | ||
1324 | } | ||
1325 | |||
1326 | return 0; | ||
1327 | } | ||
1328 | |||
1329 | static int atc_get_resources(struct ct_atc *atc) | ||
1330 | { | ||
1331 | struct daio_desc da_desc = {0}; | ||
1332 | struct daio_mgr *daio_mgr; | ||
1333 | struct src_desc src_dsc = {0}; | ||
1334 | struct src_mgr *src_mgr; | ||
1335 | struct srcimp_desc srcimp_dsc = {0}; | ||
1336 | struct srcimp_mgr *srcimp_mgr; | ||
1337 | struct sum_desc sum_dsc = {0}; | ||
1338 | struct sum_mgr *sum_mgr; | ||
1339 | int err, i; | ||
1340 | |||
1341 | atc->daios = kzalloc(sizeof(void *)*(DAIONUM), GFP_KERNEL); | ||
1342 | if (NULL == atc->daios) | ||
1343 | return -ENOMEM; | ||
1344 | |||
1345 | atc->srcs = kzalloc(sizeof(void *)*(2*2), GFP_KERNEL); | ||
1346 | if (NULL == atc->srcs) | ||
1347 | return -ENOMEM; | ||
1348 | |||
1349 | atc->srcimps = kzalloc(sizeof(void *)*(2*2), GFP_KERNEL); | ||
1350 | if (NULL == atc->srcimps) | ||
1351 | return -ENOMEM; | ||
1352 | |||
1353 | atc->pcm = kzalloc(sizeof(void *)*(2*4), GFP_KERNEL); | ||
1354 | if (NULL == atc->pcm) | ||
1355 | return -ENOMEM; | ||
1356 | |||
1357 | daio_mgr = (struct daio_mgr *)atc->rsc_mgrs[DAIO]; | ||
1358 | da_desc.msr = atc->msr; | ||
1359 | for (i = 0, atc->n_daio = 0; i < DAIONUM-1; i++) { | ||
1360 | da_desc.type = i; | ||
1361 | err = daio_mgr->get_daio(daio_mgr, &da_desc, | ||
1362 | (struct daio **)&atc->daios[i]); | ||
1363 | if (err) { | ||
1364 | printk(KERN_ERR "ctxfi: Failed to get DAIO " | ||
1365 | "resource %d!!!\n", i); | ||
1366 | return err; | ||
1367 | } | ||
1368 | atc->n_daio++; | ||
1369 | } | ||
1370 | if (atc->model == CTSB073X) | ||
1371 | da_desc.type = SPDIFI1; | ||
1372 | else | ||
1373 | da_desc.type = SPDIFIO; | ||
1374 | err = daio_mgr->get_daio(daio_mgr, &da_desc, | ||
1375 | (struct daio **)&atc->daios[i]); | ||
1376 | if (err) { | ||
1377 | printk(KERN_ERR "ctxfi: Failed to get S/PDIF-in resource!!!\n"); | ||
1378 | return err; | ||
1379 | } | ||
1380 | atc->n_daio++; | ||
1381 | |||
1382 | src_mgr = atc->rsc_mgrs[SRC]; | ||
1383 | src_dsc.multi = 1; | ||
1384 | src_dsc.msr = atc->msr; | ||
1385 | src_dsc.mode = ARCRW; | ||
1386 | for (i = 0, atc->n_src = 0; i < (2*2); i++) { | ||
1387 | err = src_mgr->get_src(src_mgr, &src_dsc, | ||
1388 | (struct src **)&atc->srcs[i]); | ||
1389 | if (err) | ||
1390 | return err; | ||
1391 | |||
1392 | atc->n_src++; | ||
1393 | } | ||
1394 | |||
1395 | srcimp_mgr = atc->rsc_mgrs[SRCIMP]; | ||
1396 | srcimp_dsc.msr = 8; /* SRCIMPs for S/PDIFIn SRT */ | ||
1397 | for (i = 0, atc->n_srcimp = 0; i < (2*1); i++) { | ||
1398 | err = srcimp_mgr->get_srcimp(srcimp_mgr, &srcimp_dsc, | ||
1399 | (struct srcimp **)&atc->srcimps[i]); | ||
1400 | if (err) | ||
1401 | return err; | ||
1402 | |||
1403 | atc->n_srcimp++; | ||
1404 | } | ||
1405 | srcimp_dsc.msr = 8; /* SRCIMPs for LINE/MICIn SRT */ | ||
1406 | for (i = 0; i < (2*1); i++) { | ||
1407 | err = srcimp_mgr->get_srcimp(srcimp_mgr, &srcimp_dsc, | ||
1408 | (struct srcimp **)&atc->srcimps[2*1+i]); | ||
1409 | if (err) | ||
1410 | return err; | ||
1411 | |||
1412 | atc->n_srcimp++; | ||
1413 | } | ||
1414 | |||
1415 | sum_mgr = atc->rsc_mgrs[SUM]; | ||
1416 | sum_dsc.msr = atc->msr; | ||
1417 | for (i = 0, atc->n_pcm = 0; i < (2*4); i++) { | ||
1418 | err = sum_mgr->get_sum(sum_mgr, &sum_dsc, | ||
1419 | (struct sum **)&atc->pcm[i]); | ||
1420 | if (err) | ||
1421 | return err; | ||
1422 | |||
1423 | atc->n_pcm++; | ||
1424 | } | ||
1425 | |||
1426 | return 0; | ||
1427 | } | ||
1428 | |||
1429 | static void | ||
1430 | atc_connect_dai(struct src_mgr *src_mgr, struct dai *dai, | ||
1431 | struct src **srcs, struct srcimp **srcimps) | ||
1432 | { | ||
1433 | struct rsc *rscs[2] = {NULL}; | ||
1434 | struct src *src; | ||
1435 | struct srcimp *srcimp; | ||
1436 | int i = 0; | ||
1437 | |||
1438 | rscs[0] = &dai->daio.rscl; | ||
1439 | rscs[1] = &dai->daio.rscr; | ||
1440 | for (i = 0; i < 2; i++) { | ||
1441 | src = srcs[i]; | ||
1442 | srcimp = srcimps[i]; | ||
1443 | srcimp->ops->map(srcimp, src, rscs[i]); | ||
1444 | src_mgr->src_disable(src_mgr, src); | ||
1445 | } | ||
1446 | |||
1447 | src_mgr->commit_write(src_mgr); /* Actually disable SRCs */ | ||
1448 | |||
1449 | src = srcs[0]; | ||
1450 | src->ops->set_pm(src, 1); | ||
1451 | for (i = 0; i < 2; i++) { | ||
1452 | src = srcs[i]; | ||
1453 | src->ops->set_state(src, SRC_STATE_RUN); | ||
1454 | src->ops->commit_write(src); | ||
1455 | src_mgr->src_enable_s(src_mgr, src); | ||
1456 | } | ||
1457 | |||
1458 | dai->ops->set_srt_srcl(dai, &(srcs[0]->rsc)); | ||
1459 | dai->ops->set_srt_srcr(dai, &(srcs[1]->rsc)); | ||
1460 | |||
1461 | dai->ops->set_enb_src(dai, 1); | ||
1462 | dai->ops->set_enb_srt(dai, 1); | ||
1463 | dai->ops->commit_write(dai); | ||
1464 | |||
1465 | src_mgr->commit_write(src_mgr); /* Synchronously enable SRCs */ | ||
1466 | } | ||
1467 | |||
1468 | static void atc_connect_resources(struct ct_atc *atc) | ||
1469 | { | ||
1470 | struct dai *dai; | ||
1471 | struct dao *dao; | ||
1472 | struct src *src; | ||
1473 | struct sum *sum; | ||
1474 | struct ct_mixer *mixer; | ||
1475 | struct rsc *rscs[2] = {NULL}; | ||
1476 | int i, j; | ||
1477 | |||
1478 | mixer = atc->mixer; | ||
1479 | |||
1480 | for (i = MIX_WAVE_FRONT, j = LINEO1; i <= MIX_SPDIF_OUT; i++, j++) { | ||
1481 | mixer->get_output_ports(mixer, i, &rscs[0], &rscs[1]); | ||
1482 | dao = container_of(atc->daios[j], struct dao, daio); | ||
1483 | dao->ops->set_left_input(dao, rscs[0]); | ||
1484 | dao->ops->set_right_input(dao, rscs[1]); | ||
1485 | } | ||
1486 | |||
1487 | dai = container_of(atc->daios[LINEIM], struct dai, daio); | ||
1488 | atc_connect_dai(atc->rsc_mgrs[SRC], dai, | ||
1489 | (struct src **)&atc->srcs[2], | ||
1490 | (struct srcimp **)&atc->srcimps[2]); | ||
1491 | src = atc->srcs[2]; | ||
1492 | mixer->set_input_left(mixer, MIX_LINE_IN, &src->rsc); | ||
1493 | src = atc->srcs[3]; | ||
1494 | mixer->set_input_right(mixer, MIX_LINE_IN, &src->rsc); | ||
1495 | |||
1496 | dai = container_of(atc->daios[SPDIFIO], struct dai, daio); | ||
1497 | atc_connect_dai(atc->rsc_mgrs[SRC], dai, | ||
1498 | (struct src **)&atc->srcs[0], | ||
1499 | (struct srcimp **)&atc->srcimps[0]); | ||
1500 | |||
1501 | src = atc->srcs[0]; | ||
1502 | mixer->set_input_left(mixer, MIX_SPDIF_IN, &src->rsc); | ||
1503 | src = atc->srcs[1]; | ||
1504 | mixer->set_input_right(mixer, MIX_SPDIF_IN, &src->rsc); | ||
1505 | |||
1506 | for (i = MIX_PCMI_FRONT, j = 0; i <= MIX_PCMI_SURROUND; i++, j += 2) { | ||
1507 | sum = atc->pcm[j]; | ||
1508 | mixer->set_input_left(mixer, i, &sum->rsc); | ||
1509 | sum = atc->pcm[j+1]; | ||
1510 | mixer->set_input_right(mixer, i, &sum->rsc); | ||
1511 | } | ||
1512 | } | ||
1513 | |||
1514 | #ifdef CONFIG_PM | ||
1515 | static int atc_suspend(struct ct_atc *atc, pm_message_t state) | ||
1516 | { | ||
1517 | int i; | ||
1518 | struct hw *hw = atc->hw; | ||
1519 | |||
1520 | snd_power_change_state(atc->card, SNDRV_CTL_POWER_D3hot); | ||
1521 | |||
1522 | for (i = FRONT; i < NUM_PCMS; i++) { | ||
1523 | if (!atc->pcms[i]) | ||
1524 | continue; | ||
1525 | |||
1526 | snd_pcm_suspend_all(atc->pcms[i]); | ||
1527 | } | ||
1528 | |||
1529 | atc_release_resources(atc); | ||
1530 | |||
1531 | hw->suspend(hw, state); | ||
1532 | |||
1533 | return 0; | ||
1534 | } | ||
1535 | |||
1536 | static int atc_hw_resume(struct ct_atc *atc) | ||
1537 | { | ||
1538 | struct hw *hw = atc->hw; | ||
1539 | struct card_conf info = {0}; | ||
1540 | |||
1541 | /* Re-initialize card hardware. */ | ||
1542 | info.rsr = atc->rsr; | ||
1543 | info.msr = atc->msr; | ||
1544 | info.vm_pgt_phys = atc_get_ptp_phys(atc, 0); | ||
1545 | return hw->resume(hw, &info); | ||
1546 | } | ||
1547 | |||
1548 | static int atc_resources_resume(struct ct_atc *atc) | ||
1549 | { | ||
1550 | struct ct_mixer *mixer; | ||
1551 | int err = 0; | ||
1552 | |||
1553 | /* Get resources */ | ||
1554 | err = atc_get_resources(atc); | ||
1555 | if (err < 0) { | ||
1556 | atc_release_resources(atc); | ||
1557 | return err; | ||
1558 | } | ||
1559 | |||
1560 | /* Build topology */ | ||
1561 | atc_connect_resources(atc); | ||
1562 | |||
1563 | mixer = atc->mixer; | ||
1564 | mixer->resume(mixer); | ||
1565 | |||
1566 | return 0; | ||
1567 | } | ||
1568 | |||
1569 | static int atc_resume(struct ct_atc *atc) | ||
1570 | { | ||
1571 | int err = 0; | ||
1572 | |||
1573 | /* Do hardware resume. */ | ||
1574 | err = atc_hw_resume(atc); | ||
1575 | if (err < 0) { | ||
1576 | printk(KERN_ERR "ctxfi: pci_enable_device failed, " | ||
1577 | "disabling device\n"); | ||
1578 | snd_card_disconnect(atc->card); | ||
1579 | return err; | ||
1580 | } | ||
1581 | |||
1582 | err = atc_resources_resume(atc); | ||
1583 | if (err < 0) | ||
1584 | return err; | ||
1585 | |||
1586 | snd_power_change_state(atc->card, SNDRV_CTL_POWER_D0); | ||
1587 | |||
1588 | return 0; | ||
1589 | } | ||
1590 | #endif | ||
1591 | |||
1592 | static struct ct_atc atc_preset __devinitdata = { | ||
1593 | .map_audio_buffer = ct_map_audio_buffer, | ||
1594 | .unmap_audio_buffer = ct_unmap_audio_buffer, | ||
1595 | .pcm_playback_prepare = atc_pcm_playback_prepare, | ||
1596 | .pcm_release_resources = atc_pcm_release_resources, | ||
1597 | .pcm_playback_start = atc_pcm_playback_start, | ||
1598 | .pcm_playback_stop = atc_pcm_stop, | ||
1599 | .pcm_playback_position = atc_pcm_playback_position, | ||
1600 | .pcm_capture_prepare = atc_pcm_capture_prepare, | ||
1601 | .pcm_capture_start = atc_pcm_capture_start, | ||
1602 | .pcm_capture_stop = atc_pcm_stop, | ||
1603 | .pcm_capture_position = atc_pcm_capture_position, | ||
1604 | .spdif_passthru_playback_prepare = spdif_passthru_playback_prepare, | ||
1605 | .get_ptp_phys = atc_get_ptp_phys, | ||
1606 | .select_line_in = atc_select_line_in, | ||
1607 | .select_mic_in = atc_select_mic_in, | ||
1608 | .select_digit_io = atc_select_digit_io, | ||
1609 | .line_front_unmute = atc_line_front_unmute, | ||
1610 | .line_surround_unmute = atc_line_surround_unmute, | ||
1611 | .line_clfe_unmute = atc_line_clfe_unmute, | ||
1612 | .line_rear_unmute = atc_line_rear_unmute, | ||
1613 | .line_in_unmute = atc_line_in_unmute, | ||
1614 | .spdif_out_unmute = atc_spdif_out_unmute, | ||
1615 | .spdif_in_unmute = atc_spdif_in_unmute, | ||
1616 | .spdif_out_get_status = atc_spdif_out_get_status, | ||
1617 | .spdif_out_set_status = atc_spdif_out_set_status, | ||
1618 | .spdif_out_passthru = atc_spdif_out_passthru, | ||
1619 | .have_digit_io_switch = atc_have_digit_io_switch, | ||
1620 | #ifdef CONFIG_PM | ||
1621 | .suspend = atc_suspend, | ||
1622 | .resume = atc_resume, | ||
1623 | #endif | ||
1624 | }; | ||
1625 | |||
1626 | /** | ||
1627 | * ct_atc_create - create and initialize a hardware manager | ||
1628 | * @card: corresponding alsa card object | ||
1629 | * @pci: corresponding kernel pci device object | ||
1630 | * @ratc: return created object address in it | ||
1631 | * | ||
1632 | * Creates and initializes a hardware manager. | ||
1633 | * | ||
1634 | * Creates kmallocated ct_atc structure. Initializes hardware. | ||
1635 | * Returns 0 if suceeds, or negative error code if fails. | ||
1636 | */ | ||
1637 | |||
1638 | int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci, | ||
1639 | unsigned int rsr, unsigned int msr, | ||
1640 | int chip_type, struct ct_atc **ratc) | ||
1641 | { | ||
1642 | struct ct_atc *atc; | ||
1643 | static struct snd_device_ops ops = { | ||
1644 | .dev_free = atc_dev_free, | ||
1645 | }; | ||
1646 | int err; | ||
1647 | |||
1648 | *ratc = NULL; | ||
1649 | |||
1650 | atc = kzalloc(sizeof(*atc), GFP_KERNEL); | ||
1651 | if (NULL == atc) | ||
1652 | return -ENOMEM; | ||
1653 | |||
1654 | /* Set operations */ | ||
1655 | *atc = atc_preset; | ||
1656 | |||
1657 | atc->card = card; | ||
1658 | atc->pci = pci; | ||
1659 | atc->rsr = rsr; | ||
1660 | atc->msr = msr; | ||
1661 | atc->chip_type = chip_type; | ||
1662 | |||
1663 | mutex_init(&atc->atc_mutex); | ||
1664 | |||
1665 | /* Find card model */ | ||
1666 | err = atc_identify_card(atc); | ||
1667 | if (err < 0) { | ||
1668 | printk(KERN_ERR "ctatc: Card not recognised\n"); | ||
1669 | goto error1; | ||
1670 | } | ||
1671 | |||
1672 | /* Set up device virtual memory management object */ | ||
1673 | err = ct_vm_create(&atc->vm); | ||
1674 | if (err < 0) | ||
1675 | goto error1; | ||
1676 | |||
1677 | /* Create all atc hw devices */ | ||
1678 | err = atc_create_hw_devs(atc); | ||
1679 | if (err < 0) | ||
1680 | goto error1; | ||
1681 | |||
1682 | err = ct_mixer_create(atc, (struct ct_mixer **)&atc->mixer); | ||
1683 | if (err) { | ||
1684 | printk(KERN_ERR "ctxfi: Failed to create mixer obj!!!\n"); | ||
1685 | goto error1; | ||
1686 | } | ||
1687 | |||
1688 | /* Get resources */ | ||
1689 | err = atc_get_resources(atc); | ||
1690 | if (err < 0) | ||
1691 | goto error1; | ||
1692 | |||
1693 | /* Build topology */ | ||
1694 | atc_connect_resources(atc); | ||
1695 | |||
1696 | atc->timer = ct_timer_new(atc); | ||
1697 | if (!atc->timer) | ||
1698 | goto error1; | ||
1699 | |||
1700 | err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, atc, &ops); | ||
1701 | if (err < 0) | ||
1702 | goto error1; | ||
1703 | |||
1704 | snd_card_set_dev(card, &pci->dev); | ||
1705 | |||
1706 | *ratc = atc; | ||
1707 | return 0; | ||
1708 | |||
1709 | error1: | ||
1710 | ct_atc_destroy(atc); | ||
1711 | printk(KERN_ERR "ctxfi: Something wrong!!!\n"); | ||
1712 | return err; | ||
1713 | } | ||
diff --git a/sound/pci/ctxfi/ctatc.h b/sound/pci/ctxfi/ctatc.h new file mode 100644 index 000000000000..9fd8a5708943 --- /dev/null +++ b/sound/pci/ctxfi/ctatc.h | |||
@@ -0,0 +1,154 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctatc.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of the device resource management object. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date Mar 28 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #ifndef CTATC_H | ||
19 | #define CTATC_H | ||
20 | |||
21 | #include <linux/types.h> | ||
22 | #include <linux/mutex.h> | ||
23 | #include <linux/pci.h> | ||
24 | #include <linux/timer.h> | ||
25 | #include <sound/core.h> | ||
26 | |||
27 | #include "ctvmem.h" | ||
28 | #include "ctresource.h" | ||
29 | |||
30 | enum CTALSADEVS { /* Types of alsa devices */ | ||
31 | FRONT, | ||
32 | SURROUND, | ||
33 | CLFE, | ||
34 | SIDE, | ||
35 | IEC958, | ||
36 | MIXER, | ||
37 | NUM_CTALSADEVS /* This should always be the last */ | ||
38 | }; | ||
39 | |||
40 | struct ct_atc_chip_sub_details { | ||
41 | u16 subsys; | ||
42 | const char *nm_model; | ||
43 | }; | ||
44 | |||
45 | struct ct_atc_chip_details { | ||
46 | u16 vendor; | ||
47 | u16 device; | ||
48 | const struct ct_atc_chip_sub_details *sub_details; | ||
49 | const char *nm_card; | ||
50 | }; | ||
51 | |||
52 | struct ct_atc; | ||
53 | struct ct_timer; | ||
54 | struct ct_timer_instance; | ||
55 | |||
56 | /* alsa pcm stream descriptor */ | ||
57 | struct ct_atc_pcm { | ||
58 | struct snd_pcm_substream *substream; | ||
59 | void (*interrupt)(struct ct_atc_pcm *apcm); | ||
60 | struct ct_timer_instance *timer; | ||
61 | unsigned int started:1; | ||
62 | |||
63 | /* Only mono and interleaved modes are supported now. */ | ||
64 | struct ct_vm_block *vm_block; | ||
65 | void *src; /* SRC for interacting with host memory */ | ||
66 | void **srccs; /* SRCs for sample rate conversion */ | ||
67 | void **srcimps; /* SRC Input Mappers */ | ||
68 | void **amixers; /* AMIXERs for routing converted data */ | ||
69 | void *mono; /* A SUM resource for mixing chs to one */ | ||
70 | unsigned char n_srcc; /* Number of converting SRCs */ | ||
71 | unsigned char n_srcimp; /* Number of SRC Input Mappers */ | ||
72 | unsigned char n_amixer; /* Number of AMIXERs */ | ||
73 | }; | ||
74 | |||
75 | /* Chip resource management object */ | ||
76 | struct ct_atc { | ||
77 | struct pci_dev *pci; | ||
78 | struct snd_card *card; | ||
79 | unsigned int rsr; /* reference sample rate in Hz */ | ||
80 | unsigned int msr; /* master sample rate in rsr */ | ||
81 | unsigned int pll_rate; /* current rate of Phase Lock Loop */ | ||
82 | |||
83 | int chip_type; | ||
84 | int model; | ||
85 | const char *chip_name; | ||
86 | const char *model_name; | ||
87 | |||
88 | struct ct_vm *vm; /* device virtual memory manager for this card */ | ||
89 | int (*map_audio_buffer)(struct ct_atc *atc, struct ct_atc_pcm *apcm); | ||
90 | void (*unmap_audio_buffer)(struct ct_atc *atc, struct ct_atc_pcm *apcm); | ||
91 | unsigned long (*get_ptp_phys)(struct ct_atc *atc, int index); | ||
92 | |||
93 | struct mutex atc_mutex; | ||
94 | |||
95 | int (*pcm_playback_prepare)(struct ct_atc *atc, | ||
96 | struct ct_atc_pcm *apcm); | ||
97 | int (*pcm_playback_start)(struct ct_atc *atc, struct ct_atc_pcm *apcm); | ||
98 | int (*pcm_playback_stop)(struct ct_atc *atc, struct ct_atc_pcm *apcm); | ||
99 | int (*pcm_playback_position)(struct ct_atc *atc, | ||
100 | struct ct_atc_pcm *apcm); | ||
101 | int (*spdif_passthru_playback_prepare)(struct ct_atc *atc, | ||
102 | struct ct_atc_pcm *apcm); | ||
103 | int (*pcm_capture_prepare)(struct ct_atc *atc, struct ct_atc_pcm *apcm); | ||
104 | int (*pcm_capture_start)(struct ct_atc *atc, struct ct_atc_pcm *apcm); | ||
105 | int (*pcm_capture_stop)(struct ct_atc *atc, struct ct_atc_pcm *apcm); | ||
106 | int (*pcm_capture_position)(struct ct_atc *atc, | ||
107 | struct ct_atc_pcm *apcm); | ||
108 | int (*pcm_release_resources)(struct ct_atc *atc, | ||
109 | struct ct_atc_pcm *apcm); | ||
110 | int (*select_line_in)(struct ct_atc *atc); | ||
111 | int (*select_mic_in)(struct ct_atc *atc); | ||
112 | int (*select_digit_io)(struct ct_atc *atc); | ||
113 | int (*line_front_unmute)(struct ct_atc *atc, unsigned char state); | ||
114 | int (*line_surround_unmute)(struct ct_atc *atc, unsigned char state); | ||
115 | int (*line_clfe_unmute)(struct ct_atc *atc, unsigned char state); | ||
116 | int (*line_rear_unmute)(struct ct_atc *atc, unsigned char state); | ||
117 | int (*line_in_unmute)(struct ct_atc *atc, unsigned char state); | ||
118 | int (*spdif_out_unmute)(struct ct_atc *atc, unsigned char state); | ||
119 | int (*spdif_in_unmute)(struct ct_atc *atc, unsigned char state); | ||
120 | int (*spdif_out_get_status)(struct ct_atc *atc, unsigned int *status); | ||
121 | int (*spdif_out_set_status)(struct ct_atc *atc, unsigned int status); | ||
122 | int (*spdif_out_passthru)(struct ct_atc *atc, unsigned char state); | ||
123 | int (*have_digit_io_switch)(struct ct_atc *atc); | ||
124 | |||
125 | /* Don't touch! Used for internal object. */ | ||
126 | void *rsc_mgrs[NUM_RSCTYP]; /* chip resource managers */ | ||
127 | void *mixer; /* internal mixer object */ | ||
128 | void *hw; /* chip specific hardware access object */ | ||
129 | void **daios; /* digital audio io resources */ | ||
130 | void **pcm; /* SUMs for collecting all pcm stream */ | ||
131 | void **srcs; /* Sample Rate Converters for input signal */ | ||
132 | void **srcimps; /* input mappers for SRCs */ | ||
133 | unsigned char n_daio; | ||
134 | unsigned char n_src; | ||
135 | unsigned char n_srcimp; | ||
136 | unsigned char n_pcm; | ||
137 | |||
138 | struct ct_timer *timer; | ||
139 | |||
140 | #ifdef CONFIG_PM | ||
141 | int (*suspend)(struct ct_atc *atc, pm_message_t state); | ||
142 | int (*resume)(struct ct_atc *atc); | ||
143 | #define NUM_PCMS (NUM_CTALSADEVS - 1) | ||
144 | struct snd_pcm *pcms[NUM_PCMS]; | ||
145 | #endif | ||
146 | }; | ||
147 | |||
148 | |||
149 | int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci, | ||
150 | unsigned int rsr, unsigned int msr, int chip_type, | ||
151 | struct ct_atc **ratc); | ||
152 | int __devinit ct_atc_create_alsa_devs(struct ct_atc *atc); | ||
153 | |||
154 | #endif /* CTATC_H */ | ||
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c new file mode 100644 index 000000000000..082e35c08c02 --- /dev/null +++ b/sound/pci/ctxfi/ctdaio.c | |||
@@ -0,0 +1,769 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctdaio.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of Digital Audio Input Output | ||
12 | * resource management object. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date May 23 2008 | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #include "ctdaio.h" | ||
20 | #include "cthardware.h" | ||
21 | #include "ctimap.h" | ||
22 | #include <linux/slab.h> | ||
23 | #include <linux/kernel.h> | ||
24 | |||
25 | #define DAIO_RESOURCE_NUM NUM_DAIOTYP | ||
26 | #define DAIO_OUT_MAX SPDIFOO | ||
27 | |||
28 | union daio_usage { | ||
29 | struct { | ||
30 | unsigned short lineo1:1; | ||
31 | unsigned short lineo2:1; | ||
32 | unsigned short lineo3:1; | ||
33 | unsigned short lineo4:1; | ||
34 | unsigned short spdifoo:1; | ||
35 | unsigned short lineim:1; | ||
36 | unsigned short spdifio:1; | ||
37 | unsigned short spdifi1:1; | ||
38 | } bf; | ||
39 | unsigned short data; | ||
40 | }; | ||
41 | |||
42 | struct daio_rsc_idx { | ||
43 | unsigned short left; | ||
44 | unsigned short right; | ||
45 | }; | ||
46 | |||
47 | struct daio_rsc_idx idx_20k1[NUM_DAIOTYP] = { | ||
48 | [LINEO1] = {.left = 0x00, .right = 0x01}, | ||
49 | [LINEO2] = {.left = 0x18, .right = 0x19}, | ||
50 | [LINEO3] = {.left = 0x08, .right = 0x09}, | ||
51 | [LINEO4] = {.left = 0x10, .right = 0x11}, | ||
52 | [LINEIM] = {.left = 0x1b5, .right = 0x1bd}, | ||
53 | [SPDIFOO] = {.left = 0x20, .right = 0x21}, | ||
54 | [SPDIFIO] = {.left = 0x15, .right = 0x1d}, | ||
55 | [SPDIFI1] = {.left = 0x95, .right = 0x9d}, | ||
56 | }; | ||
57 | |||
58 | struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] = { | ||
59 | [LINEO1] = {.left = 0x40, .right = 0x41}, | ||
60 | [LINEO2] = {.left = 0x70, .right = 0x71}, | ||
61 | [LINEO3] = {.left = 0x50, .right = 0x51}, | ||
62 | [LINEO4] = {.left = 0x60, .right = 0x61}, | ||
63 | [LINEIM] = {.left = 0x45, .right = 0xc5}, | ||
64 | [SPDIFOO] = {.left = 0x00, .right = 0x01}, | ||
65 | [SPDIFIO] = {.left = 0x05, .right = 0x85}, | ||
66 | }; | ||
67 | |||
68 | static int daio_master(struct rsc *rsc) | ||
69 | { | ||
70 | /* Actually, this is not the resource index of DAIO. | ||
71 | * For DAO, it is the input mapper index. And, for DAI, | ||
72 | * it is the output time-slot index. */ | ||
73 | return rsc->conj = rsc->idx; | ||
74 | } | ||
75 | |||
76 | static int daio_index(const struct rsc *rsc) | ||
77 | { | ||
78 | return rsc->conj; | ||
79 | } | ||
80 | |||
81 | static int daio_out_next_conj(struct rsc *rsc) | ||
82 | { | ||
83 | return rsc->conj += 2; | ||
84 | } | ||
85 | |||
86 | static int daio_in_next_conj_20k1(struct rsc *rsc) | ||
87 | { | ||
88 | return rsc->conj += 0x200; | ||
89 | } | ||
90 | |||
91 | static int daio_in_next_conj_20k2(struct rsc *rsc) | ||
92 | { | ||
93 | return rsc->conj += 0x100; | ||
94 | } | ||
95 | |||
96 | static struct rsc_ops daio_out_rsc_ops = { | ||
97 | .master = daio_master, | ||
98 | .next_conj = daio_out_next_conj, | ||
99 | .index = daio_index, | ||
100 | .output_slot = NULL, | ||
101 | }; | ||
102 | |||
103 | static struct rsc_ops daio_in_rsc_ops_20k1 = { | ||
104 | .master = daio_master, | ||
105 | .next_conj = daio_in_next_conj_20k1, | ||
106 | .index = NULL, | ||
107 | .output_slot = daio_index, | ||
108 | }; | ||
109 | |||
110 | static struct rsc_ops daio_in_rsc_ops_20k2 = { | ||
111 | .master = daio_master, | ||
112 | .next_conj = daio_in_next_conj_20k2, | ||
113 | .index = NULL, | ||
114 | .output_slot = daio_index, | ||
115 | }; | ||
116 | |||
117 | static unsigned int daio_device_index(enum DAIOTYP type, struct hw *hw) | ||
118 | { | ||
119 | switch (hw->chip_type) { | ||
120 | case ATC20K1: | ||
121 | switch (type) { | ||
122 | case SPDIFOO: return 0; | ||
123 | case SPDIFIO: return 0; | ||
124 | case SPDIFI1: return 1; | ||
125 | case LINEO1: return 4; | ||
126 | case LINEO2: return 7; | ||
127 | case LINEO3: return 5; | ||
128 | case LINEO4: return 6; | ||
129 | case LINEIM: return 7; | ||
130 | default: return -EINVAL; | ||
131 | } | ||
132 | case ATC20K2: | ||
133 | switch (type) { | ||
134 | case SPDIFOO: return 0; | ||
135 | case SPDIFIO: return 0; | ||
136 | case LINEO1: return 4; | ||
137 | case LINEO2: return 7; | ||
138 | case LINEO3: return 5; | ||
139 | case LINEO4: return 6; | ||
140 | case LINEIM: return 4; | ||
141 | default: return -EINVAL; | ||
142 | } | ||
143 | default: | ||
144 | return -EINVAL; | ||
145 | } | ||
146 | } | ||
147 | |||
148 | static int dao_rsc_reinit(struct dao *dao, const struct dao_desc *desc); | ||
149 | |||
150 | static int dao_spdif_get_spos(struct dao *dao, unsigned int *spos) | ||
151 | { | ||
152 | ((struct hw *)dao->hw)->dao_get_spos(dao->ctrl_blk, spos); | ||
153 | return 0; | ||
154 | } | ||
155 | |||
156 | static int dao_spdif_set_spos(struct dao *dao, unsigned int spos) | ||
157 | { | ||
158 | ((struct hw *)dao->hw)->dao_set_spos(dao->ctrl_blk, spos); | ||
159 | return 0; | ||
160 | } | ||
161 | |||
162 | static int dao_commit_write(struct dao *dao) | ||
163 | { | ||
164 | ((struct hw *)dao->hw)->dao_commit_write(dao->hw, | ||
165 | daio_device_index(dao->daio.type, dao->hw), dao->ctrl_blk); | ||
166 | return 0; | ||
167 | } | ||
168 | |||
169 | static int dao_set_left_input(struct dao *dao, struct rsc *input) | ||
170 | { | ||
171 | struct imapper *entry; | ||
172 | struct daio *daio = &dao->daio; | ||
173 | int i; | ||
174 | |||
175 | entry = kzalloc((sizeof(*entry) * daio->rscl.msr), GFP_KERNEL); | ||
176 | if (NULL == entry) | ||
177 | return -ENOMEM; | ||
178 | |||
179 | /* Program master and conjugate resources */ | ||
180 | input->ops->master(input); | ||
181 | daio->rscl.ops->master(&daio->rscl); | ||
182 | for (i = 0; i < daio->rscl.msr; i++, entry++) { | ||
183 | entry->slot = input->ops->output_slot(input); | ||
184 | entry->user = entry->addr = daio->rscl.ops->index(&daio->rscl); | ||
185 | dao->mgr->imap_add(dao->mgr, entry); | ||
186 | dao->imappers[i] = entry; | ||
187 | |||
188 | input->ops->next_conj(input); | ||
189 | daio->rscl.ops->next_conj(&daio->rscl); | ||
190 | } | ||
191 | input->ops->master(input); | ||
192 | daio->rscl.ops->master(&daio->rscl); | ||
193 | |||
194 | return 0; | ||
195 | } | ||
196 | |||
197 | static int dao_set_right_input(struct dao *dao, struct rsc *input) | ||
198 | { | ||
199 | struct imapper *entry; | ||
200 | struct daio *daio = &dao->daio; | ||
201 | int i; | ||
202 | |||
203 | entry = kzalloc((sizeof(*entry) * daio->rscr.msr), GFP_KERNEL); | ||
204 | if (NULL == entry) | ||
205 | return -ENOMEM; | ||
206 | |||
207 | /* Program master and conjugate resources */ | ||
208 | input->ops->master(input); | ||
209 | daio->rscr.ops->master(&daio->rscr); | ||
210 | for (i = 0; i < daio->rscr.msr; i++, entry++) { | ||
211 | entry->slot = input->ops->output_slot(input); | ||
212 | entry->user = entry->addr = daio->rscr.ops->index(&daio->rscr); | ||
213 | dao->mgr->imap_add(dao->mgr, entry); | ||
214 | dao->imappers[daio->rscl.msr + i] = entry; | ||
215 | |||
216 | input->ops->next_conj(input); | ||
217 | daio->rscr.ops->next_conj(&daio->rscr); | ||
218 | } | ||
219 | input->ops->master(input); | ||
220 | daio->rscr.ops->master(&daio->rscr); | ||
221 | |||
222 | return 0; | ||
223 | } | ||
224 | |||
225 | static int dao_clear_left_input(struct dao *dao) | ||
226 | { | ||
227 | struct imapper *entry; | ||
228 | struct daio *daio = &dao->daio; | ||
229 | int i; | ||
230 | |||
231 | if (NULL == dao->imappers[0]) | ||
232 | return 0; | ||
233 | |||
234 | entry = dao->imappers[0]; | ||
235 | dao->mgr->imap_delete(dao->mgr, entry); | ||
236 | /* Program conjugate resources */ | ||
237 | for (i = 1; i < daio->rscl.msr; i++) { | ||
238 | entry = dao->imappers[i]; | ||
239 | dao->mgr->imap_delete(dao->mgr, entry); | ||
240 | dao->imappers[i] = NULL; | ||
241 | } | ||
242 | |||
243 | kfree(dao->imappers[0]); | ||
244 | dao->imappers[0] = NULL; | ||
245 | |||
246 | return 0; | ||
247 | } | ||
248 | |||
249 | static int dao_clear_right_input(struct dao *dao) | ||
250 | { | ||
251 | struct imapper *entry; | ||
252 | struct daio *daio = &dao->daio; | ||
253 | int i; | ||
254 | |||
255 | if (NULL == dao->imappers[daio->rscl.msr]) | ||
256 | return 0; | ||
257 | |||
258 | entry = dao->imappers[daio->rscl.msr]; | ||
259 | dao->mgr->imap_delete(dao->mgr, entry); | ||
260 | /* Program conjugate resources */ | ||
261 | for (i = 1; i < daio->rscr.msr; i++) { | ||
262 | entry = dao->imappers[daio->rscl.msr + i]; | ||
263 | dao->mgr->imap_delete(dao->mgr, entry); | ||
264 | dao->imappers[daio->rscl.msr + i] = NULL; | ||
265 | } | ||
266 | |||
267 | kfree(dao->imappers[daio->rscl.msr]); | ||
268 | dao->imappers[daio->rscl.msr] = NULL; | ||
269 | |||
270 | return 0; | ||
271 | } | ||
272 | |||
273 | static struct dao_rsc_ops dao_ops = { | ||
274 | .set_spos = dao_spdif_set_spos, | ||
275 | .commit_write = dao_commit_write, | ||
276 | .get_spos = dao_spdif_get_spos, | ||
277 | .reinit = dao_rsc_reinit, | ||
278 | .set_left_input = dao_set_left_input, | ||
279 | .set_right_input = dao_set_right_input, | ||
280 | .clear_left_input = dao_clear_left_input, | ||
281 | .clear_right_input = dao_clear_right_input, | ||
282 | }; | ||
283 | |||
284 | static int dai_set_srt_srcl(struct dai *dai, struct rsc *src) | ||
285 | { | ||
286 | src->ops->master(src); | ||
287 | ((struct hw *)dai->hw)->dai_srt_set_srcm(dai->ctrl_blk, | ||
288 | src->ops->index(src)); | ||
289 | return 0; | ||
290 | } | ||
291 | |||
292 | static int dai_set_srt_srcr(struct dai *dai, struct rsc *src) | ||
293 | { | ||
294 | src->ops->master(src); | ||
295 | ((struct hw *)dai->hw)->dai_srt_set_srco(dai->ctrl_blk, | ||
296 | src->ops->index(src)); | ||
297 | return 0; | ||
298 | } | ||
299 | |||
300 | static int dai_set_srt_msr(struct dai *dai, unsigned int msr) | ||
301 | { | ||
302 | unsigned int rsr; | ||
303 | |||
304 | for (rsr = 0; msr > 1; msr >>= 1) | ||
305 | rsr++; | ||
306 | |||
307 | ((struct hw *)dai->hw)->dai_srt_set_rsr(dai->ctrl_blk, rsr); | ||
308 | return 0; | ||
309 | } | ||
310 | |||
311 | static int dai_set_enb_src(struct dai *dai, unsigned int enb) | ||
312 | { | ||
313 | ((struct hw *)dai->hw)->dai_srt_set_ec(dai->ctrl_blk, enb); | ||
314 | return 0; | ||
315 | } | ||
316 | |||
317 | static int dai_set_enb_srt(struct dai *dai, unsigned int enb) | ||
318 | { | ||
319 | ((struct hw *)dai->hw)->dai_srt_set_et(dai->ctrl_blk, enb); | ||
320 | return 0; | ||
321 | } | ||
322 | |||
323 | static int dai_commit_write(struct dai *dai) | ||
324 | { | ||
325 | ((struct hw *)dai->hw)->dai_commit_write(dai->hw, | ||
326 | daio_device_index(dai->daio.type, dai->hw), dai->ctrl_blk); | ||
327 | return 0; | ||
328 | } | ||
329 | |||
330 | static struct dai_rsc_ops dai_ops = { | ||
331 | .set_srt_srcl = dai_set_srt_srcl, | ||
332 | .set_srt_srcr = dai_set_srt_srcr, | ||
333 | .set_srt_msr = dai_set_srt_msr, | ||
334 | .set_enb_src = dai_set_enb_src, | ||
335 | .set_enb_srt = dai_set_enb_srt, | ||
336 | .commit_write = dai_commit_write, | ||
337 | }; | ||
338 | |||
339 | static int daio_rsc_init(struct daio *daio, | ||
340 | const struct daio_desc *desc, | ||
341 | void *hw) | ||
342 | { | ||
343 | int err; | ||
344 | unsigned int idx_l, idx_r; | ||
345 | |||
346 | switch (((struct hw *)hw)->chip_type) { | ||
347 | case ATC20K1: | ||
348 | idx_l = idx_20k1[desc->type].left; | ||
349 | idx_r = idx_20k1[desc->type].right; | ||
350 | break; | ||
351 | case ATC20K2: | ||
352 | idx_l = idx_20k2[desc->type].left; | ||
353 | idx_r = idx_20k2[desc->type].right; | ||
354 | break; | ||
355 | default: | ||
356 | return -EINVAL; | ||
357 | } | ||
358 | err = rsc_init(&daio->rscl, idx_l, DAIO, desc->msr, hw); | ||
359 | if (err) | ||
360 | return err; | ||
361 | |||
362 | err = rsc_init(&daio->rscr, idx_r, DAIO, desc->msr, hw); | ||
363 | if (err) | ||
364 | goto error1; | ||
365 | |||
366 | /* Set daio->rscl/r->ops to daio specific ones */ | ||
367 | if (desc->type <= DAIO_OUT_MAX) { | ||
368 | daio->rscl.ops = daio->rscr.ops = &daio_out_rsc_ops; | ||
369 | } else { | ||
370 | switch (((struct hw *)hw)->chip_type) { | ||
371 | case ATC20K1: | ||
372 | daio->rscl.ops = daio->rscr.ops = &daio_in_rsc_ops_20k1; | ||
373 | break; | ||
374 | case ATC20K2: | ||
375 | daio->rscl.ops = daio->rscr.ops = &daio_in_rsc_ops_20k2; | ||
376 | break; | ||
377 | default: | ||
378 | break; | ||
379 | } | ||
380 | } | ||
381 | daio->type = desc->type; | ||
382 | |||
383 | return 0; | ||
384 | |||
385 | error1: | ||
386 | rsc_uninit(&daio->rscl); | ||
387 | return err; | ||
388 | } | ||
389 | |||
390 | static int daio_rsc_uninit(struct daio *daio) | ||
391 | { | ||
392 | rsc_uninit(&daio->rscl); | ||
393 | rsc_uninit(&daio->rscr); | ||
394 | |||
395 | return 0; | ||
396 | } | ||
397 | |||
398 | static int dao_rsc_init(struct dao *dao, | ||
399 | const struct daio_desc *desc, | ||
400 | struct daio_mgr *mgr) | ||
401 | { | ||
402 | struct hw *hw = mgr->mgr.hw; | ||
403 | unsigned int conf; | ||
404 | int err; | ||
405 | |||
406 | err = daio_rsc_init(&dao->daio, desc, mgr->mgr.hw); | ||
407 | if (err) | ||
408 | return err; | ||
409 | |||
410 | dao->imappers = kzalloc(sizeof(void *)*desc->msr*2, GFP_KERNEL); | ||
411 | if (NULL == dao->imappers) { | ||
412 | err = -ENOMEM; | ||
413 | goto error1; | ||
414 | } | ||
415 | dao->ops = &dao_ops; | ||
416 | dao->mgr = mgr; | ||
417 | dao->hw = hw; | ||
418 | err = hw->dao_get_ctrl_blk(&dao->ctrl_blk); | ||
419 | if (err) | ||
420 | goto error2; | ||
421 | |||
422 | hw->daio_mgr_dsb_dao(mgr->mgr.ctrl_blk, | ||
423 | daio_device_index(dao->daio.type, hw)); | ||
424 | hw->daio_mgr_commit_write(hw, mgr->mgr.ctrl_blk); | ||
425 | |||
426 | conf = (desc->msr & 0x7) | (desc->passthru << 3); | ||
427 | hw->daio_mgr_dao_init(mgr->mgr.ctrl_blk, | ||
428 | daio_device_index(dao->daio.type, hw), conf); | ||
429 | hw->daio_mgr_enb_dao(mgr->mgr.ctrl_blk, | ||
430 | daio_device_index(dao->daio.type, hw)); | ||
431 | hw->daio_mgr_commit_write(hw, mgr->mgr.ctrl_blk); | ||
432 | |||
433 | return 0; | ||
434 | |||
435 | error2: | ||
436 | kfree(dao->imappers); | ||
437 | dao->imappers = NULL; | ||
438 | error1: | ||
439 | daio_rsc_uninit(&dao->daio); | ||
440 | return err; | ||
441 | } | ||
442 | |||
443 | static int dao_rsc_uninit(struct dao *dao) | ||
444 | { | ||
445 | if (NULL != dao->imappers) { | ||
446 | if (NULL != dao->imappers[0]) | ||
447 | dao_clear_left_input(dao); | ||
448 | |||
449 | if (NULL != dao->imappers[dao->daio.rscl.msr]) | ||
450 | dao_clear_right_input(dao); | ||
451 | |||
452 | kfree(dao->imappers); | ||
453 | dao->imappers = NULL; | ||
454 | } | ||
455 | ((struct hw *)dao->hw)->dao_put_ctrl_blk(dao->ctrl_blk); | ||
456 | dao->hw = dao->ctrl_blk = NULL; | ||
457 | daio_rsc_uninit(&dao->daio); | ||
458 | |||
459 | return 0; | ||
460 | } | ||
461 | |||
462 | static int dao_rsc_reinit(struct dao *dao, const struct dao_desc *desc) | ||
463 | { | ||
464 | struct daio_mgr *mgr = dao->mgr; | ||
465 | struct daio_desc dsc = {0}; | ||
466 | |||
467 | dsc.type = dao->daio.type; | ||
468 | dsc.msr = desc->msr; | ||
469 | dsc.passthru = desc->passthru; | ||
470 | dao_rsc_uninit(dao); | ||
471 | return dao_rsc_init(dao, &dsc, mgr); | ||
472 | } | ||
473 | |||
474 | static int dai_rsc_init(struct dai *dai, | ||
475 | const struct daio_desc *desc, | ||
476 | struct daio_mgr *mgr) | ||
477 | { | ||
478 | int err; | ||
479 | struct hw *hw = mgr->mgr.hw; | ||
480 | unsigned int rsr, msr; | ||
481 | |||
482 | err = daio_rsc_init(&dai->daio, desc, mgr->mgr.hw); | ||
483 | if (err) | ||
484 | return err; | ||
485 | |||
486 | dai->ops = &dai_ops; | ||
487 | dai->hw = mgr->mgr.hw; | ||
488 | err = hw->dai_get_ctrl_blk(&dai->ctrl_blk); | ||
489 | if (err) | ||
490 | goto error1; | ||
491 | |||
492 | for (rsr = 0, msr = desc->msr; msr > 1; msr >>= 1) | ||
493 | rsr++; | ||
494 | |||
495 | hw->dai_srt_set_rsr(dai->ctrl_blk, rsr); | ||
496 | hw->dai_srt_set_drat(dai->ctrl_blk, 0); | ||
497 | /* default to disabling control of a SRC */ | ||
498 | hw->dai_srt_set_ec(dai->ctrl_blk, 0); | ||
499 | hw->dai_srt_set_et(dai->ctrl_blk, 0); /* default to disabling SRT */ | ||
500 | hw->dai_commit_write(hw, | ||
501 | daio_device_index(dai->daio.type, dai->hw), dai->ctrl_blk); | ||
502 | |||
503 | return 0; | ||
504 | |||
505 | error1: | ||
506 | daio_rsc_uninit(&dai->daio); | ||
507 | return err; | ||
508 | } | ||
509 | |||
510 | static int dai_rsc_uninit(struct dai *dai) | ||
511 | { | ||
512 | ((struct hw *)dai->hw)->dai_put_ctrl_blk(dai->ctrl_blk); | ||
513 | dai->hw = dai->ctrl_blk = NULL; | ||
514 | daio_rsc_uninit(&dai->daio); | ||
515 | return 0; | ||
516 | } | ||
517 | |||
518 | static int daio_mgr_get_rsc(struct rsc_mgr *mgr, enum DAIOTYP type) | ||
519 | { | ||
520 | if (((union daio_usage *)mgr->rscs)->data & (0x1 << type)) | ||
521 | return -ENOENT; | ||
522 | |||
523 | ((union daio_usage *)mgr->rscs)->data |= (0x1 << type); | ||
524 | |||
525 | return 0; | ||
526 | } | ||
527 | |||
528 | static int daio_mgr_put_rsc(struct rsc_mgr *mgr, enum DAIOTYP type) | ||
529 | { | ||
530 | ((union daio_usage *)mgr->rscs)->data &= ~(0x1 << type); | ||
531 | |||
532 | return 0; | ||
533 | } | ||
534 | |||
535 | static int get_daio_rsc(struct daio_mgr *mgr, | ||
536 | const struct daio_desc *desc, | ||
537 | struct daio **rdaio) | ||
538 | { | ||
539 | int err; | ||
540 | struct dai *dai = NULL; | ||
541 | struct dao *dao = NULL; | ||
542 | unsigned long flags; | ||
543 | |||
544 | *rdaio = NULL; | ||
545 | |||
546 | /* Check whether there are sufficient daio resources to meet request. */ | ||
547 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
548 | err = daio_mgr_get_rsc(&mgr->mgr, desc->type); | ||
549 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
550 | if (err) { | ||
551 | printk(KERN_ERR "Can't meet DAIO resource request!\n"); | ||
552 | return err; | ||
553 | } | ||
554 | |||
555 | /* Allocate mem for daio resource */ | ||
556 | if (desc->type <= DAIO_OUT_MAX) { | ||
557 | dao = kzalloc(sizeof(*dao), GFP_KERNEL); | ||
558 | if (NULL == dao) { | ||
559 | err = -ENOMEM; | ||
560 | goto error; | ||
561 | } | ||
562 | err = dao_rsc_init(dao, desc, mgr); | ||
563 | if (err) | ||
564 | goto error; | ||
565 | |||
566 | *rdaio = &dao->daio; | ||
567 | } else { | ||
568 | dai = kzalloc(sizeof(*dai), GFP_KERNEL); | ||
569 | if (NULL == dai) { | ||
570 | err = -ENOMEM; | ||
571 | goto error; | ||
572 | } | ||
573 | err = dai_rsc_init(dai, desc, mgr); | ||
574 | if (err) | ||
575 | goto error; | ||
576 | |||
577 | *rdaio = &dai->daio; | ||
578 | } | ||
579 | |||
580 | mgr->daio_enable(mgr, *rdaio); | ||
581 | mgr->commit_write(mgr); | ||
582 | |||
583 | return 0; | ||
584 | |||
585 | error: | ||
586 | if (NULL != dao) | ||
587 | kfree(dao); | ||
588 | else if (NULL != dai) | ||
589 | kfree(dai); | ||
590 | |||
591 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
592 | daio_mgr_put_rsc(&mgr->mgr, desc->type); | ||
593 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
594 | return err; | ||
595 | } | ||
596 | |||
597 | static int put_daio_rsc(struct daio_mgr *mgr, struct daio *daio) | ||
598 | { | ||
599 | unsigned long flags; | ||
600 | |||
601 | mgr->daio_disable(mgr, daio); | ||
602 | mgr->commit_write(mgr); | ||
603 | |||
604 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
605 | daio_mgr_put_rsc(&mgr->mgr, daio->type); | ||
606 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
607 | |||
608 | if (daio->type <= DAIO_OUT_MAX) { | ||
609 | dao_rsc_uninit(container_of(daio, struct dao, daio)); | ||
610 | kfree(container_of(daio, struct dao, daio)); | ||
611 | } else { | ||
612 | dai_rsc_uninit(container_of(daio, struct dai, daio)); | ||
613 | kfree(container_of(daio, struct dai, daio)); | ||
614 | } | ||
615 | |||
616 | return 0; | ||
617 | } | ||
618 | |||
619 | static int daio_mgr_enb_daio(struct daio_mgr *mgr, struct daio *daio) | ||
620 | { | ||
621 | struct hw *hw = mgr->mgr.hw; | ||
622 | |||
623 | if (DAIO_OUT_MAX >= daio->type) { | ||
624 | hw->daio_mgr_enb_dao(mgr->mgr.ctrl_blk, | ||
625 | daio_device_index(daio->type, hw)); | ||
626 | } else { | ||
627 | hw->daio_mgr_enb_dai(mgr->mgr.ctrl_blk, | ||
628 | daio_device_index(daio->type, hw)); | ||
629 | } | ||
630 | return 0; | ||
631 | } | ||
632 | |||
633 | static int daio_mgr_dsb_daio(struct daio_mgr *mgr, struct daio *daio) | ||
634 | { | ||
635 | struct hw *hw = mgr->mgr.hw; | ||
636 | |||
637 | if (DAIO_OUT_MAX >= daio->type) { | ||
638 | hw->daio_mgr_dsb_dao(mgr->mgr.ctrl_blk, | ||
639 | daio_device_index(daio->type, hw)); | ||
640 | } else { | ||
641 | hw->daio_mgr_dsb_dai(mgr->mgr.ctrl_blk, | ||
642 | daio_device_index(daio->type, hw)); | ||
643 | } | ||
644 | return 0; | ||
645 | } | ||
646 | |||
647 | static int daio_map_op(void *data, struct imapper *entry) | ||
648 | { | ||
649 | struct rsc_mgr *mgr = &((struct daio_mgr *)data)->mgr; | ||
650 | struct hw *hw = mgr->hw; | ||
651 | |||
652 | hw->daio_mgr_set_imaparc(mgr->ctrl_blk, entry->slot); | ||
653 | hw->daio_mgr_set_imapnxt(mgr->ctrl_blk, entry->next); | ||
654 | hw->daio_mgr_set_imapaddr(mgr->ctrl_blk, entry->addr); | ||
655 | hw->daio_mgr_commit_write(mgr->hw, mgr->ctrl_blk); | ||
656 | |||
657 | return 0; | ||
658 | } | ||
659 | |||
660 | static int daio_imap_add(struct daio_mgr *mgr, struct imapper *entry) | ||
661 | { | ||
662 | unsigned long flags; | ||
663 | int err; | ||
664 | |||
665 | spin_lock_irqsave(&mgr->imap_lock, flags); | ||
666 | if ((0 == entry->addr) && (mgr->init_imap_added)) { | ||
667 | input_mapper_delete(&mgr->imappers, mgr->init_imap, | ||
668 | daio_map_op, mgr); | ||
669 | mgr->init_imap_added = 0; | ||
670 | } | ||
671 | err = input_mapper_add(&mgr->imappers, entry, daio_map_op, mgr); | ||
672 | spin_unlock_irqrestore(&mgr->imap_lock, flags); | ||
673 | |||
674 | return err; | ||
675 | } | ||
676 | |||
677 | static int daio_imap_delete(struct daio_mgr *mgr, struct imapper *entry) | ||
678 | { | ||
679 | unsigned long flags; | ||
680 | int err; | ||
681 | |||
682 | spin_lock_irqsave(&mgr->imap_lock, flags); | ||
683 | err = input_mapper_delete(&mgr->imappers, entry, daio_map_op, mgr); | ||
684 | if (list_empty(&mgr->imappers)) { | ||
685 | input_mapper_add(&mgr->imappers, mgr->init_imap, | ||
686 | daio_map_op, mgr); | ||
687 | mgr->init_imap_added = 1; | ||
688 | } | ||
689 | spin_unlock_irqrestore(&mgr->imap_lock, flags); | ||
690 | |||
691 | return err; | ||
692 | } | ||
693 | |||
694 | static int daio_mgr_commit_write(struct daio_mgr *mgr) | ||
695 | { | ||
696 | struct hw *hw = mgr->mgr.hw; | ||
697 | |||
698 | hw->daio_mgr_commit_write(hw, mgr->mgr.ctrl_blk); | ||
699 | return 0; | ||
700 | } | ||
701 | |||
702 | int daio_mgr_create(void *hw, struct daio_mgr **rdaio_mgr) | ||
703 | { | ||
704 | int err, i; | ||
705 | struct daio_mgr *daio_mgr; | ||
706 | struct imapper *entry; | ||
707 | |||
708 | *rdaio_mgr = NULL; | ||
709 | daio_mgr = kzalloc(sizeof(*daio_mgr), GFP_KERNEL); | ||
710 | if (NULL == daio_mgr) | ||
711 | return -ENOMEM; | ||
712 | |||
713 | err = rsc_mgr_init(&daio_mgr->mgr, DAIO, DAIO_RESOURCE_NUM, hw); | ||
714 | if (err) | ||
715 | goto error1; | ||
716 | |||
717 | spin_lock_init(&daio_mgr->mgr_lock); | ||
718 | spin_lock_init(&daio_mgr->imap_lock); | ||
719 | INIT_LIST_HEAD(&daio_mgr->imappers); | ||
720 | entry = kzalloc(sizeof(*entry), GFP_KERNEL); | ||
721 | if (NULL == entry) { | ||
722 | err = -ENOMEM; | ||
723 | goto error2; | ||
724 | } | ||
725 | entry->slot = entry->addr = entry->next = entry->user = 0; | ||
726 | list_add(&entry->list, &daio_mgr->imappers); | ||
727 | daio_mgr->init_imap = entry; | ||
728 | daio_mgr->init_imap_added = 1; | ||
729 | |||
730 | daio_mgr->get_daio = get_daio_rsc; | ||
731 | daio_mgr->put_daio = put_daio_rsc; | ||
732 | daio_mgr->daio_enable = daio_mgr_enb_daio; | ||
733 | daio_mgr->daio_disable = daio_mgr_dsb_daio; | ||
734 | daio_mgr->imap_add = daio_imap_add; | ||
735 | daio_mgr->imap_delete = daio_imap_delete; | ||
736 | daio_mgr->commit_write = daio_mgr_commit_write; | ||
737 | |||
738 | for (i = 0; i < 8; i++) { | ||
739 | ((struct hw *)hw)->daio_mgr_dsb_dao(daio_mgr->mgr.ctrl_blk, i); | ||
740 | ((struct hw *)hw)->daio_mgr_dsb_dai(daio_mgr->mgr.ctrl_blk, i); | ||
741 | } | ||
742 | ((struct hw *)hw)->daio_mgr_commit_write(hw, daio_mgr->mgr.ctrl_blk); | ||
743 | |||
744 | *rdaio_mgr = daio_mgr; | ||
745 | |||
746 | return 0; | ||
747 | |||
748 | error2: | ||
749 | rsc_mgr_uninit(&daio_mgr->mgr); | ||
750 | error1: | ||
751 | kfree(daio_mgr); | ||
752 | return err; | ||
753 | } | ||
754 | |||
755 | int daio_mgr_destroy(struct daio_mgr *daio_mgr) | ||
756 | { | ||
757 | unsigned long flags; | ||
758 | |||
759 | /* free daio input mapper list */ | ||
760 | spin_lock_irqsave(&daio_mgr->imap_lock, flags); | ||
761 | free_input_mapper_list(&daio_mgr->imappers); | ||
762 | spin_unlock_irqrestore(&daio_mgr->imap_lock, flags); | ||
763 | |||
764 | rsc_mgr_uninit(&daio_mgr->mgr); | ||
765 | kfree(daio_mgr); | ||
766 | |||
767 | return 0; | ||
768 | } | ||
769 | |||
diff --git a/sound/pci/ctxfi/ctdaio.h b/sound/pci/ctxfi/ctdaio.h new file mode 100644 index 000000000000..0f52ce571ee8 --- /dev/null +++ b/sound/pci/ctxfi/ctdaio.h | |||
@@ -0,0 +1,122 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctdaio.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of Digital Audio Input Output | ||
12 | * resource management object. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date May 23 2008 | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #ifndef CTDAIO_H | ||
20 | #define CTDAIO_H | ||
21 | |||
22 | #include "ctresource.h" | ||
23 | #include "ctimap.h" | ||
24 | #include <linux/spinlock.h> | ||
25 | #include <linux/list.h> | ||
26 | |||
27 | /* Define the descriptor of a daio resource */ | ||
28 | enum DAIOTYP { | ||
29 | LINEO1, | ||
30 | LINEO2, | ||
31 | LINEO3, | ||
32 | LINEO4, | ||
33 | SPDIFOO, /* S/PDIF Out (Flexijack/Optical) */ | ||
34 | LINEIM, | ||
35 | SPDIFIO, /* S/PDIF In (Flexijack/Optical) on the card */ | ||
36 | SPDIFI1, /* S/PDIF In on internal Drive Bay */ | ||
37 | NUM_DAIOTYP | ||
38 | }; | ||
39 | |||
40 | struct dao_rsc_ops; | ||
41 | struct dai_rsc_ops; | ||
42 | struct daio_mgr; | ||
43 | |||
44 | struct daio { | ||
45 | struct rsc rscl; /* Basic resource info for left TX/RX */ | ||
46 | struct rsc rscr; /* Basic resource info for right TX/RX */ | ||
47 | enum DAIOTYP type; | ||
48 | }; | ||
49 | |||
50 | struct dao { | ||
51 | struct daio daio; | ||
52 | struct dao_rsc_ops *ops; /* DAO specific operations */ | ||
53 | struct imapper **imappers; | ||
54 | struct daio_mgr *mgr; | ||
55 | void *hw; | ||
56 | void *ctrl_blk; | ||
57 | }; | ||
58 | |||
59 | struct dai { | ||
60 | struct daio daio; | ||
61 | struct dai_rsc_ops *ops; /* DAI specific operations */ | ||
62 | void *hw; | ||
63 | void *ctrl_blk; | ||
64 | }; | ||
65 | |||
66 | struct dao_desc { | ||
67 | unsigned int msr:4; | ||
68 | unsigned int passthru:1; | ||
69 | }; | ||
70 | |||
71 | struct dao_rsc_ops { | ||
72 | int (*set_spos)(struct dao *dao, unsigned int spos); | ||
73 | int (*commit_write)(struct dao *dao); | ||
74 | int (*get_spos)(struct dao *dao, unsigned int *spos); | ||
75 | int (*reinit)(struct dao *dao, const struct dao_desc *desc); | ||
76 | int (*set_left_input)(struct dao *dao, struct rsc *input); | ||
77 | int (*set_right_input)(struct dao *dao, struct rsc *input); | ||
78 | int (*clear_left_input)(struct dao *dao); | ||
79 | int (*clear_right_input)(struct dao *dao); | ||
80 | }; | ||
81 | |||
82 | struct dai_rsc_ops { | ||
83 | int (*set_srt_srcl)(struct dai *dai, struct rsc *src); | ||
84 | int (*set_srt_srcr)(struct dai *dai, struct rsc *src); | ||
85 | int (*set_srt_msr)(struct dai *dai, unsigned int msr); | ||
86 | int (*set_enb_src)(struct dai *dai, unsigned int enb); | ||
87 | int (*set_enb_srt)(struct dai *dai, unsigned int enb); | ||
88 | int (*commit_write)(struct dai *dai); | ||
89 | }; | ||
90 | |||
91 | /* Define daio resource request description info */ | ||
92 | struct daio_desc { | ||
93 | unsigned int type:4; | ||
94 | unsigned int msr:4; | ||
95 | unsigned int passthru:1; | ||
96 | }; | ||
97 | |||
98 | struct daio_mgr { | ||
99 | struct rsc_mgr mgr; /* Basic resource manager info */ | ||
100 | spinlock_t mgr_lock; | ||
101 | spinlock_t imap_lock; | ||
102 | struct list_head imappers; | ||
103 | struct imapper *init_imap; | ||
104 | unsigned int init_imap_added; | ||
105 | |||
106 | /* request one daio resource */ | ||
107 | int (*get_daio)(struct daio_mgr *mgr, | ||
108 | const struct daio_desc *desc, struct daio **rdaio); | ||
109 | /* return one daio resource */ | ||
110 | int (*put_daio)(struct daio_mgr *mgr, struct daio *daio); | ||
111 | int (*daio_enable)(struct daio_mgr *mgr, struct daio *daio); | ||
112 | int (*daio_disable)(struct daio_mgr *mgr, struct daio *daio); | ||
113 | int (*imap_add)(struct daio_mgr *mgr, struct imapper *entry); | ||
114 | int (*imap_delete)(struct daio_mgr *mgr, struct imapper *entry); | ||
115 | int (*commit_write)(struct daio_mgr *mgr); | ||
116 | }; | ||
117 | |||
118 | /* Constructor and destructor of daio resource manager */ | ||
119 | int daio_mgr_create(void *hw, struct daio_mgr **rdaio_mgr); | ||
120 | int daio_mgr_destroy(struct daio_mgr *daio_mgr); | ||
121 | |||
122 | #endif /* CTDAIO_H */ | ||
diff --git a/sound/pci/ctxfi/cthardware.c b/sound/pci/ctxfi/cthardware.c new file mode 100644 index 000000000000..8e64f4862e85 --- /dev/null +++ b/sound/pci/ctxfi/cthardware.c | |||
@@ -0,0 +1,91 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File cthardware.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of hardware access methord. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date Jun 26 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #include "cthardware.h" | ||
19 | #include "cthw20k1.h" | ||
20 | #include "cthw20k2.h" | ||
21 | #include <linux/bug.h> | ||
22 | |||
23 | int __devinit create_hw_obj(struct pci_dev *pci, enum CHIPTYP chip_type, | ||
24 | enum CTCARDS model, struct hw **rhw) | ||
25 | { | ||
26 | int err; | ||
27 | |||
28 | switch (chip_type) { | ||
29 | case ATC20K1: | ||
30 | err = create_20k1_hw_obj(rhw); | ||
31 | break; | ||
32 | case ATC20K2: | ||
33 | err = create_20k2_hw_obj(rhw); | ||
34 | break; | ||
35 | default: | ||
36 | err = -ENODEV; | ||
37 | break; | ||
38 | } | ||
39 | if (err) | ||
40 | return err; | ||
41 | |||
42 | (*rhw)->pci = pci; | ||
43 | (*rhw)->chip_type = chip_type; | ||
44 | (*rhw)->model = model; | ||
45 | |||
46 | return 0; | ||
47 | } | ||
48 | |||
49 | int destroy_hw_obj(struct hw *hw) | ||
50 | { | ||
51 | int err; | ||
52 | |||
53 | switch (hw->pci->device) { | ||
54 | case 0x0005: /* 20k1 device */ | ||
55 | err = destroy_20k1_hw_obj(hw); | ||
56 | break; | ||
57 | case 0x000B: /* 20k2 device */ | ||
58 | err = destroy_20k2_hw_obj(hw); | ||
59 | break; | ||
60 | default: | ||
61 | err = -ENODEV; | ||
62 | break; | ||
63 | } | ||
64 | |||
65 | return err; | ||
66 | } | ||
67 | |||
68 | unsigned int get_field(unsigned int data, unsigned int field) | ||
69 | { | ||
70 | int i; | ||
71 | |||
72 | BUG_ON(!field); | ||
73 | /* @field should always be greater than 0 */ | ||
74 | for (i = 0; !(field & (1 << i)); ) | ||
75 | i++; | ||
76 | |||
77 | return (data & field) >> i; | ||
78 | } | ||
79 | |||
80 | void set_field(unsigned int *data, unsigned int field, unsigned int value) | ||
81 | { | ||
82 | int i; | ||
83 | |||
84 | BUG_ON(!field); | ||
85 | /* @field should always be greater than 0 */ | ||
86 | for (i = 0; !(field & (1 << i)); ) | ||
87 | i++; | ||
88 | |||
89 | *data = (*data & (~field)) | ((value << i) & field); | ||
90 | } | ||
91 | |||
diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h new file mode 100644 index 000000000000..af55405f5dec --- /dev/null +++ b/sound/pci/ctxfi/cthardware.h | |||
@@ -0,0 +1,203 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File cthardware.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of hardware access methord. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date May 13 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #ifndef CTHARDWARE_H | ||
19 | #define CTHARDWARE_H | ||
20 | |||
21 | #include <linux/types.h> | ||
22 | #include <linux/pci.h> | ||
23 | |||
24 | enum CHIPTYP { | ||
25 | ATC20K1, | ||
26 | ATC20K2, | ||
27 | ATCNONE | ||
28 | }; | ||
29 | |||
30 | enum CTCARDS { | ||
31 | /* 20k1 models */ | ||
32 | CTSB055X, | ||
33 | CT20K1_MODEL_FIRST = CTSB055X, | ||
34 | CTSB073X, | ||
35 | CTUAA, | ||
36 | CT20K1_UNKNOWN, | ||
37 | /* 20k2 models */ | ||
38 | CTSB0760, | ||
39 | CT20K2_MODEL_FIRST = CTSB0760, | ||
40 | CTHENDRIX, | ||
41 | CTSB0880, | ||
42 | CT20K2_UNKNOWN, | ||
43 | NUM_CTCARDS /* This should always be the last */ | ||
44 | }; | ||
45 | |||
46 | /* Type of input source for ADC */ | ||
47 | enum ADCSRC{ | ||
48 | ADC_MICIN, | ||
49 | ADC_LINEIN, | ||
50 | ADC_VIDEO, | ||
51 | ADC_AUX, | ||
52 | ADC_NONE /* Switch to digital input */ | ||
53 | }; | ||
54 | |||
55 | struct card_conf { | ||
56 | /* device virtual mem page table page physical addr | ||
57 | * (supporting one page table page now) */ | ||
58 | unsigned long vm_pgt_phys; | ||
59 | unsigned int rsr; /* reference sample rate in Hzs*/ | ||
60 | unsigned int msr; /* master sample rate in rsrs */ | ||
61 | }; | ||
62 | |||
63 | struct hw { | ||
64 | int (*card_init)(struct hw *hw, struct card_conf *info); | ||
65 | int (*card_stop)(struct hw *hw); | ||
66 | int (*pll_init)(struct hw *hw, unsigned int rsr); | ||
67 | #ifdef CONFIG_PM | ||
68 | int (*suspend)(struct hw *hw, pm_message_t state); | ||
69 | int (*resume)(struct hw *hw, struct card_conf *info); | ||
70 | #endif | ||
71 | int (*is_adc_source_selected)(struct hw *hw, enum ADCSRC source); | ||
72 | int (*select_adc_source)(struct hw *hw, enum ADCSRC source); | ||
73 | int (*have_digit_io_switch)(struct hw *hw); | ||
74 | |||
75 | /* SRC operations */ | ||
76 | int (*src_rsc_get_ctrl_blk)(void **rblk); | ||
77 | int (*src_rsc_put_ctrl_blk)(void *blk); | ||
78 | int (*src_set_state)(void *blk, unsigned int state); | ||
79 | int (*src_set_bm)(void *blk, unsigned int bm); | ||
80 | int (*src_set_rsr)(void *blk, unsigned int rsr); | ||
81 | int (*src_set_sf)(void *blk, unsigned int sf); | ||
82 | int (*src_set_wr)(void *blk, unsigned int wr); | ||
83 | int (*src_set_pm)(void *blk, unsigned int pm); | ||
84 | int (*src_set_rom)(void *blk, unsigned int rom); | ||
85 | int (*src_set_vo)(void *blk, unsigned int vo); | ||
86 | int (*src_set_st)(void *blk, unsigned int st); | ||
87 | int (*src_set_ie)(void *blk, unsigned int ie); | ||
88 | int (*src_set_ilsz)(void *blk, unsigned int ilsz); | ||
89 | int (*src_set_bp)(void *blk, unsigned int bp); | ||
90 | int (*src_set_cisz)(void *blk, unsigned int cisz); | ||
91 | int (*src_set_ca)(void *blk, unsigned int ca); | ||
92 | int (*src_set_sa)(void *blk, unsigned int sa); | ||
93 | int (*src_set_la)(void *blk, unsigned int la); | ||
94 | int (*src_set_pitch)(void *blk, unsigned int pitch); | ||
95 | int (*src_set_clear_zbufs)(void *blk, unsigned int clear); | ||
96 | int (*src_set_dirty)(void *blk, unsigned int flags); | ||
97 | int (*src_set_dirty_all)(void *blk); | ||
98 | int (*src_commit_write)(struct hw *hw, unsigned int idx, void *blk); | ||
99 | int (*src_get_ca)(struct hw *hw, unsigned int idx, void *blk); | ||
100 | unsigned int (*src_get_dirty)(void *blk); | ||
101 | unsigned int (*src_dirty_conj_mask)(void); | ||
102 | int (*src_mgr_get_ctrl_blk)(void **rblk); | ||
103 | int (*src_mgr_put_ctrl_blk)(void *blk); | ||
104 | /* syncly enable src @idx */ | ||
105 | int (*src_mgr_enbs_src)(void *blk, unsigned int idx); | ||
106 | /* enable src @idx */ | ||
107 | int (*src_mgr_enb_src)(void *blk, unsigned int idx); | ||
108 | /* disable src @idx */ | ||
109 | int (*src_mgr_dsb_src)(void *blk, unsigned int idx); | ||
110 | int (*src_mgr_commit_write)(struct hw *hw, void *blk); | ||
111 | |||
112 | /* SRC Input Mapper operations */ | ||
113 | int (*srcimp_mgr_get_ctrl_blk)(void **rblk); | ||
114 | int (*srcimp_mgr_put_ctrl_blk)(void *blk); | ||
115 | int (*srcimp_mgr_set_imaparc)(void *blk, unsigned int slot); | ||
116 | int (*srcimp_mgr_set_imapuser)(void *blk, unsigned int user); | ||
117 | int (*srcimp_mgr_set_imapnxt)(void *blk, unsigned int next); | ||
118 | int (*srcimp_mgr_set_imapaddr)(void *blk, unsigned int addr); | ||
119 | int (*srcimp_mgr_commit_write)(struct hw *hw, void *blk); | ||
120 | |||
121 | /* AMIXER operations */ | ||
122 | int (*amixer_rsc_get_ctrl_blk)(void **rblk); | ||
123 | int (*amixer_rsc_put_ctrl_blk)(void *blk); | ||
124 | int (*amixer_mgr_get_ctrl_blk)(void **rblk); | ||
125 | int (*amixer_mgr_put_ctrl_blk)(void *blk); | ||
126 | int (*amixer_set_mode)(void *blk, unsigned int mode); | ||
127 | int (*amixer_set_iv)(void *blk, unsigned int iv); | ||
128 | int (*amixer_set_x)(void *blk, unsigned int x); | ||
129 | int (*amixer_set_y)(void *blk, unsigned int y); | ||
130 | int (*amixer_set_sadr)(void *blk, unsigned int sadr); | ||
131 | int (*amixer_set_se)(void *blk, unsigned int se); | ||
132 | int (*amixer_set_dirty)(void *blk, unsigned int flags); | ||
133 | int (*amixer_set_dirty_all)(void *blk); | ||
134 | int (*amixer_commit_write)(struct hw *hw, unsigned int idx, void *blk); | ||
135 | int (*amixer_get_y)(void *blk); | ||
136 | unsigned int (*amixer_get_dirty)(void *blk); | ||
137 | |||
138 | /* DAIO operations */ | ||
139 | int (*dai_get_ctrl_blk)(void **rblk); | ||
140 | int (*dai_put_ctrl_blk)(void *blk); | ||
141 | int (*dai_srt_set_srco)(void *blk, unsigned int src); | ||
142 | int (*dai_srt_set_srcm)(void *blk, unsigned int src); | ||
143 | int (*dai_srt_set_rsr)(void *blk, unsigned int rsr); | ||
144 | int (*dai_srt_set_drat)(void *blk, unsigned int drat); | ||
145 | int (*dai_srt_set_ec)(void *blk, unsigned int ec); | ||
146 | int (*dai_srt_set_et)(void *blk, unsigned int et); | ||
147 | int (*dai_commit_write)(struct hw *hw, unsigned int idx, void *blk); | ||
148 | int (*dao_get_ctrl_blk)(void **rblk); | ||
149 | int (*dao_put_ctrl_blk)(void *blk); | ||
150 | int (*dao_set_spos)(void *blk, unsigned int spos); | ||
151 | int (*dao_commit_write)(struct hw *hw, unsigned int idx, void *blk); | ||
152 | int (*dao_get_spos)(void *blk, unsigned int *spos); | ||
153 | |||
154 | int (*daio_mgr_get_ctrl_blk)(struct hw *hw, void **rblk); | ||
155 | int (*daio_mgr_put_ctrl_blk)(void *blk); | ||
156 | int (*daio_mgr_enb_dai)(void *blk, unsigned int idx); | ||
157 | int (*daio_mgr_dsb_dai)(void *blk, unsigned int idx); | ||
158 | int (*daio_mgr_enb_dao)(void *blk, unsigned int idx); | ||
159 | int (*daio_mgr_dsb_dao)(void *blk, unsigned int idx); | ||
160 | int (*daio_mgr_dao_init)(void *blk, unsigned int idx, | ||
161 | unsigned int conf); | ||
162 | int (*daio_mgr_set_imaparc)(void *blk, unsigned int slot); | ||
163 | int (*daio_mgr_set_imapnxt)(void *blk, unsigned int next); | ||
164 | int (*daio_mgr_set_imapaddr)(void *blk, unsigned int addr); | ||
165 | int (*daio_mgr_commit_write)(struct hw *hw, void *blk); | ||
166 | |||
167 | int (*set_timer_irq)(struct hw *hw, int enable); | ||
168 | int (*set_timer_tick)(struct hw *hw, unsigned int tick); | ||
169 | unsigned int (*get_wc)(struct hw *hw); | ||
170 | |||
171 | void (*irq_callback)(void *data, unsigned int bit); | ||
172 | void *irq_callback_data; | ||
173 | |||
174 | struct pci_dev *pci; /* the pci kernel structure of this card */ | ||
175 | int irq; | ||
176 | unsigned long io_base; | ||
177 | unsigned long mem_base; | ||
178 | |||
179 | enum CHIPTYP chip_type; | ||
180 | enum CTCARDS model; | ||
181 | }; | ||
182 | |||
183 | int create_hw_obj(struct pci_dev *pci, enum CHIPTYP chip_type, | ||
184 | enum CTCARDS model, struct hw **rhw); | ||
185 | int destroy_hw_obj(struct hw *hw); | ||
186 | |||
187 | unsigned int get_field(unsigned int data, unsigned int field); | ||
188 | void set_field(unsigned int *data, unsigned int field, unsigned int value); | ||
189 | |||
190 | /* IRQ bits */ | ||
191 | #define PLL_INT (1 << 10) /* PLL input-clock out-of-range */ | ||
192 | #define FI_INT (1 << 9) /* forced interrupt */ | ||
193 | #define IT_INT (1 << 8) /* timer interrupt */ | ||
194 | #define PCI_INT (1 << 7) /* PCI bus error pending */ | ||
195 | #define URT_INT (1 << 6) /* UART Tx/Rx */ | ||
196 | #define GPI_INT (1 << 5) /* GPI pin */ | ||
197 | #define MIX_INT (1 << 4) /* mixer parameter segment FIFO channels */ | ||
198 | #define DAI_INT (1 << 3) /* DAI (SR-tracker or SPDIF-receiver) */ | ||
199 | #define TP_INT (1 << 2) /* transport priority queue */ | ||
200 | #define DSP_INT (1 << 1) /* DSP */ | ||
201 | #define SRC_INT (1 << 0) /* SRC channels */ | ||
202 | |||
203 | #endif /* CTHARDWARE_H */ | ||
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c new file mode 100644 index 000000000000..ad3e1d144464 --- /dev/null +++ b/sound/pci/ctxfi/cthw20k1.c | |||
@@ -0,0 +1,2297 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File cthw20k1.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of hardware access methord for 20k1. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date Jun 24 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #include <linux/types.h> | ||
19 | #include <linux/slab.h> | ||
20 | #include <linux/pci.h> | ||
21 | #include <linux/io.h> | ||
22 | #include <linux/string.h> | ||
23 | #include <linux/spinlock.h> | ||
24 | #include <linux/kernel.h> | ||
25 | #include <linux/interrupt.h> | ||
26 | #include <linux/delay.h> | ||
27 | #include "cthw20k1.h" | ||
28 | #include "ct20k1reg.h" | ||
29 | |||
30 | #if BITS_PER_LONG == 32 | ||
31 | #define CT_XFI_DMA_MASK DMA_BIT_MASK(32) /* 32 bit PTE */ | ||
32 | #else | ||
33 | #define CT_XFI_DMA_MASK DMA_BIT_MASK(64) /* 64 bit PTE */ | ||
34 | #endif | ||
35 | |||
36 | struct hw20k1 { | ||
37 | struct hw hw; | ||
38 | spinlock_t reg_20k1_lock; | ||
39 | spinlock_t reg_pci_lock; | ||
40 | }; | ||
41 | |||
42 | static u32 hw_read_20kx(struct hw *hw, u32 reg); | ||
43 | static void hw_write_20kx(struct hw *hw, u32 reg, u32 data); | ||
44 | static u32 hw_read_pci(struct hw *hw, u32 reg); | ||
45 | static void hw_write_pci(struct hw *hw, u32 reg, u32 data); | ||
46 | |||
47 | /* | ||
48 | * Type definition block. | ||
49 | * The layout of control structures can be directly applied on 20k2 chip. | ||
50 | */ | ||
51 | |||
52 | /* | ||
53 | * SRC control block definitions. | ||
54 | */ | ||
55 | |||
56 | /* SRC resource control block */ | ||
57 | #define SRCCTL_STATE 0x00000007 | ||
58 | #define SRCCTL_BM 0x00000008 | ||
59 | #define SRCCTL_RSR 0x00000030 | ||
60 | #define SRCCTL_SF 0x000001C0 | ||
61 | #define SRCCTL_WR 0x00000200 | ||
62 | #define SRCCTL_PM 0x00000400 | ||
63 | #define SRCCTL_ROM 0x00001800 | ||
64 | #define SRCCTL_VO 0x00002000 | ||
65 | #define SRCCTL_ST 0x00004000 | ||
66 | #define SRCCTL_IE 0x00008000 | ||
67 | #define SRCCTL_ILSZ 0x000F0000 | ||
68 | #define SRCCTL_BP 0x00100000 | ||
69 | |||
70 | #define SRCCCR_CISZ 0x000007FF | ||
71 | #define SRCCCR_CWA 0x001FF800 | ||
72 | #define SRCCCR_D 0x00200000 | ||
73 | #define SRCCCR_RS 0x01C00000 | ||
74 | #define SRCCCR_NAL 0x3E000000 | ||
75 | #define SRCCCR_RA 0xC0000000 | ||
76 | |||
77 | #define SRCCA_CA 0x03FFFFFF | ||
78 | #define SRCCA_RS 0x1C000000 | ||
79 | #define SRCCA_NAL 0xE0000000 | ||
80 | |||
81 | #define SRCSA_SA 0x03FFFFFF | ||
82 | |||
83 | #define SRCLA_LA 0x03FFFFFF | ||
84 | |||
85 | /* Mixer Parameter Ring ram Low and Hight register. | ||
86 | * Fixed-point value in 8.24 format for parameter channel */ | ||
87 | #define MPRLH_PITCH 0xFFFFFFFF | ||
88 | |||
89 | /* SRC resource register dirty flags */ | ||
90 | union src_dirty { | ||
91 | struct { | ||
92 | u16 ctl:1; | ||
93 | u16 ccr:1; | ||
94 | u16 sa:1; | ||
95 | u16 la:1; | ||
96 | u16 ca:1; | ||
97 | u16 mpr:1; | ||
98 | u16 czbfs:1; /* Clear Z-Buffers */ | ||
99 | u16 rsv:9; | ||
100 | } bf; | ||
101 | u16 data; | ||
102 | }; | ||
103 | |||
104 | struct src_rsc_ctrl_blk { | ||
105 | unsigned int ctl; | ||
106 | unsigned int ccr; | ||
107 | unsigned int ca; | ||
108 | unsigned int sa; | ||
109 | unsigned int la; | ||
110 | unsigned int mpr; | ||
111 | union src_dirty dirty; | ||
112 | }; | ||
113 | |||
114 | /* SRC manager control block */ | ||
115 | union src_mgr_dirty { | ||
116 | struct { | ||
117 | u16 enb0:1; | ||
118 | u16 enb1:1; | ||
119 | u16 enb2:1; | ||
120 | u16 enb3:1; | ||
121 | u16 enb4:1; | ||
122 | u16 enb5:1; | ||
123 | u16 enb6:1; | ||
124 | u16 enb7:1; | ||
125 | u16 enbsa:1; | ||
126 | u16 rsv:7; | ||
127 | } bf; | ||
128 | u16 data; | ||
129 | }; | ||
130 | |||
131 | struct src_mgr_ctrl_blk { | ||
132 | unsigned int enbsa; | ||
133 | unsigned int enb[8]; | ||
134 | union src_mgr_dirty dirty; | ||
135 | }; | ||
136 | |||
137 | /* SRCIMP manager control block */ | ||
138 | #define SRCAIM_ARC 0x00000FFF | ||
139 | #define SRCAIM_NXT 0x00FF0000 | ||
140 | #define SRCAIM_SRC 0xFF000000 | ||
141 | |||
142 | struct srcimap { | ||
143 | unsigned int srcaim; | ||
144 | unsigned int idx; | ||
145 | }; | ||
146 | |||
147 | /* SRCIMP manager register dirty flags */ | ||
148 | union srcimp_mgr_dirty { | ||
149 | struct { | ||
150 | u16 srcimap:1; | ||
151 | u16 rsv:15; | ||
152 | } bf; | ||
153 | u16 data; | ||
154 | }; | ||
155 | |||
156 | struct srcimp_mgr_ctrl_blk { | ||
157 | struct srcimap srcimap; | ||
158 | union srcimp_mgr_dirty dirty; | ||
159 | }; | ||
160 | |||
161 | /* | ||
162 | * Function implementation block. | ||
163 | */ | ||
164 | |||
165 | static int src_get_rsc_ctrl_blk(void **rblk) | ||
166 | { | ||
167 | struct src_rsc_ctrl_blk *blk; | ||
168 | |||
169 | *rblk = NULL; | ||
170 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
171 | if (NULL == blk) | ||
172 | return -ENOMEM; | ||
173 | |||
174 | *rblk = blk; | ||
175 | |||
176 | return 0; | ||
177 | } | ||
178 | |||
179 | static int src_put_rsc_ctrl_blk(void *blk) | ||
180 | { | ||
181 | kfree((struct src_rsc_ctrl_blk *)blk); | ||
182 | |||
183 | return 0; | ||
184 | } | ||
185 | |||
186 | static int src_set_state(void *blk, unsigned int state) | ||
187 | { | ||
188 | struct src_rsc_ctrl_blk *ctl = blk; | ||
189 | |||
190 | set_field(&ctl->ctl, SRCCTL_STATE, state); | ||
191 | ctl->dirty.bf.ctl = 1; | ||
192 | return 0; | ||
193 | } | ||
194 | |||
195 | static int src_set_bm(void *blk, unsigned int bm) | ||
196 | { | ||
197 | struct src_rsc_ctrl_blk *ctl = blk; | ||
198 | |||
199 | set_field(&ctl->ctl, SRCCTL_BM, bm); | ||
200 | ctl->dirty.bf.ctl = 1; | ||
201 | return 0; | ||
202 | } | ||
203 | |||
204 | static int src_set_rsr(void *blk, unsigned int rsr) | ||
205 | { | ||
206 | struct src_rsc_ctrl_blk *ctl = blk; | ||
207 | |||
208 | set_field(&ctl->ctl, SRCCTL_RSR, rsr); | ||
209 | ctl->dirty.bf.ctl = 1; | ||
210 | return 0; | ||
211 | } | ||
212 | |||
213 | static int src_set_sf(void *blk, unsigned int sf) | ||
214 | { | ||
215 | struct src_rsc_ctrl_blk *ctl = blk; | ||
216 | |||
217 | set_field(&ctl->ctl, SRCCTL_SF, sf); | ||
218 | ctl->dirty.bf.ctl = 1; | ||
219 | return 0; | ||
220 | } | ||
221 | |||
222 | static int src_set_wr(void *blk, unsigned int wr) | ||
223 | { | ||
224 | struct src_rsc_ctrl_blk *ctl = blk; | ||
225 | |||
226 | set_field(&ctl->ctl, SRCCTL_WR, wr); | ||
227 | ctl->dirty.bf.ctl = 1; | ||
228 | return 0; | ||
229 | } | ||
230 | |||
231 | static int src_set_pm(void *blk, unsigned int pm) | ||
232 | { | ||
233 | struct src_rsc_ctrl_blk *ctl = blk; | ||
234 | |||
235 | set_field(&ctl->ctl, SRCCTL_PM, pm); | ||
236 | ctl->dirty.bf.ctl = 1; | ||
237 | return 0; | ||
238 | } | ||
239 | |||
240 | static int src_set_rom(void *blk, unsigned int rom) | ||
241 | { | ||
242 | struct src_rsc_ctrl_blk *ctl = blk; | ||
243 | |||
244 | set_field(&ctl->ctl, SRCCTL_ROM, rom); | ||
245 | ctl->dirty.bf.ctl = 1; | ||
246 | return 0; | ||
247 | } | ||
248 | |||
249 | static int src_set_vo(void *blk, unsigned int vo) | ||
250 | { | ||
251 | struct src_rsc_ctrl_blk *ctl = blk; | ||
252 | |||
253 | set_field(&ctl->ctl, SRCCTL_VO, vo); | ||
254 | ctl->dirty.bf.ctl = 1; | ||
255 | return 0; | ||
256 | } | ||
257 | |||
258 | static int src_set_st(void *blk, unsigned int st) | ||
259 | { | ||
260 | struct src_rsc_ctrl_blk *ctl = blk; | ||
261 | |||
262 | set_field(&ctl->ctl, SRCCTL_ST, st); | ||
263 | ctl->dirty.bf.ctl = 1; | ||
264 | return 0; | ||
265 | } | ||
266 | |||
267 | static int src_set_ie(void *blk, unsigned int ie) | ||
268 | { | ||
269 | struct src_rsc_ctrl_blk *ctl = blk; | ||
270 | |||
271 | set_field(&ctl->ctl, SRCCTL_IE, ie); | ||
272 | ctl->dirty.bf.ctl = 1; | ||
273 | return 0; | ||
274 | } | ||
275 | |||
276 | static int src_set_ilsz(void *blk, unsigned int ilsz) | ||
277 | { | ||
278 | struct src_rsc_ctrl_blk *ctl = blk; | ||
279 | |||
280 | set_field(&ctl->ctl, SRCCTL_ILSZ, ilsz); | ||
281 | ctl->dirty.bf.ctl = 1; | ||
282 | return 0; | ||
283 | } | ||
284 | |||
285 | static int src_set_bp(void *blk, unsigned int bp) | ||
286 | { | ||
287 | struct src_rsc_ctrl_blk *ctl = blk; | ||
288 | |||
289 | set_field(&ctl->ctl, SRCCTL_BP, bp); | ||
290 | ctl->dirty.bf.ctl = 1; | ||
291 | return 0; | ||
292 | } | ||
293 | |||
294 | static int src_set_cisz(void *blk, unsigned int cisz) | ||
295 | { | ||
296 | struct src_rsc_ctrl_blk *ctl = blk; | ||
297 | |||
298 | set_field(&ctl->ccr, SRCCCR_CISZ, cisz); | ||
299 | ctl->dirty.bf.ccr = 1; | ||
300 | return 0; | ||
301 | } | ||
302 | |||
303 | static int src_set_ca(void *blk, unsigned int ca) | ||
304 | { | ||
305 | struct src_rsc_ctrl_blk *ctl = blk; | ||
306 | |||
307 | set_field(&ctl->ca, SRCCA_CA, ca); | ||
308 | ctl->dirty.bf.ca = 1; | ||
309 | return 0; | ||
310 | } | ||
311 | |||
312 | static int src_set_sa(void *blk, unsigned int sa) | ||
313 | { | ||
314 | struct src_rsc_ctrl_blk *ctl = blk; | ||
315 | |||
316 | set_field(&ctl->sa, SRCSA_SA, sa); | ||
317 | ctl->dirty.bf.sa = 1; | ||
318 | return 0; | ||
319 | } | ||
320 | |||
321 | static int src_set_la(void *blk, unsigned int la) | ||
322 | { | ||
323 | struct src_rsc_ctrl_blk *ctl = blk; | ||
324 | |||
325 | set_field(&ctl->la, SRCLA_LA, la); | ||
326 | ctl->dirty.bf.la = 1; | ||
327 | return 0; | ||
328 | } | ||
329 | |||
330 | static int src_set_pitch(void *blk, unsigned int pitch) | ||
331 | { | ||
332 | struct src_rsc_ctrl_blk *ctl = blk; | ||
333 | |||
334 | set_field(&ctl->mpr, MPRLH_PITCH, pitch); | ||
335 | ctl->dirty.bf.mpr = 1; | ||
336 | return 0; | ||
337 | } | ||
338 | |||
339 | static int src_set_clear_zbufs(void *blk, unsigned int clear) | ||
340 | { | ||
341 | ((struct src_rsc_ctrl_blk *)blk)->dirty.bf.czbfs = (clear ? 1 : 0); | ||
342 | return 0; | ||
343 | } | ||
344 | |||
345 | static int src_set_dirty(void *blk, unsigned int flags) | ||
346 | { | ||
347 | ((struct src_rsc_ctrl_blk *)blk)->dirty.data = (flags & 0xffff); | ||
348 | return 0; | ||
349 | } | ||
350 | |||
351 | static int src_set_dirty_all(void *blk) | ||
352 | { | ||
353 | ((struct src_rsc_ctrl_blk *)blk)->dirty.data = ~(0x0); | ||
354 | return 0; | ||
355 | } | ||
356 | |||
357 | #define AR_SLOT_SIZE 4096 | ||
358 | #define AR_SLOT_BLOCK_SIZE 16 | ||
359 | #define AR_PTS_PITCH 6 | ||
360 | #define AR_PARAM_SRC_OFFSET 0x60 | ||
361 | |||
362 | static unsigned int src_param_pitch_mixer(unsigned int src_idx) | ||
363 | { | ||
364 | return ((src_idx << 4) + AR_PTS_PITCH + AR_SLOT_SIZE | ||
365 | - AR_PARAM_SRC_OFFSET) % AR_SLOT_SIZE; | ||
366 | |||
367 | } | ||
368 | |||
369 | static int src_commit_write(struct hw *hw, unsigned int idx, void *blk) | ||
370 | { | ||
371 | struct src_rsc_ctrl_blk *ctl = blk; | ||
372 | int i; | ||
373 | |||
374 | if (ctl->dirty.bf.czbfs) { | ||
375 | /* Clear Z-Buffer registers */ | ||
376 | for (i = 0; i < 8; i++) | ||
377 | hw_write_20kx(hw, SRCUPZ+idx*0x100+i*0x4, 0); | ||
378 | |||
379 | for (i = 0; i < 4; i++) | ||
380 | hw_write_20kx(hw, SRCDN0Z+idx*0x100+i*0x4, 0); | ||
381 | |||
382 | for (i = 0; i < 8; i++) | ||
383 | hw_write_20kx(hw, SRCDN1Z+idx*0x100+i*0x4, 0); | ||
384 | |||
385 | ctl->dirty.bf.czbfs = 0; | ||
386 | } | ||
387 | if (ctl->dirty.bf.mpr) { | ||
388 | /* Take the parameter mixer resource in the same group as that | ||
389 | * the idx src is in for simplicity. Unlike src, all conjugate | ||
390 | * parameter mixer resources must be programmed for | ||
391 | * corresponding conjugate src resources. */ | ||
392 | unsigned int pm_idx = src_param_pitch_mixer(idx); | ||
393 | hw_write_20kx(hw, PRING_LO_HI+4*pm_idx, ctl->mpr); | ||
394 | hw_write_20kx(hw, PMOPLO+8*pm_idx, 0x3); | ||
395 | hw_write_20kx(hw, PMOPHI+8*pm_idx, 0x0); | ||
396 | ctl->dirty.bf.mpr = 0; | ||
397 | } | ||
398 | if (ctl->dirty.bf.sa) { | ||
399 | hw_write_20kx(hw, SRCSA+idx*0x100, ctl->sa); | ||
400 | ctl->dirty.bf.sa = 0; | ||
401 | } | ||
402 | if (ctl->dirty.bf.la) { | ||
403 | hw_write_20kx(hw, SRCLA+idx*0x100, ctl->la); | ||
404 | ctl->dirty.bf.la = 0; | ||
405 | } | ||
406 | if (ctl->dirty.bf.ca) { | ||
407 | hw_write_20kx(hw, SRCCA+idx*0x100, ctl->ca); | ||
408 | ctl->dirty.bf.ca = 0; | ||
409 | } | ||
410 | |||
411 | /* Write srccf register */ | ||
412 | hw_write_20kx(hw, SRCCF+idx*0x100, 0x0); | ||
413 | |||
414 | if (ctl->dirty.bf.ccr) { | ||
415 | hw_write_20kx(hw, SRCCCR+idx*0x100, ctl->ccr); | ||
416 | ctl->dirty.bf.ccr = 0; | ||
417 | } | ||
418 | if (ctl->dirty.bf.ctl) { | ||
419 | hw_write_20kx(hw, SRCCTL+idx*0x100, ctl->ctl); | ||
420 | ctl->dirty.bf.ctl = 0; | ||
421 | } | ||
422 | |||
423 | return 0; | ||
424 | } | ||
425 | |||
426 | static int src_get_ca(struct hw *hw, unsigned int idx, void *blk) | ||
427 | { | ||
428 | struct src_rsc_ctrl_blk *ctl = blk; | ||
429 | |||
430 | ctl->ca = hw_read_20kx(hw, SRCCA+idx*0x100); | ||
431 | ctl->dirty.bf.ca = 0; | ||
432 | |||
433 | return get_field(ctl->ca, SRCCA_CA); | ||
434 | } | ||
435 | |||
436 | static unsigned int src_get_dirty(void *blk) | ||
437 | { | ||
438 | return ((struct src_rsc_ctrl_blk *)blk)->dirty.data; | ||
439 | } | ||
440 | |||
441 | static unsigned int src_dirty_conj_mask(void) | ||
442 | { | ||
443 | return 0x20; | ||
444 | } | ||
445 | |||
446 | static int src_mgr_enbs_src(void *blk, unsigned int idx) | ||
447 | { | ||
448 | ((struct src_mgr_ctrl_blk *)blk)->enbsa = ~(0x0); | ||
449 | ((struct src_mgr_ctrl_blk *)blk)->dirty.bf.enbsa = 1; | ||
450 | ((struct src_mgr_ctrl_blk *)blk)->enb[idx/32] |= (0x1 << (idx%32)); | ||
451 | return 0; | ||
452 | } | ||
453 | |||
454 | static int src_mgr_enb_src(void *blk, unsigned int idx) | ||
455 | { | ||
456 | ((struct src_mgr_ctrl_blk *)blk)->enb[idx/32] |= (0x1 << (idx%32)); | ||
457 | ((struct src_mgr_ctrl_blk *)blk)->dirty.data |= (0x1 << (idx/32)); | ||
458 | return 0; | ||
459 | } | ||
460 | |||
461 | static int src_mgr_dsb_src(void *blk, unsigned int idx) | ||
462 | { | ||
463 | ((struct src_mgr_ctrl_blk *)blk)->enb[idx/32] &= ~(0x1 << (idx%32)); | ||
464 | ((struct src_mgr_ctrl_blk *)blk)->dirty.data |= (0x1 << (idx/32)); | ||
465 | return 0; | ||
466 | } | ||
467 | |||
468 | static int src_mgr_commit_write(struct hw *hw, void *blk) | ||
469 | { | ||
470 | struct src_mgr_ctrl_blk *ctl = blk; | ||
471 | int i; | ||
472 | unsigned int ret; | ||
473 | |||
474 | if (ctl->dirty.bf.enbsa) { | ||
475 | do { | ||
476 | ret = hw_read_20kx(hw, SRCENBSTAT); | ||
477 | } while (ret & 0x1); | ||
478 | hw_write_20kx(hw, SRCENBS, ctl->enbsa); | ||
479 | ctl->dirty.bf.enbsa = 0; | ||
480 | } | ||
481 | for (i = 0; i < 8; i++) { | ||
482 | if ((ctl->dirty.data & (0x1 << i))) { | ||
483 | hw_write_20kx(hw, SRCENB+(i*0x100), ctl->enb[i]); | ||
484 | ctl->dirty.data &= ~(0x1 << i); | ||
485 | } | ||
486 | } | ||
487 | |||
488 | return 0; | ||
489 | } | ||
490 | |||
491 | static int src_mgr_get_ctrl_blk(void **rblk) | ||
492 | { | ||
493 | struct src_mgr_ctrl_blk *blk; | ||
494 | |||
495 | *rblk = NULL; | ||
496 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
497 | if (NULL == blk) | ||
498 | return -ENOMEM; | ||
499 | |||
500 | *rblk = blk; | ||
501 | |||
502 | return 0; | ||
503 | } | ||
504 | |||
505 | static int src_mgr_put_ctrl_blk(void *blk) | ||
506 | { | ||
507 | kfree((struct src_mgr_ctrl_blk *)blk); | ||
508 | |||
509 | return 0; | ||
510 | } | ||
511 | |||
512 | static int srcimp_mgr_get_ctrl_blk(void **rblk) | ||
513 | { | ||
514 | struct srcimp_mgr_ctrl_blk *blk; | ||
515 | |||
516 | *rblk = NULL; | ||
517 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
518 | if (NULL == blk) | ||
519 | return -ENOMEM; | ||
520 | |||
521 | *rblk = blk; | ||
522 | |||
523 | return 0; | ||
524 | } | ||
525 | |||
526 | static int srcimp_mgr_put_ctrl_blk(void *blk) | ||
527 | { | ||
528 | kfree((struct srcimp_mgr_ctrl_blk *)blk); | ||
529 | |||
530 | return 0; | ||
531 | } | ||
532 | |||
533 | static int srcimp_mgr_set_imaparc(void *blk, unsigned int slot) | ||
534 | { | ||
535 | struct srcimp_mgr_ctrl_blk *ctl = blk; | ||
536 | |||
537 | set_field(&ctl->srcimap.srcaim, SRCAIM_ARC, slot); | ||
538 | ctl->dirty.bf.srcimap = 1; | ||
539 | return 0; | ||
540 | } | ||
541 | |||
542 | static int srcimp_mgr_set_imapuser(void *blk, unsigned int user) | ||
543 | { | ||
544 | struct srcimp_mgr_ctrl_blk *ctl = blk; | ||
545 | |||
546 | set_field(&ctl->srcimap.srcaim, SRCAIM_SRC, user); | ||
547 | ctl->dirty.bf.srcimap = 1; | ||
548 | return 0; | ||
549 | } | ||
550 | |||
551 | static int srcimp_mgr_set_imapnxt(void *blk, unsigned int next) | ||
552 | { | ||
553 | struct srcimp_mgr_ctrl_blk *ctl = blk; | ||
554 | |||
555 | set_field(&ctl->srcimap.srcaim, SRCAIM_NXT, next); | ||
556 | ctl->dirty.bf.srcimap = 1; | ||
557 | return 0; | ||
558 | } | ||
559 | |||
560 | static int srcimp_mgr_set_imapaddr(void *blk, unsigned int addr) | ||
561 | { | ||
562 | struct srcimp_mgr_ctrl_blk *ctl = blk; | ||
563 | |||
564 | ctl->srcimap.idx = addr; | ||
565 | ctl->dirty.bf.srcimap = 1; | ||
566 | return 0; | ||
567 | } | ||
568 | |||
569 | static int srcimp_mgr_commit_write(struct hw *hw, void *blk) | ||
570 | { | ||
571 | struct srcimp_mgr_ctrl_blk *ctl = blk; | ||
572 | |||
573 | if (ctl->dirty.bf.srcimap) { | ||
574 | hw_write_20kx(hw, SRCIMAP+ctl->srcimap.idx*0x100, | ||
575 | ctl->srcimap.srcaim); | ||
576 | ctl->dirty.bf.srcimap = 0; | ||
577 | } | ||
578 | |||
579 | return 0; | ||
580 | } | ||
581 | |||
582 | /* | ||
583 | * AMIXER control block definitions. | ||
584 | */ | ||
585 | |||
586 | #define AMOPLO_M 0x00000003 | ||
587 | #define AMOPLO_X 0x0003FFF0 | ||
588 | #define AMOPLO_Y 0xFFFC0000 | ||
589 | |||
590 | #define AMOPHI_SADR 0x000000FF | ||
591 | #define AMOPHI_SE 0x80000000 | ||
592 | |||
593 | /* AMIXER resource register dirty flags */ | ||
594 | union amixer_dirty { | ||
595 | struct { | ||
596 | u16 amoplo:1; | ||
597 | u16 amophi:1; | ||
598 | u16 rsv:14; | ||
599 | } bf; | ||
600 | u16 data; | ||
601 | }; | ||
602 | |||
603 | /* AMIXER resource control block */ | ||
604 | struct amixer_rsc_ctrl_blk { | ||
605 | unsigned int amoplo; | ||
606 | unsigned int amophi; | ||
607 | union amixer_dirty dirty; | ||
608 | }; | ||
609 | |||
610 | static int amixer_set_mode(void *blk, unsigned int mode) | ||
611 | { | ||
612 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
613 | |||
614 | set_field(&ctl->amoplo, AMOPLO_M, mode); | ||
615 | ctl->dirty.bf.amoplo = 1; | ||
616 | return 0; | ||
617 | } | ||
618 | |||
619 | static int amixer_set_iv(void *blk, unsigned int iv) | ||
620 | { | ||
621 | /* 20k1 amixer does not have this field */ | ||
622 | return 0; | ||
623 | } | ||
624 | |||
625 | static int amixer_set_x(void *blk, unsigned int x) | ||
626 | { | ||
627 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
628 | |||
629 | set_field(&ctl->amoplo, AMOPLO_X, x); | ||
630 | ctl->dirty.bf.amoplo = 1; | ||
631 | return 0; | ||
632 | } | ||
633 | |||
634 | static int amixer_set_y(void *blk, unsigned int y) | ||
635 | { | ||
636 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
637 | |||
638 | set_field(&ctl->amoplo, AMOPLO_Y, y); | ||
639 | ctl->dirty.bf.amoplo = 1; | ||
640 | return 0; | ||
641 | } | ||
642 | |||
643 | static int amixer_set_sadr(void *blk, unsigned int sadr) | ||
644 | { | ||
645 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
646 | |||
647 | set_field(&ctl->amophi, AMOPHI_SADR, sadr); | ||
648 | ctl->dirty.bf.amophi = 1; | ||
649 | return 0; | ||
650 | } | ||
651 | |||
652 | static int amixer_set_se(void *blk, unsigned int se) | ||
653 | { | ||
654 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
655 | |||
656 | set_field(&ctl->amophi, AMOPHI_SE, se); | ||
657 | ctl->dirty.bf.amophi = 1; | ||
658 | return 0; | ||
659 | } | ||
660 | |||
661 | static int amixer_set_dirty(void *blk, unsigned int flags) | ||
662 | { | ||
663 | ((struct amixer_rsc_ctrl_blk *)blk)->dirty.data = (flags & 0xffff); | ||
664 | return 0; | ||
665 | } | ||
666 | |||
667 | static int amixer_set_dirty_all(void *blk) | ||
668 | { | ||
669 | ((struct amixer_rsc_ctrl_blk *)blk)->dirty.data = ~(0x0); | ||
670 | return 0; | ||
671 | } | ||
672 | |||
673 | static int amixer_commit_write(struct hw *hw, unsigned int idx, void *blk) | ||
674 | { | ||
675 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
676 | |||
677 | if (ctl->dirty.bf.amoplo || ctl->dirty.bf.amophi) { | ||
678 | hw_write_20kx(hw, AMOPLO+idx*8, ctl->amoplo); | ||
679 | ctl->dirty.bf.amoplo = 0; | ||
680 | hw_write_20kx(hw, AMOPHI+idx*8, ctl->amophi); | ||
681 | ctl->dirty.bf.amophi = 0; | ||
682 | } | ||
683 | |||
684 | return 0; | ||
685 | } | ||
686 | |||
687 | static int amixer_get_y(void *blk) | ||
688 | { | ||
689 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
690 | |||
691 | return get_field(ctl->amoplo, AMOPLO_Y); | ||
692 | } | ||
693 | |||
694 | static unsigned int amixer_get_dirty(void *blk) | ||
695 | { | ||
696 | return ((struct amixer_rsc_ctrl_blk *)blk)->dirty.data; | ||
697 | } | ||
698 | |||
699 | static int amixer_rsc_get_ctrl_blk(void **rblk) | ||
700 | { | ||
701 | struct amixer_rsc_ctrl_blk *blk; | ||
702 | |||
703 | *rblk = NULL; | ||
704 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
705 | if (NULL == blk) | ||
706 | return -ENOMEM; | ||
707 | |||
708 | *rblk = blk; | ||
709 | |||
710 | return 0; | ||
711 | } | ||
712 | |||
713 | static int amixer_rsc_put_ctrl_blk(void *blk) | ||
714 | { | ||
715 | kfree((struct amixer_rsc_ctrl_blk *)blk); | ||
716 | |||
717 | return 0; | ||
718 | } | ||
719 | |||
720 | static int amixer_mgr_get_ctrl_blk(void **rblk) | ||
721 | { | ||
722 | /*amixer_mgr_ctrl_blk_t *blk;*/ | ||
723 | |||
724 | *rblk = NULL; | ||
725 | /*blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
726 | if (NULL == blk) | ||
727 | return -ENOMEM; | ||
728 | |||
729 | *rblk = blk;*/ | ||
730 | |||
731 | return 0; | ||
732 | } | ||
733 | |||
734 | static int amixer_mgr_put_ctrl_blk(void *blk) | ||
735 | { | ||
736 | /*kfree((amixer_mgr_ctrl_blk_t *)blk);*/ | ||
737 | |||
738 | return 0; | ||
739 | } | ||
740 | |||
741 | /* | ||
742 | * DAIO control block definitions. | ||
743 | */ | ||
744 | |||
745 | /* Receiver Sample Rate Tracker Control register */ | ||
746 | #define SRTCTL_SRCR 0x000000FF | ||
747 | #define SRTCTL_SRCL 0x0000FF00 | ||
748 | #define SRTCTL_RSR 0x00030000 | ||
749 | #define SRTCTL_DRAT 0x000C0000 | ||
750 | #define SRTCTL_RLE 0x10000000 | ||
751 | #define SRTCTL_RLP 0x20000000 | ||
752 | #define SRTCTL_EC 0x40000000 | ||
753 | #define SRTCTL_ET 0x80000000 | ||
754 | |||
755 | /* DAIO Receiver register dirty flags */ | ||
756 | union dai_dirty { | ||
757 | struct { | ||
758 | u16 srtctl:1; | ||
759 | u16 rsv:15; | ||
760 | } bf; | ||
761 | u16 data; | ||
762 | }; | ||
763 | |||
764 | /* DAIO Receiver control block */ | ||
765 | struct dai_ctrl_blk { | ||
766 | unsigned int srtctl; | ||
767 | union dai_dirty dirty; | ||
768 | }; | ||
769 | |||
770 | /* S/PDIF Transmitter register dirty flags */ | ||
771 | union dao_dirty { | ||
772 | struct { | ||
773 | u16 spos:1; | ||
774 | u16 rsv:15; | ||
775 | } bf; | ||
776 | u16 data; | ||
777 | }; | ||
778 | |||
779 | /* S/PDIF Transmitter control block */ | ||
780 | struct dao_ctrl_blk { | ||
781 | unsigned int spos; /* S/PDIF Output Channel Status Register */ | ||
782 | union dao_dirty dirty; | ||
783 | }; | ||
784 | |||
785 | /* Audio Input Mapper RAM */ | ||
786 | #define AIM_ARC 0x00000FFF | ||
787 | #define AIM_NXT 0x007F0000 | ||
788 | |||
789 | struct daoimap { | ||
790 | unsigned int aim; | ||
791 | unsigned int idx; | ||
792 | }; | ||
793 | |||
794 | /* I2S Transmitter/Receiver Control register */ | ||
795 | #define I2SCTL_EA 0x00000004 | ||
796 | #define I2SCTL_EI 0x00000010 | ||
797 | |||
798 | /* S/PDIF Transmitter Control register */ | ||
799 | #define SPOCTL_OE 0x00000001 | ||
800 | #define SPOCTL_OS 0x0000000E | ||
801 | #define SPOCTL_RIV 0x00000010 | ||
802 | #define SPOCTL_LIV 0x00000020 | ||
803 | #define SPOCTL_SR 0x000000C0 | ||
804 | |||
805 | /* S/PDIF Receiver Control register */ | ||
806 | #define SPICTL_EN 0x00000001 | ||
807 | #define SPICTL_I24 0x00000002 | ||
808 | #define SPICTL_IB 0x00000004 | ||
809 | #define SPICTL_SM 0x00000008 | ||
810 | #define SPICTL_VM 0x00000010 | ||
811 | |||
812 | /* DAIO manager register dirty flags */ | ||
813 | union daio_mgr_dirty { | ||
814 | struct { | ||
815 | u32 i2soctl:4; | ||
816 | u32 i2sictl:4; | ||
817 | u32 spoctl:4; | ||
818 | u32 spictl:4; | ||
819 | u32 daoimap:1; | ||
820 | u32 rsv:15; | ||
821 | } bf; | ||
822 | u32 data; | ||
823 | }; | ||
824 | |||
825 | /* DAIO manager control block */ | ||
826 | struct daio_mgr_ctrl_blk { | ||
827 | unsigned int i2sctl; | ||
828 | unsigned int spoctl; | ||
829 | unsigned int spictl; | ||
830 | struct daoimap daoimap; | ||
831 | union daio_mgr_dirty dirty; | ||
832 | }; | ||
833 | |||
834 | static int dai_srt_set_srcr(void *blk, unsigned int src) | ||
835 | { | ||
836 | struct dai_ctrl_blk *ctl = blk; | ||
837 | |||
838 | set_field(&ctl->srtctl, SRTCTL_SRCR, src); | ||
839 | ctl->dirty.bf.srtctl = 1; | ||
840 | return 0; | ||
841 | } | ||
842 | |||
843 | static int dai_srt_set_srcl(void *blk, unsigned int src) | ||
844 | { | ||
845 | struct dai_ctrl_blk *ctl = blk; | ||
846 | |||
847 | set_field(&ctl->srtctl, SRTCTL_SRCL, src); | ||
848 | ctl->dirty.bf.srtctl = 1; | ||
849 | return 0; | ||
850 | } | ||
851 | |||
852 | static int dai_srt_set_rsr(void *blk, unsigned int rsr) | ||
853 | { | ||
854 | struct dai_ctrl_blk *ctl = blk; | ||
855 | |||
856 | set_field(&ctl->srtctl, SRTCTL_RSR, rsr); | ||
857 | ctl->dirty.bf.srtctl = 1; | ||
858 | return 0; | ||
859 | } | ||
860 | |||
861 | static int dai_srt_set_drat(void *blk, unsigned int drat) | ||
862 | { | ||
863 | struct dai_ctrl_blk *ctl = blk; | ||
864 | |||
865 | set_field(&ctl->srtctl, SRTCTL_DRAT, drat); | ||
866 | ctl->dirty.bf.srtctl = 1; | ||
867 | return 0; | ||
868 | } | ||
869 | |||
870 | static int dai_srt_set_ec(void *blk, unsigned int ec) | ||
871 | { | ||
872 | struct dai_ctrl_blk *ctl = blk; | ||
873 | |||
874 | set_field(&ctl->srtctl, SRTCTL_EC, ec ? 1 : 0); | ||
875 | ctl->dirty.bf.srtctl = 1; | ||
876 | return 0; | ||
877 | } | ||
878 | |||
879 | static int dai_srt_set_et(void *blk, unsigned int et) | ||
880 | { | ||
881 | struct dai_ctrl_blk *ctl = blk; | ||
882 | |||
883 | set_field(&ctl->srtctl, SRTCTL_ET, et ? 1 : 0); | ||
884 | ctl->dirty.bf.srtctl = 1; | ||
885 | return 0; | ||
886 | } | ||
887 | |||
888 | static int dai_commit_write(struct hw *hw, unsigned int idx, void *blk) | ||
889 | { | ||
890 | struct dai_ctrl_blk *ctl = blk; | ||
891 | |||
892 | if (ctl->dirty.bf.srtctl) { | ||
893 | if (idx < 4) { | ||
894 | /* S/PDIF SRTs */ | ||
895 | hw_write_20kx(hw, SRTSCTL+0x4*idx, ctl->srtctl); | ||
896 | } else { | ||
897 | /* I2S SRT */ | ||
898 | hw_write_20kx(hw, SRTICTL, ctl->srtctl); | ||
899 | } | ||
900 | ctl->dirty.bf.srtctl = 0; | ||
901 | } | ||
902 | |||
903 | return 0; | ||
904 | } | ||
905 | |||
906 | static int dai_get_ctrl_blk(void **rblk) | ||
907 | { | ||
908 | struct dai_ctrl_blk *blk; | ||
909 | |||
910 | *rblk = NULL; | ||
911 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
912 | if (NULL == blk) | ||
913 | return -ENOMEM; | ||
914 | |||
915 | *rblk = blk; | ||
916 | |||
917 | return 0; | ||
918 | } | ||
919 | |||
920 | static int dai_put_ctrl_blk(void *blk) | ||
921 | { | ||
922 | kfree((struct dai_ctrl_blk *)blk); | ||
923 | |||
924 | return 0; | ||
925 | } | ||
926 | |||
927 | static int dao_set_spos(void *blk, unsigned int spos) | ||
928 | { | ||
929 | ((struct dao_ctrl_blk *)blk)->spos = spos; | ||
930 | ((struct dao_ctrl_blk *)blk)->dirty.bf.spos = 1; | ||
931 | return 0; | ||
932 | } | ||
933 | |||
934 | static int dao_commit_write(struct hw *hw, unsigned int idx, void *blk) | ||
935 | { | ||
936 | struct dao_ctrl_blk *ctl = blk; | ||
937 | |||
938 | if (ctl->dirty.bf.spos) { | ||
939 | if (idx < 4) { | ||
940 | /* S/PDIF SPOSx */ | ||
941 | hw_write_20kx(hw, SPOS+0x4*idx, ctl->spos); | ||
942 | } | ||
943 | ctl->dirty.bf.spos = 0; | ||
944 | } | ||
945 | |||
946 | return 0; | ||
947 | } | ||
948 | |||
949 | static int dao_get_spos(void *blk, unsigned int *spos) | ||
950 | { | ||
951 | *spos = ((struct dao_ctrl_blk *)blk)->spos; | ||
952 | return 0; | ||
953 | } | ||
954 | |||
955 | static int dao_get_ctrl_blk(void **rblk) | ||
956 | { | ||
957 | struct dao_ctrl_blk *blk; | ||
958 | |||
959 | *rblk = NULL; | ||
960 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
961 | if (NULL == blk) | ||
962 | return -ENOMEM; | ||
963 | |||
964 | *rblk = blk; | ||
965 | |||
966 | return 0; | ||
967 | } | ||
968 | |||
969 | static int dao_put_ctrl_blk(void *blk) | ||
970 | { | ||
971 | kfree((struct dao_ctrl_blk *)blk); | ||
972 | |||
973 | return 0; | ||
974 | } | ||
975 | |||
976 | static int daio_mgr_enb_dai(void *blk, unsigned int idx) | ||
977 | { | ||
978 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
979 | |||
980 | if (idx < 4) { | ||
981 | /* S/PDIF input */ | ||
982 | set_field(&ctl->spictl, SPICTL_EN << (idx*8), 1); | ||
983 | ctl->dirty.bf.spictl |= (0x1 << idx); | ||
984 | } else { | ||
985 | /* I2S input */ | ||
986 | idx %= 4; | ||
987 | set_field(&ctl->i2sctl, I2SCTL_EI << (idx*8), 1); | ||
988 | ctl->dirty.bf.i2sictl |= (0x1 << idx); | ||
989 | } | ||
990 | return 0; | ||
991 | } | ||
992 | |||
993 | static int daio_mgr_dsb_dai(void *blk, unsigned int idx) | ||
994 | { | ||
995 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
996 | |||
997 | if (idx < 4) { | ||
998 | /* S/PDIF input */ | ||
999 | set_field(&ctl->spictl, SPICTL_EN << (idx*8), 0); | ||
1000 | ctl->dirty.bf.spictl |= (0x1 << idx); | ||
1001 | } else { | ||
1002 | /* I2S input */ | ||
1003 | idx %= 4; | ||
1004 | set_field(&ctl->i2sctl, I2SCTL_EI << (idx*8), 0); | ||
1005 | ctl->dirty.bf.i2sictl |= (0x1 << idx); | ||
1006 | } | ||
1007 | return 0; | ||
1008 | } | ||
1009 | |||
1010 | static int daio_mgr_enb_dao(void *blk, unsigned int idx) | ||
1011 | { | ||
1012 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
1013 | |||
1014 | if (idx < 4) { | ||
1015 | /* S/PDIF output */ | ||
1016 | set_field(&ctl->spoctl, SPOCTL_OE << (idx*8), 1); | ||
1017 | ctl->dirty.bf.spoctl |= (0x1 << idx); | ||
1018 | } else { | ||
1019 | /* I2S output */ | ||
1020 | idx %= 4; | ||
1021 | set_field(&ctl->i2sctl, I2SCTL_EA << (idx*8), 1); | ||
1022 | ctl->dirty.bf.i2soctl |= (0x1 << idx); | ||
1023 | } | ||
1024 | return 0; | ||
1025 | } | ||
1026 | |||
1027 | static int daio_mgr_dsb_dao(void *blk, unsigned int idx) | ||
1028 | { | ||
1029 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
1030 | |||
1031 | if (idx < 4) { | ||
1032 | /* S/PDIF output */ | ||
1033 | set_field(&ctl->spoctl, SPOCTL_OE << (idx*8), 0); | ||
1034 | ctl->dirty.bf.spoctl |= (0x1 << idx); | ||
1035 | } else { | ||
1036 | /* I2S output */ | ||
1037 | idx %= 4; | ||
1038 | set_field(&ctl->i2sctl, I2SCTL_EA << (idx*8), 0); | ||
1039 | ctl->dirty.bf.i2soctl |= (0x1 << idx); | ||
1040 | } | ||
1041 | return 0; | ||
1042 | } | ||
1043 | |||
1044 | static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf) | ||
1045 | { | ||
1046 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
1047 | |||
1048 | if (idx < 4) { | ||
1049 | /* S/PDIF output */ | ||
1050 | switch ((conf & 0x7)) { | ||
1051 | case 0: | ||
1052 | set_field(&ctl->spoctl, SPOCTL_SR << (idx*8), 3); | ||
1053 | break; /* CDIF */ | ||
1054 | case 1: | ||
1055 | set_field(&ctl->spoctl, SPOCTL_SR << (idx*8), 0); | ||
1056 | break; | ||
1057 | case 2: | ||
1058 | set_field(&ctl->spoctl, SPOCTL_SR << (idx*8), 1); | ||
1059 | break; | ||
1060 | case 4: | ||
1061 | set_field(&ctl->spoctl, SPOCTL_SR << (idx*8), 2); | ||
1062 | break; | ||
1063 | default: | ||
1064 | break; | ||
1065 | } | ||
1066 | set_field(&ctl->spoctl, SPOCTL_LIV << (idx*8), | ||
1067 | (conf >> 4) & 0x1); /* Non-audio */ | ||
1068 | set_field(&ctl->spoctl, SPOCTL_RIV << (idx*8), | ||
1069 | (conf >> 4) & 0x1); /* Non-audio */ | ||
1070 | set_field(&ctl->spoctl, SPOCTL_OS << (idx*8), | ||
1071 | ((conf >> 3) & 0x1) ? 2 : 2); /* Raw */ | ||
1072 | |||
1073 | ctl->dirty.bf.spoctl |= (0x1 << idx); | ||
1074 | } else { | ||
1075 | /* I2S output */ | ||
1076 | /*idx %= 4; */ | ||
1077 | } | ||
1078 | return 0; | ||
1079 | } | ||
1080 | |||
1081 | static int daio_mgr_set_imaparc(void *blk, unsigned int slot) | ||
1082 | { | ||
1083 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
1084 | |||
1085 | set_field(&ctl->daoimap.aim, AIM_ARC, slot); | ||
1086 | ctl->dirty.bf.daoimap = 1; | ||
1087 | return 0; | ||
1088 | } | ||
1089 | |||
1090 | static int daio_mgr_set_imapnxt(void *blk, unsigned int next) | ||
1091 | { | ||
1092 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
1093 | |||
1094 | set_field(&ctl->daoimap.aim, AIM_NXT, next); | ||
1095 | ctl->dirty.bf.daoimap = 1; | ||
1096 | return 0; | ||
1097 | } | ||
1098 | |||
1099 | static int daio_mgr_set_imapaddr(void *blk, unsigned int addr) | ||
1100 | { | ||
1101 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
1102 | |||
1103 | ctl->daoimap.idx = addr; | ||
1104 | ctl->dirty.bf.daoimap = 1; | ||
1105 | return 0; | ||
1106 | } | ||
1107 | |||
1108 | static int daio_mgr_commit_write(struct hw *hw, void *blk) | ||
1109 | { | ||
1110 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
1111 | int i; | ||
1112 | |||
1113 | if (ctl->dirty.bf.i2sictl || ctl->dirty.bf.i2soctl) { | ||
1114 | for (i = 0; i < 4; i++) { | ||
1115 | if ((ctl->dirty.bf.i2sictl & (0x1 << i))) | ||
1116 | ctl->dirty.bf.i2sictl &= ~(0x1 << i); | ||
1117 | |||
1118 | if ((ctl->dirty.bf.i2soctl & (0x1 << i))) | ||
1119 | ctl->dirty.bf.i2soctl &= ~(0x1 << i); | ||
1120 | } | ||
1121 | hw_write_20kx(hw, I2SCTL, ctl->i2sctl); | ||
1122 | mdelay(1); | ||
1123 | } | ||
1124 | if (ctl->dirty.bf.spoctl) { | ||
1125 | for (i = 0; i < 4; i++) { | ||
1126 | if ((ctl->dirty.bf.spoctl & (0x1 << i))) | ||
1127 | ctl->dirty.bf.spoctl &= ~(0x1 << i); | ||
1128 | } | ||
1129 | hw_write_20kx(hw, SPOCTL, ctl->spoctl); | ||
1130 | mdelay(1); | ||
1131 | } | ||
1132 | if (ctl->dirty.bf.spictl) { | ||
1133 | for (i = 0; i < 4; i++) { | ||
1134 | if ((ctl->dirty.bf.spictl & (0x1 << i))) | ||
1135 | ctl->dirty.bf.spictl &= ~(0x1 << i); | ||
1136 | } | ||
1137 | hw_write_20kx(hw, SPICTL, ctl->spictl); | ||
1138 | mdelay(1); | ||
1139 | } | ||
1140 | if (ctl->dirty.bf.daoimap) { | ||
1141 | hw_write_20kx(hw, DAOIMAP+ctl->daoimap.idx*4, | ||
1142 | ctl->daoimap.aim); | ||
1143 | ctl->dirty.bf.daoimap = 0; | ||
1144 | } | ||
1145 | |||
1146 | return 0; | ||
1147 | } | ||
1148 | |||
1149 | static int daio_mgr_get_ctrl_blk(struct hw *hw, void **rblk) | ||
1150 | { | ||
1151 | struct daio_mgr_ctrl_blk *blk; | ||
1152 | |||
1153 | *rblk = NULL; | ||
1154 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
1155 | if (NULL == blk) | ||
1156 | return -ENOMEM; | ||
1157 | |||
1158 | blk->i2sctl = hw_read_20kx(hw, I2SCTL); | ||
1159 | blk->spoctl = hw_read_20kx(hw, SPOCTL); | ||
1160 | blk->spictl = hw_read_20kx(hw, SPICTL); | ||
1161 | |||
1162 | *rblk = blk; | ||
1163 | |||
1164 | return 0; | ||
1165 | } | ||
1166 | |||
1167 | static int daio_mgr_put_ctrl_blk(void *blk) | ||
1168 | { | ||
1169 | kfree((struct daio_mgr_ctrl_blk *)blk); | ||
1170 | |||
1171 | return 0; | ||
1172 | } | ||
1173 | |||
1174 | /* Timer interrupt */ | ||
1175 | static int set_timer_irq(struct hw *hw, int enable) | ||
1176 | { | ||
1177 | hw_write_20kx(hw, GIE, enable ? IT_INT : 0); | ||
1178 | return 0; | ||
1179 | } | ||
1180 | |||
1181 | static int set_timer_tick(struct hw *hw, unsigned int ticks) | ||
1182 | { | ||
1183 | if (ticks) | ||
1184 | ticks |= TIMR_IE | TIMR_IP; | ||
1185 | hw_write_20kx(hw, TIMR, ticks); | ||
1186 | return 0; | ||
1187 | } | ||
1188 | |||
1189 | static unsigned int get_wc(struct hw *hw) | ||
1190 | { | ||
1191 | return hw_read_20kx(hw, WC); | ||
1192 | } | ||
1193 | |||
1194 | /* Card hardware initialization block */ | ||
1195 | struct dac_conf { | ||
1196 | unsigned int msr; /* master sample rate in rsrs */ | ||
1197 | }; | ||
1198 | |||
1199 | struct adc_conf { | ||
1200 | unsigned int msr; /* master sample rate in rsrs */ | ||
1201 | unsigned char input; /* the input source of ADC */ | ||
1202 | unsigned char mic20db; /* boost mic by 20db if input is microphone */ | ||
1203 | }; | ||
1204 | |||
1205 | struct daio_conf { | ||
1206 | unsigned int msr; /* master sample rate in rsrs */ | ||
1207 | }; | ||
1208 | |||
1209 | struct trn_conf { | ||
1210 | unsigned long vm_pgt_phys; | ||
1211 | }; | ||
1212 | |||
1213 | static int hw_daio_init(struct hw *hw, const struct daio_conf *info) | ||
1214 | { | ||
1215 | u32 i2sorg; | ||
1216 | u32 spdorg; | ||
1217 | |||
1218 | /* Read I2S CTL. Keep original value. */ | ||
1219 | /*i2sorg = hw_read_20kx(hw, I2SCTL);*/ | ||
1220 | i2sorg = 0x94040404; /* enable all audio out and I2S-D input */ | ||
1221 | /* Program I2S with proper master sample rate and enable | ||
1222 | * the correct I2S channel. */ | ||
1223 | i2sorg &= 0xfffffffc; | ||
1224 | |||
1225 | /* Enable S/PDIF-out-A in fixed 24-bit data | ||
1226 | * format and default to 48kHz. */ | ||
1227 | /* Disable all before doing any changes. */ | ||
1228 | hw_write_20kx(hw, SPOCTL, 0x0); | ||
1229 | spdorg = 0x05; | ||
1230 | |||
1231 | switch (info->msr) { | ||
1232 | case 1: | ||
1233 | i2sorg |= 1; | ||
1234 | spdorg |= (0x0 << 6); | ||
1235 | break; | ||
1236 | case 2: | ||
1237 | i2sorg |= 2; | ||
1238 | spdorg |= (0x1 << 6); | ||
1239 | break; | ||
1240 | case 4: | ||
1241 | i2sorg |= 3; | ||
1242 | spdorg |= (0x2 << 6); | ||
1243 | break; | ||
1244 | default: | ||
1245 | i2sorg |= 1; | ||
1246 | break; | ||
1247 | } | ||
1248 | |||
1249 | hw_write_20kx(hw, I2SCTL, i2sorg); | ||
1250 | hw_write_20kx(hw, SPOCTL, spdorg); | ||
1251 | |||
1252 | /* Enable S/PDIF-in-A in fixed 24-bit data format. */ | ||
1253 | /* Disable all before doing any changes. */ | ||
1254 | hw_write_20kx(hw, SPICTL, 0x0); | ||
1255 | mdelay(1); | ||
1256 | spdorg = 0x0a0a0a0a; | ||
1257 | hw_write_20kx(hw, SPICTL, spdorg); | ||
1258 | mdelay(1); | ||
1259 | |||
1260 | return 0; | ||
1261 | } | ||
1262 | |||
1263 | /* TRANSPORT operations */ | ||
1264 | static int hw_trn_init(struct hw *hw, const struct trn_conf *info) | ||
1265 | { | ||
1266 | u32 trnctl; | ||
1267 | u32 ptp_phys_low, ptp_phys_high; | ||
1268 | |||
1269 | /* Set up device page table */ | ||
1270 | if ((~0UL) == info->vm_pgt_phys) { | ||
1271 | printk(KERN_ERR "Wrong device page table page address!\n"); | ||
1272 | return -1; | ||
1273 | } | ||
1274 | |||
1275 | trnctl = 0x13; /* 32-bit, 4k-size page */ | ||
1276 | ptp_phys_low = (u32)info->vm_pgt_phys; | ||
1277 | ptp_phys_high = upper_32_bits(info->vm_pgt_phys); | ||
1278 | if (sizeof(void *) == 8) /* 64bit address */ | ||
1279 | trnctl |= (1 << 2); | ||
1280 | #if 0 /* Only 4k h/w pages for simplicitiy */ | ||
1281 | #if PAGE_SIZE == 8192 | ||
1282 | trnctl |= (1<<5); | ||
1283 | #endif | ||
1284 | #endif | ||
1285 | hw_write_20kx(hw, PTPALX, ptp_phys_low); | ||
1286 | hw_write_20kx(hw, PTPAHX, ptp_phys_high); | ||
1287 | hw_write_20kx(hw, TRNCTL, trnctl); | ||
1288 | hw_write_20kx(hw, TRNIS, 0x200c01); /* realy needed? */ | ||
1289 | |||
1290 | return 0; | ||
1291 | } | ||
1292 | |||
1293 | /* Card initialization */ | ||
1294 | #define GCTL_EAC 0x00000001 | ||
1295 | #define GCTL_EAI 0x00000002 | ||
1296 | #define GCTL_BEP 0x00000004 | ||
1297 | #define GCTL_BES 0x00000008 | ||
1298 | #define GCTL_DSP 0x00000010 | ||
1299 | #define GCTL_DBP 0x00000020 | ||
1300 | #define GCTL_ABP 0x00000040 | ||
1301 | #define GCTL_TBP 0x00000080 | ||
1302 | #define GCTL_SBP 0x00000100 | ||
1303 | #define GCTL_FBP 0x00000200 | ||
1304 | #define GCTL_XA 0x00000400 | ||
1305 | #define GCTL_ET 0x00000800 | ||
1306 | #define GCTL_PR 0x00001000 | ||
1307 | #define GCTL_MRL 0x00002000 | ||
1308 | #define GCTL_SDE 0x00004000 | ||
1309 | #define GCTL_SDI 0x00008000 | ||
1310 | #define GCTL_SM 0x00010000 | ||
1311 | #define GCTL_SR 0x00020000 | ||
1312 | #define GCTL_SD 0x00040000 | ||
1313 | #define GCTL_SE 0x00080000 | ||
1314 | #define GCTL_AID 0x00100000 | ||
1315 | |||
1316 | static int hw_pll_init(struct hw *hw, unsigned int rsr) | ||
1317 | { | ||
1318 | unsigned int pllctl; | ||
1319 | int i; | ||
1320 | |||
1321 | pllctl = (48000 == rsr) ? 0x1480a001 : 0x1480a731; | ||
1322 | for (i = 0; i < 3; i++) { | ||
1323 | if (hw_read_20kx(hw, PLLCTL) == pllctl) | ||
1324 | break; | ||
1325 | |||
1326 | hw_write_20kx(hw, PLLCTL, pllctl); | ||
1327 | mdelay(40); | ||
1328 | } | ||
1329 | if (i >= 3) { | ||
1330 | printk(KERN_ALERT "PLL initialization failed!!!\n"); | ||
1331 | return -EBUSY; | ||
1332 | } | ||
1333 | |||
1334 | return 0; | ||
1335 | } | ||
1336 | |||
1337 | static int hw_auto_init(struct hw *hw) | ||
1338 | { | ||
1339 | unsigned int gctl; | ||
1340 | int i; | ||
1341 | |||
1342 | gctl = hw_read_20kx(hw, GCTL); | ||
1343 | set_field(&gctl, GCTL_EAI, 0); | ||
1344 | hw_write_20kx(hw, GCTL, gctl); | ||
1345 | set_field(&gctl, GCTL_EAI, 1); | ||
1346 | hw_write_20kx(hw, GCTL, gctl); | ||
1347 | mdelay(10); | ||
1348 | for (i = 0; i < 400000; i++) { | ||
1349 | gctl = hw_read_20kx(hw, GCTL); | ||
1350 | if (get_field(gctl, GCTL_AID)) | ||
1351 | break; | ||
1352 | } | ||
1353 | if (!get_field(gctl, GCTL_AID)) { | ||
1354 | printk(KERN_ALERT "Card Auto-init failed!!!\n"); | ||
1355 | return -EBUSY; | ||
1356 | } | ||
1357 | |||
1358 | return 0; | ||
1359 | } | ||
1360 | |||
1361 | static int i2c_unlock(struct hw *hw) | ||
1362 | { | ||
1363 | if ((hw_read_pci(hw, 0xcc) & 0xff) == 0xaa) | ||
1364 | return 0; | ||
1365 | |||
1366 | hw_write_pci(hw, 0xcc, 0x8c); | ||
1367 | hw_write_pci(hw, 0xcc, 0x0e); | ||
1368 | if ((hw_read_pci(hw, 0xcc) & 0xff) == 0xaa) | ||
1369 | return 0; | ||
1370 | |||
1371 | hw_write_pci(hw, 0xcc, 0xee); | ||
1372 | hw_write_pci(hw, 0xcc, 0xaa); | ||
1373 | if ((hw_read_pci(hw, 0xcc) & 0xff) == 0xaa) | ||
1374 | return 0; | ||
1375 | |||
1376 | return -1; | ||
1377 | } | ||
1378 | |||
1379 | static void i2c_lock(struct hw *hw) | ||
1380 | { | ||
1381 | if ((hw_read_pci(hw, 0xcc) & 0xff) == 0xaa) | ||
1382 | hw_write_pci(hw, 0xcc, 0x00); | ||
1383 | } | ||
1384 | |||
1385 | static void i2c_write(struct hw *hw, u32 device, u32 addr, u32 data) | ||
1386 | { | ||
1387 | unsigned int ret; | ||
1388 | |||
1389 | do { | ||
1390 | ret = hw_read_pci(hw, 0xEC); | ||
1391 | } while (!(ret & 0x800000)); | ||
1392 | hw_write_pci(hw, 0xE0, device); | ||
1393 | hw_write_pci(hw, 0xE4, (data << 8) | (addr & 0xff)); | ||
1394 | } | ||
1395 | |||
1396 | /* DAC operations */ | ||
1397 | |||
1398 | static int hw_reset_dac(struct hw *hw) | ||
1399 | { | ||
1400 | u32 i; | ||
1401 | u16 gpioorg; | ||
1402 | unsigned int ret; | ||
1403 | |||
1404 | if (i2c_unlock(hw)) | ||
1405 | return -1; | ||
1406 | |||
1407 | do { | ||
1408 | ret = hw_read_pci(hw, 0xEC); | ||
1409 | } while (!(ret & 0x800000)); | ||
1410 | hw_write_pci(hw, 0xEC, 0x05); /* write to i2c status control */ | ||
1411 | |||
1412 | /* To be effective, need to reset the DAC twice. */ | ||
1413 | for (i = 0; i < 2; i++) { | ||
1414 | /* set gpio */ | ||
1415 | mdelay(100); | ||
1416 | gpioorg = (u16)hw_read_20kx(hw, GPIO); | ||
1417 | gpioorg &= 0xfffd; | ||
1418 | hw_write_20kx(hw, GPIO, gpioorg); | ||
1419 | mdelay(1); | ||
1420 | hw_write_20kx(hw, GPIO, gpioorg | 0x2); | ||
1421 | } | ||
1422 | |||
1423 | i2c_write(hw, 0x00180080, 0x01, 0x80); | ||
1424 | i2c_write(hw, 0x00180080, 0x02, 0x10); | ||
1425 | |||
1426 | i2c_lock(hw); | ||
1427 | |||
1428 | return 0; | ||
1429 | } | ||
1430 | |||
1431 | static int hw_dac_init(struct hw *hw, const struct dac_conf *info) | ||
1432 | { | ||
1433 | u32 data; | ||
1434 | u16 gpioorg; | ||
1435 | unsigned int ret; | ||
1436 | |||
1437 | if (hw->model == CTSB055X) { | ||
1438 | /* SB055x, unmute outputs */ | ||
1439 | gpioorg = (u16)hw_read_20kx(hw, GPIO); | ||
1440 | gpioorg &= 0xffbf; /* set GPIO6 to low */ | ||
1441 | gpioorg |= 2; /* set GPIO1 to high */ | ||
1442 | hw_write_20kx(hw, GPIO, gpioorg); | ||
1443 | return 0; | ||
1444 | } | ||
1445 | |||
1446 | /* mute outputs */ | ||
1447 | gpioorg = (u16)hw_read_20kx(hw, GPIO); | ||
1448 | gpioorg &= 0xffbf; | ||
1449 | hw_write_20kx(hw, GPIO, gpioorg); | ||
1450 | |||
1451 | hw_reset_dac(hw); | ||
1452 | |||
1453 | if (i2c_unlock(hw)) | ||
1454 | return -1; | ||
1455 | |||
1456 | hw_write_pci(hw, 0xEC, 0x05); /* write to i2c status control */ | ||
1457 | do { | ||
1458 | ret = hw_read_pci(hw, 0xEC); | ||
1459 | } while (!(ret & 0x800000)); | ||
1460 | |||
1461 | switch (info->msr) { | ||
1462 | case 1: | ||
1463 | data = 0x24; | ||
1464 | break; | ||
1465 | case 2: | ||
1466 | data = 0x25; | ||
1467 | break; | ||
1468 | case 4: | ||
1469 | data = 0x26; | ||
1470 | break; | ||
1471 | default: | ||
1472 | data = 0x24; | ||
1473 | break; | ||
1474 | } | ||
1475 | |||
1476 | i2c_write(hw, 0x00180080, 0x06, data); | ||
1477 | i2c_write(hw, 0x00180080, 0x09, data); | ||
1478 | i2c_write(hw, 0x00180080, 0x0c, data); | ||
1479 | i2c_write(hw, 0x00180080, 0x0f, data); | ||
1480 | |||
1481 | i2c_lock(hw); | ||
1482 | |||
1483 | /* unmute outputs */ | ||
1484 | gpioorg = (u16)hw_read_20kx(hw, GPIO); | ||
1485 | gpioorg = gpioorg | 0x40; | ||
1486 | hw_write_20kx(hw, GPIO, gpioorg); | ||
1487 | |||
1488 | return 0; | ||
1489 | } | ||
1490 | |||
1491 | /* ADC operations */ | ||
1492 | |||
1493 | static int is_adc_input_selected_SB055x(struct hw *hw, enum ADCSRC type) | ||
1494 | { | ||
1495 | return 0; | ||
1496 | } | ||
1497 | |||
1498 | static int is_adc_input_selected_SBx(struct hw *hw, enum ADCSRC type) | ||
1499 | { | ||
1500 | u32 data; | ||
1501 | |||
1502 | data = hw_read_20kx(hw, GPIO); | ||
1503 | switch (type) { | ||
1504 | case ADC_MICIN: | ||
1505 | data = ((data & (0x1<<7)) && (data & (0x1<<8))); | ||
1506 | break; | ||
1507 | case ADC_LINEIN: | ||
1508 | data = (!(data & (0x1<<7)) && (data & (0x1<<8))); | ||
1509 | break; | ||
1510 | case ADC_NONE: /* Digital I/O */ | ||
1511 | data = (!(data & (0x1<<8))); | ||
1512 | break; | ||
1513 | default: | ||
1514 | data = 0; | ||
1515 | } | ||
1516 | return data; | ||
1517 | } | ||
1518 | |||
1519 | static int is_adc_input_selected_hendrix(struct hw *hw, enum ADCSRC type) | ||
1520 | { | ||
1521 | u32 data; | ||
1522 | |||
1523 | data = hw_read_20kx(hw, GPIO); | ||
1524 | switch (type) { | ||
1525 | case ADC_MICIN: | ||
1526 | data = (data & (0x1 << 7)) ? 1 : 0; | ||
1527 | break; | ||
1528 | case ADC_LINEIN: | ||
1529 | data = (data & (0x1 << 7)) ? 0 : 1; | ||
1530 | break; | ||
1531 | default: | ||
1532 | data = 0; | ||
1533 | } | ||
1534 | return data; | ||
1535 | } | ||
1536 | |||
1537 | static int hw_is_adc_input_selected(struct hw *hw, enum ADCSRC type) | ||
1538 | { | ||
1539 | switch (hw->model) { | ||
1540 | case CTSB055X: | ||
1541 | return is_adc_input_selected_SB055x(hw, type); | ||
1542 | case CTSB073X: | ||
1543 | return is_adc_input_selected_hendrix(hw, type); | ||
1544 | case CTUAA: | ||
1545 | return is_adc_input_selected_hendrix(hw, type); | ||
1546 | default: | ||
1547 | return is_adc_input_selected_SBx(hw, type); | ||
1548 | } | ||
1549 | } | ||
1550 | |||
1551 | static int | ||
1552 | adc_input_select_SB055x(struct hw *hw, enum ADCSRC type, unsigned char boost) | ||
1553 | { | ||
1554 | u32 data; | ||
1555 | |||
1556 | /* | ||
1557 | * check and set the following GPIO bits accordingly | ||
1558 | * ADC_Gain = GPIO2 | ||
1559 | * DRM_off = GPIO3 | ||
1560 | * Mic_Pwr_on = GPIO7 | ||
1561 | * Digital_IO_Sel = GPIO8 | ||
1562 | * Mic_Sw = GPIO9 | ||
1563 | * Aux/MicLine_Sw = GPIO12 | ||
1564 | */ | ||
1565 | data = hw_read_20kx(hw, GPIO); | ||
1566 | data &= 0xec73; | ||
1567 | switch (type) { | ||
1568 | case ADC_MICIN: | ||
1569 | data |= (0x1<<7) | (0x1<<8) | (0x1<<9) ; | ||
1570 | data |= boost ? (0x1<<2) : 0; | ||
1571 | break; | ||
1572 | case ADC_LINEIN: | ||
1573 | data |= (0x1<<8); | ||
1574 | break; | ||
1575 | case ADC_AUX: | ||
1576 | data |= (0x1<<8) | (0x1<<12); | ||
1577 | break; | ||
1578 | case ADC_NONE: | ||
1579 | data |= (0x1<<12); /* set to digital */ | ||
1580 | break; | ||
1581 | default: | ||
1582 | return -1; | ||
1583 | } | ||
1584 | |||
1585 | hw_write_20kx(hw, GPIO, data); | ||
1586 | |||
1587 | return 0; | ||
1588 | } | ||
1589 | |||
1590 | |||
1591 | static int | ||
1592 | adc_input_select_SBx(struct hw *hw, enum ADCSRC type, unsigned char boost) | ||
1593 | { | ||
1594 | u32 data; | ||
1595 | u32 i2c_data; | ||
1596 | unsigned int ret; | ||
1597 | |||
1598 | if (i2c_unlock(hw)) | ||
1599 | return -1; | ||
1600 | |||
1601 | do { | ||
1602 | ret = hw_read_pci(hw, 0xEC); | ||
1603 | } while (!(ret & 0x800000)); /* i2c ready poll */ | ||
1604 | /* set i2c access mode as Direct Control */ | ||
1605 | hw_write_pci(hw, 0xEC, 0x05); | ||
1606 | |||
1607 | data = hw_read_20kx(hw, GPIO); | ||
1608 | switch (type) { | ||
1609 | case ADC_MICIN: | ||
1610 | data |= ((0x1 << 7) | (0x1 << 8)); | ||
1611 | i2c_data = 0x1; /* Mic-in */ | ||
1612 | break; | ||
1613 | case ADC_LINEIN: | ||
1614 | data &= ~(0x1 << 7); | ||
1615 | data |= (0x1 << 8); | ||
1616 | i2c_data = 0x2; /* Line-in */ | ||
1617 | break; | ||
1618 | case ADC_NONE: | ||
1619 | data &= ~(0x1 << 8); | ||
1620 | i2c_data = 0x0; /* set to Digital */ | ||
1621 | break; | ||
1622 | default: | ||
1623 | i2c_lock(hw); | ||
1624 | return -1; | ||
1625 | } | ||
1626 | hw_write_20kx(hw, GPIO, data); | ||
1627 | i2c_write(hw, 0x001a0080, 0x2a, i2c_data); | ||
1628 | if (boost) { | ||
1629 | i2c_write(hw, 0x001a0080, 0x1c, 0xe7); /* +12dB boost */ | ||
1630 | i2c_write(hw, 0x001a0080, 0x1e, 0xe7); /* +12dB boost */ | ||
1631 | } else { | ||
1632 | i2c_write(hw, 0x001a0080, 0x1c, 0xcf); /* No boost */ | ||
1633 | i2c_write(hw, 0x001a0080, 0x1e, 0xcf); /* No boost */ | ||
1634 | } | ||
1635 | |||
1636 | i2c_lock(hw); | ||
1637 | |||
1638 | return 0; | ||
1639 | } | ||
1640 | |||
1641 | static int | ||
1642 | adc_input_select_hendrix(struct hw *hw, enum ADCSRC type, unsigned char boost) | ||
1643 | { | ||
1644 | u32 data; | ||
1645 | u32 i2c_data; | ||
1646 | unsigned int ret; | ||
1647 | |||
1648 | if (i2c_unlock(hw)) | ||
1649 | return -1; | ||
1650 | |||
1651 | do { | ||
1652 | ret = hw_read_pci(hw, 0xEC); | ||
1653 | } while (!(ret & 0x800000)); /* i2c ready poll */ | ||
1654 | /* set i2c access mode as Direct Control */ | ||
1655 | hw_write_pci(hw, 0xEC, 0x05); | ||
1656 | |||
1657 | data = hw_read_20kx(hw, GPIO); | ||
1658 | switch (type) { | ||
1659 | case ADC_MICIN: | ||
1660 | data |= (0x1 << 7); | ||
1661 | i2c_data = 0x1; /* Mic-in */ | ||
1662 | break; | ||
1663 | case ADC_LINEIN: | ||
1664 | data &= ~(0x1 << 7); | ||
1665 | i2c_data = 0x2; /* Line-in */ | ||
1666 | break; | ||
1667 | default: | ||
1668 | i2c_lock(hw); | ||
1669 | return -1; | ||
1670 | } | ||
1671 | hw_write_20kx(hw, GPIO, data); | ||
1672 | i2c_write(hw, 0x001a0080, 0x2a, i2c_data); | ||
1673 | if (boost) { | ||
1674 | i2c_write(hw, 0x001a0080, 0x1c, 0xe7); /* +12dB boost */ | ||
1675 | i2c_write(hw, 0x001a0080, 0x1e, 0xe7); /* +12dB boost */ | ||
1676 | } else { | ||
1677 | i2c_write(hw, 0x001a0080, 0x1c, 0xcf); /* No boost */ | ||
1678 | i2c_write(hw, 0x001a0080, 0x1e, 0xcf); /* No boost */ | ||
1679 | } | ||
1680 | |||
1681 | i2c_lock(hw); | ||
1682 | |||
1683 | return 0; | ||
1684 | } | ||
1685 | |||
1686 | static int hw_adc_input_select(struct hw *hw, enum ADCSRC type) | ||
1687 | { | ||
1688 | int state = type == ADC_MICIN; | ||
1689 | |||
1690 | switch (hw->model) { | ||
1691 | case CTSB055X: | ||
1692 | return adc_input_select_SB055x(hw, type, state); | ||
1693 | case CTSB073X: | ||
1694 | return adc_input_select_hendrix(hw, type, state); | ||
1695 | case CTUAA: | ||
1696 | return adc_input_select_hendrix(hw, type, state); | ||
1697 | default: | ||
1698 | return adc_input_select_SBx(hw, type, state); | ||
1699 | } | ||
1700 | } | ||
1701 | |||
1702 | static int adc_init_SB055x(struct hw *hw, int input, int mic20db) | ||
1703 | { | ||
1704 | return adc_input_select_SB055x(hw, input, mic20db); | ||
1705 | } | ||
1706 | |||
1707 | static int adc_init_SBx(struct hw *hw, int input, int mic20db) | ||
1708 | { | ||
1709 | u16 gpioorg; | ||
1710 | u16 input_source; | ||
1711 | u32 adcdata; | ||
1712 | unsigned int ret; | ||
1713 | |||
1714 | input_source = 0x100; /* default to analog */ | ||
1715 | switch (input) { | ||
1716 | case ADC_MICIN: | ||
1717 | adcdata = 0x1; | ||
1718 | input_source = 0x180; /* set GPIO7 to select Mic */ | ||
1719 | break; | ||
1720 | case ADC_LINEIN: | ||
1721 | adcdata = 0x2; | ||
1722 | break; | ||
1723 | case ADC_VIDEO: | ||
1724 | adcdata = 0x4; | ||
1725 | break; | ||
1726 | case ADC_AUX: | ||
1727 | adcdata = 0x8; | ||
1728 | break; | ||
1729 | case ADC_NONE: | ||
1730 | adcdata = 0x0; | ||
1731 | input_source = 0x0; /* set to Digital */ | ||
1732 | break; | ||
1733 | default: | ||
1734 | adcdata = 0x0; | ||
1735 | break; | ||
1736 | } | ||
1737 | |||
1738 | if (i2c_unlock(hw)) | ||
1739 | return -1; | ||
1740 | |||
1741 | do { | ||
1742 | ret = hw_read_pci(hw, 0xEC); | ||
1743 | } while (!(ret & 0x800000)); /* i2c ready poll */ | ||
1744 | hw_write_pci(hw, 0xEC, 0x05); /* write to i2c status control */ | ||
1745 | |||
1746 | i2c_write(hw, 0x001a0080, 0x0e, 0x08); | ||
1747 | i2c_write(hw, 0x001a0080, 0x18, 0x0a); | ||
1748 | i2c_write(hw, 0x001a0080, 0x28, 0x86); | ||
1749 | i2c_write(hw, 0x001a0080, 0x2a, adcdata); | ||
1750 | |||
1751 | if (mic20db) { | ||
1752 | i2c_write(hw, 0x001a0080, 0x1c, 0xf7); | ||
1753 | i2c_write(hw, 0x001a0080, 0x1e, 0xf7); | ||
1754 | } else { | ||
1755 | i2c_write(hw, 0x001a0080, 0x1c, 0xcf); | ||
1756 | i2c_write(hw, 0x001a0080, 0x1e, 0xcf); | ||
1757 | } | ||
1758 | |||
1759 | if (!(hw_read_20kx(hw, ID0) & 0x100)) | ||
1760 | i2c_write(hw, 0x001a0080, 0x16, 0x26); | ||
1761 | |||
1762 | i2c_lock(hw); | ||
1763 | |||
1764 | gpioorg = (u16)hw_read_20kx(hw, GPIO); | ||
1765 | gpioorg &= 0xfe7f; | ||
1766 | gpioorg |= input_source; | ||
1767 | hw_write_20kx(hw, GPIO, gpioorg); | ||
1768 | |||
1769 | return 0; | ||
1770 | } | ||
1771 | |||
1772 | static int hw_adc_init(struct hw *hw, const struct adc_conf *info) | ||
1773 | { | ||
1774 | if (hw->model == CTSB055X) | ||
1775 | return adc_init_SB055x(hw, info->input, info->mic20db); | ||
1776 | else | ||
1777 | return adc_init_SBx(hw, info->input, info->mic20db); | ||
1778 | } | ||
1779 | |||
1780 | static int hw_have_digit_io_switch(struct hw *hw) | ||
1781 | { | ||
1782 | /* SB073x and Vista compatible cards have no digit IO switch */ | ||
1783 | return !(hw->model == CTSB073X || hw->model == CTUAA); | ||
1784 | } | ||
1785 | |||
1786 | #define CTLBITS(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) | ||
1787 | |||
1788 | #define UAA_CFG_PWRSTATUS 0x44 | ||
1789 | #define UAA_CFG_SPACE_FLAG 0xA0 | ||
1790 | #define UAA_CORE_CHANGE 0x3FFC | ||
1791 | static int uaa_to_xfi(struct pci_dev *pci) | ||
1792 | { | ||
1793 | unsigned int bar0, bar1, bar2, bar3, bar4, bar5; | ||
1794 | unsigned int cmd, irq, cl_size, l_timer, pwr; | ||
1795 | unsigned int is_uaa; | ||
1796 | unsigned int data[4] = {0}; | ||
1797 | unsigned int io_base; | ||
1798 | void *mem_base; | ||
1799 | int i; | ||
1800 | const u32 CTLX = CTLBITS('C', 'T', 'L', 'X'); | ||
1801 | const u32 CTL_ = CTLBITS('C', 'T', 'L', '-'); | ||
1802 | const u32 CTLF = CTLBITS('C', 'T', 'L', 'F'); | ||
1803 | const u32 CTLi = CTLBITS('C', 'T', 'L', 'i'); | ||
1804 | const u32 CTLA = CTLBITS('C', 'T', 'L', 'A'); | ||
1805 | const u32 CTLZ = CTLBITS('C', 'T', 'L', 'Z'); | ||
1806 | const u32 CTLL = CTLBITS('C', 'T', 'L', 'L'); | ||
1807 | |||
1808 | /* By default, Hendrix card UAA Bar0 should be using memory... */ | ||
1809 | io_base = pci_resource_start(pci, 0); | ||
1810 | mem_base = ioremap(io_base, pci_resource_len(pci, 0)); | ||
1811 | if (NULL == mem_base) | ||
1812 | return -ENOENT; | ||
1813 | |||
1814 | /* Read current mode from Mode Change Register */ | ||
1815 | for (i = 0; i < 4; i++) | ||
1816 | data[i] = readl(mem_base + UAA_CORE_CHANGE); | ||
1817 | |||
1818 | /* Determine current mode... */ | ||
1819 | if (data[0] == CTLA) { | ||
1820 | is_uaa = ((data[1] == CTLZ && data[2] == CTLL | ||
1821 | && data[3] == CTLA) || (data[1] == CTLA | ||
1822 | && data[2] == CTLZ && data[3] == CTLL)); | ||
1823 | } else if (data[0] == CTLZ) { | ||
1824 | is_uaa = (data[1] == CTLL | ||
1825 | && data[2] == CTLA && data[3] == CTLA); | ||
1826 | } else if (data[0] == CTLL) { | ||
1827 | is_uaa = (data[1] == CTLA | ||
1828 | && data[2] == CTLA && data[3] == CTLZ); | ||
1829 | } else { | ||
1830 | is_uaa = 0; | ||
1831 | } | ||
1832 | |||
1833 | if (!is_uaa) { | ||
1834 | /* Not in UAA mode currently. Return directly. */ | ||
1835 | iounmap(mem_base); | ||
1836 | return 0; | ||
1837 | } | ||
1838 | |||
1839 | pci_read_config_dword(pci, PCI_BASE_ADDRESS_0, &bar0); | ||
1840 | pci_read_config_dword(pci, PCI_BASE_ADDRESS_1, &bar1); | ||
1841 | pci_read_config_dword(pci, PCI_BASE_ADDRESS_2, &bar2); | ||
1842 | pci_read_config_dword(pci, PCI_BASE_ADDRESS_3, &bar3); | ||
1843 | pci_read_config_dword(pci, PCI_BASE_ADDRESS_4, &bar4); | ||
1844 | pci_read_config_dword(pci, PCI_BASE_ADDRESS_5, &bar5); | ||
1845 | pci_read_config_dword(pci, PCI_INTERRUPT_LINE, &irq); | ||
1846 | pci_read_config_dword(pci, PCI_CACHE_LINE_SIZE, &cl_size); | ||
1847 | pci_read_config_dword(pci, PCI_LATENCY_TIMER, &l_timer); | ||
1848 | pci_read_config_dword(pci, UAA_CFG_PWRSTATUS, &pwr); | ||
1849 | pci_read_config_dword(pci, PCI_COMMAND, &cmd); | ||
1850 | |||
1851 | /* Set up X-Fi core PCI configuration space. */ | ||
1852 | /* Switch to X-Fi config space with BAR0 exposed. */ | ||
1853 | pci_write_config_dword(pci, UAA_CFG_SPACE_FLAG, 0x87654321); | ||
1854 | /* Copy UAA's BAR5 into X-Fi BAR0 */ | ||
1855 | pci_write_config_dword(pci, PCI_BASE_ADDRESS_0, bar5); | ||
1856 | /* Switch to X-Fi config space without BAR0 exposed. */ | ||
1857 | pci_write_config_dword(pci, UAA_CFG_SPACE_FLAG, 0x12345678); | ||
1858 | pci_write_config_dword(pci, PCI_BASE_ADDRESS_1, bar1); | ||
1859 | pci_write_config_dword(pci, PCI_BASE_ADDRESS_2, bar2); | ||
1860 | pci_write_config_dword(pci, PCI_BASE_ADDRESS_3, bar3); | ||
1861 | pci_write_config_dword(pci, PCI_BASE_ADDRESS_4, bar4); | ||
1862 | pci_write_config_dword(pci, PCI_INTERRUPT_LINE, irq); | ||
1863 | pci_write_config_dword(pci, PCI_CACHE_LINE_SIZE, cl_size); | ||
1864 | pci_write_config_dword(pci, PCI_LATENCY_TIMER, l_timer); | ||
1865 | pci_write_config_dword(pci, UAA_CFG_PWRSTATUS, pwr); | ||
1866 | pci_write_config_dword(pci, PCI_COMMAND, cmd); | ||
1867 | |||
1868 | /* Switch to X-Fi mode */ | ||
1869 | writel(CTLX, (mem_base + UAA_CORE_CHANGE)); | ||
1870 | writel(CTL_, (mem_base + UAA_CORE_CHANGE)); | ||
1871 | writel(CTLF, (mem_base + UAA_CORE_CHANGE)); | ||
1872 | writel(CTLi, (mem_base + UAA_CORE_CHANGE)); | ||
1873 | |||
1874 | iounmap(mem_base); | ||
1875 | |||
1876 | return 0; | ||
1877 | } | ||
1878 | |||
1879 | static irqreturn_t ct_20k1_interrupt(int irq, void *dev_id) | ||
1880 | { | ||
1881 | struct hw *hw = dev_id; | ||
1882 | unsigned int status; | ||
1883 | |||
1884 | status = hw_read_20kx(hw, GIP); | ||
1885 | if (!status) | ||
1886 | return IRQ_NONE; | ||
1887 | |||
1888 | if (hw->irq_callback) | ||
1889 | hw->irq_callback(hw->irq_callback_data, status); | ||
1890 | |||
1891 | hw_write_20kx(hw, GIP, status); | ||
1892 | return IRQ_HANDLED; | ||
1893 | } | ||
1894 | |||
1895 | static int hw_card_start(struct hw *hw) | ||
1896 | { | ||
1897 | int err; | ||
1898 | struct pci_dev *pci = hw->pci; | ||
1899 | |||
1900 | err = pci_enable_device(pci); | ||
1901 | if (err < 0) | ||
1902 | return err; | ||
1903 | |||
1904 | /* Set DMA transfer mask */ | ||
1905 | if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 || | ||
1906 | pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) { | ||
1907 | printk(KERN_ERR "architecture does not support PCI " | ||
1908 | "busmaster DMA with mask 0x%llx\n", | ||
1909 | CT_XFI_DMA_MASK); | ||
1910 | err = -ENXIO; | ||
1911 | goto error1; | ||
1912 | } | ||
1913 | |||
1914 | if (!hw->io_base) { | ||
1915 | err = pci_request_regions(pci, "XFi"); | ||
1916 | if (err < 0) | ||
1917 | goto error1; | ||
1918 | |||
1919 | if (hw->model == CTUAA) | ||
1920 | hw->io_base = pci_resource_start(pci, 5); | ||
1921 | else | ||
1922 | hw->io_base = pci_resource_start(pci, 0); | ||
1923 | |||
1924 | } | ||
1925 | |||
1926 | /* Switch to X-Fi mode from UAA mode if neeeded */ | ||
1927 | if (hw->model == CTUAA) { | ||
1928 | err = uaa_to_xfi(pci); | ||
1929 | if (err) | ||
1930 | goto error2; | ||
1931 | |||
1932 | } | ||
1933 | |||
1934 | if (hw->irq < 0) { | ||
1935 | err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED, | ||
1936 | "ctxfi", hw); | ||
1937 | if (err < 0) { | ||
1938 | printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); | ||
1939 | goto error2; | ||
1940 | } | ||
1941 | hw->irq = pci->irq; | ||
1942 | } | ||
1943 | |||
1944 | pci_set_master(pci); | ||
1945 | |||
1946 | return 0; | ||
1947 | |||
1948 | error2: | ||
1949 | pci_release_regions(pci); | ||
1950 | hw->io_base = 0; | ||
1951 | error1: | ||
1952 | pci_disable_device(pci); | ||
1953 | return err; | ||
1954 | } | ||
1955 | |||
1956 | static int hw_card_stop(struct hw *hw) | ||
1957 | { | ||
1958 | unsigned int data; | ||
1959 | |||
1960 | /* disable transport bus master and queueing of request */ | ||
1961 | hw_write_20kx(hw, TRNCTL, 0x00); | ||
1962 | |||
1963 | /* disable pll */ | ||
1964 | data = hw_read_20kx(hw, PLLCTL); | ||
1965 | hw_write_20kx(hw, PLLCTL, (data & (~(0x0F<<12)))); | ||
1966 | |||
1967 | /* TODO: Disable interrupt and so on... */ | ||
1968 | if (hw->irq >= 0) | ||
1969 | synchronize_irq(hw->irq); | ||
1970 | return 0; | ||
1971 | } | ||
1972 | |||
1973 | static int hw_card_shutdown(struct hw *hw) | ||
1974 | { | ||
1975 | if (hw->irq >= 0) | ||
1976 | free_irq(hw->irq, hw); | ||
1977 | |||
1978 | hw->irq = -1; | ||
1979 | |||
1980 | if (NULL != ((void *)hw->mem_base)) | ||
1981 | iounmap((void *)hw->mem_base); | ||
1982 | |||
1983 | hw->mem_base = (unsigned long)NULL; | ||
1984 | |||
1985 | if (hw->io_base) | ||
1986 | pci_release_regions(hw->pci); | ||
1987 | |||
1988 | hw->io_base = 0; | ||
1989 | |||
1990 | pci_disable_device(hw->pci); | ||
1991 | |||
1992 | return 0; | ||
1993 | } | ||
1994 | |||
1995 | static int hw_card_init(struct hw *hw, struct card_conf *info) | ||
1996 | { | ||
1997 | int err; | ||
1998 | unsigned int gctl; | ||
1999 | u32 data; | ||
2000 | struct dac_conf dac_info = {0}; | ||
2001 | struct adc_conf adc_info = {0}; | ||
2002 | struct daio_conf daio_info = {0}; | ||
2003 | struct trn_conf trn_info = {0}; | ||
2004 | |||
2005 | /* Get PCI io port base address and do Hendrix switch if needed. */ | ||
2006 | err = hw_card_start(hw); | ||
2007 | if (err) | ||
2008 | return err; | ||
2009 | |||
2010 | /* PLL init */ | ||
2011 | err = hw_pll_init(hw, info->rsr); | ||
2012 | if (err < 0) | ||
2013 | return err; | ||
2014 | |||
2015 | /* kick off auto-init */ | ||
2016 | err = hw_auto_init(hw); | ||
2017 | if (err < 0) | ||
2018 | return err; | ||
2019 | |||
2020 | /* Enable audio ring */ | ||
2021 | gctl = hw_read_20kx(hw, GCTL); | ||
2022 | set_field(&gctl, GCTL_EAC, 1); | ||
2023 | set_field(&gctl, GCTL_DBP, 1); | ||
2024 | set_field(&gctl, GCTL_TBP, 1); | ||
2025 | set_field(&gctl, GCTL_FBP, 1); | ||
2026 | set_field(&gctl, GCTL_ET, 1); | ||
2027 | hw_write_20kx(hw, GCTL, gctl); | ||
2028 | mdelay(10); | ||
2029 | |||
2030 | /* Reset all global pending interrupts */ | ||
2031 | hw_write_20kx(hw, GIE, 0); | ||
2032 | /* Reset all SRC pending interrupts */ | ||
2033 | hw_write_20kx(hw, SRCIP, 0); | ||
2034 | mdelay(30); | ||
2035 | |||
2036 | /* Detect the card ID and configure GPIO accordingly. */ | ||
2037 | switch (hw->model) { | ||
2038 | case CTSB055X: | ||
2039 | hw_write_20kx(hw, GPIOCTL, 0x13fe); | ||
2040 | break; | ||
2041 | case CTSB073X: | ||
2042 | hw_write_20kx(hw, GPIOCTL, 0x00e6); | ||
2043 | break; | ||
2044 | case CTUAA: | ||
2045 | hw_write_20kx(hw, GPIOCTL, 0x00c2); | ||
2046 | break; | ||
2047 | default: | ||
2048 | hw_write_20kx(hw, GPIOCTL, 0x01e6); | ||
2049 | break; | ||
2050 | } | ||
2051 | |||
2052 | trn_info.vm_pgt_phys = info->vm_pgt_phys; | ||
2053 | err = hw_trn_init(hw, &trn_info); | ||
2054 | if (err < 0) | ||
2055 | return err; | ||
2056 | |||
2057 | daio_info.msr = info->msr; | ||
2058 | err = hw_daio_init(hw, &daio_info); | ||
2059 | if (err < 0) | ||
2060 | return err; | ||
2061 | |||
2062 | dac_info.msr = info->msr; | ||
2063 | err = hw_dac_init(hw, &dac_info); | ||
2064 | if (err < 0) | ||
2065 | return err; | ||
2066 | |||
2067 | adc_info.msr = info->msr; | ||
2068 | adc_info.input = ADC_LINEIN; | ||
2069 | adc_info.mic20db = 0; | ||
2070 | err = hw_adc_init(hw, &adc_info); | ||
2071 | if (err < 0) | ||
2072 | return err; | ||
2073 | |||
2074 | data = hw_read_20kx(hw, SRCMCTL); | ||
2075 | data |= 0x1; /* Enables input from the audio ring */ | ||
2076 | hw_write_20kx(hw, SRCMCTL, data); | ||
2077 | |||
2078 | return 0; | ||
2079 | } | ||
2080 | |||
2081 | #ifdef CONFIG_PM | ||
2082 | static int hw_suspend(struct hw *hw, pm_message_t state) | ||
2083 | { | ||
2084 | struct pci_dev *pci = hw->pci; | ||
2085 | |||
2086 | hw_card_stop(hw); | ||
2087 | |||
2088 | if (hw->model == CTUAA) { | ||
2089 | /* Switch to UAA config space. */ | ||
2090 | pci_write_config_dword(pci, UAA_CFG_SPACE_FLAG, 0x0); | ||
2091 | } | ||
2092 | |||
2093 | pci_disable_device(pci); | ||
2094 | pci_save_state(pci); | ||
2095 | pci_set_power_state(pci, pci_choose_state(pci, state)); | ||
2096 | |||
2097 | return 0; | ||
2098 | } | ||
2099 | |||
2100 | static int hw_resume(struct hw *hw, struct card_conf *info) | ||
2101 | { | ||
2102 | struct pci_dev *pci = hw->pci; | ||
2103 | |||
2104 | pci_set_power_state(pci, PCI_D0); | ||
2105 | pci_restore_state(pci); | ||
2106 | |||
2107 | /* Re-initialize card hardware. */ | ||
2108 | return hw_card_init(hw, info); | ||
2109 | } | ||
2110 | #endif | ||
2111 | |||
2112 | static u32 hw_read_20kx(struct hw *hw, u32 reg) | ||
2113 | { | ||
2114 | u32 value; | ||
2115 | unsigned long flags; | ||
2116 | |||
2117 | spin_lock_irqsave( | ||
2118 | &container_of(hw, struct hw20k1, hw)->reg_20k1_lock, flags); | ||
2119 | outl(reg, hw->io_base + 0x0); | ||
2120 | value = inl(hw->io_base + 0x4); | ||
2121 | spin_unlock_irqrestore( | ||
2122 | &container_of(hw, struct hw20k1, hw)->reg_20k1_lock, flags); | ||
2123 | |||
2124 | return value; | ||
2125 | } | ||
2126 | |||
2127 | static void hw_write_20kx(struct hw *hw, u32 reg, u32 data) | ||
2128 | { | ||
2129 | unsigned long flags; | ||
2130 | |||
2131 | spin_lock_irqsave( | ||
2132 | &container_of(hw, struct hw20k1, hw)->reg_20k1_lock, flags); | ||
2133 | outl(reg, hw->io_base + 0x0); | ||
2134 | outl(data, hw->io_base + 0x4); | ||
2135 | spin_unlock_irqrestore( | ||
2136 | &container_of(hw, struct hw20k1, hw)->reg_20k1_lock, flags); | ||
2137 | |||
2138 | } | ||
2139 | |||
2140 | static u32 hw_read_pci(struct hw *hw, u32 reg) | ||
2141 | { | ||
2142 | u32 value; | ||
2143 | unsigned long flags; | ||
2144 | |||
2145 | spin_lock_irqsave( | ||
2146 | &container_of(hw, struct hw20k1, hw)->reg_pci_lock, flags); | ||
2147 | outl(reg, hw->io_base + 0x10); | ||
2148 | value = inl(hw->io_base + 0x14); | ||
2149 | spin_unlock_irqrestore( | ||
2150 | &container_of(hw, struct hw20k1, hw)->reg_pci_lock, flags); | ||
2151 | |||
2152 | return value; | ||
2153 | } | ||
2154 | |||
2155 | static void hw_write_pci(struct hw *hw, u32 reg, u32 data) | ||
2156 | { | ||
2157 | unsigned long flags; | ||
2158 | |||
2159 | spin_lock_irqsave( | ||
2160 | &container_of(hw, struct hw20k1, hw)->reg_pci_lock, flags); | ||
2161 | outl(reg, hw->io_base + 0x10); | ||
2162 | outl(data, hw->io_base + 0x14); | ||
2163 | spin_unlock_irqrestore( | ||
2164 | &container_of(hw, struct hw20k1, hw)->reg_pci_lock, flags); | ||
2165 | } | ||
2166 | |||
2167 | static struct hw ct20k1_preset __devinitdata = { | ||
2168 | .irq = -1, | ||
2169 | |||
2170 | .card_init = hw_card_init, | ||
2171 | .card_stop = hw_card_stop, | ||
2172 | .pll_init = hw_pll_init, | ||
2173 | .is_adc_source_selected = hw_is_adc_input_selected, | ||
2174 | .select_adc_source = hw_adc_input_select, | ||
2175 | .have_digit_io_switch = hw_have_digit_io_switch, | ||
2176 | #ifdef CONFIG_PM | ||
2177 | .suspend = hw_suspend, | ||
2178 | .resume = hw_resume, | ||
2179 | #endif | ||
2180 | |||
2181 | .src_rsc_get_ctrl_blk = src_get_rsc_ctrl_blk, | ||
2182 | .src_rsc_put_ctrl_blk = src_put_rsc_ctrl_blk, | ||
2183 | .src_mgr_get_ctrl_blk = src_mgr_get_ctrl_blk, | ||
2184 | .src_mgr_put_ctrl_blk = src_mgr_put_ctrl_blk, | ||
2185 | .src_set_state = src_set_state, | ||
2186 | .src_set_bm = src_set_bm, | ||
2187 | .src_set_rsr = src_set_rsr, | ||
2188 | .src_set_sf = src_set_sf, | ||
2189 | .src_set_wr = src_set_wr, | ||
2190 | .src_set_pm = src_set_pm, | ||
2191 | .src_set_rom = src_set_rom, | ||
2192 | .src_set_vo = src_set_vo, | ||
2193 | .src_set_st = src_set_st, | ||
2194 | .src_set_ie = src_set_ie, | ||
2195 | .src_set_ilsz = src_set_ilsz, | ||
2196 | .src_set_bp = src_set_bp, | ||
2197 | .src_set_cisz = src_set_cisz, | ||
2198 | .src_set_ca = src_set_ca, | ||
2199 | .src_set_sa = src_set_sa, | ||
2200 | .src_set_la = src_set_la, | ||
2201 | .src_set_pitch = src_set_pitch, | ||
2202 | .src_set_dirty = src_set_dirty, | ||
2203 | .src_set_clear_zbufs = src_set_clear_zbufs, | ||
2204 | .src_set_dirty_all = src_set_dirty_all, | ||
2205 | .src_commit_write = src_commit_write, | ||
2206 | .src_get_ca = src_get_ca, | ||
2207 | .src_get_dirty = src_get_dirty, | ||
2208 | .src_dirty_conj_mask = src_dirty_conj_mask, | ||
2209 | .src_mgr_enbs_src = src_mgr_enbs_src, | ||
2210 | .src_mgr_enb_src = src_mgr_enb_src, | ||
2211 | .src_mgr_dsb_src = src_mgr_dsb_src, | ||
2212 | .src_mgr_commit_write = src_mgr_commit_write, | ||
2213 | |||
2214 | .srcimp_mgr_get_ctrl_blk = srcimp_mgr_get_ctrl_blk, | ||
2215 | .srcimp_mgr_put_ctrl_blk = srcimp_mgr_put_ctrl_blk, | ||
2216 | .srcimp_mgr_set_imaparc = srcimp_mgr_set_imaparc, | ||
2217 | .srcimp_mgr_set_imapuser = srcimp_mgr_set_imapuser, | ||
2218 | .srcimp_mgr_set_imapnxt = srcimp_mgr_set_imapnxt, | ||
2219 | .srcimp_mgr_set_imapaddr = srcimp_mgr_set_imapaddr, | ||
2220 | .srcimp_mgr_commit_write = srcimp_mgr_commit_write, | ||
2221 | |||
2222 | .amixer_rsc_get_ctrl_blk = amixer_rsc_get_ctrl_blk, | ||
2223 | .amixer_rsc_put_ctrl_blk = amixer_rsc_put_ctrl_blk, | ||
2224 | .amixer_mgr_get_ctrl_blk = amixer_mgr_get_ctrl_blk, | ||
2225 | .amixer_mgr_put_ctrl_blk = amixer_mgr_put_ctrl_blk, | ||
2226 | .amixer_set_mode = amixer_set_mode, | ||
2227 | .amixer_set_iv = amixer_set_iv, | ||
2228 | .amixer_set_x = amixer_set_x, | ||
2229 | .amixer_set_y = amixer_set_y, | ||
2230 | .amixer_set_sadr = amixer_set_sadr, | ||
2231 | .amixer_set_se = amixer_set_se, | ||
2232 | .amixer_set_dirty = amixer_set_dirty, | ||
2233 | .amixer_set_dirty_all = amixer_set_dirty_all, | ||
2234 | .amixer_commit_write = amixer_commit_write, | ||
2235 | .amixer_get_y = amixer_get_y, | ||
2236 | .amixer_get_dirty = amixer_get_dirty, | ||
2237 | |||
2238 | .dai_get_ctrl_blk = dai_get_ctrl_blk, | ||
2239 | .dai_put_ctrl_blk = dai_put_ctrl_blk, | ||
2240 | .dai_srt_set_srco = dai_srt_set_srcr, | ||
2241 | .dai_srt_set_srcm = dai_srt_set_srcl, | ||
2242 | .dai_srt_set_rsr = dai_srt_set_rsr, | ||
2243 | .dai_srt_set_drat = dai_srt_set_drat, | ||
2244 | .dai_srt_set_ec = dai_srt_set_ec, | ||
2245 | .dai_srt_set_et = dai_srt_set_et, | ||
2246 | .dai_commit_write = dai_commit_write, | ||
2247 | |||
2248 | .dao_get_ctrl_blk = dao_get_ctrl_blk, | ||
2249 | .dao_put_ctrl_blk = dao_put_ctrl_blk, | ||
2250 | .dao_set_spos = dao_set_spos, | ||
2251 | .dao_commit_write = dao_commit_write, | ||
2252 | .dao_get_spos = dao_get_spos, | ||
2253 | |||
2254 | .daio_mgr_get_ctrl_blk = daio_mgr_get_ctrl_blk, | ||
2255 | .daio_mgr_put_ctrl_blk = daio_mgr_put_ctrl_blk, | ||
2256 | .daio_mgr_enb_dai = daio_mgr_enb_dai, | ||
2257 | .daio_mgr_dsb_dai = daio_mgr_dsb_dai, | ||
2258 | .daio_mgr_enb_dao = daio_mgr_enb_dao, | ||
2259 | .daio_mgr_dsb_dao = daio_mgr_dsb_dao, | ||
2260 | .daio_mgr_dao_init = daio_mgr_dao_init, | ||
2261 | .daio_mgr_set_imaparc = daio_mgr_set_imaparc, | ||
2262 | .daio_mgr_set_imapnxt = daio_mgr_set_imapnxt, | ||
2263 | .daio_mgr_set_imapaddr = daio_mgr_set_imapaddr, | ||
2264 | .daio_mgr_commit_write = daio_mgr_commit_write, | ||
2265 | |||
2266 | .set_timer_irq = set_timer_irq, | ||
2267 | .set_timer_tick = set_timer_tick, | ||
2268 | .get_wc = get_wc, | ||
2269 | }; | ||
2270 | |||
2271 | int __devinit create_20k1_hw_obj(struct hw **rhw) | ||
2272 | { | ||
2273 | struct hw20k1 *hw20k1; | ||
2274 | |||
2275 | *rhw = NULL; | ||
2276 | hw20k1 = kzalloc(sizeof(*hw20k1), GFP_KERNEL); | ||
2277 | if (NULL == hw20k1) | ||
2278 | return -ENOMEM; | ||
2279 | |||
2280 | spin_lock_init(&hw20k1->reg_20k1_lock); | ||
2281 | spin_lock_init(&hw20k1->reg_pci_lock); | ||
2282 | |||
2283 | hw20k1->hw = ct20k1_preset; | ||
2284 | |||
2285 | *rhw = &hw20k1->hw; | ||
2286 | |||
2287 | return 0; | ||
2288 | } | ||
2289 | |||
2290 | int destroy_20k1_hw_obj(struct hw *hw) | ||
2291 | { | ||
2292 | if (hw->io_base) | ||
2293 | hw_card_shutdown(hw); | ||
2294 | |||
2295 | kfree(container_of(hw, struct hw20k1, hw)); | ||
2296 | return 0; | ||
2297 | } | ||
diff --git a/sound/pci/ctxfi/cthw20k1.h b/sound/pci/ctxfi/cthw20k1.h new file mode 100644 index 000000000000..02f72fb448a6 --- /dev/null +++ b/sound/pci/ctxfi/cthw20k1.h | |||
@@ -0,0 +1,26 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File cthw20k1.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of hardware access methord. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date May 13 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #ifndef CTHW20K1_H | ||
19 | #define CTHW20K1_H | ||
20 | |||
21 | #include "cthardware.h" | ||
22 | |||
23 | int create_20k1_hw_obj(struct hw **rhw); | ||
24 | int destroy_20k1_hw_obj(struct hw *hw); | ||
25 | |||
26 | #endif /* CTHW20K1_H */ | ||
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c new file mode 100644 index 000000000000..dec46d04b041 --- /dev/null +++ b/sound/pci/ctxfi/cthw20k2.c | |||
@@ -0,0 +1,2176 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File cthw20k2.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of hardware access methord for 20k2. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date May 14 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #include <linux/types.h> | ||
19 | #include <linux/slab.h> | ||
20 | #include <linux/pci.h> | ||
21 | #include <linux/io.h> | ||
22 | #include <linux/string.h> | ||
23 | #include <linux/kernel.h> | ||
24 | #include <linux/interrupt.h> | ||
25 | #include <linux/delay.h> | ||
26 | #include "cthw20k2.h" | ||
27 | #include "ct20k2reg.h" | ||
28 | |||
29 | #if BITS_PER_LONG == 32 | ||
30 | #define CT_XFI_DMA_MASK DMA_BIT_MASK(32) /* 32 bit PTE */ | ||
31 | #else | ||
32 | #define CT_XFI_DMA_MASK DMA_BIT_MASK(64) /* 64 bit PTE */ | ||
33 | #endif | ||
34 | |||
35 | struct hw20k2 { | ||
36 | struct hw hw; | ||
37 | /* for i2c */ | ||
38 | unsigned char dev_id; | ||
39 | unsigned char addr_size; | ||
40 | unsigned char data_size; | ||
41 | }; | ||
42 | |||
43 | static u32 hw_read_20kx(struct hw *hw, u32 reg); | ||
44 | static void hw_write_20kx(struct hw *hw, u32 reg, u32 data); | ||
45 | |||
46 | /* | ||
47 | * Type definition block. | ||
48 | * The layout of control structures can be directly applied on 20k2 chip. | ||
49 | */ | ||
50 | |||
51 | /* | ||
52 | * SRC control block definitions. | ||
53 | */ | ||
54 | |||
55 | /* SRC resource control block */ | ||
56 | #define SRCCTL_STATE 0x00000007 | ||
57 | #define SRCCTL_BM 0x00000008 | ||
58 | #define SRCCTL_RSR 0x00000030 | ||
59 | #define SRCCTL_SF 0x000001C0 | ||
60 | #define SRCCTL_WR 0x00000200 | ||
61 | #define SRCCTL_PM 0x00000400 | ||
62 | #define SRCCTL_ROM 0x00001800 | ||
63 | #define SRCCTL_VO 0x00002000 | ||
64 | #define SRCCTL_ST 0x00004000 | ||
65 | #define SRCCTL_IE 0x00008000 | ||
66 | #define SRCCTL_ILSZ 0x000F0000 | ||
67 | #define SRCCTL_BP 0x00100000 | ||
68 | |||
69 | #define SRCCCR_CISZ 0x000007FF | ||
70 | #define SRCCCR_CWA 0x001FF800 | ||
71 | #define SRCCCR_D 0x00200000 | ||
72 | #define SRCCCR_RS 0x01C00000 | ||
73 | #define SRCCCR_NAL 0x3E000000 | ||
74 | #define SRCCCR_RA 0xC0000000 | ||
75 | |||
76 | #define SRCCA_CA 0x0FFFFFFF | ||
77 | #define SRCCA_RS 0xE0000000 | ||
78 | |||
79 | #define SRCSA_SA 0x0FFFFFFF | ||
80 | |||
81 | #define SRCLA_LA 0x0FFFFFFF | ||
82 | |||
83 | /* Mixer Parameter Ring ram Low and Hight register. | ||
84 | * Fixed-point value in 8.24 format for parameter channel */ | ||
85 | #define MPRLH_PITCH 0xFFFFFFFF | ||
86 | |||
87 | /* SRC resource register dirty flags */ | ||
88 | union src_dirty { | ||
89 | struct { | ||
90 | u16 ctl:1; | ||
91 | u16 ccr:1; | ||
92 | u16 sa:1; | ||
93 | u16 la:1; | ||
94 | u16 ca:1; | ||
95 | u16 mpr:1; | ||
96 | u16 czbfs:1; /* Clear Z-Buffers */ | ||
97 | u16 rsv:9; | ||
98 | } bf; | ||
99 | u16 data; | ||
100 | }; | ||
101 | |||
102 | struct src_rsc_ctrl_blk { | ||
103 | unsigned int ctl; | ||
104 | unsigned int ccr; | ||
105 | unsigned int ca; | ||
106 | unsigned int sa; | ||
107 | unsigned int la; | ||
108 | unsigned int mpr; | ||
109 | union src_dirty dirty; | ||
110 | }; | ||
111 | |||
112 | /* SRC manager control block */ | ||
113 | union src_mgr_dirty { | ||
114 | struct { | ||
115 | u16 enb0:1; | ||
116 | u16 enb1:1; | ||
117 | u16 enb2:1; | ||
118 | u16 enb3:1; | ||
119 | u16 enb4:1; | ||
120 | u16 enb5:1; | ||
121 | u16 enb6:1; | ||
122 | u16 enb7:1; | ||
123 | u16 enbsa:1; | ||
124 | u16 rsv:7; | ||
125 | } bf; | ||
126 | u16 data; | ||
127 | }; | ||
128 | |||
129 | struct src_mgr_ctrl_blk { | ||
130 | unsigned int enbsa; | ||
131 | unsigned int enb[8]; | ||
132 | union src_mgr_dirty dirty; | ||
133 | }; | ||
134 | |||
135 | /* SRCIMP manager control block */ | ||
136 | #define SRCAIM_ARC 0x00000FFF | ||
137 | #define SRCAIM_NXT 0x00FF0000 | ||
138 | #define SRCAIM_SRC 0xFF000000 | ||
139 | |||
140 | struct srcimap { | ||
141 | unsigned int srcaim; | ||
142 | unsigned int idx; | ||
143 | }; | ||
144 | |||
145 | /* SRCIMP manager register dirty flags */ | ||
146 | union srcimp_mgr_dirty { | ||
147 | struct { | ||
148 | u16 srcimap:1; | ||
149 | u16 rsv:15; | ||
150 | } bf; | ||
151 | u16 data; | ||
152 | }; | ||
153 | |||
154 | struct srcimp_mgr_ctrl_blk { | ||
155 | struct srcimap srcimap; | ||
156 | union srcimp_mgr_dirty dirty; | ||
157 | }; | ||
158 | |||
159 | /* | ||
160 | * Function implementation block. | ||
161 | */ | ||
162 | |||
163 | static int src_get_rsc_ctrl_blk(void **rblk) | ||
164 | { | ||
165 | struct src_rsc_ctrl_blk *blk; | ||
166 | |||
167 | *rblk = NULL; | ||
168 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
169 | if (NULL == blk) | ||
170 | return -ENOMEM; | ||
171 | |||
172 | *rblk = blk; | ||
173 | |||
174 | return 0; | ||
175 | } | ||
176 | |||
177 | static int src_put_rsc_ctrl_blk(void *blk) | ||
178 | { | ||
179 | kfree(blk); | ||
180 | |||
181 | return 0; | ||
182 | } | ||
183 | |||
184 | static int src_set_state(void *blk, unsigned int state) | ||
185 | { | ||
186 | struct src_rsc_ctrl_blk *ctl = blk; | ||
187 | |||
188 | set_field(&ctl->ctl, SRCCTL_STATE, state); | ||
189 | ctl->dirty.bf.ctl = 1; | ||
190 | return 0; | ||
191 | } | ||
192 | |||
193 | static int src_set_bm(void *blk, unsigned int bm) | ||
194 | { | ||
195 | struct src_rsc_ctrl_blk *ctl = blk; | ||
196 | |||
197 | set_field(&ctl->ctl, SRCCTL_BM, bm); | ||
198 | ctl->dirty.bf.ctl = 1; | ||
199 | return 0; | ||
200 | } | ||
201 | |||
202 | static int src_set_rsr(void *blk, unsigned int rsr) | ||
203 | { | ||
204 | struct src_rsc_ctrl_blk *ctl = blk; | ||
205 | |||
206 | set_field(&ctl->ctl, SRCCTL_RSR, rsr); | ||
207 | ctl->dirty.bf.ctl = 1; | ||
208 | return 0; | ||
209 | } | ||
210 | |||
211 | static int src_set_sf(void *blk, unsigned int sf) | ||
212 | { | ||
213 | struct src_rsc_ctrl_blk *ctl = blk; | ||
214 | |||
215 | set_field(&ctl->ctl, SRCCTL_SF, sf); | ||
216 | ctl->dirty.bf.ctl = 1; | ||
217 | return 0; | ||
218 | } | ||
219 | |||
220 | static int src_set_wr(void *blk, unsigned int wr) | ||
221 | { | ||
222 | struct src_rsc_ctrl_blk *ctl = blk; | ||
223 | |||
224 | set_field(&ctl->ctl, SRCCTL_WR, wr); | ||
225 | ctl->dirty.bf.ctl = 1; | ||
226 | return 0; | ||
227 | } | ||
228 | |||
229 | static int src_set_pm(void *blk, unsigned int pm) | ||
230 | { | ||
231 | struct src_rsc_ctrl_blk *ctl = blk; | ||
232 | |||
233 | set_field(&ctl->ctl, SRCCTL_PM, pm); | ||
234 | ctl->dirty.bf.ctl = 1; | ||
235 | return 0; | ||
236 | } | ||
237 | |||
238 | static int src_set_rom(void *blk, unsigned int rom) | ||
239 | { | ||
240 | struct src_rsc_ctrl_blk *ctl = blk; | ||
241 | |||
242 | set_field(&ctl->ctl, SRCCTL_ROM, rom); | ||
243 | ctl->dirty.bf.ctl = 1; | ||
244 | return 0; | ||
245 | } | ||
246 | |||
247 | static int src_set_vo(void *blk, unsigned int vo) | ||
248 | { | ||
249 | struct src_rsc_ctrl_blk *ctl = blk; | ||
250 | |||
251 | set_field(&ctl->ctl, SRCCTL_VO, vo); | ||
252 | ctl->dirty.bf.ctl = 1; | ||
253 | return 0; | ||
254 | } | ||
255 | |||
256 | static int src_set_st(void *blk, unsigned int st) | ||
257 | { | ||
258 | struct src_rsc_ctrl_blk *ctl = blk; | ||
259 | |||
260 | set_field(&ctl->ctl, SRCCTL_ST, st); | ||
261 | ctl->dirty.bf.ctl = 1; | ||
262 | return 0; | ||
263 | } | ||
264 | |||
265 | static int src_set_ie(void *blk, unsigned int ie) | ||
266 | { | ||
267 | struct src_rsc_ctrl_blk *ctl = blk; | ||
268 | |||
269 | set_field(&ctl->ctl, SRCCTL_IE, ie); | ||
270 | ctl->dirty.bf.ctl = 1; | ||
271 | return 0; | ||
272 | } | ||
273 | |||
274 | static int src_set_ilsz(void *blk, unsigned int ilsz) | ||
275 | { | ||
276 | struct src_rsc_ctrl_blk *ctl = blk; | ||
277 | |||
278 | set_field(&ctl->ctl, SRCCTL_ILSZ, ilsz); | ||
279 | ctl->dirty.bf.ctl = 1; | ||
280 | return 0; | ||
281 | } | ||
282 | |||
283 | static int src_set_bp(void *blk, unsigned int bp) | ||
284 | { | ||
285 | struct src_rsc_ctrl_blk *ctl = blk; | ||
286 | |||
287 | set_field(&ctl->ctl, SRCCTL_BP, bp); | ||
288 | ctl->dirty.bf.ctl = 1; | ||
289 | return 0; | ||
290 | } | ||
291 | |||
292 | static int src_set_cisz(void *blk, unsigned int cisz) | ||
293 | { | ||
294 | struct src_rsc_ctrl_blk *ctl = blk; | ||
295 | |||
296 | set_field(&ctl->ccr, SRCCCR_CISZ, cisz); | ||
297 | ctl->dirty.bf.ccr = 1; | ||
298 | return 0; | ||
299 | } | ||
300 | |||
301 | static int src_set_ca(void *blk, unsigned int ca) | ||
302 | { | ||
303 | struct src_rsc_ctrl_blk *ctl = blk; | ||
304 | |||
305 | set_field(&ctl->ca, SRCCA_CA, ca); | ||
306 | ctl->dirty.bf.ca = 1; | ||
307 | return 0; | ||
308 | } | ||
309 | |||
310 | static int src_set_sa(void *blk, unsigned int sa) | ||
311 | { | ||
312 | struct src_rsc_ctrl_blk *ctl = blk; | ||
313 | |||
314 | set_field(&ctl->sa, SRCSA_SA, sa); | ||
315 | ctl->dirty.bf.sa = 1; | ||
316 | return 0; | ||
317 | } | ||
318 | |||
319 | static int src_set_la(void *blk, unsigned int la) | ||
320 | { | ||
321 | struct src_rsc_ctrl_blk *ctl = blk; | ||
322 | |||
323 | set_field(&ctl->la, SRCLA_LA, la); | ||
324 | ctl->dirty.bf.la = 1; | ||
325 | return 0; | ||
326 | } | ||
327 | |||
328 | static int src_set_pitch(void *blk, unsigned int pitch) | ||
329 | { | ||
330 | struct src_rsc_ctrl_blk *ctl = blk; | ||
331 | |||
332 | set_field(&ctl->mpr, MPRLH_PITCH, pitch); | ||
333 | ctl->dirty.bf.mpr = 1; | ||
334 | return 0; | ||
335 | } | ||
336 | |||
337 | static int src_set_clear_zbufs(void *blk, unsigned int clear) | ||
338 | { | ||
339 | ((struct src_rsc_ctrl_blk *)blk)->dirty.bf.czbfs = (clear ? 1 : 0); | ||
340 | return 0; | ||
341 | } | ||
342 | |||
343 | static int src_set_dirty(void *blk, unsigned int flags) | ||
344 | { | ||
345 | ((struct src_rsc_ctrl_blk *)blk)->dirty.data = (flags & 0xffff); | ||
346 | return 0; | ||
347 | } | ||
348 | |||
349 | static int src_set_dirty_all(void *blk) | ||
350 | { | ||
351 | ((struct src_rsc_ctrl_blk *)blk)->dirty.data = ~(0x0); | ||
352 | return 0; | ||
353 | } | ||
354 | |||
355 | #define AR_SLOT_SIZE 4096 | ||
356 | #define AR_SLOT_BLOCK_SIZE 16 | ||
357 | #define AR_PTS_PITCH 6 | ||
358 | #define AR_PARAM_SRC_OFFSET 0x60 | ||
359 | |||
360 | static unsigned int src_param_pitch_mixer(unsigned int src_idx) | ||
361 | { | ||
362 | return ((src_idx << 4) + AR_PTS_PITCH + AR_SLOT_SIZE | ||
363 | - AR_PARAM_SRC_OFFSET) % AR_SLOT_SIZE; | ||
364 | |||
365 | } | ||
366 | |||
367 | static int src_commit_write(struct hw *hw, unsigned int idx, void *blk) | ||
368 | { | ||
369 | struct src_rsc_ctrl_blk *ctl = blk; | ||
370 | int i; | ||
371 | |||
372 | if (ctl->dirty.bf.czbfs) { | ||
373 | /* Clear Z-Buffer registers */ | ||
374 | for (i = 0; i < 8; i++) | ||
375 | hw_write_20kx(hw, SRC_UPZ+idx*0x100+i*0x4, 0); | ||
376 | |||
377 | for (i = 0; i < 4; i++) | ||
378 | hw_write_20kx(hw, SRC_DN0Z+idx*0x100+i*0x4, 0); | ||
379 | |||
380 | for (i = 0; i < 8; i++) | ||
381 | hw_write_20kx(hw, SRC_DN1Z+idx*0x100+i*0x4, 0); | ||
382 | |||
383 | ctl->dirty.bf.czbfs = 0; | ||
384 | } | ||
385 | if (ctl->dirty.bf.mpr) { | ||
386 | /* Take the parameter mixer resource in the same group as that | ||
387 | * the idx src is in for simplicity. Unlike src, all conjugate | ||
388 | * parameter mixer resources must be programmed for | ||
389 | * corresponding conjugate src resources. */ | ||
390 | unsigned int pm_idx = src_param_pitch_mixer(idx); | ||
391 | hw_write_20kx(hw, MIXER_PRING_LO_HI+4*pm_idx, ctl->mpr); | ||
392 | hw_write_20kx(hw, MIXER_PMOPLO+8*pm_idx, 0x3); | ||
393 | hw_write_20kx(hw, MIXER_PMOPHI+8*pm_idx, 0x0); | ||
394 | ctl->dirty.bf.mpr = 0; | ||
395 | } | ||
396 | if (ctl->dirty.bf.sa) { | ||
397 | hw_write_20kx(hw, SRC_SA+idx*0x100, ctl->sa); | ||
398 | ctl->dirty.bf.sa = 0; | ||
399 | } | ||
400 | if (ctl->dirty.bf.la) { | ||
401 | hw_write_20kx(hw, SRC_LA+idx*0x100, ctl->la); | ||
402 | ctl->dirty.bf.la = 0; | ||
403 | } | ||
404 | if (ctl->dirty.bf.ca) { | ||
405 | hw_write_20kx(hw, SRC_CA+idx*0x100, ctl->ca); | ||
406 | ctl->dirty.bf.ca = 0; | ||
407 | } | ||
408 | |||
409 | /* Write srccf register */ | ||
410 | hw_write_20kx(hw, SRC_CF+idx*0x100, 0x0); | ||
411 | |||
412 | if (ctl->dirty.bf.ccr) { | ||
413 | hw_write_20kx(hw, SRC_CCR+idx*0x100, ctl->ccr); | ||
414 | ctl->dirty.bf.ccr = 0; | ||
415 | } | ||
416 | if (ctl->dirty.bf.ctl) { | ||
417 | hw_write_20kx(hw, SRC_CTL+idx*0x100, ctl->ctl); | ||
418 | ctl->dirty.bf.ctl = 0; | ||
419 | } | ||
420 | |||
421 | return 0; | ||
422 | } | ||
423 | |||
424 | static int src_get_ca(struct hw *hw, unsigned int idx, void *blk) | ||
425 | { | ||
426 | struct src_rsc_ctrl_blk *ctl = blk; | ||
427 | |||
428 | ctl->ca = hw_read_20kx(hw, SRC_CA+idx*0x100); | ||
429 | ctl->dirty.bf.ca = 0; | ||
430 | |||
431 | return get_field(ctl->ca, SRCCA_CA); | ||
432 | } | ||
433 | |||
434 | static unsigned int src_get_dirty(void *blk) | ||
435 | { | ||
436 | return ((struct src_rsc_ctrl_blk *)blk)->dirty.data; | ||
437 | } | ||
438 | |||
439 | static unsigned int src_dirty_conj_mask(void) | ||
440 | { | ||
441 | return 0x20; | ||
442 | } | ||
443 | |||
444 | static int src_mgr_enbs_src(void *blk, unsigned int idx) | ||
445 | { | ||
446 | ((struct src_mgr_ctrl_blk *)blk)->enbsa |= (0x1 << ((idx%128)/4)); | ||
447 | ((struct src_mgr_ctrl_blk *)blk)->dirty.bf.enbsa = 1; | ||
448 | ((struct src_mgr_ctrl_blk *)blk)->enb[idx/32] |= (0x1 << (idx%32)); | ||
449 | return 0; | ||
450 | } | ||
451 | |||
452 | static int src_mgr_enb_src(void *blk, unsigned int idx) | ||
453 | { | ||
454 | ((struct src_mgr_ctrl_blk *)blk)->enb[idx/32] |= (0x1 << (idx%32)); | ||
455 | ((struct src_mgr_ctrl_blk *)blk)->dirty.data |= (0x1 << (idx/32)); | ||
456 | return 0; | ||
457 | } | ||
458 | |||
459 | static int src_mgr_dsb_src(void *blk, unsigned int idx) | ||
460 | { | ||
461 | ((struct src_mgr_ctrl_blk *)blk)->enb[idx/32] &= ~(0x1 << (idx%32)); | ||
462 | ((struct src_mgr_ctrl_blk *)blk)->dirty.data |= (0x1 << (idx/32)); | ||
463 | return 0; | ||
464 | } | ||
465 | |||
466 | static int src_mgr_commit_write(struct hw *hw, void *blk) | ||
467 | { | ||
468 | struct src_mgr_ctrl_blk *ctl = blk; | ||
469 | int i; | ||
470 | unsigned int ret; | ||
471 | |||
472 | if (ctl->dirty.bf.enbsa) { | ||
473 | do { | ||
474 | ret = hw_read_20kx(hw, SRC_ENBSTAT); | ||
475 | } while (ret & 0x1); | ||
476 | hw_write_20kx(hw, SRC_ENBSA, ctl->enbsa); | ||
477 | ctl->dirty.bf.enbsa = 0; | ||
478 | } | ||
479 | for (i = 0; i < 8; i++) { | ||
480 | if ((ctl->dirty.data & (0x1 << i))) { | ||
481 | hw_write_20kx(hw, SRC_ENB+(i*0x100), ctl->enb[i]); | ||
482 | ctl->dirty.data &= ~(0x1 << i); | ||
483 | } | ||
484 | } | ||
485 | |||
486 | return 0; | ||
487 | } | ||
488 | |||
489 | static int src_mgr_get_ctrl_blk(void **rblk) | ||
490 | { | ||
491 | struct src_mgr_ctrl_blk *blk; | ||
492 | |||
493 | *rblk = NULL; | ||
494 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
495 | if (NULL == blk) | ||
496 | return -ENOMEM; | ||
497 | |||
498 | *rblk = blk; | ||
499 | |||
500 | return 0; | ||
501 | } | ||
502 | |||
503 | static int src_mgr_put_ctrl_blk(void *blk) | ||
504 | { | ||
505 | kfree(blk); | ||
506 | |||
507 | return 0; | ||
508 | } | ||
509 | |||
510 | static int srcimp_mgr_get_ctrl_blk(void **rblk) | ||
511 | { | ||
512 | struct srcimp_mgr_ctrl_blk *blk; | ||
513 | |||
514 | *rblk = NULL; | ||
515 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
516 | if (NULL == blk) | ||
517 | return -ENOMEM; | ||
518 | |||
519 | *rblk = blk; | ||
520 | |||
521 | return 0; | ||
522 | } | ||
523 | |||
524 | static int srcimp_mgr_put_ctrl_blk(void *blk) | ||
525 | { | ||
526 | kfree(blk); | ||
527 | |||
528 | return 0; | ||
529 | } | ||
530 | |||
531 | static int srcimp_mgr_set_imaparc(void *blk, unsigned int slot) | ||
532 | { | ||
533 | struct srcimp_mgr_ctrl_blk *ctl = blk; | ||
534 | |||
535 | set_field(&ctl->srcimap.srcaim, SRCAIM_ARC, slot); | ||
536 | ctl->dirty.bf.srcimap = 1; | ||
537 | return 0; | ||
538 | } | ||
539 | |||
540 | static int srcimp_mgr_set_imapuser(void *blk, unsigned int user) | ||
541 | { | ||
542 | struct srcimp_mgr_ctrl_blk *ctl = blk; | ||
543 | |||
544 | set_field(&ctl->srcimap.srcaim, SRCAIM_SRC, user); | ||
545 | ctl->dirty.bf.srcimap = 1; | ||
546 | return 0; | ||
547 | } | ||
548 | |||
549 | static int srcimp_mgr_set_imapnxt(void *blk, unsigned int next) | ||
550 | { | ||
551 | struct srcimp_mgr_ctrl_blk *ctl = blk; | ||
552 | |||
553 | set_field(&ctl->srcimap.srcaim, SRCAIM_NXT, next); | ||
554 | ctl->dirty.bf.srcimap = 1; | ||
555 | return 0; | ||
556 | } | ||
557 | |||
558 | static int srcimp_mgr_set_imapaddr(void *blk, unsigned int addr) | ||
559 | { | ||
560 | ((struct srcimp_mgr_ctrl_blk *)blk)->srcimap.idx = addr; | ||
561 | ((struct srcimp_mgr_ctrl_blk *)blk)->dirty.bf.srcimap = 1; | ||
562 | return 0; | ||
563 | } | ||
564 | |||
565 | static int srcimp_mgr_commit_write(struct hw *hw, void *blk) | ||
566 | { | ||
567 | struct srcimp_mgr_ctrl_blk *ctl = blk; | ||
568 | |||
569 | if (ctl->dirty.bf.srcimap) { | ||
570 | hw_write_20kx(hw, SRC_IMAP+ctl->srcimap.idx*0x100, | ||
571 | ctl->srcimap.srcaim); | ||
572 | ctl->dirty.bf.srcimap = 0; | ||
573 | } | ||
574 | |||
575 | return 0; | ||
576 | } | ||
577 | |||
578 | /* | ||
579 | * AMIXER control block definitions. | ||
580 | */ | ||
581 | |||
582 | #define AMOPLO_M 0x00000003 | ||
583 | #define AMOPLO_IV 0x00000004 | ||
584 | #define AMOPLO_X 0x0003FFF0 | ||
585 | #define AMOPLO_Y 0xFFFC0000 | ||
586 | |||
587 | #define AMOPHI_SADR 0x000000FF | ||
588 | #define AMOPHI_SE 0x80000000 | ||
589 | |||
590 | /* AMIXER resource register dirty flags */ | ||
591 | union amixer_dirty { | ||
592 | struct { | ||
593 | u16 amoplo:1; | ||
594 | u16 amophi:1; | ||
595 | u16 rsv:14; | ||
596 | } bf; | ||
597 | u16 data; | ||
598 | }; | ||
599 | |||
600 | /* AMIXER resource control block */ | ||
601 | struct amixer_rsc_ctrl_blk { | ||
602 | unsigned int amoplo; | ||
603 | unsigned int amophi; | ||
604 | union amixer_dirty dirty; | ||
605 | }; | ||
606 | |||
607 | static int amixer_set_mode(void *blk, unsigned int mode) | ||
608 | { | ||
609 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
610 | |||
611 | set_field(&ctl->amoplo, AMOPLO_M, mode); | ||
612 | ctl->dirty.bf.amoplo = 1; | ||
613 | return 0; | ||
614 | } | ||
615 | |||
616 | static int amixer_set_iv(void *blk, unsigned int iv) | ||
617 | { | ||
618 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
619 | |||
620 | set_field(&ctl->amoplo, AMOPLO_IV, iv); | ||
621 | ctl->dirty.bf.amoplo = 1; | ||
622 | return 0; | ||
623 | } | ||
624 | |||
625 | static int amixer_set_x(void *blk, unsigned int x) | ||
626 | { | ||
627 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
628 | |||
629 | set_field(&ctl->amoplo, AMOPLO_X, x); | ||
630 | ctl->dirty.bf.amoplo = 1; | ||
631 | return 0; | ||
632 | } | ||
633 | |||
634 | static int amixer_set_y(void *blk, unsigned int y) | ||
635 | { | ||
636 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
637 | |||
638 | set_field(&ctl->amoplo, AMOPLO_Y, y); | ||
639 | ctl->dirty.bf.amoplo = 1; | ||
640 | return 0; | ||
641 | } | ||
642 | |||
643 | static int amixer_set_sadr(void *blk, unsigned int sadr) | ||
644 | { | ||
645 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
646 | |||
647 | set_field(&ctl->amophi, AMOPHI_SADR, sadr); | ||
648 | ctl->dirty.bf.amophi = 1; | ||
649 | return 0; | ||
650 | } | ||
651 | |||
652 | static int amixer_set_se(void *blk, unsigned int se) | ||
653 | { | ||
654 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
655 | |||
656 | set_field(&ctl->amophi, AMOPHI_SE, se); | ||
657 | ctl->dirty.bf.amophi = 1; | ||
658 | return 0; | ||
659 | } | ||
660 | |||
661 | static int amixer_set_dirty(void *blk, unsigned int flags) | ||
662 | { | ||
663 | ((struct amixer_rsc_ctrl_blk *)blk)->dirty.data = (flags & 0xffff); | ||
664 | return 0; | ||
665 | } | ||
666 | |||
667 | static int amixer_set_dirty_all(void *blk) | ||
668 | { | ||
669 | ((struct amixer_rsc_ctrl_blk *)blk)->dirty.data = ~(0x0); | ||
670 | return 0; | ||
671 | } | ||
672 | |||
673 | static int amixer_commit_write(struct hw *hw, unsigned int idx, void *blk) | ||
674 | { | ||
675 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
676 | |||
677 | if (ctl->dirty.bf.amoplo || ctl->dirty.bf.amophi) { | ||
678 | hw_write_20kx(hw, MIXER_AMOPLO+idx*8, ctl->amoplo); | ||
679 | ctl->dirty.bf.amoplo = 0; | ||
680 | hw_write_20kx(hw, MIXER_AMOPHI+idx*8, ctl->amophi); | ||
681 | ctl->dirty.bf.amophi = 0; | ||
682 | } | ||
683 | |||
684 | return 0; | ||
685 | } | ||
686 | |||
687 | static int amixer_get_y(void *blk) | ||
688 | { | ||
689 | struct amixer_rsc_ctrl_blk *ctl = blk; | ||
690 | |||
691 | return get_field(ctl->amoplo, AMOPLO_Y); | ||
692 | } | ||
693 | |||
694 | static unsigned int amixer_get_dirty(void *blk) | ||
695 | { | ||
696 | return ((struct amixer_rsc_ctrl_blk *)blk)->dirty.data; | ||
697 | } | ||
698 | |||
699 | static int amixer_rsc_get_ctrl_blk(void **rblk) | ||
700 | { | ||
701 | struct amixer_rsc_ctrl_blk *blk; | ||
702 | |||
703 | *rblk = NULL; | ||
704 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
705 | if (NULL == blk) | ||
706 | return -ENOMEM; | ||
707 | |||
708 | *rblk = blk; | ||
709 | |||
710 | return 0; | ||
711 | } | ||
712 | |||
713 | static int amixer_rsc_put_ctrl_blk(void *blk) | ||
714 | { | ||
715 | kfree(blk); | ||
716 | |||
717 | return 0; | ||
718 | } | ||
719 | |||
720 | static int amixer_mgr_get_ctrl_blk(void **rblk) | ||
721 | { | ||
722 | *rblk = NULL; | ||
723 | |||
724 | return 0; | ||
725 | } | ||
726 | |||
727 | static int amixer_mgr_put_ctrl_blk(void *blk) | ||
728 | { | ||
729 | return 0; | ||
730 | } | ||
731 | |||
732 | /* | ||
733 | * DAIO control block definitions. | ||
734 | */ | ||
735 | |||
736 | /* Receiver Sample Rate Tracker Control register */ | ||
737 | #define SRTCTL_SRCO 0x000000FF | ||
738 | #define SRTCTL_SRCM 0x0000FF00 | ||
739 | #define SRTCTL_RSR 0x00030000 | ||
740 | #define SRTCTL_DRAT 0x00300000 | ||
741 | #define SRTCTL_EC 0x01000000 | ||
742 | #define SRTCTL_ET 0x10000000 | ||
743 | |||
744 | /* DAIO Receiver register dirty flags */ | ||
745 | union dai_dirty { | ||
746 | struct { | ||
747 | u16 srt:1; | ||
748 | u16 rsv:15; | ||
749 | } bf; | ||
750 | u16 data; | ||
751 | }; | ||
752 | |||
753 | /* DAIO Receiver control block */ | ||
754 | struct dai_ctrl_blk { | ||
755 | unsigned int srt; | ||
756 | union dai_dirty dirty; | ||
757 | }; | ||
758 | |||
759 | /* Audio Input Mapper RAM */ | ||
760 | #define AIM_ARC 0x00000FFF | ||
761 | #define AIM_NXT 0x007F0000 | ||
762 | |||
763 | struct daoimap { | ||
764 | unsigned int aim; | ||
765 | unsigned int idx; | ||
766 | }; | ||
767 | |||
768 | /* Audio Transmitter Control and Status register */ | ||
769 | #define ATXCTL_EN 0x00000001 | ||
770 | #define ATXCTL_MODE 0x00000010 | ||
771 | #define ATXCTL_CD 0x00000020 | ||
772 | #define ATXCTL_RAW 0x00000100 | ||
773 | #define ATXCTL_MT 0x00000200 | ||
774 | #define ATXCTL_NUC 0x00003000 | ||
775 | #define ATXCTL_BEN 0x00010000 | ||
776 | #define ATXCTL_BMUX 0x00700000 | ||
777 | #define ATXCTL_B24 0x01000000 | ||
778 | #define ATXCTL_CPF 0x02000000 | ||
779 | #define ATXCTL_RIV 0x10000000 | ||
780 | #define ATXCTL_LIV 0x20000000 | ||
781 | #define ATXCTL_RSAT 0x40000000 | ||
782 | #define ATXCTL_LSAT 0x80000000 | ||
783 | |||
784 | /* XDIF Transmitter register dirty flags */ | ||
785 | union dao_dirty { | ||
786 | struct { | ||
787 | u16 atxcsl:1; | ||
788 | u16 rsv:15; | ||
789 | } bf; | ||
790 | u16 data; | ||
791 | }; | ||
792 | |||
793 | /* XDIF Transmitter control block */ | ||
794 | struct dao_ctrl_blk { | ||
795 | /* XDIF Transmitter Channel Status Low Register */ | ||
796 | unsigned int atxcsl; | ||
797 | union dao_dirty dirty; | ||
798 | }; | ||
799 | |||
800 | /* Audio Receiver Control register */ | ||
801 | #define ARXCTL_EN 0x00000001 | ||
802 | |||
803 | /* DAIO manager register dirty flags */ | ||
804 | union daio_mgr_dirty { | ||
805 | struct { | ||
806 | u32 atxctl:8; | ||
807 | u32 arxctl:8; | ||
808 | u32 daoimap:1; | ||
809 | u32 rsv:15; | ||
810 | } bf; | ||
811 | u32 data; | ||
812 | }; | ||
813 | |||
814 | /* DAIO manager control block */ | ||
815 | struct daio_mgr_ctrl_blk { | ||
816 | struct daoimap daoimap; | ||
817 | unsigned int txctl[8]; | ||
818 | unsigned int rxctl[8]; | ||
819 | union daio_mgr_dirty dirty; | ||
820 | }; | ||
821 | |||
822 | static int dai_srt_set_srco(void *blk, unsigned int src) | ||
823 | { | ||
824 | struct dai_ctrl_blk *ctl = blk; | ||
825 | |||
826 | set_field(&ctl->srt, SRTCTL_SRCO, src); | ||
827 | ctl->dirty.bf.srt = 1; | ||
828 | return 0; | ||
829 | } | ||
830 | |||
831 | static int dai_srt_set_srcm(void *blk, unsigned int src) | ||
832 | { | ||
833 | struct dai_ctrl_blk *ctl = blk; | ||
834 | |||
835 | set_field(&ctl->srt, SRTCTL_SRCM, src); | ||
836 | ctl->dirty.bf.srt = 1; | ||
837 | return 0; | ||
838 | } | ||
839 | |||
840 | static int dai_srt_set_rsr(void *blk, unsigned int rsr) | ||
841 | { | ||
842 | struct dai_ctrl_blk *ctl = blk; | ||
843 | |||
844 | set_field(&ctl->srt, SRTCTL_RSR, rsr); | ||
845 | ctl->dirty.bf.srt = 1; | ||
846 | return 0; | ||
847 | } | ||
848 | |||
849 | static int dai_srt_set_drat(void *blk, unsigned int drat) | ||
850 | { | ||
851 | struct dai_ctrl_blk *ctl = blk; | ||
852 | |||
853 | set_field(&ctl->srt, SRTCTL_DRAT, drat); | ||
854 | ctl->dirty.bf.srt = 1; | ||
855 | return 0; | ||
856 | } | ||
857 | |||
858 | static int dai_srt_set_ec(void *blk, unsigned int ec) | ||
859 | { | ||
860 | struct dai_ctrl_blk *ctl = blk; | ||
861 | |||
862 | set_field(&ctl->srt, SRTCTL_EC, ec ? 1 : 0); | ||
863 | ctl->dirty.bf.srt = 1; | ||
864 | return 0; | ||
865 | } | ||
866 | |||
867 | static int dai_srt_set_et(void *blk, unsigned int et) | ||
868 | { | ||
869 | struct dai_ctrl_blk *ctl = blk; | ||
870 | |||
871 | set_field(&ctl->srt, SRTCTL_ET, et ? 1 : 0); | ||
872 | ctl->dirty.bf.srt = 1; | ||
873 | return 0; | ||
874 | } | ||
875 | |||
876 | static int dai_commit_write(struct hw *hw, unsigned int idx, void *blk) | ||
877 | { | ||
878 | struct dai_ctrl_blk *ctl = blk; | ||
879 | |||
880 | if (ctl->dirty.bf.srt) { | ||
881 | hw_write_20kx(hw, AUDIO_IO_RX_SRT_CTL+0x40*idx, ctl->srt); | ||
882 | ctl->dirty.bf.srt = 0; | ||
883 | } | ||
884 | |||
885 | return 0; | ||
886 | } | ||
887 | |||
888 | static int dai_get_ctrl_blk(void **rblk) | ||
889 | { | ||
890 | struct dai_ctrl_blk *blk; | ||
891 | |||
892 | *rblk = NULL; | ||
893 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
894 | if (NULL == blk) | ||
895 | return -ENOMEM; | ||
896 | |||
897 | *rblk = blk; | ||
898 | |||
899 | return 0; | ||
900 | } | ||
901 | |||
902 | static int dai_put_ctrl_blk(void *blk) | ||
903 | { | ||
904 | kfree(blk); | ||
905 | |||
906 | return 0; | ||
907 | } | ||
908 | |||
909 | static int dao_set_spos(void *blk, unsigned int spos) | ||
910 | { | ||
911 | ((struct dao_ctrl_blk *)blk)->atxcsl = spos; | ||
912 | ((struct dao_ctrl_blk *)blk)->dirty.bf.atxcsl = 1; | ||
913 | return 0; | ||
914 | } | ||
915 | |||
916 | static int dao_commit_write(struct hw *hw, unsigned int idx, void *blk) | ||
917 | { | ||
918 | struct dao_ctrl_blk *ctl = blk; | ||
919 | |||
920 | if (ctl->dirty.bf.atxcsl) { | ||
921 | if (idx < 4) { | ||
922 | /* S/PDIF SPOSx */ | ||
923 | hw_write_20kx(hw, AUDIO_IO_TX_CSTAT_L+0x40*idx, | ||
924 | ctl->atxcsl); | ||
925 | } | ||
926 | ctl->dirty.bf.atxcsl = 0; | ||
927 | } | ||
928 | |||
929 | return 0; | ||
930 | } | ||
931 | |||
932 | static int dao_get_spos(void *blk, unsigned int *spos) | ||
933 | { | ||
934 | *spos = ((struct dao_ctrl_blk *)blk)->atxcsl; | ||
935 | return 0; | ||
936 | } | ||
937 | |||
938 | static int dao_get_ctrl_blk(void **rblk) | ||
939 | { | ||
940 | struct dao_ctrl_blk *blk; | ||
941 | |||
942 | *rblk = NULL; | ||
943 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
944 | if (NULL == blk) | ||
945 | return -ENOMEM; | ||
946 | |||
947 | *rblk = blk; | ||
948 | |||
949 | return 0; | ||
950 | } | ||
951 | |||
952 | static int dao_put_ctrl_blk(void *blk) | ||
953 | { | ||
954 | kfree(blk); | ||
955 | |||
956 | return 0; | ||
957 | } | ||
958 | |||
959 | static int daio_mgr_enb_dai(void *blk, unsigned int idx) | ||
960 | { | ||
961 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
962 | |||
963 | set_field(&ctl->rxctl[idx], ARXCTL_EN, 1); | ||
964 | ctl->dirty.bf.arxctl |= (0x1 << idx); | ||
965 | return 0; | ||
966 | } | ||
967 | |||
968 | static int daio_mgr_dsb_dai(void *blk, unsigned int idx) | ||
969 | { | ||
970 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
971 | |||
972 | set_field(&ctl->rxctl[idx], ARXCTL_EN, 0); | ||
973 | |||
974 | ctl->dirty.bf.arxctl |= (0x1 << idx); | ||
975 | return 0; | ||
976 | } | ||
977 | |||
978 | static int daio_mgr_enb_dao(void *blk, unsigned int idx) | ||
979 | { | ||
980 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
981 | |||
982 | set_field(&ctl->txctl[idx], ATXCTL_EN, 1); | ||
983 | ctl->dirty.bf.atxctl |= (0x1 << idx); | ||
984 | return 0; | ||
985 | } | ||
986 | |||
987 | static int daio_mgr_dsb_dao(void *blk, unsigned int idx) | ||
988 | { | ||
989 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
990 | |||
991 | set_field(&ctl->txctl[idx], ATXCTL_EN, 0); | ||
992 | ctl->dirty.bf.atxctl |= (0x1 << idx); | ||
993 | return 0; | ||
994 | } | ||
995 | |||
996 | static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf) | ||
997 | { | ||
998 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
999 | |||
1000 | if (idx < 4) { | ||
1001 | /* S/PDIF output */ | ||
1002 | switch ((conf & 0x7)) { | ||
1003 | case 1: | ||
1004 | set_field(&ctl->txctl[idx], ATXCTL_NUC, 0); | ||
1005 | break; | ||
1006 | case 2: | ||
1007 | set_field(&ctl->txctl[idx], ATXCTL_NUC, 1); | ||
1008 | break; | ||
1009 | case 4: | ||
1010 | set_field(&ctl->txctl[idx], ATXCTL_NUC, 2); | ||
1011 | break; | ||
1012 | case 8: | ||
1013 | set_field(&ctl->txctl[idx], ATXCTL_NUC, 3); | ||
1014 | break; | ||
1015 | default: | ||
1016 | break; | ||
1017 | } | ||
1018 | /* CDIF */ | ||
1019 | set_field(&ctl->txctl[idx], ATXCTL_CD, (!(conf & 0x7))); | ||
1020 | /* Non-audio */ | ||
1021 | set_field(&ctl->txctl[idx], ATXCTL_LIV, (conf >> 4) & 0x1); | ||
1022 | /* Non-audio */ | ||
1023 | set_field(&ctl->txctl[idx], ATXCTL_RIV, (conf >> 4) & 0x1); | ||
1024 | set_field(&ctl->txctl[idx], ATXCTL_RAW, | ||
1025 | ((conf >> 3) & 0x1) ? 0 : 0); | ||
1026 | ctl->dirty.bf.atxctl |= (0x1 << idx); | ||
1027 | } else { | ||
1028 | /* I2S output */ | ||
1029 | /*idx %= 4; */ | ||
1030 | } | ||
1031 | return 0; | ||
1032 | } | ||
1033 | |||
1034 | static int daio_mgr_set_imaparc(void *blk, unsigned int slot) | ||
1035 | { | ||
1036 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
1037 | |||
1038 | set_field(&ctl->daoimap.aim, AIM_ARC, slot); | ||
1039 | ctl->dirty.bf.daoimap = 1; | ||
1040 | return 0; | ||
1041 | } | ||
1042 | |||
1043 | static int daio_mgr_set_imapnxt(void *blk, unsigned int next) | ||
1044 | { | ||
1045 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
1046 | |||
1047 | set_field(&ctl->daoimap.aim, AIM_NXT, next); | ||
1048 | ctl->dirty.bf.daoimap = 1; | ||
1049 | return 0; | ||
1050 | } | ||
1051 | |||
1052 | static int daio_mgr_set_imapaddr(void *blk, unsigned int addr) | ||
1053 | { | ||
1054 | ((struct daio_mgr_ctrl_blk *)blk)->daoimap.idx = addr; | ||
1055 | ((struct daio_mgr_ctrl_blk *)blk)->dirty.bf.daoimap = 1; | ||
1056 | return 0; | ||
1057 | } | ||
1058 | |||
1059 | static int daio_mgr_commit_write(struct hw *hw, void *blk) | ||
1060 | { | ||
1061 | struct daio_mgr_ctrl_blk *ctl = blk; | ||
1062 | unsigned int data; | ||
1063 | int i; | ||
1064 | |||
1065 | for (i = 0; i < 8; i++) { | ||
1066 | if ((ctl->dirty.bf.atxctl & (0x1 << i))) { | ||
1067 | data = ctl->txctl[i]; | ||
1068 | hw_write_20kx(hw, (AUDIO_IO_TX_CTL+(0x40*i)), data); | ||
1069 | ctl->dirty.bf.atxctl &= ~(0x1 << i); | ||
1070 | mdelay(1); | ||
1071 | } | ||
1072 | if ((ctl->dirty.bf.arxctl & (0x1 << i))) { | ||
1073 | data = ctl->rxctl[i]; | ||
1074 | hw_write_20kx(hw, (AUDIO_IO_RX_CTL+(0x40*i)), data); | ||
1075 | ctl->dirty.bf.arxctl &= ~(0x1 << i); | ||
1076 | mdelay(1); | ||
1077 | } | ||
1078 | } | ||
1079 | if (ctl->dirty.bf.daoimap) { | ||
1080 | hw_write_20kx(hw, AUDIO_IO_AIM+ctl->daoimap.idx*4, | ||
1081 | ctl->daoimap.aim); | ||
1082 | ctl->dirty.bf.daoimap = 0; | ||
1083 | } | ||
1084 | |||
1085 | return 0; | ||
1086 | } | ||
1087 | |||
1088 | static int daio_mgr_get_ctrl_blk(struct hw *hw, void **rblk) | ||
1089 | { | ||
1090 | struct daio_mgr_ctrl_blk *blk; | ||
1091 | int i; | ||
1092 | |||
1093 | *rblk = NULL; | ||
1094 | blk = kzalloc(sizeof(*blk), GFP_KERNEL); | ||
1095 | if (NULL == blk) | ||
1096 | return -ENOMEM; | ||
1097 | |||
1098 | for (i = 0; i < 8; i++) { | ||
1099 | blk->txctl[i] = hw_read_20kx(hw, AUDIO_IO_TX_CTL+(0x40*i)); | ||
1100 | blk->rxctl[i] = hw_read_20kx(hw, AUDIO_IO_RX_CTL+(0x40*i)); | ||
1101 | } | ||
1102 | |||
1103 | *rblk = blk; | ||
1104 | |||
1105 | return 0; | ||
1106 | } | ||
1107 | |||
1108 | static int daio_mgr_put_ctrl_blk(void *blk) | ||
1109 | { | ||
1110 | kfree(blk); | ||
1111 | |||
1112 | return 0; | ||
1113 | } | ||
1114 | |||
1115 | /* Card hardware initialization block */ | ||
1116 | struct dac_conf { | ||
1117 | unsigned int msr; /* master sample rate in rsrs */ | ||
1118 | }; | ||
1119 | |||
1120 | struct adc_conf { | ||
1121 | unsigned int msr; /* master sample rate in rsrs */ | ||
1122 | unsigned char input; /* the input source of ADC */ | ||
1123 | unsigned char mic20db; /* boost mic by 20db if input is microphone */ | ||
1124 | }; | ||
1125 | |||
1126 | struct daio_conf { | ||
1127 | unsigned int msr; /* master sample rate in rsrs */ | ||
1128 | }; | ||
1129 | |||
1130 | struct trn_conf { | ||
1131 | unsigned long vm_pgt_phys; | ||
1132 | }; | ||
1133 | |||
1134 | static int hw_daio_init(struct hw *hw, const struct daio_conf *info) | ||
1135 | { | ||
1136 | u32 data; | ||
1137 | int i; | ||
1138 | |||
1139 | /* Program I2S with proper sample rate and enable the correct I2S | ||
1140 | * channel. ED(0/8/16/24): Enable all I2S/I2X master clock output */ | ||
1141 | if (1 == info->msr) { | ||
1142 | hw_write_20kx(hw, AUDIO_IO_MCLK, 0x01010101); | ||
1143 | hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x01010101); | ||
1144 | hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0); | ||
1145 | } else if (2 == info->msr) { | ||
1146 | hw_write_20kx(hw, AUDIO_IO_MCLK, 0x11111111); | ||
1147 | /* Specify all playing 96khz | ||
1148 | * EA [0] - Enabled | ||
1149 | * RTA [4:5] - 96kHz | ||
1150 | * EB [8] - Enabled | ||
1151 | * RTB [12:13] - 96kHz | ||
1152 | * EC [16] - Enabled | ||
1153 | * RTC [20:21] - 96kHz | ||
1154 | * ED [24] - Enabled | ||
1155 | * RTD [28:29] - 96kHz */ | ||
1156 | hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x11111111); | ||
1157 | hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0); | ||
1158 | } else { | ||
1159 | printk(KERN_ALERT "ctxfi: ERROR!!! Invalid sampling rate!!!\n"); | ||
1160 | return -EINVAL; | ||
1161 | } | ||
1162 | |||
1163 | for (i = 0; i < 8; i++) { | ||
1164 | if (i <= 3) { | ||
1165 | /* 1st 3 channels are SPDIFs (SB0960) */ | ||
1166 | if (i == 3) | ||
1167 | data = 0x1001001; | ||
1168 | else | ||
1169 | data = 0x1000001; | ||
1170 | |||
1171 | hw_write_20kx(hw, (AUDIO_IO_TX_CTL+(0x40*i)), data); | ||
1172 | hw_write_20kx(hw, (AUDIO_IO_RX_CTL+(0x40*i)), data); | ||
1173 | |||
1174 | /* Initialize the SPDIF Out Channel status registers. | ||
1175 | * The value specified here is based on the typical | ||
1176 | * values provided in the specification, namely: Clock | ||
1177 | * Accuracy of 1000ppm, Sample Rate of 48KHz, | ||
1178 | * unspecified source number, Generation status = 1, | ||
1179 | * Category code = 0x12 (Digital Signal Mixer), | ||
1180 | * Mode = 0, Emph = 0, Copy Permitted, AN = 0 | ||
1181 | * (indicating that we're transmitting digital audio, | ||
1182 | * and the Professional Use bit is 0. */ | ||
1183 | |||
1184 | hw_write_20kx(hw, AUDIO_IO_TX_CSTAT_L+(0x40*i), | ||
1185 | 0x02109204); /* Default to 48kHz */ | ||
1186 | |||
1187 | hw_write_20kx(hw, AUDIO_IO_TX_CSTAT_H+(0x40*i), 0x0B); | ||
1188 | } else { | ||
1189 | /* Next 5 channels are I2S (SB0960) */ | ||
1190 | data = 0x11; | ||
1191 | hw_write_20kx(hw, AUDIO_IO_RX_CTL+(0x40*i), data); | ||
1192 | if (2 == info->msr) { | ||
1193 | /* Four channels per sample period */ | ||
1194 | data |= 0x1000; | ||
1195 | } | ||
1196 | hw_write_20kx(hw, AUDIO_IO_TX_CTL+(0x40*i), data); | ||
1197 | } | ||
1198 | } | ||
1199 | |||
1200 | return 0; | ||
1201 | } | ||
1202 | |||
1203 | /* TRANSPORT operations */ | ||
1204 | static int hw_trn_init(struct hw *hw, const struct trn_conf *info) | ||
1205 | { | ||
1206 | u32 vmctl, data; | ||
1207 | u32 ptp_phys_low, ptp_phys_high; | ||
1208 | int i; | ||
1209 | |||
1210 | /* Set up device page table */ | ||
1211 | if ((~0UL) == info->vm_pgt_phys) { | ||
1212 | printk(KERN_ALERT "ctxfi: " | ||
1213 | "Wrong device page table page address!!!\n"); | ||
1214 | return -1; | ||
1215 | } | ||
1216 | |||
1217 | vmctl = 0x80000C0F; /* 32-bit, 4k-size page */ | ||
1218 | ptp_phys_low = (u32)info->vm_pgt_phys; | ||
1219 | ptp_phys_high = upper_32_bits(info->vm_pgt_phys); | ||
1220 | if (sizeof(void *) == 8) /* 64bit address */ | ||
1221 | vmctl |= (3 << 8); | ||
1222 | /* Write page table physical address to all PTPAL registers */ | ||
1223 | for (i = 0; i < 64; i++) { | ||
1224 | hw_write_20kx(hw, VMEM_PTPAL+(16*i), ptp_phys_low); | ||
1225 | hw_write_20kx(hw, VMEM_PTPAH+(16*i), ptp_phys_high); | ||
1226 | } | ||
1227 | /* Enable virtual memory transfer */ | ||
1228 | hw_write_20kx(hw, VMEM_CTL, vmctl); | ||
1229 | /* Enable transport bus master and queueing of request */ | ||
1230 | hw_write_20kx(hw, TRANSPORT_CTL, 0x03); | ||
1231 | hw_write_20kx(hw, TRANSPORT_INT, 0x200c01); | ||
1232 | /* Enable transport ring */ | ||
1233 | data = hw_read_20kx(hw, TRANSPORT_ENB); | ||
1234 | hw_write_20kx(hw, TRANSPORT_ENB, (data | 0x03)); | ||
1235 | |||
1236 | return 0; | ||
1237 | } | ||
1238 | |||
1239 | /* Card initialization */ | ||
1240 | #define GCTL_AIE 0x00000001 | ||
1241 | #define GCTL_UAA 0x00000002 | ||
1242 | #define GCTL_DPC 0x00000004 | ||
1243 | #define GCTL_DBP 0x00000008 | ||
1244 | #define GCTL_ABP 0x00000010 | ||
1245 | #define GCTL_TBP 0x00000020 | ||
1246 | #define GCTL_SBP 0x00000040 | ||
1247 | #define GCTL_FBP 0x00000080 | ||
1248 | #define GCTL_ME 0x00000100 | ||
1249 | #define GCTL_AID 0x00001000 | ||
1250 | |||
1251 | #define PLLCTL_SRC 0x00000007 | ||
1252 | #define PLLCTL_SPE 0x00000008 | ||
1253 | #define PLLCTL_RD 0x000000F0 | ||
1254 | #define PLLCTL_FD 0x0001FF00 | ||
1255 | #define PLLCTL_OD 0x00060000 | ||
1256 | #define PLLCTL_B 0x00080000 | ||
1257 | #define PLLCTL_AS 0x00100000 | ||
1258 | #define PLLCTL_LF 0x03E00000 | ||
1259 | #define PLLCTL_SPS 0x1C000000 | ||
1260 | #define PLLCTL_AD 0x60000000 | ||
1261 | |||
1262 | #define PLLSTAT_CCS 0x00000007 | ||
1263 | #define PLLSTAT_SPL 0x00000008 | ||
1264 | #define PLLSTAT_CRD 0x000000F0 | ||
1265 | #define PLLSTAT_CFD 0x0001FF00 | ||
1266 | #define PLLSTAT_SL 0x00020000 | ||
1267 | #define PLLSTAT_FAS 0x00040000 | ||
1268 | #define PLLSTAT_B 0x00080000 | ||
1269 | #define PLLSTAT_PD 0x00100000 | ||
1270 | #define PLLSTAT_OCA 0x00200000 | ||
1271 | #define PLLSTAT_NCA 0x00400000 | ||
1272 | |||
1273 | static int hw_pll_init(struct hw *hw, unsigned int rsr) | ||
1274 | { | ||
1275 | unsigned int pllenb; | ||
1276 | unsigned int pllctl; | ||
1277 | unsigned int pllstat; | ||
1278 | int i; | ||
1279 | |||
1280 | pllenb = 0xB; | ||
1281 | hw_write_20kx(hw, PLL_ENB, pllenb); | ||
1282 | pllctl = 0x20D00000; | ||
1283 | set_field(&pllctl, PLLCTL_FD, 16 - 4); | ||
1284 | hw_write_20kx(hw, PLL_CTL, pllctl); | ||
1285 | mdelay(40); | ||
1286 | pllctl = hw_read_20kx(hw, PLL_CTL); | ||
1287 | set_field(&pllctl, PLLCTL_B, 0); | ||
1288 | if (48000 == rsr) { | ||
1289 | set_field(&pllctl, PLLCTL_FD, 16 - 2); | ||
1290 | set_field(&pllctl, PLLCTL_RD, 1 - 1); | ||
1291 | } else { /* 44100 */ | ||
1292 | set_field(&pllctl, PLLCTL_FD, 147 - 2); | ||
1293 | set_field(&pllctl, PLLCTL_RD, 10 - 1); | ||
1294 | } | ||
1295 | hw_write_20kx(hw, PLL_CTL, pllctl); | ||
1296 | mdelay(40); | ||
1297 | for (i = 0; i < 1000; i++) { | ||
1298 | pllstat = hw_read_20kx(hw, PLL_STAT); | ||
1299 | if (get_field(pllstat, PLLSTAT_PD)) | ||
1300 | continue; | ||
1301 | |||
1302 | if (get_field(pllstat, PLLSTAT_B) != | ||
1303 | get_field(pllctl, PLLCTL_B)) | ||
1304 | continue; | ||
1305 | |||
1306 | if (get_field(pllstat, PLLSTAT_CCS) != | ||
1307 | get_field(pllctl, PLLCTL_SRC)) | ||
1308 | continue; | ||
1309 | |||
1310 | if (get_field(pllstat, PLLSTAT_CRD) != | ||
1311 | get_field(pllctl, PLLCTL_RD)) | ||
1312 | continue; | ||
1313 | |||
1314 | if (get_field(pllstat, PLLSTAT_CFD) != | ||
1315 | get_field(pllctl, PLLCTL_FD)) | ||
1316 | continue; | ||
1317 | |||
1318 | break; | ||
1319 | } | ||
1320 | if (i >= 1000) { | ||
1321 | printk(KERN_ALERT "ctxfi: PLL initialization failed!!!\n"); | ||
1322 | return -EBUSY; | ||
1323 | } | ||
1324 | |||
1325 | return 0; | ||
1326 | } | ||
1327 | |||
1328 | static int hw_auto_init(struct hw *hw) | ||
1329 | { | ||
1330 | unsigned int gctl; | ||
1331 | int i; | ||
1332 | |||
1333 | gctl = hw_read_20kx(hw, GLOBAL_CNTL_GCTL); | ||
1334 | set_field(&gctl, GCTL_AIE, 0); | ||
1335 | hw_write_20kx(hw, GLOBAL_CNTL_GCTL, gctl); | ||
1336 | set_field(&gctl, GCTL_AIE, 1); | ||
1337 | hw_write_20kx(hw, GLOBAL_CNTL_GCTL, gctl); | ||
1338 | mdelay(10); | ||
1339 | for (i = 0; i < 400000; i++) { | ||
1340 | gctl = hw_read_20kx(hw, GLOBAL_CNTL_GCTL); | ||
1341 | if (get_field(gctl, GCTL_AID)) | ||
1342 | break; | ||
1343 | } | ||
1344 | if (!get_field(gctl, GCTL_AID)) { | ||
1345 | printk(KERN_ALERT "ctxfi: Card Auto-init failed!!!\n"); | ||
1346 | return -EBUSY; | ||
1347 | } | ||
1348 | |||
1349 | return 0; | ||
1350 | } | ||
1351 | |||
1352 | /* DAC operations */ | ||
1353 | |||
1354 | #define CS4382_MC1 0x1 | ||
1355 | #define CS4382_MC2 0x2 | ||
1356 | #define CS4382_MC3 0x3 | ||
1357 | #define CS4382_FC 0x4 | ||
1358 | #define CS4382_IC 0x5 | ||
1359 | #define CS4382_XC1 0x6 | ||
1360 | #define CS4382_VCA1 0x7 | ||
1361 | #define CS4382_VCB1 0x8 | ||
1362 | #define CS4382_XC2 0x9 | ||
1363 | #define CS4382_VCA2 0xA | ||
1364 | #define CS4382_VCB2 0xB | ||
1365 | #define CS4382_XC3 0xC | ||
1366 | #define CS4382_VCA3 0xD | ||
1367 | #define CS4382_VCB3 0xE | ||
1368 | #define CS4382_XC4 0xF | ||
1369 | #define CS4382_VCA4 0x10 | ||
1370 | #define CS4382_VCB4 0x11 | ||
1371 | #define CS4382_CREV 0x12 | ||
1372 | |||
1373 | /* I2C status */ | ||
1374 | #define STATE_LOCKED 0x00 | ||
1375 | #define STATE_UNLOCKED 0xAA | ||
1376 | #define DATA_READY 0x800000 /* Used with I2C_IF_STATUS */ | ||
1377 | #define DATA_ABORT 0x10000 /* Used with I2C_IF_STATUS */ | ||
1378 | |||
1379 | #define I2C_STATUS_DCM 0x00000001 | ||
1380 | #define I2C_STATUS_BC 0x00000006 | ||
1381 | #define I2C_STATUS_APD 0x00000008 | ||
1382 | #define I2C_STATUS_AB 0x00010000 | ||
1383 | #define I2C_STATUS_DR 0x00800000 | ||
1384 | |||
1385 | #define I2C_ADDRESS_PTAD 0x0000FFFF | ||
1386 | #define I2C_ADDRESS_SLAD 0x007F0000 | ||
1387 | |||
1388 | struct regs_cs4382 { | ||
1389 | u32 mode_control_1; | ||
1390 | u32 mode_control_2; | ||
1391 | u32 mode_control_3; | ||
1392 | |||
1393 | u32 filter_control; | ||
1394 | u32 invert_control; | ||
1395 | |||
1396 | u32 mix_control_P1; | ||
1397 | u32 vol_control_A1; | ||
1398 | u32 vol_control_B1; | ||
1399 | |||
1400 | u32 mix_control_P2; | ||
1401 | u32 vol_control_A2; | ||
1402 | u32 vol_control_B2; | ||
1403 | |||
1404 | u32 mix_control_P3; | ||
1405 | u32 vol_control_A3; | ||
1406 | u32 vol_control_B3; | ||
1407 | |||
1408 | u32 mix_control_P4; | ||
1409 | u32 vol_control_A4; | ||
1410 | u32 vol_control_B4; | ||
1411 | }; | ||
1412 | |||
1413 | static int hw20k2_i2c_unlock_full_access(struct hw *hw) | ||
1414 | { | ||
1415 | u8 UnlockKeySequence_FLASH_FULLACCESS_MODE[2] = {0xB3, 0xD4}; | ||
1416 | |||
1417 | /* Send keys for forced BIOS mode */ | ||
1418 | hw_write_20kx(hw, I2C_IF_WLOCK, | ||
1419 | UnlockKeySequence_FLASH_FULLACCESS_MODE[0]); | ||
1420 | hw_write_20kx(hw, I2C_IF_WLOCK, | ||
1421 | UnlockKeySequence_FLASH_FULLACCESS_MODE[1]); | ||
1422 | /* Check whether the chip is unlocked */ | ||
1423 | if (hw_read_20kx(hw, I2C_IF_WLOCK) == STATE_UNLOCKED) | ||
1424 | return 0; | ||
1425 | |||
1426 | return -1; | ||
1427 | } | ||
1428 | |||
1429 | static int hw20k2_i2c_lock_chip(struct hw *hw) | ||
1430 | { | ||
1431 | /* Write twice */ | ||
1432 | hw_write_20kx(hw, I2C_IF_WLOCK, STATE_LOCKED); | ||
1433 | hw_write_20kx(hw, I2C_IF_WLOCK, STATE_LOCKED); | ||
1434 | if (hw_read_20kx(hw, I2C_IF_WLOCK) == STATE_LOCKED) | ||
1435 | return 0; | ||
1436 | |||
1437 | return -1; | ||
1438 | } | ||
1439 | |||
1440 | static int hw20k2_i2c_init(struct hw *hw, u8 dev_id, u8 addr_size, u8 data_size) | ||
1441 | { | ||
1442 | struct hw20k2 *hw20k2 = (struct hw20k2 *)hw; | ||
1443 | int err; | ||
1444 | unsigned int i2c_status; | ||
1445 | unsigned int i2c_addr; | ||
1446 | |||
1447 | err = hw20k2_i2c_unlock_full_access(hw); | ||
1448 | if (err < 0) | ||
1449 | return err; | ||
1450 | |||
1451 | hw20k2->addr_size = addr_size; | ||
1452 | hw20k2->data_size = data_size; | ||
1453 | hw20k2->dev_id = dev_id; | ||
1454 | |||
1455 | i2c_addr = 0; | ||
1456 | set_field(&i2c_addr, I2C_ADDRESS_SLAD, dev_id); | ||
1457 | |||
1458 | hw_write_20kx(hw, I2C_IF_ADDRESS, i2c_addr); | ||
1459 | |||
1460 | i2c_status = hw_read_20kx(hw, I2C_IF_STATUS); | ||
1461 | |||
1462 | set_field(&i2c_status, I2C_STATUS_DCM, 1); /* Direct control mode */ | ||
1463 | |||
1464 | hw_write_20kx(hw, I2C_IF_STATUS, i2c_status); | ||
1465 | |||
1466 | return 0; | ||
1467 | } | ||
1468 | |||
1469 | static int hw20k2_i2c_uninit(struct hw *hw) | ||
1470 | { | ||
1471 | unsigned int i2c_status; | ||
1472 | unsigned int i2c_addr; | ||
1473 | |||
1474 | i2c_addr = 0; | ||
1475 | set_field(&i2c_addr, I2C_ADDRESS_SLAD, 0x57); /* I2C id */ | ||
1476 | |||
1477 | hw_write_20kx(hw, I2C_IF_ADDRESS, i2c_addr); | ||
1478 | |||
1479 | i2c_status = hw_read_20kx(hw, I2C_IF_STATUS); | ||
1480 | |||
1481 | set_field(&i2c_status, I2C_STATUS_DCM, 0); /* I2C mode */ | ||
1482 | |||
1483 | hw_write_20kx(hw, I2C_IF_STATUS, i2c_status); | ||
1484 | |||
1485 | return hw20k2_i2c_lock_chip(hw); | ||
1486 | } | ||
1487 | |||
1488 | static int hw20k2_i2c_wait_data_ready(struct hw *hw) | ||
1489 | { | ||
1490 | int i = 0x400000; | ||
1491 | unsigned int ret; | ||
1492 | |||
1493 | do { | ||
1494 | ret = hw_read_20kx(hw, I2C_IF_STATUS); | ||
1495 | } while ((!(ret & DATA_READY)) && --i); | ||
1496 | |||
1497 | return i; | ||
1498 | } | ||
1499 | |||
1500 | static int hw20k2_i2c_read(struct hw *hw, u16 addr, u32 *datap) | ||
1501 | { | ||
1502 | struct hw20k2 *hw20k2 = (struct hw20k2 *)hw; | ||
1503 | unsigned int i2c_status; | ||
1504 | |||
1505 | i2c_status = hw_read_20kx(hw, I2C_IF_STATUS); | ||
1506 | set_field(&i2c_status, I2C_STATUS_BC, | ||
1507 | (4 == hw20k2->addr_size) ? 0 : hw20k2->addr_size); | ||
1508 | hw_write_20kx(hw, I2C_IF_STATUS, i2c_status); | ||
1509 | if (!hw20k2_i2c_wait_data_ready(hw)) | ||
1510 | return -1; | ||
1511 | |||
1512 | hw_write_20kx(hw, I2C_IF_WDATA, addr); | ||
1513 | if (!hw20k2_i2c_wait_data_ready(hw)) | ||
1514 | return -1; | ||
1515 | |||
1516 | /* Force a read operation */ | ||
1517 | hw_write_20kx(hw, I2C_IF_RDATA, 0); | ||
1518 | if (!hw20k2_i2c_wait_data_ready(hw)) | ||
1519 | return -1; | ||
1520 | |||
1521 | *datap = hw_read_20kx(hw, I2C_IF_RDATA); | ||
1522 | |||
1523 | return 0; | ||
1524 | } | ||
1525 | |||
1526 | static int hw20k2_i2c_write(struct hw *hw, u16 addr, u32 data) | ||
1527 | { | ||
1528 | struct hw20k2 *hw20k2 = (struct hw20k2 *)hw; | ||
1529 | unsigned int i2c_data = (data << (hw20k2->addr_size * 8)) | addr; | ||
1530 | unsigned int i2c_status; | ||
1531 | |||
1532 | i2c_status = hw_read_20kx(hw, I2C_IF_STATUS); | ||
1533 | |||
1534 | set_field(&i2c_status, I2C_STATUS_BC, | ||
1535 | (4 == (hw20k2->addr_size + hw20k2->data_size)) ? | ||
1536 | 0 : (hw20k2->addr_size + hw20k2->data_size)); | ||
1537 | |||
1538 | hw_write_20kx(hw, I2C_IF_STATUS, i2c_status); | ||
1539 | hw20k2_i2c_wait_data_ready(hw); | ||
1540 | /* Dummy write to trigger the write oprtation */ | ||
1541 | hw_write_20kx(hw, I2C_IF_WDATA, 0); | ||
1542 | hw20k2_i2c_wait_data_ready(hw); | ||
1543 | |||
1544 | /* This is the real data */ | ||
1545 | hw_write_20kx(hw, I2C_IF_WDATA, i2c_data); | ||
1546 | hw20k2_i2c_wait_data_ready(hw); | ||
1547 | |||
1548 | return 0; | ||
1549 | } | ||
1550 | |||
1551 | static int hw_dac_init(struct hw *hw, const struct dac_conf *info) | ||
1552 | { | ||
1553 | int err; | ||
1554 | u32 data; | ||
1555 | int i; | ||
1556 | struct regs_cs4382 cs_read = {0}; | ||
1557 | struct regs_cs4382 cs_def = { | ||
1558 | 0x00000001, /* Mode Control 1 */ | ||
1559 | 0x00000000, /* Mode Control 2 */ | ||
1560 | 0x00000084, /* Mode Control 3 */ | ||
1561 | 0x00000000, /* Filter Control */ | ||
1562 | 0x00000000, /* Invert Control */ | ||
1563 | 0x00000024, /* Mixing Control Pair 1 */ | ||
1564 | 0x00000000, /* Vol Control A1 */ | ||
1565 | 0x00000000, /* Vol Control B1 */ | ||
1566 | 0x00000024, /* Mixing Control Pair 2 */ | ||
1567 | 0x00000000, /* Vol Control A2 */ | ||
1568 | 0x00000000, /* Vol Control B2 */ | ||
1569 | 0x00000024, /* Mixing Control Pair 3 */ | ||
1570 | 0x00000000, /* Vol Control A3 */ | ||
1571 | 0x00000000, /* Vol Control B3 */ | ||
1572 | 0x00000024, /* Mixing Control Pair 4 */ | ||
1573 | 0x00000000, /* Vol Control A4 */ | ||
1574 | 0x00000000 /* Vol Control B4 */ | ||
1575 | }; | ||
1576 | |||
1577 | /* Set DAC reset bit as output */ | ||
1578 | data = hw_read_20kx(hw, GPIO_CTRL); | ||
1579 | data |= 0x02; | ||
1580 | hw_write_20kx(hw, GPIO_CTRL, data); | ||
1581 | |||
1582 | err = hw20k2_i2c_init(hw, 0x18, 1, 1); | ||
1583 | if (err < 0) | ||
1584 | goto End; | ||
1585 | |||
1586 | for (i = 0; i < 2; i++) { | ||
1587 | /* Reset DAC twice just in-case the chip | ||
1588 | * didn't initialized properly */ | ||
1589 | data = hw_read_20kx(hw, GPIO_DATA); | ||
1590 | /* GPIO data bit 1 */ | ||
1591 | data &= 0xFFFFFFFD; | ||
1592 | hw_write_20kx(hw, GPIO_DATA, data); | ||
1593 | mdelay(10); | ||
1594 | data |= 0x2; | ||
1595 | hw_write_20kx(hw, GPIO_DATA, data); | ||
1596 | mdelay(50); | ||
1597 | |||
1598 | /* Reset the 2nd time */ | ||
1599 | data &= 0xFFFFFFFD; | ||
1600 | hw_write_20kx(hw, GPIO_DATA, data); | ||
1601 | mdelay(10); | ||
1602 | data |= 0x2; | ||
1603 | hw_write_20kx(hw, GPIO_DATA, data); | ||
1604 | mdelay(50); | ||
1605 | |||
1606 | if (hw20k2_i2c_read(hw, CS4382_MC1, &cs_read.mode_control_1)) | ||
1607 | continue; | ||
1608 | |||
1609 | if (hw20k2_i2c_read(hw, CS4382_MC2, &cs_read.mode_control_2)) | ||
1610 | continue; | ||
1611 | |||
1612 | if (hw20k2_i2c_read(hw, CS4382_MC3, &cs_read.mode_control_3)) | ||
1613 | continue; | ||
1614 | |||
1615 | if (hw20k2_i2c_read(hw, CS4382_FC, &cs_read.filter_control)) | ||
1616 | continue; | ||
1617 | |||
1618 | if (hw20k2_i2c_read(hw, CS4382_IC, &cs_read.invert_control)) | ||
1619 | continue; | ||
1620 | |||
1621 | if (hw20k2_i2c_read(hw, CS4382_XC1, &cs_read.mix_control_P1)) | ||
1622 | continue; | ||
1623 | |||
1624 | if (hw20k2_i2c_read(hw, CS4382_VCA1, &cs_read.vol_control_A1)) | ||
1625 | continue; | ||
1626 | |||
1627 | if (hw20k2_i2c_read(hw, CS4382_VCB1, &cs_read.vol_control_B1)) | ||
1628 | continue; | ||
1629 | |||
1630 | if (hw20k2_i2c_read(hw, CS4382_XC2, &cs_read.mix_control_P2)) | ||
1631 | continue; | ||
1632 | |||
1633 | if (hw20k2_i2c_read(hw, CS4382_VCA2, &cs_read.vol_control_A2)) | ||
1634 | continue; | ||
1635 | |||
1636 | if (hw20k2_i2c_read(hw, CS4382_VCB2, &cs_read.vol_control_B2)) | ||
1637 | continue; | ||
1638 | |||
1639 | if (hw20k2_i2c_read(hw, CS4382_XC3, &cs_read.mix_control_P3)) | ||
1640 | continue; | ||
1641 | |||
1642 | if (hw20k2_i2c_read(hw, CS4382_VCA3, &cs_read.vol_control_A3)) | ||
1643 | continue; | ||
1644 | |||
1645 | if (hw20k2_i2c_read(hw, CS4382_VCB3, &cs_read.vol_control_B3)) | ||
1646 | continue; | ||
1647 | |||
1648 | if (hw20k2_i2c_read(hw, CS4382_XC4, &cs_read.mix_control_P4)) | ||
1649 | continue; | ||
1650 | |||
1651 | if (hw20k2_i2c_read(hw, CS4382_VCA4, &cs_read.vol_control_A4)) | ||
1652 | continue; | ||
1653 | |||
1654 | if (hw20k2_i2c_read(hw, CS4382_VCB4, &cs_read.vol_control_B4)) | ||
1655 | continue; | ||
1656 | |||
1657 | if (memcmp(&cs_read, &cs_def, sizeof(cs_read))) | ||
1658 | continue; | ||
1659 | else | ||
1660 | break; | ||
1661 | } | ||
1662 | |||
1663 | if (i >= 2) | ||
1664 | goto End; | ||
1665 | |||
1666 | /* Note: Every I2C write must have some delay. | ||
1667 | * This is not a requirement but the delay works here... */ | ||
1668 | hw20k2_i2c_write(hw, CS4382_MC1, 0x80); | ||
1669 | hw20k2_i2c_write(hw, CS4382_MC2, 0x10); | ||
1670 | if (1 == info->msr) { | ||
1671 | hw20k2_i2c_write(hw, CS4382_XC1, 0x24); | ||
1672 | hw20k2_i2c_write(hw, CS4382_XC2, 0x24); | ||
1673 | hw20k2_i2c_write(hw, CS4382_XC3, 0x24); | ||
1674 | hw20k2_i2c_write(hw, CS4382_XC4, 0x24); | ||
1675 | } else if (2 == info->msr) { | ||
1676 | hw20k2_i2c_write(hw, CS4382_XC1, 0x25); | ||
1677 | hw20k2_i2c_write(hw, CS4382_XC2, 0x25); | ||
1678 | hw20k2_i2c_write(hw, CS4382_XC3, 0x25); | ||
1679 | hw20k2_i2c_write(hw, CS4382_XC4, 0x25); | ||
1680 | } else { | ||
1681 | hw20k2_i2c_write(hw, CS4382_XC1, 0x26); | ||
1682 | hw20k2_i2c_write(hw, CS4382_XC2, 0x26); | ||
1683 | hw20k2_i2c_write(hw, CS4382_XC3, 0x26); | ||
1684 | hw20k2_i2c_write(hw, CS4382_XC4, 0x26); | ||
1685 | } | ||
1686 | |||
1687 | return 0; | ||
1688 | End: | ||
1689 | |||
1690 | hw20k2_i2c_uninit(hw); | ||
1691 | return -1; | ||
1692 | } | ||
1693 | |||
1694 | /* ADC operations */ | ||
1695 | #define MAKE_WM8775_ADDR(addr, data) (u32)(((addr<<1)&0xFE)|((data>>8)&0x1)) | ||
1696 | #define MAKE_WM8775_DATA(data) (u32)(data&0xFF) | ||
1697 | |||
1698 | #define WM8775_IC 0x0B | ||
1699 | #define WM8775_MMC 0x0C | ||
1700 | #define WM8775_AADCL 0x0E | ||
1701 | #define WM8775_AADCR 0x0F | ||
1702 | #define WM8775_ADCMC 0x15 | ||
1703 | #define WM8775_RESET 0x17 | ||
1704 | |||
1705 | static int hw_is_adc_input_selected(struct hw *hw, enum ADCSRC type) | ||
1706 | { | ||
1707 | u32 data; | ||
1708 | |||
1709 | data = hw_read_20kx(hw, GPIO_DATA); | ||
1710 | switch (type) { | ||
1711 | case ADC_MICIN: | ||
1712 | data = (data & (0x1 << 14)) ? 1 : 0; | ||
1713 | break; | ||
1714 | case ADC_LINEIN: | ||
1715 | data = (data & (0x1 << 14)) ? 0 : 1; | ||
1716 | break; | ||
1717 | default: | ||
1718 | data = 0; | ||
1719 | } | ||
1720 | return data; | ||
1721 | } | ||
1722 | |||
1723 | static int hw_adc_input_select(struct hw *hw, enum ADCSRC type) | ||
1724 | { | ||
1725 | u32 data; | ||
1726 | |||
1727 | data = hw_read_20kx(hw, GPIO_DATA); | ||
1728 | switch (type) { | ||
1729 | case ADC_MICIN: | ||
1730 | data |= (0x1 << 14); | ||
1731 | hw_write_20kx(hw, GPIO_DATA, data); | ||
1732 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x101), | ||
1733 | MAKE_WM8775_DATA(0x101)); /* Mic-in */ | ||
1734 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xE7), | ||
1735 | MAKE_WM8775_DATA(0xE7)); /* +12dB boost */ | ||
1736 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xE7), | ||
1737 | MAKE_WM8775_DATA(0xE7)); /* +12dB boost */ | ||
1738 | break; | ||
1739 | case ADC_LINEIN: | ||
1740 | data &= ~(0x1 << 14); | ||
1741 | hw_write_20kx(hw, GPIO_DATA, data); | ||
1742 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x102), | ||
1743 | MAKE_WM8775_DATA(0x102)); /* Line-in */ | ||
1744 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xCF), | ||
1745 | MAKE_WM8775_DATA(0xCF)); /* No boost */ | ||
1746 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xCF), | ||
1747 | MAKE_WM8775_DATA(0xCF)); /* No boost */ | ||
1748 | break; | ||
1749 | default: | ||
1750 | break; | ||
1751 | } | ||
1752 | |||
1753 | return 0; | ||
1754 | } | ||
1755 | |||
1756 | static int hw_adc_init(struct hw *hw, const struct adc_conf *info) | ||
1757 | { | ||
1758 | int err; | ||
1759 | u32 mux = 2, data, ctl; | ||
1760 | |||
1761 | /* Set ADC reset bit as output */ | ||
1762 | data = hw_read_20kx(hw, GPIO_CTRL); | ||
1763 | data |= (0x1 << 15); | ||
1764 | hw_write_20kx(hw, GPIO_CTRL, data); | ||
1765 | |||
1766 | /* Initialize I2C */ | ||
1767 | err = hw20k2_i2c_init(hw, 0x1A, 1, 1); | ||
1768 | if (err < 0) { | ||
1769 | printk(KERN_ALERT "ctxfi: Failure to acquire I2C!!!\n"); | ||
1770 | goto error; | ||
1771 | } | ||
1772 | |||
1773 | /* Make ADC in normal operation */ | ||
1774 | data = hw_read_20kx(hw, GPIO_DATA); | ||
1775 | data &= ~(0x1 << 15); | ||
1776 | mdelay(10); | ||
1777 | data |= (0x1 << 15); | ||
1778 | hw_write_20kx(hw, GPIO_DATA, data); | ||
1779 | mdelay(50); | ||
1780 | |||
1781 | /* Set the master mode (256fs) */ | ||
1782 | if (1 == info->msr) { | ||
1783 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_MMC, 0x02), | ||
1784 | MAKE_WM8775_DATA(0x02)); | ||
1785 | } else if (2 == info->msr) { | ||
1786 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_MMC, 0x0A), | ||
1787 | MAKE_WM8775_DATA(0x0A)); | ||
1788 | } else { | ||
1789 | printk(KERN_ALERT "ctxfi: Invalid master sampling " | ||
1790 | "rate (msr %d)!!!\n", info->msr); | ||
1791 | err = -EINVAL; | ||
1792 | goto error; | ||
1793 | } | ||
1794 | |||
1795 | /* Configure GPIO bit 14 change to line-in/mic-in */ | ||
1796 | ctl = hw_read_20kx(hw, GPIO_CTRL); | ||
1797 | ctl |= 0x1 << 14; | ||
1798 | hw_write_20kx(hw, GPIO_CTRL, ctl); | ||
1799 | |||
1800 | /* Check using Mic-in or Line-in */ | ||
1801 | data = hw_read_20kx(hw, GPIO_DATA); | ||
1802 | |||
1803 | if (mux == 1) { | ||
1804 | /* Configures GPIO data to select Mic-in */ | ||
1805 | data |= 0x1 << 14; | ||
1806 | hw_write_20kx(hw, GPIO_DATA, data); | ||
1807 | |||
1808 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x101), | ||
1809 | MAKE_WM8775_DATA(0x101)); /* Mic-in */ | ||
1810 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xE7), | ||
1811 | MAKE_WM8775_DATA(0xE7)); /* +12dB boost */ | ||
1812 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xE7), | ||
1813 | MAKE_WM8775_DATA(0xE7)); /* +12dB boost */ | ||
1814 | } else if (mux == 2) { | ||
1815 | /* Configures GPIO data to select Line-in */ | ||
1816 | data &= ~(0x1 << 14); | ||
1817 | hw_write_20kx(hw, GPIO_DATA, data); | ||
1818 | |||
1819 | /* Setup ADC */ | ||
1820 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x102), | ||
1821 | MAKE_WM8775_DATA(0x102)); /* Line-in */ | ||
1822 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xCF), | ||
1823 | MAKE_WM8775_DATA(0xCF)); /* No boost */ | ||
1824 | hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xCF), | ||
1825 | MAKE_WM8775_DATA(0xCF)); /* No boost */ | ||
1826 | } else { | ||
1827 | printk(KERN_ALERT "ctxfi: ERROR!!! Invalid input mux!!!\n"); | ||
1828 | err = -EINVAL; | ||
1829 | goto error; | ||
1830 | } | ||
1831 | |||
1832 | return 0; | ||
1833 | |||
1834 | error: | ||
1835 | hw20k2_i2c_uninit(hw); | ||
1836 | return err; | ||
1837 | } | ||
1838 | |||
1839 | static int hw_have_digit_io_switch(struct hw *hw) | ||
1840 | { | ||
1841 | return 0; | ||
1842 | } | ||
1843 | |||
1844 | static int hw_card_start(struct hw *hw) | ||
1845 | { | ||
1846 | int err = 0; | ||
1847 | struct pci_dev *pci = hw->pci; | ||
1848 | unsigned int gctl; | ||
1849 | |||
1850 | err = pci_enable_device(pci); | ||
1851 | if (err < 0) | ||
1852 | return err; | ||
1853 | |||
1854 | /* Set DMA transfer mask */ | ||
1855 | if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 || | ||
1856 | pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) { | ||
1857 | printk(KERN_ERR "ctxfi: architecture does not support PCI " | ||
1858 | "busmaster DMA with mask 0x%llx\n", CT_XFI_DMA_MASK); | ||
1859 | err = -ENXIO; | ||
1860 | goto error1; | ||
1861 | } | ||
1862 | |||
1863 | if (!hw->io_base) { | ||
1864 | err = pci_request_regions(pci, "XFi"); | ||
1865 | if (err < 0) | ||
1866 | goto error1; | ||
1867 | |||
1868 | hw->io_base = pci_resource_start(hw->pci, 2); | ||
1869 | hw->mem_base = (unsigned long)ioremap(hw->io_base, | ||
1870 | pci_resource_len(hw->pci, 2)); | ||
1871 | if (NULL == (void *)hw->mem_base) { | ||
1872 | err = -ENOENT; | ||
1873 | goto error2; | ||
1874 | } | ||
1875 | } | ||
1876 | |||
1877 | /* Switch to 20k2 mode from UAA mode. */ | ||
1878 | gctl = hw_read_20kx(hw, GLOBAL_CNTL_GCTL); | ||
1879 | set_field(&gctl, GCTL_UAA, 0); | ||
1880 | hw_write_20kx(hw, GLOBAL_CNTL_GCTL, gctl); | ||
1881 | |||
1882 | /*if ((err = request_irq(pci->irq, ct_atc_interrupt, IRQF_SHARED, | ||
1883 | atc->chip_details->nm_card, hw))) { | ||
1884 | goto error3; | ||
1885 | } | ||
1886 | hw->irq = pci->irq; | ||
1887 | */ | ||
1888 | |||
1889 | pci_set_master(pci); | ||
1890 | |||
1891 | return 0; | ||
1892 | |||
1893 | /*error3: | ||
1894 | iounmap((void *)hw->mem_base); | ||
1895 | hw->mem_base = (unsigned long)NULL;*/ | ||
1896 | error2: | ||
1897 | pci_release_regions(pci); | ||
1898 | hw->io_base = 0; | ||
1899 | error1: | ||
1900 | pci_disable_device(pci); | ||
1901 | return err; | ||
1902 | } | ||
1903 | |||
1904 | static int hw_card_stop(struct hw *hw) | ||
1905 | { | ||
1906 | unsigned int data; | ||
1907 | |||
1908 | /* disable transport bus master and queueing of request */ | ||
1909 | hw_write_20kx(hw, TRANSPORT_CTL, 0x00); | ||
1910 | |||
1911 | /* disable pll */ | ||
1912 | data = hw_read_20kx(hw, PLL_ENB); | ||
1913 | hw_write_20kx(hw, PLL_ENB, (data & (~0x07))); | ||
1914 | |||
1915 | /* TODO: Disable interrupt and so on... */ | ||
1916 | return 0; | ||
1917 | } | ||
1918 | |||
1919 | static int hw_card_shutdown(struct hw *hw) | ||
1920 | { | ||
1921 | if (hw->irq >= 0) | ||
1922 | free_irq(hw->irq, hw); | ||
1923 | |||
1924 | hw->irq = -1; | ||
1925 | |||
1926 | if (NULL != ((void *)hw->mem_base)) | ||
1927 | iounmap((void *)hw->mem_base); | ||
1928 | |||
1929 | hw->mem_base = (unsigned long)NULL; | ||
1930 | |||
1931 | if (hw->io_base) | ||
1932 | pci_release_regions(hw->pci); | ||
1933 | |||
1934 | hw->io_base = 0; | ||
1935 | |||
1936 | pci_disable_device(hw->pci); | ||
1937 | |||
1938 | return 0; | ||
1939 | } | ||
1940 | |||
1941 | static int hw_card_init(struct hw *hw, struct card_conf *info) | ||
1942 | { | ||
1943 | int err; | ||
1944 | unsigned int gctl; | ||
1945 | u32 data = 0; | ||
1946 | struct dac_conf dac_info = {0}; | ||
1947 | struct adc_conf adc_info = {0}; | ||
1948 | struct daio_conf daio_info = {0}; | ||
1949 | struct trn_conf trn_info = {0}; | ||
1950 | |||
1951 | /* Get PCI io port/memory base address and | ||
1952 | * do 20kx core switch if needed. */ | ||
1953 | err = hw_card_start(hw); | ||
1954 | if (err) | ||
1955 | return err; | ||
1956 | |||
1957 | /* PLL init */ | ||
1958 | err = hw_pll_init(hw, info->rsr); | ||
1959 | if (err < 0) | ||
1960 | return err; | ||
1961 | |||
1962 | /* kick off auto-init */ | ||
1963 | err = hw_auto_init(hw); | ||
1964 | if (err < 0) | ||
1965 | return err; | ||
1966 | |||
1967 | gctl = hw_read_20kx(hw, GLOBAL_CNTL_GCTL); | ||
1968 | set_field(&gctl, GCTL_DBP, 1); | ||
1969 | set_field(&gctl, GCTL_TBP, 1); | ||
1970 | set_field(&gctl, GCTL_FBP, 1); | ||
1971 | set_field(&gctl, GCTL_DPC, 0); | ||
1972 | hw_write_20kx(hw, GLOBAL_CNTL_GCTL, gctl); | ||
1973 | |||
1974 | /* Reset all global pending interrupts */ | ||
1975 | hw_write_20kx(hw, INTERRUPT_GIE, 0); | ||
1976 | /* Reset all SRC pending interrupts */ | ||
1977 | hw_write_20kx(hw, SRC_IP, 0); | ||
1978 | |||
1979 | /* TODO: detect the card ID and configure GPIO accordingly. */ | ||
1980 | /* Configures GPIO (0xD802 0x98028) */ | ||
1981 | /*hw_write_20kx(hw, GPIO_CTRL, 0x7F07);*/ | ||
1982 | /* Configures GPIO (SB0880) */ | ||
1983 | /*hw_write_20kx(hw, GPIO_CTRL, 0xFF07);*/ | ||
1984 | hw_write_20kx(hw, GPIO_CTRL, 0xD802); | ||
1985 | |||
1986 | /* Enable audio ring */ | ||
1987 | hw_write_20kx(hw, MIXER_AR_ENABLE, 0x01); | ||
1988 | |||
1989 | trn_info.vm_pgt_phys = info->vm_pgt_phys; | ||
1990 | err = hw_trn_init(hw, &trn_info); | ||
1991 | if (err < 0) | ||
1992 | return err; | ||
1993 | |||
1994 | daio_info.msr = info->msr; | ||
1995 | err = hw_daio_init(hw, &daio_info); | ||
1996 | if (err < 0) | ||
1997 | return err; | ||
1998 | |||
1999 | dac_info.msr = info->msr; | ||
2000 | err = hw_dac_init(hw, &dac_info); | ||
2001 | if (err < 0) | ||
2002 | return err; | ||
2003 | |||
2004 | adc_info.msr = info->msr; | ||
2005 | adc_info.input = ADC_LINEIN; | ||
2006 | adc_info.mic20db = 0; | ||
2007 | err = hw_adc_init(hw, &adc_info); | ||
2008 | if (err < 0) | ||
2009 | return err; | ||
2010 | |||
2011 | data = hw_read_20kx(hw, SRC_MCTL); | ||
2012 | data |= 0x1; /* Enables input from the audio ring */ | ||
2013 | hw_write_20kx(hw, SRC_MCTL, data); | ||
2014 | |||
2015 | return 0; | ||
2016 | } | ||
2017 | |||
2018 | #ifdef CONFIG_PM | ||
2019 | static int hw_suspend(struct hw *hw, pm_message_t state) | ||
2020 | { | ||
2021 | struct pci_dev *pci = hw->pci; | ||
2022 | |||
2023 | hw_card_stop(hw); | ||
2024 | |||
2025 | pci_disable_device(pci); | ||
2026 | pci_save_state(pci); | ||
2027 | pci_set_power_state(pci, pci_choose_state(pci, state)); | ||
2028 | |||
2029 | return 0; | ||
2030 | } | ||
2031 | |||
2032 | static int hw_resume(struct hw *hw, struct card_conf *info) | ||
2033 | { | ||
2034 | struct pci_dev *pci = hw->pci; | ||
2035 | |||
2036 | pci_set_power_state(pci, PCI_D0); | ||
2037 | pci_restore_state(pci); | ||
2038 | |||
2039 | /* Re-initialize card hardware. */ | ||
2040 | return hw_card_init(hw, info); | ||
2041 | } | ||
2042 | #endif | ||
2043 | |||
2044 | static u32 hw_read_20kx(struct hw *hw, u32 reg) | ||
2045 | { | ||
2046 | return readl((void *)(hw->mem_base + reg)); | ||
2047 | } | ||
2048 | |||
2049 | static void hw_write_20kx(struct hw *hw, u32 reg, u32 data) | ||
2050 | { | ||
2051 | writel(data, (void *)(hw->mem_base + reg)); | ||
2052 | } | ||
2053 | |||
2054 | static struct hw ct20k2_preset __devinitdata = { | ||
2055 | .irq = -1, | ||
2056 | |||
2057 | .card_init = hw_card_init, | ||
2058 | .card_stop = hw_card_stop, | ||
2059 | .pll_init = hw_pll_init, | ||
2060 | .is_adc_source_selected = hw_is_adc_input_selected, | ||
2061 | .select_adc_source = hw_adc_input_select, | ||
2062 | .have_digit_io_switch = hw_have_digit_io_switch, | ||
2063 | #ifdef CONFIG_PM | ||
2064 | .suspend = hw_suspend, | ||
2065 | .resume = hw_resume, | ||
2066 | #endif | ||
2067 | |||
2068 | .src_rsc_get_ctrl_blk = src_get_rsc_ctrl_blk, | ||
2069 | .src_rsc_put_ctrl_blk = src_put_rsc_ctrl_blk, | ||
2070 | .src_mgr_get_ctrl_blk = src_mgr_get_ctrl_blk, | ||
2071 | .src_mgr_put_ctrl_blk = src_mgr_put_ctrl_blk, | ||
2072 | .src_set_state = src_set_state, | ||
2073 | .src_set_bm = src_set_bm, | ||
2074 | .src_set_rsr = src_set_rsr, | ||
2075 | .src_set_sf = src_set_sf, | ||
2076 | .src_set_wr = src_set_wr, | ||
2077 | .src_set_pm = src_set_pm, | ||
2078 | .src_set_rom = src_set_rom, | ||
2079 | .src_set_vo = src_set_vo, | ||
2080 | .src_set_st = src_set_st, | ||
2081 | .src_set_ie = src_set_ie, | ||
2082 | .src_set_ilsz = src_set_ilsz, | ||
2083 | .src_set_bp = src_set_bp, | ||
2084 | .src_set_cisz = src_set_cisz, | ||
2085 | .src_set_ca = src_set_ca, | ||
2086 | .src_set_sa = src_set_sa, | ||
2087 | .src_set_la = src_set_la, | ||
2088 | .src_set_pitch = src_set_pitch, | ||
2089 | .src_set_dirty = src_set_dirty, | ||
2090 | .src_set_clear_zbufs = src_set_clear_zbufs, | ||
2091 | .src_set_dirty_all = src_set_dirty_all, | ||
2092 | .src_commit_write = src_commit_write, | ||
2093 | .src_get_ca = src_get_ca, | ||
2094 | .src_get_dirty = src_get_dirty, | ||
2095 | .src_dirty_conj_mask = src_dirty_conj_mask, | ||
2096 | .src_mgr_enbs_src = src_mgr_enbs_src, | ||
2097 | .src_mgr_enb_src = src_mgr_enb_src, | ||
2098 | .src_mgr_dsb_src = src_mgr_dsb_src, | ||
2099 | .src_mgr_commit_write = src_mgr_commit_write, | ||
2100 | |||
2101 | .srcimp_mgr_get_ctrl_blk = srcimp_mgr_get_ctrl_blk, | ||
2102 | .srcimp_mgr_put_ctrl_blk = srcimp_mgr_put_ctrl_blk, | ||
2103 | .srcimp_mgr_set_imaparc = srcimp_mgr_set_imaparc, | ||
2104 | .srcimp_mgr_set_imapuser = srcimp_mgr_set_imapuser, | ||
2105 | .srcimp_mgr_set_imapnxt = srcimp_mgr_set_imapnxt, | ||
2106 | .srcimp_mgr_set_imapaddr = srcimp_mgr_set_imapaddr, | ||
2107 | .srcimp_mgr_commit_write = srcimp_mgr_commit_write, | ||
2108 | |||
2109 | .amixer_rsc_get_ctrl_blk = amixer_rsc_get_ctrl_blk, | ||
2110 | .amixer_rsc_put_ctrl_blk = amixer_rsc_put_ctrl_blk, | ||
2111 | .amixer_mgr_get_ctrl_blk = amixer_mgr_get_ctrl_blk, | ||
2112 | .amixer_mgr_put_ctrl_blk = amixer_mgr_put_ctrl_blk, | ||
2113 | .amixer_set_mode = amixer_set_mode, | ||
2114 | .amixer_set_iv = amixer_set_iv, | ||
2115 | .amixer_set_x = amixer_set_x, | ||
2116 | .amixer_set_y = amixer_set_y, | ||
2117 | .amixer_set_sadr = amixer_set_sadr, | ||
2118 | .amixer_set_se = amixer_set_se, | ||
2119 | .amixer_set_dirty = amixer_set_dirty, | ||
2120 | .amixer_set_dirty_all = amixer_set_dirty_all, | ||
2121 | .amixer_commit_write = amixer_commit_write, | ||
2122 | .amixer_get_y = amixer_get_y, | ||
2123 | .amixer_get_dirty = amixer_get_dirty, | ||
2124 | |||
2125 | .dai_get_ctrl_blk = dai_get_ctrl_blk, | ||
2126 | .dai_put_ctrl_blk = dai_put_ctrl_blk, | ||
2127 | .dai_srt_set_srco = dai_srt_set_srco, | ||
2128 | .dai_srt_set_srcm = dai_srt_set_srcm, | ||
2129 | .dai_srt_set_rsr = dai_srt_set_rsr, | ||
2130 | .dai_srt_set_drat = dai_srt_set_drat, | ||
2131 | .dai_srt_set_ec = dai_srt_set_ec, | ||
2132 | .dai_srt_set_et = dai_srt_set_et, | ||
2133 | .dai_commit_write = dai_commit_write, | ||
2134 | |||
2135 | .dao_get_ctrl_blk = dao_get_ctrl_blk, | ||
2136 | .dao_put_ctrl_blk = dao_put_ctrl_blk, | ||
2137 | .dao_set_spos = dao_set_spos, | ||
2138 | .dao_commit_write = dao_commit_write, | ||
2139 | .dao_get_spos = dao_get_spos, | ||
2140 | |||
2141 | .daio_mgr_get_ctrl_blk = daio_mgr_get_ctrl_blk, | ||
2142 | .daio_mgr_put_ctrl_blk = daio_mgr_put_ctrl_blk, | ||
2143 | .daio_mgr_enb_dai = daio_mgr_enb_dai, | ||
2144 | .daio_mgr_dsb_dai = daio_mgr_dsb_dai, | ||
2145 | .daio_mgr_enb_dao = daio_mgr_enb_dao, | ||
2146 | .daio_mgr_dsb_dao = daio_mgr_dsb_dao, | ||
2147 | .daio_mgr_dao_init = daio_mgr_dao_init, | ||
2148 | .daio_mgr_set_imaparc = daio_mgr_set_imaparc, | ||
2149 | .daio_mgr_set_imapnxt = daio_mgr_set_imapnxt, | ||
2150 | .daio_mgr_set_imapaddr = daio_mgr_set_imapaddr, | ||
2151 | .daio_mgr_commit_write = daio_mgr_commit_write, | ||
2152 | }; | ||
2153 | |||
2154 | int __devinit create_20k2_hw_obj(struct hw **rhw) | ||
2155 | { | ||
2156 | struct hw20k2 *hw20k2; | ||
2157 | |||
2158 | *rhw = NULL; | ||
2159 | hw20k2 = kzalloc(sizeof(*hw20k2), GFP_KERNEL); | ||
2160 | if (!hw20k2) | ||
2161 | return -ENOMEM; | ||
2162 | |||
2163 | hw20k2->hw = ct20k2_preset; | ||
2164 | *rhw = &hw20k2->hw; | ||
2165 | |||
2166 | return 0; | ||
2167 | } | ||
2168 | |||
2169 | int destroy_20k2_hw_obj(struct hw *hw) | ||
2170 | { | ||
2171 | if (hw->io_base) | ||
2172 | hw_card_shutdown(hw); | ||
2173 | |||
2174 | kfree(hw); | ||
2175 | return 0; | ||
2176 | } | ||
diff --git a/sound/pci/ctxfi/cthw20k2.h b/sound/pci/ctxfi/cthw20k2.h new file mode 100644 index 000000000000..d2b7daab6815 --- /dev/null +++ b/sound/pci/ctxfi/cthw20k2.h | |||
@@ -0,0 +1,26 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File cthw20k2.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of hardware access methord. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date May 13 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #ifndef CTHW20K2_H | ||
19 | #define CTHW20K2_H | ||
20 | |||
21 | #include "cthardware.h" | ||
22 | |||
23 | int create_20k2_hw_obj(struct hw **rhw); | ||
24 | int destroy_20k2_hw_obj(struct hw *hw); | ||
25 | |||
26 | #endif /* CTHW20K2_H */ | ||
diff --git a/sound/pci/ctxfi/ctimap.c b/sound/pci/ctxfi/ctimap.c new file mode 100644 index 000000000000..0b73368a4df6 --- /dev/null +++ b/sound/pci/ctxfi/ctimap.c | |||
@@ -0,0 +1,112 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctimap.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of generic input mapper operations | ||
12 | * for input mapper management. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date May 23 2008 | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #include "ctimap.h" | ||
20 | #include <linux/slab.h> | ||
21 | |||
22 | int input_mapper_add(struct list_head *mappers, struct imapper *entry, | ||
23 | int (*map_op)(void *, struct imapper *), void *data) | ||
24 | { | ||
25 | struct list_head *pos, *pre, *head; | ||
26 | struct imapper *pre_ent, *pos_ent; | ||
27 | |||
28 | head = mappers; | ||
29 | |||
30 | if (list_empty(head)) { | ||
31 | entry->next = entry->addr; | ||
32 | map_op(data, entry); | ||
33 | list_add(&entry->list, head); | ||
34 | return 0; | ||
35 | } | ||
36 | |||
37 | list_for_each(pos, head) { | ||
38 | pos_ent = list_entry(pos, struct imapper, list); | ||
39 | if (pos_ent->slot > entry->slot) { | ||
40 | /* found a position in list */ | ||
41 | break; | ||
42 | } | ||
43 | } | ||
44 | |||
45 | if (pos != head) { | ||
46 | pre = pos->prev; | ||
47 | if (pre == head) | ||
48 | pre = head->prev; | ||
49 | |||
50 | __list_add(&entry->list, pos->prev, pos); | ||
51 | } else { | ||
52 | pre = head->prev; | ||
53 | pos = head->next; | ||
54 | list_add_tail(&entry->list, head); | ||
55 | } | ||
56 | |||
57 | pre_ent = list_entry(pre, struct imapper, list); | ||
58 | pos_ent = list_entry(pos, struct imapper, list); | ||
59 | |||
60 | entry->next = pos_ent->addr; | ||
61 | map_op(data, entry); | ||
62 | pre_ent->next = entry->addr; | ||
63 | map_op(data, pre_ent); | ||
64 | |||
65 | return 0; | ||
66 | } | ||
67 | |||
68 | int input_mapper_delete(struct list_head *mappers, struct imapper *entry, | ||
69 | int (*map_op)(void *, struct imapper *), void *data) | ||
70 | { | ||
71 | struct list_head *next, *pre, *head; | ||
72 | struct imapper *pre_ent, *next_ent; | ||
73 | |||
74 | head = mappers; | ||
75 | |||
76 | if (list_empty(head)) | ||
77 | return 0; | ||
78 | |||
79 | pre = (entry->list.prev == head) ? head->prev : entry->list.prev; | ||
80 | next = (entry->list.next == head) ? head->next : entry->list.next; | ||
81 | |||
82 | if (pre == &entry->list) { | ||
83 | /* entry is the only one node in mappers list */ | ||
84 | entry->next = entry->addr = entry->user = entry->slot = 0; | ||
85 | map_op(data, entry); | ||
86 | list_del(&entry->list); | ||
87 | return 0; | ||
88 | } | ||
89 | |||
90 | pre_ent = list_entry(pre, struct imapper, list); | ||
91 | next_ent = list_entry(next, struct imapper, list); | ||
92 | |||
93 | pre_ent->next = next_ent->addr; | ||
94 | map_op(data, pre_ent); | ||
95 | list_del(&entry->list); | ||
96 | |||
97 | return 0; | ||
98 | } | ||
99 | |||
100 | void free_input_mapper_list(struct list_head *head) | ||
101 | { | ||
102 | struct imapper *entry; | ||
103 | struct list_head *pos; | ||
104 | |||
105 | while (!list_empty(head)) { | ||
106 | pos = head->next; | ||
107 | list_del(pos); | ||
108 | entry = list_entry(pos, struct imapper, list); | ||
109 | kfree(entry); | ||
110 | } | ||
111 | } | ||
112 | |||
diff --git a/sound/pci/ctxfi/ctimap.h b/sound/pci/ctxfi/ctimap.h new file mode 100644 index 000000000000..53ccf9be8b68 --- /dev/null +++ b/sound/pci/ctxfi/ctimap.h | |||
@@ -0,0 +1,40 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctimap.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of generic input mapper operations | ||
12 | * for input mapper management. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date May 23 2008 | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #ifndef CTIMAP_H | ||
20 | #define CTIMAP_H | ||
21 | |||
22 | #include <linux/list.h> | ||
23 | |||
24 | struct imapper { | ||
25 | unsigned short slot; /* the id of the slot containing input data */ | ||
26 | unsigned short user; /* the id of the user resource consuming data */ | ||
27 | unsigned short addr; /* the input mapper ram id */ | ||
28 | unsigned short next; /* the next input mapper ram id */ | ||
29 | struct list_head list; | ||
30 | }; | ||
31 | |||
32 | int input_mapper_add(struct list_head *mappers, struct imapper *entry, | ||
33 | int (*map_op)(void *, struct imapper *), void *data); | ||
34 | |||
35 | int input_mapper_delete(struct list_head *mappers, struct imapper *entry, | ||
36 | int (*map_op)(void *, struct imapper *), void *data); | ||
37 | |||
38 | void free_input_mapper_list(struct list_head *mappers); | ||
39 | |||
40 | #endif /* CTIMAP_H */ | ||
diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c new file mode 100644 index 000000000000..f26d7cd9db9f --- /dev/null +++ b/sound/pci/ctxfi/ctmixer.c | |||
@@ -0,0 +1,1157 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctmixer.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of alsa mixer device functions. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date May 28 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | |||
19 | #include "ctmixer.h" | ||
20 | #include "ctamixer.h" | ||
21 | #include <linux/slab.h> | ||
22 | #include <sound/core.h> | ||
23 | #include <sound/control.h> | ||
24 | #include <sound/asoundef.h> | ||
25 | #include <sound/pcm.h> | ||
26 | #include <sound/tlv.h> | ||
27 | |||
28 | enum CT_SUM_CTL { | ||
29 | SUM_IN_F, | ||
30 | SUM_IN_R, | ||
31 | SUM_IN_C, | ||
32 | SUM_IN_S, | ||
33 | SUM_IN_F_C, | ||
34 | |||
35 | NUM_CT_SUMS | ||
36 | }; | ||
37 | |||
38 | enum CT_AMIXER_CTL { | ||
39 | /* volume control mixers */ | ||
40 | AMIXER_MASTER_F, | ||
41 | AMIXER_MASTER_R, | ||
42 | AMIXER_MASTER_C, | ||
43 | AMIXER_MASTER_S, | ||
44 | AMIXER_PCM_F, | ||
45 | AMIXER_PCM_R, | ||
46 | AMIXER_PCM_C, | ||
47 | AMIXER_PCM_S, | ||
48 | AMIXER_SPDIFI, | ||
49 | AMIXER_LINEIN, | ||
50 | AMIXER_MIC, | ||
51 | AMIXER_SPDIFO, | ||
52 | AMIXER_WAVE_F, | ||
53 | AMIXER_WAVE_R, | ||
54 | AMIXER_WAVE_C, | ||
55 | AMIXER_WAVE_S, | ||
56 | AMIXER_MASTER_F_C, | ||
57 | AMIXER_PCM_F_C, | ||
58 | AMIXER_SPDIFI_C, | ||
59 | AMIXER_LINEIN_C, | ||
60 | AMIXER_MIC_C, | ||
61 | |||
62 | /* this should always be the last one */ | ||
63 | NUM_CT_AMIXERS | ||
64 | }; | ||
65 | |||
66 | enum CTALSA_MIXER_CTL { | ||
67 | /* volume control mixers */ | ||
68 | MIXER_MASTER_P, | ||
69 | MIXER_PCM_P, | ||
70 | MIXER_LINEIN_P, | ||
71 | MIXER_MIC_P, | ||
72 | MIXER_SPDIFI_P, | ||
73 | MIXER_SPDIFO_P, | ||
74 | MIXER_WAVEF_P, | ||
75 | MIXER_WAVER_P, | ||
76 | MIXER_WAVEC_P, | ||
77 | MIXER_WAVES_P, | ||
78 | MIXER_MASTER_C, | ||
79 | MIXER_PCM_C, | ||
80 | MIXER_LINEIN_C, | ||
81 | MIXER_MIC_C, | ||
82 | MIXER_SPDIFI_C, | ||
83 | |||
84 | /* switch control mixers */ | ||
85 | MIXER_PCM_C_S, | ||
86 | MIXER_LINEIN_C_S, | ||
87 | MIXER_MIC_C_S, | ||
88 | MIXER_SPDIFI_C_S, | ||
89 | MIXER_LINEIN_P_S, | ||
90 | MIXER_SPDIFO_P_S, | ||
91 | MIXER_SPDIFI_P_S, | ||
92 | MIXER_WAVEF_P_S, | ||
93 | MIXER_WAVER_P_S, | ||
94 | MIXER_WAVEC_P_S, | ||
95 | MIXER_WAVES_P_S, | ||
96 | MIXER_DIGITAL_IO_S, | ||
97 | MIXER_IEC958_MASK, | ||
98 | MIXER_IEC958_DEFAULT, | ||
99 | MIXER_IEC958_STREAM, | ||
100 | |||
101 | /* this should always be the last one */ | ||
102 | NUM_CTALSA_MIXERS | ||
103 | }; | ||
104 | |||
105 | #define VOL_MIXER_START MIXER_MASTER_P | ||
106 | #define VOL_MIXER_END MIXER_SPDIFI_C | ||
107 | #define VOL_MIXER_NUM (VOL_MIXER_END - VOL_MIXER_START + 1) | ||
108 | #define SWH_MIXER_START MIXER_PCM_C_S | ||
109 | #define SWH_MIXER_END MIXER_DIGITAL_IO_S | ||
110 | #define SWH_CAPTURE_START MIXER_PCM_C_S | ||
111 | #define SWH_CAPTURE_END MIXER_SPDIFI_C_S | ||
112 | |||
113 | #define CHN_NUM 2 | ||
114 | |||
115 | struct ct_kcontrol_init { | ||
116 | unsigned char ctl; | ||
117 | char *name; | ||
118 | }; | ||
119 | |||
120 | static struct ct_kcontrol_init | ||
121 | ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = { | ||
122 | [MIXER_MASTER_P] = { | ||
123 | .ctl = 1, | ||
124 | .name = "Master Playback Volume", | ||
125 | }, | ||
126 | [MIXER_MASTER_C] = { | ||
127 | .ctl = 1, | ||
128 | .name = "Master Capture Volume", | ||
129 | }, | ||
130 | [MIXER_PCM_P] = { | ||
131 | .ctl = 1, | ||
132 | .name = "PCM Playback Volume", | ||
133 | }, | ||
134 | [MIXER_PCM_C] = { | ||
135 | .ctl = 1, | ||
136 | .name = "PCM Capture Volume", | ||
137 | }, | ||
138 | [MIXER_LINEIN_P] = { | ||
139 | .ctl = 1, | ||
140 | .name = "Line-in Playback Volume", | ||
141 | }, | ||
142 | [MIXER_LINEIN_C] = { | ||
143 | .ctl = 1, | ||
144 | .name = "Line-in Capture Volume", | ||
145 | }, | ||
146 | [MIXER_MIC_P] = { | ||
147 | .ctl = 1, | ||
148 | .name = "Mic Playback Volume", | ||
149 | }, | ||
150 | [MIXER_MIC_C] = { | ||
151 | .ctl = 1, | ||
152 | .name = "Mic Capture Volume", | ||
153 | }, | ||
154 | [MIXER_SPDIFI_P] = { | ||
155 | .ctl = 1, | ||
156 | .name = "S/PDIF-in Playback Volume", | ||
157 | }, | ||
158 | [MIXER_SPDIFI_C] = { | ||
159 | .ctl = 1, | ||
160 | .name = "S/PDIF-in Capture Volume", | ||
161 | }, | ||
162 | [MIXER_SPDIFO_P] = { | ||
163 | .ctl = 1, | ||
164 | .name = "S/PDIF-out Playback Volume", | ||
165 | }, | ||
166 | [MIXER_WAVEF_P] = { | ||
167 | .ctl = 1, | ||
168 | .name = "Front Playback Volume", | ||
169 | }, | ||
170 | [MIXER_WAVES_P] = { | ||
171 | .ctl = 1, | ||
172 | .name = "Side Playback Volume", | ||
173 | }, | ||
174 | [MIXER_WAVEC_P] = { | ||
175 | .ctl = 1, | ||
176 | .name = "Center/LFE Playback Volume", | ||
177 | }, | ||
178 | [MIXER_WAVER_P] = { | ||
179 | .ctl = 1, | ||
180 | .name = "Surround Playback Volume", | ||
181 | }, | ||
182 | |||
183 | [MIXER_PCM_C_S] = { | ||
184 | .ctl = 1, | ||
185 | .name = "PCM Capture Switch", | ||
186 | }, | ||
187 | [MIXER_LINEIN_C_S] = { | ||
188 | .ctl = 1, | ||
189 | .name = "Line-in Capture Switch", | ||
190 | }, | ||
191 | [MIXER_MIC_C_S] = { | ||
192 | .ctl = 1, | ||
193 | .name = "Mic Capture Switch", | ||
194 | }, | ||
195 | [MIXER_SPDIFI_C_S] = { | ||
196 | .ctl = 1, | ||
197 | .name = "S/PDIF-in Capture Switch", | ||
198 | }, | ||
199 | [MIXER_LINEIN_P_S] = { | ||
200 | .ctl = 1, | ||
201 | .name = "Line-in Playback Switch", | ||
202 | }, | ||
203 | [MIXER_SPDIFO_P_S] = { | ||
204 | .ctl = 1, | ||
205 | .name = "S/PDIF-out Playback Switch", | ||
206 | }, | ||
207 | [MIXER_SPDIFI_P_S] = { | ||
208 | .ctl = 1, | ||
209 | .name = "S/PDIF-in Playback Switch", | ||
210 | }, | ||
211 | [MIXER_WAVEF_P_S] = { | ||
212 | .ctl = 1, | ||
213 | .name = "Front Playback Switch", | ||
214 | }, | ||
215 | [MIXER_WAVES_P_S] = { | ||
216 | .ctl = 1, | ||
217 | .name = "Side Playback Switch", | ||
218 | }, | ||
219 | [MIXER_WAVEC_P_S] = { | ||
220 | .ctl = 1, | ||
221 | .name = "Center/LFE Playback Switch", | ||
222 | }, | ||
223 | [MIXER_WAVER_P_S] = { | ||
224 | .ctl = 1, | ||
225 | .name = "Surround Playback Switch", | ||
226 | }, | ||
227 | [MIXER_DIGITAL_IO_S] = { | ||
228 | .ctl = 0, | ||
229 | .name = "Digit-IO Playback Switch", | ||
230 | }, | ||
231 | }; | ||
232 | |||
233 | static void | ||
234 | ct_mixer_recording_select(struct ct_mixer *mixer, enum CT_AMIXER_CTL type); | ||
235 | |||
236 | static void | ||
237 | ct_mixer_recording_unselect(struct ct_mixer *mixer, enum CT_AMIXER_CTL type); | ||
238 | |||
239 | static struct snd_kcontrol *kctls[2] = {NULL}; | ||
240 | |||
241 | static enum CT_AMIXER_CTL get_amixer_index(enum CTALSA_MIXER_CTL alsa_index) | ||
242 | { | ||
243 | switch (alsa_index) { | ||
244 | case MIXER_MASTER_P: return AMIXER_MASTER_F; | ||
245 | case MIXER_MASTER_C: return AMIXER_MASTER_F_C; | ||
246 | case MIXER_PCM_P: return AMIXER_PCM_F; | ||
247 | case MIXER_PCM_C: | ||
248 | case MIXER_PCM_C_S: return AMIXER_PCM_F_C; | ||
249 | case MIXER_LINEIN_P: return AMIXER_LINEIN; | ||
250 | case MIXER_LINEIN_C: | ||
251 | case MIXER_LINEIN_C_S: return AMIXER_LINEIN_C; | ||
252 | case MIXER_MIC_P: return AMIXER_MIC; | ||
253 | case MIXER_MIC_C: | ||
254 | case MIXER_MIC_C_S: return AMIXER_MIC_C; | ||
255 | case MIXER_SPDIFI_P: return AMIXER_SPDIFI; | ||
256 | case MIXER_SPDIFI_C: | ||
257 | case MIXER_SPDIFI_C_S: return AMIXER_SPDIFI_C; | ||
258 | case MIXER_SPDIFO_P: return AMIXER_SPDIFO; | ||
259 | case MIXER_WAVEF_P: return AMIXER_WAVE_F; | ||
260 | case MIXER_WAVES_P: return AMIXER_WAVE_S; | ||
261 | case MIXER_WAVEC_P: return AMIXER_WAVE_C; | ||
262 | case MIXER_WAVER_P: return AMIXER_WAVE_R; | ||
263 | default: return NUM_CT_AMIXERS; | ||
264 | } | ||
265 | } | ||
266 | |||
267 | static enum CT_AMIXER_CTL get_recording_amixer(enum CT_AMIXER_CTL index) | ||
268 | { | ||
269 | switch (index) { | ||
270 | case AMIXER_MASTER_F: return AMIXER_MASTER_F_C; | ||
271 | case AMIXER_PCM_F: return AMIXER_PCM_F_C; | ||
272 | case AMIXER_SPDIFI: return AMIXER_SPDIFI_C; | ||
273 | case AMIXER_LINEIN: return AMIXER_LINEIN_C; | ||
274 | case AMIXER_MIC: return AMIXER_MIC_C; | ||
275 | default: return NUM_CT_AMIXERS; | ||
276 | } | ||
277 | } | ||
278 | |||
279 | static unsigned char | ||
280 | get_switch_state(struct ct_mixer *mixer, enum CTALSA_MIXER_CTL type) | ||
281 | { | ||
282 | return (mixer->switch_state & (0x1 << (type - SWH_MIXER_START))) | ||
283 | ? 1 : 0; | ||
284 | } | ||
285 | |||
286 | static void | ||
287 | set_switch_state(struct ct_mixer *mixer, | ||
288 | enum CTALSA_MIXER_CTL type, unsigned char state) | ||
289 | { | ||
290 | if (state) | ||
291 | mixer->switch_state |= (0x1 << (type - SWH_MIXER_START)); | ||
292 | else | ||
293 | mixer->switch_state &= ~(0x1 << (type - SWH_MIXER_START)); | ||
294 | } | ||
295 | |||
296 | #if 0 /* not used */ | ||
297 | /* Map integer value ranging from 0 to 65535 to 14-bit float value ranging | ||
298 | * from 2^-6 to (1+1023/1024) */ | ||
299 | static unsigned int uint16_to_float14(unsigned int x) | ||
300 | { | ||
301 | unsigned int i; | ||
302 | |||
303 | if (x < 17) | ||
304 | return 0; | ||
305 | |||
306 | x *= 2031; | ||
307 | x /= 65535; | ||
308 | x += 16; | ||
309 | |||
310 | /* i <= 6 */ | ||
311 | for (i = 0; !(x & 0x400); i++) | ||
312 | x <<= 1; | ||
313 | |||
314 | x = (((7 - i) & 0x7) << 10) | (x & 0x3ff); | ||
315 | |||
316 | return x; | ||
317 | } | ||
318 | |||
319 | static unsigned int float14_to_uint16(unsigned int x) | ||
320 | { | ||
321 | unsigned int e; | ||
322 | |||
323 | if (!x) | ||
324 | return x; | ||
325 | |||
326 | e = (x >> 10) & 0x7; | ||
327 | x &= 0x3ff; | ||
328 | x += 1024; | ||
329 | x >>= (7 - e); | ||
330 | x -= 16; | ||
331 | x *= 65535; | ||
332 | x /= 2031; | ||
333 | |||
334 | return x; | ||
335 | } | ||
336 | #endif /* not used */ | ||
337 | |||
338 | #define VOL_SCALE 0x1c | ||
339 | #define VOL_MAX 0x100 | ||
340 | |||
341 | static const DECLARE_TLV_DB_SCALE(ct_vol_db_scale, -6400, 25, 1); | ||
342 | |||
343 | static int ct_alsa_mix_volume_info(struct snd_kcontrol *kcontrol, | ||
344 | struct snd_ctl_elem_info *uinfo) | ||
345 | { | ||
346 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | ||
347 | uinfo->count = 2; | ||
348 | uinfo->value.integer.min = 0; | ||
349 | uinfo->value.integer.max = VOL_MAX; | ||
350 | |||
351 | return 0; | ||
352 | } | ||
353 | |||
354 | static int ct_alsa_mix_volume_get(struct snd_kcontrol *kcontrol, | ||
355 | struct snd_ctl_elem_value *ucontrol) | ||
356 | { | ||
357 | struct ct_atc *atc = snd_kcontrol_chip(kcontrol); | ||
358 | enum CT_AMIXER_CTL type = get_amixer_index(kcontrol->private_value); | ||
359 | struct amixer *amixer; | ||
360 | int i, val; | ||
361 | |||
362 | for (i = 0; i < 2; i++) { | ||
363 | amixer = ((struct ct_mixer *)atc->mixer)-> | ||
364 | amixers[type*CHN_NUM+i]; | ||
365 | val = amixer->ops->get_scale(amixer) / VOL_SCALE; | ||
366 | if (val < 0) | ||
367 | val = 0; | ||
368 | else if (val > VOL_MAX) | ||
369 | val = VOL_MAX; | ||
370 | ucontrol->value.integer.value[i] = val; | ||
371 | } | ||
372 | |||
373 | return 0; | ||
374 | } | ||
375 | |||
376 | static int ct_alsa_mix_volume_put(struct snd_kcontrol *kcontrol, | ||
377 | struct snd_ctl_elem_value *ucontrol) | ||
378 | { | ||
379 | struct ct_atc *atc = snd_kcontrol_chip(kcontrol); | ||
380 | struct ct_mixer *mixer = atc->mixer; | ||
381 | enum CT_AMIXER_CTL type = get_amixer_index(kcontrol->private_value); | ||
382 | struct amixer *amixer; | ||
383 | int i, j, val, oval, change = 0; | ||
384 | |||
385 | for (i = 0; i < 2; i++) { | ||
386 | val = ucontrol->value.integer.value[i]; | ||
387 | if (val < 0) | ||
388 | val = 0; | ||
389 | else if (val > VOL_MAX) | ||
390 | val = VOL_MAX; | ||
391 | val *= VOL_SCALE; | ||
392 | amixer = mixer->amixers[type*CHN_NUM+i]; | ||
393 | oval = amixer->ops->get_scale(amixer); | ||
394 | if (val != oval) { | ||
395 | amixer->ops->set_scale(amixer, val); | ||
396 | amixer->ops->commit_write(amixer); | ||
397 | change = 1; | ||
398 | /* Synchronize Master/PCM playback AMIXERs. */ | ||
399 | if (AMIXER_MASTER_F == type || AMIXER_PCM_F == type) { | ||
400 | for (j = 1; j < 4; j++) { | ||
401 | amixer = mixer-> | ||
402 | amixers[(type+j)*CHN_NUM+i]; | ||
403 | amixer->ops->set_scale(amixer, val); | ||
404 | amixer->ops->commit_write(amixer); | ||
405 | } | ||
406 | } | ||
407 | } | ||
408 | } | ||
409 | |||
410 | return change; | ||
411 | } | ||
412 | |||
413 | static struct snd_kcontrol_new vol_ctl = { | ||
414 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | ||
415 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, | ||
416 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
417 | .info = ct_alsa_mix_volume_info, | ||
418 | .get = ct_alsa_mix_volume_get, | ||
419 | .put = ct_alsa_mix_volume_put, | ||
420 | .tlv = { .p = ct_vol_db_scale }, | ||
421 | }; | ||
422 | |||
423 | static void | ||
424 | do_line_mic_switch(struct ct_atc *atc, enum CTALSA_MIXER_CTL type) | ||
425 | { | ||
426 | |||
427 | if (MIXER_LINEIN_C_S == type) { | ||
428 | atc->select_line_in(atc); | ||
429 | set_switch_state(atc->mixer, MIXER_MIC_C_S, 0); | ||
430 | snd_ctl_notify(atc->card, SNDRV_CTL_EVENT_MASK_VALUE, | ||
431 | &kctls[1]->id); | ||
432 | } else if (MIXER_MIC_C_S == type) { | ||
433 | atc->select_mic_in(atc); | ||
434 | set_switch_state(atc->mixer, MIXER_LINEIN_C_S, 0); | ||
435 | snd_ctl_notify(atc->card, SNDRV_CTL_EVENT_MASK_VALUE, | ||
436 | &kctls[0]->id); | ||
437 | } | ||
438 | } | ||
439 | |||
440 | static void | ||
441 | do_digit_io_switch(struct ct_atc *atc, int state) | ||
442 | { | ||
443 | struct ct_mixer *mixer = atc->mixer; | ||
444 | |||
445 | if (state) { | ||
446 | atc->select_digit_io(atc); | ||
447 | atc->spdif_out_unmute(atc, | ||
448 | get_switch_state(mixer, MIXER_SPDIFO_P_S)); | ||
449 | atc->spdif_in_unmute(atc, 1); | ||
450 | atc->line_in_unmute(atc, 0); | ||
451 | return; | ||
452 | } | ||
453 | |||
454 | if (get_switch_state(mixer, MIXER_LINEIN_C_S)) | ||
455 | atc->select_line_in(atc); | ||
456 | else if (get_switch_state(mixer, MIXER_MIC_C_S)) | ||
457 | atc->select_mic_in(atc); | ||
458 | |||
459 | atc->spdif_out_unmute(atc, 0); | ||
460 | atc->spdif_in_unmute(atc, 0); | ||
461 | atc->line_in_unmute(atc, 1); | ||
462 | return; | ||
463 | } | ||
464 | |||
465 | static void do_switch(struct ct_atc *atc, enum CTALSA_MIXER_CTL type, int state) | ||
466 | { | ||
467 | struct ct_mixer *mixer = atc->mixer; | ||
468 | |||
469 | /* Do changes in mixer. */ | ||
470 | if ((SWH_CAPTURE_START <= type) && (SWH_CAPTURE_END >= type)) { | ||
471 | if (state) { | ||
472 | ct_mixer_recording_select(mixer, | ||
473 | get_amixer_index(type)); | ||
474 | } else { | ||
475 | ct_mixer_recording_unselect(mixer, | ||
476 | get_amixer_index(type)); | ||
477 | } | ||
478 | } | ||
479 | /* Do changes out of mixer. */ | ||
480 | if (state && (MIXER_LINEIN_C_S == type || MIXER_MIC_C_S == type)) | ||
481 | do_line_mic_switch(atc, type); | ||
482 | else if (MIXER_WAVEF_P_S == type) | ||
483 | atc->line_front_unmute(atc, state); | ||
484 | else if (MIXER_WAVES_P_S == type) | ||
485 | atc->line_surround_unmute(atc, state); | ||
486 | else if (MIXER_WAVEC_P_S == type) | ||
487 | atc->line_clfe_unmute(atc, state); | ||
488 | else if (MIXER_WAVER_P_S == type) | ||
489 | atc->line_rear_unmute(atc, state); | ||
490 | else if (MIXER_LINEIN_P_S == type) | ||
491 | atc->line_in_unmute(atc, state); | ||
492 | else if (MIXER_SPDIFO_P_S == type) | ||
493 | atc->spdif_out_unmute(atc, state); | ||
494 | else if (MIXER_SPDIFI_P_S == type) | ||
495 | atc->spdif_in_unmute(atc, state); | ||
496 | else if (MIXER_DIGITAL_IO_S == type) | ||
497 | do_digit_io_switch(atc, state); | ||
498 | |||
499 | return; | ||
500 | } | ||
501 | |||
502 | static int ct_alsa_mix_switch_info(struct snd_kcontrol *kcontrol, | ||
503 | struct snd_ctl_elem_info *uinfo) | ||
504 | { | ||
505 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | ||
506 | uinfo->count = 1; | ||
507 | uinfo->value.integer.min = 0; | ||
508 | uinfo->value.integer.max = 1; | ||
509 | uinfo->value.integer.step = 1; | ||
510 | |||
511 | return 0; | ||
512 | } | ||
513 | |||
514 | static int ct_alsa_mix_switch_get(struct snd_kcontrol *kcontrol, | ||
515 | struct snd_ctl_elem_value *ucontrol) | ||
516 | { | ||
517 | struct ct_mixer *mixer = | ||
518 | ((struct ct_atc *)snd_kcontrol_chip(kcontrol))->mixer; | ||
519 | enum CTALSA_MIXER_CTL type = kcontrol->private_value; | ||
520 | |||
521 | ucontrol->value.integer.value[0] = get_switch_state(mixer, type); | ||
522 | return 0; | ||
523 | } | ||
524 | |||
525 | static int ct_alsa_mix_switch_put(struct snd_kcontrol *kcontrol, | ||
526 | struct snd_ctl_elem_value *ucontrol) | ||
527 | { | ||
528 | struct ct_atc *atc = snd_kcontrol_chip(kcontrol); | ||
529 | struct ct_mixer *mixer = atc->mixer; | ||
530 | enum CTALSA_MIXER_CTL type = kcontrol->private_value; | ||
531 | int state; | ||
532 | |||
533 | state = ucontrol->value.integer.value[0]; | ||
534 | if (get_switch_state(mixer, type) == state) | ||
535 | return 0; | ||
536 | |||
537 | set_switch_state(mixer, type, state); | ||
538 | do_switch(atc, type, state); | ||
539 | |||
540 | return 1; | ||
541 | } | ||
542 | |||
543 | static struct snd_kcontrol_new swh_ctl = { | ||
544 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | ||
545 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
546 | .info = ct_alsa_mix_switch_info, | ||
547 | .get = ct_alsa_mix_switch_get, | ||
548 | .put = ct_alsa_mix_switch_put | ||
549 | }; | ||
550 | |||
551 | static int ct_spdif_info(struct snd_kcontrol *kcontrol, | ||
552 | struct snd_ctl_elem_info *uinfo) | ||
553 | { | ||
554 | uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958; | ||
555 | uinfo->count = 1; | ||
556 | return 0; | ||
557 | } | ||
558 | |||
559 | static int ct_spdif_get_mask(struct snd_kcontrol *kcontrol, | ||
560 | struct snd_ctl_elem_value *ucontrol) | ||
561 | { | ||
562 | ucontrol->value.iec958.status[0] = 0xff; | ||
563 | ucontrol->value.iec958.status[1] = 0xff; | ||
564 | ucontrol->value.iec958.status[2] = 0xff; | ||
565 | ucontrol->value.iec958.status[3] = 0xff; | ||
566 | return 0; | ||
567 | } | ||
568 | |||
569 | static int ct_spdif_default_get(struct snd_kcontrol *kcontrol, | ||
570 | struct snd_ctl_elem_value *ucontrol) | ||
571 | { | ||
572 | unsigned int status = SNDRV_PCM_DEFAULT_CON_SPDIF; | ||
573 | |||
574 | ucontrol->value.iec958.status[0] = (status >> 0) & 0xff; | ||
575 | ucontrol->value.iec958.status[1] = (status >> 8) & 0xff; | ||
576 | ucontrol->value.iec958.status[2] = (status >> 16) & 0xff; | ||
577 | ucontrol->value.iec958.status[3] = (status >> 24) & 0xff; | ||
578 | |||
579 | return 0; | ||
580 | } | ||
581 | |||
582 | static int ct_spdif_get(struct snd_kcontrol *kcontrol, | ||
583 | struct snd_ctl_elem_value *ucontrol) | ||
584 | { | ||
585 | struct ct_atc *atc = snd_kcontrol_chip(kcontrol); | ||
586 | unsigned int status; | ||
587 | |||
588 | atc->spdif_out_get_status(atc, &status); | ||
589 | ucontrol->value.iec958.status[0] = (status >> 0) & 0xff; | ||
590 | ucontrol->value.iec958.status[1] = (status >> 8) & 0xff; | ||
591 | ucontrol->value.iec958.status[2] = (status >> 16) & 0xff; | ||
592 | ucontrol->value.iec958.status[3] = (status >> 24) & 0xff; | ||
593 | |||
594 | return 0; | ||
595 | } | ||
596 | |||
597 | static int ct_spdif_put(struct snd_kcontrol *kcontrol, | ||
598 | struct snd_ctl_elem_value *ucontrol) | ||
599 | { | ||
600 | struct ct_atc *atc = snd_kcontrol_chip(kcontrol); | ||
601 | int change; | ||
602 | unsigned int status, old_status; | ||
603 | |||
604 | status = (ucontrol->value.iec958.status[0] << 0) | | ||
605 | (ucontrol->value.iec958.status[1] << 8) | | ||
606 | (ucontrol->value.iec958.status[2] << 16) | | ||
607 | (ucontrol->value.iec958.status[3] << 24); | ||
608 | |||
609 | atc->spdif_out_get_status(atc, &old_status); | ||
610 | change = (old_status != status); | ||
611 | if (change) | ||
612 | atc->spdif_out_set_status(atc, status); | ||
613 | |||
614 | return change; | ||
615 | } | ||
616 | |||
617 | static struct snd_kcontrol_new iec958_mask_ctl = { | ||
618 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | ||
619 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | ||
620 | .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, MASK), | ||
621 | .count = 1, | ||
622 | .info = ct_spdif_info, | ||
623 | .get = ct_spdif_get_mask, | ||
624 | .private_value = MIXER_IEC958_MASK | ||
625 | }; | ||
626 | |||
627 | static struct snd_kcontrol_new iec958_default_ctl = { | ||
628 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | ||
629 | .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT), | ||
630 | .count = 1, | ||
631 | .info = ct_spdif_info, | ||
632 | .get = ct_spdif_default_get, | ||
633 | .put = ct_spdif_put, | ||
634 | .private_value = MIXER_IEC958_DEFAULT | ||
635 | }; | ||
636 | |||
637 | static struct snd_kcontrol_new iec958_ctl = { | ||
638 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | ||
639 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | ||
640 | .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, PCM_STREAM), | ||
641 | .count = 1, | ||
642 | .info = ct_spdif_info, | ||
643 | .get = ct_spdif_get, | ||
644 | .put = ct_spdif_put, | ||
645 | .private_value = MIXER_IEC958_STREAM | ||
646 | }; | ||
647 | |||
648 | #define NUM_IEC958_CTL 3 | ||
649 | |||
650 | static int | ||
651 | ct_mixer_kcontrol_new(struct ct_mixer *mixer, struct snd_kcontrol_new *new) | ||
652 | { | ||
653 | struct snd_kcontrol *kctl; | ||
654 | int err; | ||
655 | |||
656 | kctl = snd_ctl_new1(new, mixer->atc); | ||
657 | if (NULL == kctl) | ||
658 | return -ENOMEM; | ||
659 | |||
660 | if (SNDRV_CTL_ELEM_IFACE_PCM == kctl->id.iface) | ||
661 | kctl->id.device = IEC958; | ||
662 | |||
663 | err = snd_ctl_add(mixer->atc->card, kctl); | ||
664 | if (err) | ||
665 | return err; | ||
666 | |||
667 | switch (new->private_value) { | ||
668 | case MIXER_LINEIN_C_S: | ||
669 | kctls[0] = kctl; break; | ||
670 | case MIXER_MIC_C_S: | ||
671 | kctls[1] = kctl; break; | ||
672 | default: | ||
673 | break; | ||
674 | } | ||
675 | |||
676 | return 0; | ||
677 | } | ||
678 | |||
679 | static int ct_mixer_kcontrols_create(struct ct_mixer *mixer) | ||
680 | { | ||
681 | enum CTALSA_MIXER_CTL type; | ||
682 | struct ct_atc *atc = mixer->atc; | ||
683 | int err; | ||
684 | |||
685 | /* Create snd kcontrol instances on demand */ | ||
686 | for (type = VOL_MIXER_START; type <= VOL_MIXER_END; type++) { | ||
687 | if (ct_kcontrol_init_table[type].ctl) { | ||
688 | vol_ctl.name = ct_kcontrol_init_table[type].name; | ||
689 | vol_ctl.private_value = (unsigned long)type; | ||
690 | err = ct_mixer_kcontrol_new(mixer, &vol_ctl); | ||
691 | if (err) | ||
692 | return err; | ||
693 | } | ||
694 | } | ||
695 | |||
696 | ct_kcontrol_init_table[MIXER_DIGITAL_IO_S].ctl = | ||
697 | atc->have_digit_io_switch(atc); | ||
698 | for (type = SWH_MIXER_START; type <= SWH_MIXER_END; type++) { | ||
699 | if (ct_kcontrol_init_table[type].ctl) { | ||
700 | swh_ctl.name = ct_kcontrol_init_table[type].name; | ||
701 | swh_ctl.private_value = (unsigned long)type; | ||
702 | err = ct_mixer_kcontrol_new(mixer, &swh_ctl); | ||
703 | if (err) | ||
704 | return err; | ||
705 | } | ||
706 | } | ||
707 | |||
708 | err = ct_mixer_kcontrol_new(mixer, &iec958_mask_ctl); | ||
709 | if (err) | ||
710 | return err; | ||
711 | |||
712 | err = ct_mixer_kcontrol_new(mixer, &iec958_default_ctl); | ||
713 | if (err) | ||
714 | return err; | ||
715 | |||
716 | err = ct_mixer_kcontrol_new(mixer, &iec958_ctl); | ||
717 | if (err) | ||
718 | return err; | ||
719 | |||
720 | atc->line_front_unmute(atc, 1); | ||
721 | set_switch_state(mixer, MIXER_WAVEF_P_S, 1); | ||
722 | atc->line_surround_unmute(atc, 0); | ||
723 | set_switch_state(mixer, MIXER_WAVES_P_S, 0); | ||
724 | atc->line_clfe_unmute(atc, 0); | ||
725 | set_switch_state(mixer, MIXER_WAVEC_P_S, 0); | ||
726 | atc->line_rear_unmute(atc, 0); | ||
727 | set_switch_state(mixer, MIXER_WAVER_P_S, 0); | ||
728 | atc->spdif_out_unmute(atc, 0); | ||
729 | set_switch_state(mixer, MIXER_SPDIFO_P_S, 0); | ||
730 | atc->line_in_unmute(atc, 0); | ||
731 | set_switch_state(mixer, MIXER_LINEIN_P_S, 0); | ||
732 | atc->spdif_in_unmute(atc, 0); | ||
733 | set_switch_state(mixer, MIXER_SPDIFI_P_S, 0); | ||
734 | |||
735 | set_switch_state(mixer, MIXER_PCM_C_S, 1); | ||
736 | set_switch_state(mixer, MIXER_LINEIN_C_S, 1); | ||
737 | set_switch_state(mixer, MIXER_SPDIFI_C_S, 1); | ||
738 | |||
739 | return 0; | ||
740 | } | ||
741 | |||
742 | static void | ||
743 | ct_mixer_recording_select(struct ct_mixer *mixer, enum CT_AMIXER_CTL type) | ||
744 | { | ||
745 | struct amixer *amix_d; | ||
746 | struct sum *sum_c; | ||
747 | int i; | ||
748 | |||
749 | for (i = 0; i < 2; i++) { | ||
750 | amix_d = mixer->amixers[type*CHN_NUM+i]; | ||
751 | sum_c = mixer->sums[SUM_IN_F_C*CHN_NUM+i]; | ||
752 | amix_d->ops->set_sum(amix_d, sum_c); | ||
753 | amix_d->ops->commit_write(amix_d); | ||
754 | } | ||
755 | } | ||
756 | |||
757 | static void | ||
758 | ct_mixer_recording_unselect(struct ct_mixer *mixer, enum CT_AMIXER_CTL type) | ||
759 | { | ||
760 | struct amixer *amix_d; | ||
761 | int i; | ||
762 | |||
763 | for (i = 0; i < 2; i++) { | ||
764 | amix_d = mixer->amixers[type*CHN_NUM+i]; | ||
765 | amix_d->ops->set_sum(amix_d, NULL); | ||
766 | amix_d->ops->commit_write(amix_d); | ||
767 | } | ||
768 | } | ||
769 | |||
770 | static int ct_mixer_get_resources(struct ct_mixer *mixer) | ||
771 | { | ||
772 | struct sum_mgr *sum_mgr; | ||
773 | struct sum *sum; | ||
774 | struct sum_desc sum_desc = {0}; | ||
775 | struct amixer_mgr *amixer_mgr; | ||
776 | struct amixer *amixer; | ||
777 | struct amixer_desc am_desc = {0}; | ||
778 | int err; | ||
779 | int i; | ||
780 | |||
781 | /* Allocate sum resources for mixer obj */ | ||
782 | sum_mgr = (struct sum_mgr *)mixer->atc->rsc_mgrs[SUM]; | ||
783 | sum_desc.msr = mixer->atc->msr; | ||
784 | for (i = 0; i < (NUM_CT_SUMS * CHN_NUM); i++) { | ||
785 | err = sum_mgr->get_sum(sum_mgr, &sum_desc, &sum); | ||
786 | if (err) { | ||
787 | printk(KERN_ERR "ctxfi:Failed to get sum resources for " | ||
788 | "front output!\n"); | ||
789 | break; | ||
790 | } | ||
791 | mixer->sums[i] = sum; | ||
792 | } | ||
793 | if (err) | ||
794 | goto error1; | ||
795 | |||
796 | /* Allocate amixer resources for mixer obj */ | ||
797 | amixer_mgr = (struct amixer_mgr *)mixer->atc->rsc_mgrs[AMIXER]; | ||
798 | am_desc.msr = mixer->atc->msr; | ||
799 | for (i = 0; i < (NUM_CT_AMIXERS * CHN_NUM); i++) { | ||
800 | err = amixer_mgr->get_amixer(amixer_mgr, &am_desc, &amixer); | ||
801 | if (err) { | ||
802 | printk(KERN_ERR "ctxfi:Failed to get amixer resources " | ||
803 | "for mixer obj!\n"); | ||
804 | break; | ||
805 | } | ||
806 | mixer->amixers[i] = amixer; | ||
807 | } | ||
808 | if (err) | ||
809 | goto error2; | ||
810 | |||
811 | return 0; | ||
812 | |||
813 | error2: | ||
814 | for (i = 0; i < (NUM_CT_AMIXERS * CHN_NUM); i++) { | ||
815 | if (NULL != mixer->amixers[i]) { | ||
816 | amixer = mixer->amixers[i]; | ||
817 | amixer_mgr->put_amixer(amixer_mgr, amixer); | ||
818 | mixer->amixers[i] = NULL; | ||
819 | } | ||
820 | } | ||
821 | error1: | ||
822 | for (i = 0; i < (NUM_CT_SUMS * CHN_NUM); i++) { | ||
823 | if (NULL != mixer->sums[i]) { | ||
824 | sum_mgr->put_sum(sum_mgr, (struct sum *)mixer->sums[i]); | ||
825 | mixer->sums[i] = NULL; | ||
826 | } | ||
827 | } | ||
828 | |||
829 | return err; | ||
830 | } | ||
831 | |||
832 | static int ct_mixer_get_mem(struct ct_mixer **rmixer) | ||
833 | { | ||
834 | struct ct_mixer *mixer; | ||
835 | int err; | ||
836 | |||
837 | *rmixer = NULL; | ||
838 | /* Allocate mem for mixer obj */ | ||
839 | mixer = kzalloc(sizeof(*mixer), GFP_KERNEL); | ||
840 | if (NULL == mixer) | ||
841 | return -ENOMEM; | ||
842 | |||
843 | mixer->amixers = kzalloc(sizeof(void *)*(NUM_CT_AMIXERS*CHN_NUM), | ||
844 | GFP_KERNEL); | ||
845 | if (NULL == mixer->amixers) { | ||
846 | err = -ENOMEM; | ||
847 | goto error1; | ||
848 | } | ||
849 | mixer->sums = kzalloc(sizeof(void *)*(NUM_CT_SUMS*CHN_NUM), GFP_KERNEL); | ||
850 | if (NULL == mixer->sums) { | ||
851 | err = -ENOMEM; | ||
852 | goto error2; | ||
853 | } | ||
854 | |||
855 | *rmixer = mixer; | ||
856 | return 0; | ||
857 | |||
858 | error2: | ||
859 | kfree(mixer->amixers); | ||
860 | error1: | ||
861 | kfree(mixer); | ||
862 | return err; | ||
863 | } | ||
864 | |||
865 | static int ct_mixer_topology_build(struct ct_mixer *mixer) | ||
866 | { | ||
867 | struct sum *sum; | ||
868 | struct amixer *amix_d, *amix_s; | ||
869 | enum CT_AMIXER_CTL i, j; | ||
870 | |||
871 | /* Build topology from destination to source */ | ||
872 | |||
873 | /* Set up Master mixer */ | ||
874 | for (i = AMIXER_MASTER_F, j = SUM_IN_F; | ||
875 | i <= AMIXER_MASTER_S; i++, j++) { | ||
876 | amix_d = mixer->amixers[i*CHN_NUM]; | ||
877 | sum = mixer->sums[j*CHN_NUM]; | ||
878 | amix_d->ops->setup(amix_d, &sum->rsc, INIT_VOL, NULL); | ||
879 | amix_d = mixer->amixers[i*CHN_NUM+1]; | ||
880 | sum = mixer->sums[j*CHN_NUM+1]; | ||
881 | amix_d->ops->setup(amix_d, &sum->rsc, INIT_VOL, NULL); | ||
882 | } | ||
883 | |||
884 | /* Set up Wave-out mixer */ | ||
885 | for (i = AMIXER_WAVE_F, j = AMIXER_MASTER_F; | ||
886 | i <= AMIXER_WAVE_S; i++, j++) { | ||
887 | amix_d = mixer->amixers[i*CHN_NUM]; | ||
888 | amix_s = mixer->amixers[j*CHN_NUM]; | ||
889 | amix_d->ops->setup(amix_d, &amix_s->rsc, INIT_VOL, NULL); | ||
890 | amix_d = mixer->amixers[i*CHN_NUM+1]; | ||
891 | amix_s = mixer->amixers[j*CHN_NUM+1]; | ||
892 | amix_d->ops->setup(amix_d, &amix_s->rsc, INIT_VOL, NULL); | ||
893 | } | ||
894 | |||
895 | /* Set up S/PDIF-out mixer */ | ||
896 | amix_d = mixer->amixers[AMIXER_SPDIFO*CHN_NUM]; | ||
897 | amix_s = mixer->amixers[AMIXER_MASTER_F*CHN_NUM]; | ||
898 | amix_d->ops->setup(amix_d, &amix_s->rsc, INIT_VOL, NULL); | ||
899 | amix_d = mixer->amixers[AMIXER_SPDIFO*CHN_NUM+1]; | ||
900 | amix_s = mixer->amixers[AMIXER_MASTER_F*CHN_NUM+1]; | ||
901 | amix_d->ops->setup(amix_d, &amix_s->rsc, INIT_VOL, NULL); | ||
902 | |||
903 | /* Set up PCM-in mixer */ | ||
904 | for (i = AMIXER_PCM_F, j = SUM_IN_F; i <= AMIXER_PCM_S; i++, j++) { | ||
905 | amix_d = mixer->amixers[i*CHN_NUM]; | ||
906 | sum = mixer->sums[j*CHN_NUM]; | ||
907 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
908 | amix_d = mixer->amixers[i*CHN_NUM+1]; | ||
909 | sum = mixer->sums[j*CHN_NUM+1]; | ||
910 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
911 | } | ||
912 | |||
913 | /* Set up Line-in mixer */ | ||
914 | amix_d = mixer->amixers[AMIXER_LINEIN*CHN_NUM]; | ||
915 | sum = mixer->sums[SUM_IN_F*CHN_NUM]; | ||
916 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
917 | amix_d = mixer->amixers[AMIXER_LINEIN*CHN_NUM+1]; | ||
918 | sum = mixer->sums[SUM_IN_F*CHN_NUM+1]; | ||
919 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
920 | |||
921 | /* Set up Mic-in mixer */ | ||
922 | amix_d = mixer->amixers[AMIXER_MIC*CHN_NUM]; | ||
923 | sum = mixer->sums[SUM_IN_F*CHN_NUM]; | ||
924 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
925 | amix_d = mixer->amixers[AMIXER_MIC*CHN_NUM+1]; | ||
926 | sum = mixer->sums[SUM_IN_F*CHN_NUM+1]; | ||
927 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
928 | |||
929 | /* Set up S/PDIF-in mixer */ | ||
930 | amix_d = mixer->amixers[AMIXER_SPDIFI*CHN_NUM]; | ||
931 | sum = mixer->sums[SUM_IN_F*CHN_NUM]; | ||
932 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
933 | amix_d = mixer->amixers[AMIXER_SPDIFI*CHN_NUM+1]; | ||
934 | sum = mixer->sums[SUM_IN_F*CHN_NUM+1]; | ||
935 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
936 | |||
937 | /* Set up Master recording mixer */ | ||
938 | amix_d = mixer->amixers[AMIXER_MASTER_F_C*CHN_NUM]; | ||
939 | sum = mixer->sums[SUM_IN_F_C*CHN_NUM]; | ||
940 | amix_d->ops->setup(amix_d, &sum->rsc, INIT_VOL, NULL); | ||
941 | amix_d = mixer->amixers[AMIXER_MASTER_F_C*CHN_NUM+1]; | ||
942 | sum = mixer->sums[SUM_IN_F_C*CHN_NUM+1]; | ||
943 | amix_d->ops->setup(amix_d, &sum->rsc, INIT_VOL, NULL); | ||
944 | |||
945 | /* Set up PCM-in recording mixer */ | ||
946 | amix_d = mixer->amixers[AMIXER_PCM_F_C*CHN_NUM]; | ||
947 | sum = mixer->sums[SUM_IN_F_C*CHN_NUM]; | ||
948 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
949 | amix_d = mixer->amixers[AMIXER_PCM_F_C*CHN_NUM+1]; | ||
950 | sum = mixer->sums[SUM_IN_F_C*CHN_NUM+1]; | ||
951 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
952 | |||
953 | /* Set up Line-in recording mixer */ | ||
954 | amix_d = mixer->amixers[AMIXER_LINEIN_C*CHN_NUM]; | ||
955 | sum = mixer->sums[SUM_IN_F_C*CHN_NUM]; | ||
956 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
957 | amix_d = mixer->amixers[AMIXER_LINEIN_C*CHN_NUM+1]; | ||
958 | sum = mixer->sums[SUM_IN_F_C*CHN_NUM+1]; | ||
959 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
960 | |||
961 | /* Set up Mic-in recording mixer */ | ||
962 | amix_d = mixer->amixers[AMIXER_MIC_C*CHN_NUM]; | ||
963 | sum = mixer->sums[SUM_IN_F_C*CHN_NUM]; | ||
964 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
965 | amix_d = mixer->amixers[AMIXER_MIC_C*CHN_NUM+1]; | ||
966 | sum = mixer->sums[SUM_IN_F_C*CHN_NUM+1]; | ||
967 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
968 | |||
969 | /* Set up S/PDIF-in recording mixer */ | ||
970 | amix_d = mixer->amixers[AMIXER_SPDIFI_C*CHN_NUM]; | ||
971 | sum = mixer->sums[SUM_IN_F_C*CHN_NUM]; | ||
972 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
973 | amix_d = mixer->amixers[AMIXER_SPDIFI_C*CHN_NUM+1]; | ||
974 | sum = mixer->sums[SUM_IN_F_C*CHN_NUM+1]; | ||
975 | amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); | ||
976 | |||
977 | return 0; | ||
978 | } | ||
979 | |||
980 | static int mixer_set_input_port(struct amixer *amixer, struct rsc *rsc) | ||
981 | { | ||
982 | amixer->ops->set_input(amixer, rsc); | ||
983 | amixer->ops->commit_write(amixer); | ||
984 | |||
985 | return 0; | ||
986 | } | ||
987 | |||
988 | static enum CT_AMIXER_CTL port_to_amixer(enum MIXER_PORT_T type) | ||
989 | { | ||
990 | switch (type) { | ||
991 | case MIX_WAVE_FRONT: return AMIXER_WAVE_F; | ||
992 | case MIX_WAVE_SURROUND: return AMIXER_WAVE_S; | ||
993 | case MIX_WAVE_CENTLFE: return AMIXER_WAVE_C; | ||
994 | case MIX_WAVE_REAR: return AMIXER_WAVE_R; | ||
995 | case MIX_PCMO_FRONT: return AMIXER_MASTER_F_C; | ||
996 | case MIX_SPDIF_OUT: return AMIXER_SPDIFO; | ||
997 | case MIX_LINE_IN: return AMIXER_LINEIN; | ||
998 | case MIX_MIC_IN: return AMIXER_MIC; | ||
999 | case MIX_SPDIF_IN: return AMIXER_SPDIFI; | ||
1000 | case MIX_PCMI_FRONT: return AMIXER_PCM_F; | ||
1001 | case MIX_PCMI_SURROUND: return AMIXER_PCM_S; | ||
1002 | case MIX_PCMI_CENTLFE: return AMIXER_PCM_C; | ||
1003 | case MIX_PCMI_REAR: return AMIXER_PCM_R; | ||
1004 | default: return 0; | ||
1005 | } | ||
1006 | } | ||
1007 | |||
1008 | static int mixer_get_output_ports(struct ct_mixer *mixer, | ||
1009 | enum MIXER_PORT_T type, | ||
1010 | struct rsc **rleft, struct rsc **rright) | ||
1011 | { | ||
1012 | enum CT_AMIXER_CTL amix = port_to_amixer(type); | ||
1013 | |||
1014 | if (NULL != rleft) | ||
1015 | *rleft = &((struct amixer *)mixer->amixers[amix*CHN_NUM])->rsc; | ||
1016 | |||
1017 | if (NULL != rright) | ||
1018 | *rright = | ||
1019 | &((struct amixer *)mixer->amixers[amix*CHN_NUM+1])->rsc; | ||
1020 | |||
1021 | return 0; | ||
1022 | } | ||
1023 | |||
1024 | static int mixer_set_input_left(struct ct_mixer *mixer, | ||
1025 | enum MIXER_PORT_T type, struct rsc *rsc) | ||
1026 | { | ||
1027 | enum CT_AMIXER_CTL amix = port_to_amixer(type); | ||
1028 | |||
1029 | mixer_set_input_port(mixer->amixers[amix*CHN_NUM], rsc); | ||
1030 | amix = get_recording_amixer(amix); | ||
1031 | if (amix < NUM_CT_AMIXERS) | ||
1032 | mixer_set_input_port(mixer->amixers[amix*CHN_NUM], rsc); | ||
1033 | |||
1034 | return 0; | ||
1035 | } | ||
1036 | |||
1037 | static int | ||
1038 | mixer_set_input_right(struct ct_mixer *mixer, | ||
1039 | enum MIXER_PORT_T type, struct rsc *rsc) | ||
1040 | { | ||
1041 | enum CT_AMIXER_CTL amix = port_to_amixer(type); | ||
1042 | |||
1043 | mixer_set_input_port(mixer->amixers[amix*CHN_NUM+1], rsc); | ||
1044 | amix = get_recording_amixer(amix); | ||
1045 | if (amix < NUM_CT_AMIXERS) | ||
1046 | mixer_set_input_port(mixer->amixers[amix*CHN_NUM+1], rsc); | ||
1047 | |||
1048 | return 0; | ||
1049 | } | ||
1050 | |||
1051 | #ifdef CONFIG_PM | ||
1052 | static int mixer_resume(struct ct_mixer *mixer) | ||
1053 | { | ||
1054 | int i, state; | ||
1055 | struct amixer *amixer; | ||
1056 | |||
1057 | /* resume topology and volume gain. */ | ||
1058 | for (i = 0; i < NUM_CT_AMIXERS*CHN_NUM; i++) { | ||
1059 | amixer = mixer->amixers[i]; | ||
1060 | amixer->ops->commit_write(amixer); | ||
1061 | } | ||
1062 | |||
1063 | /* resume switch state. */ | ||
1064 | for (i = SWH_MIXER_START; i <= SWH_MIXER_END; i++) { | ||
1065 | state = get_switch_state(mixer, i); | ||
1066 | do_switch(mixer->atc, i, state); | ||
1067 | } | ||
1068 | |||
1069 | return 0; | ||
1070 | } | ||
1071 | #endif | ||
1072 | |||
1073 | int ct_mixer_destroy(struct ct_mixer *mixer) | ||
1074 | { | ||
1075 | struct sum_mgr *sum_mgr = (struct sum_mgr *)mixer->atc->rsc_mgrs[SUM]; | ||
1076 | struct amixer_mgr *amixer_mgr = | ||
1077 | (struct amixer_mgr *)mixer->atc->rsc_mgrs[AMIXER]; | ||
1078 | struct amixer *amixer; | ||
1079 | int i = 0; | ||
1080 | |||
1081 | /* Release amixer resources */ | ||
1082 | for (i = 0; i < (NUM_CT_AMIXERS * CHN_NUM); i++) { | ||
1083 | if (NULL != mixer->amixers[i]) { | ||
1084 | amixer = mixer->amixers[i]; | ||
1085 | amixer_mgr->put_amixer(amixer_mgr, amixer); | ||
1086 | } | ||
1087 | } | ||
1088 | |||
1089 | /* Release sum resources */ | ||
1090 | for (i = 0; i < (NUM_CT_SUMS * CHN_NUM); i++) { | ||
1091 | if (NULL != mixer->sums[i]) | ||
1092 | sum_mgr->put_sum(sum_mgr, (struct sum *)mixer->sums[i]); | ||
1093 | } | ||
1094 | |||
1095 | /* Release mem assigned to mixer object */ | ||
1096 | kfree(mixer->sums); | ||
1097 | kfree(mixer->amixers); | ||
1098 | kfree(mixer); | ||
1099 | |||
1100 | return 0; | ||
1101 | } | ||
1102 | |||
1103 | int ct_mixer_create(struct ct_atc *atc, struct ct_mixer **rmixer) | ||
1104 | { | ||
1105 | struct ct_mixer *mixer; | ||
1106 | int err; | ||
1107 | |||
1108 | *rmixer = NULL; | ||
1109 | |||
1110 | /* Allocate mem for mixer obj */ | ||
1111 | err = ct_mixer_get_mem(&mixer); | ||
1112 | if (err) | ||
1113 | return err; | ||
1114 | |||
1115 | mixer->switch_state = 0; | ||
1116 | mixer->atc = atc; | ||
1117 | /* Set operations */ | ||
1118 | mixer->get_output_ports = mixer_get_output_ports; | ||
1119 | mixer->set_input_left = mixer_set_input_left; | ||
1120 | mixer->set_input_right = mixer_set_input_right; | ||
1121 | #ifdef CONFIG_PM | ||
1122 | mixer->resume = mixer_resume; | ||
1123 | #endif | ||
1124 | |||
1125 | /* Allocate chip resources for mixer obj */ | ||
1126 | err = ct_mixer_get_resources(mixer); | ||
1127 | if (err) | ||
1128 | goto error; | ||
1129 | |||
1130 | /* Build internal mixer topology */ | ||
1131 | ct_mixer_topology_build(mixer); | ||
1132 | |||
1133 | *rmixer = mixer; | ||
1134 | |||
1135 | return 0; | ||
1136 | |||
1137 | error: | ||
1138 | ct_mixer_destroy(mixer); | ||
1139 | return err; | ||
1140 | } | ||
1141 | |||
1142 | int ct_alsa_mix_create(struct ct_atc *atc, | ||
1143 | enum CTALSADEVS device, | ||
1144 | const char *device_name) | ||
1145 | { | ||
1146 | int err; | ||
1147 | |||
1148 | /* Create snd kcontrol instances on demand */ | ||
1149 | /* vol_ctl.device = swh_ctl.device = device; */ /* better w/ device 0 */ | ||
1150 | err = ct_mixer_kcontrols_create((struct ct_mixer *)atc->mixer); | ||
1151 | if (err) | ||
1152 | return err; | ||
1153 | |||
1154 | strcpy(atc->card->mixername, device_name); | ||
1155 | |||
1156 | return 0; | ||
1157 | } | ||
diff --git a/sound/pci/ctxfi/ctmixer.h b/sound/pci/ctxfi/ctmixer.h new file mode 100644 index 000000000000..b009e989e77d --- /dev/null +++ b/sound/pci/ctxfi/ctmixer.h | |||
@@ -0,0 +1,70 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctmixer.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of the mixer device functions. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date Mar 28 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #ifndef CTMIXER_H | ||
19 | #define CTMIXER_H | ||
20 | |||
21 | #include "ctatc.h" | ||
22 | #include "ctresource.h" | ||
23 | |||
24 | #define INIT_VOL 0x1c00 | ||
25 | |||
26 | enum MIXER_PORT_T { | ||
27 | MIX_WAVE_FRONT, | ||
28 | MIX_WAVE_REAR, | ||
29 | MIX_WAVE_CENTLFE, | ||
30 | MIX_WAVE_SURROUND, | ||
31 | MIX_SPDIF_OUT, | ||
32 | MIX_PCMO_FRONT, | ||
33 | MIX_MIC_IN, | ||
34 | MIX_LINE_IN, | ||
35 | MIX_SPDIF_IN, | ||
36 | MIX_PCMI_FRONT, | ||
37 | MIX_PCMI_REAR, | ||
38 | MIX_PCMI_CENTLFE, | ||
39 | MIX_PCMI_SURROUND, | ||
40 | |||
41 | NUM_MIX_PORTS | ||
42 | }; | ||
43 | |||
44 | /* alsa mixer descriptor */ | ||
45 | struct ct_mixer { | ||
46 | struct ct_atc *atc; | ||
47 | |||
48 | void **amixers; /* amixer resources for volume control */ | ||
49 | void **sums; /* sum resources for signal collection */ | ||
50 | unsigned int switch_state; /* A bit-map to indicate state of switches */ | ||
51 | |||
52 | int (*get_output_ports)(struct ct_mixer *mixer, enum MIXER_PORT_T type, | ||
53 | struct rsc **rleft, struct rsc **rright); | ||
54 | |||
55 | int (*set_input_left)(struct ct_mixer *mixer, | ||
56 | enum MIXER_PORT_T type, struct rsc *rsc); | ||
57 | int (*set_input_right)(struct ct_mixer *mixer, | ||
58 | enum MIXER_PORT_T type, struct rsc *rsc); | ||
59 | #ifdef CONFIG_PM | ||
60 | int (*resume)(struct ct_mixer *mixer); | ||
61 | #endif | ||
62 | }; | ||
63 | |||
64 | int ct_alsa_mix_create(struct ct_atc *atc, | ||
65 | enum CTALSADEVS device, | ||
66 | const char *device_name); | ||
67 | int ct_mixer_create(struct ct_atc *atc, struct ct_mixer **rmixer); | ||
68 | int ct_mixer_destroy(struct ct_mixer *mixer); | ||
69 | |||
70 | #endif /* CTMIXER_H */ | ||
diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c new file mode 100644 index 000000000000..60ea23180acb --- /dev/null +++ b/sound/pci/ctxfi/ctpcm.c | |||
@@ -0,0 +1,430 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctpcm.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of the pcm device functions. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date Apr 2 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #include "ctpcm.h" | ||
19 | #include "cttimer.h" | ||
20 | #include <sound/pcm.h> | ||
21 | |||
22 | /* Hardware descriptions for playback */ | ||
23 | static struct snd_pcm_hardware ct_pcm_playback_hw = { | ||
24 | .info = (SNDRV_PCM_INFO_MMAP | | ||
25 | SNDRV_PCM_INFO_INTERLEAVED | | ||
26 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | ||
27 | SNDRV_PCM_INFO_MMAP_VALID | | ||
28 | SNDRV_PCM_INFO_PAUSE), | ||
29 | .formats = (SNDRV_PCM_FMTBIT_U8 | | ||
30 | SNDRV_PCM_FMTBIT_S16_LE | | ||
31 | SNDRV_PCM_FMTBIT_S24_3LE | | ||
32 | SNDRV_PCM_FMTBIT_S32_LE | | ||
33 | SNDRV_PCM_FMTBIT_FLOAT_LE), | ||
34 | .rates = (SNDRV_PCM_RATE_CONTINUOUS | | ||
35 | SNDRV_PCM_RATE_8000_192000), | ||
36 | .rate_min = 8000, | ||
37 | .rate_max = 192000, | ||
38 | .channels_min = 1, | ||
39 | .channels_max = 2, | ||
40 | .buffer_bytes_max = (128*1024), | ||
41 | .period_bytes_min = (64), | ||
42 | .period_bytes_max = (128*1024), | ||
43 | .periods_min = 2, | ||
44 | .periods_max = 1024, | ||
45 | .fifo_size = 0, | ||
46 | }; | ||
47 | |||
48 | static struct snd_pcm_hardware ct_spdif_passthru_playback_hw = { | ||
49 | .info = (SNDRV_PCM_INFO_MMAP | | ||
50 | SNDRV_PCM_INFO_INTERLEAVED | | ||
51 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | ||
52 | SNDRV_PCM_INFO_MMAP_VALID | | ||
53 | SNDRV_PCM_INFO_PAUSE), | ||
54 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | ||
55 | .rates = (SNDRV_PCM_RATE_48000 | | ||
56 | SNDRV_PCM_RATE_44100 | | ||
57 | SNDRV_PCM_RATE_32000), | ||
58 | .rate_min = 32000, | ||
59 | .rate_max = 48000, | ||
60 | .channels_min = 2, | ||
61 | .channels_max = 2, | ||
62 | .buffer_bytes_max = (128*1024), | ||
63 | .period_bytes_min = (64), | ||
64 | .period_bytes_max = (128*1024), | ||
65 | .periods_min = 2, | ||
66 | .periods_max = 1024, | ||
67 | .fifo_size = 0, | ||
68 | }; | ||
69 | |||
70 | /* Hardware descriptions for capture */ | ||
71 | static struct snd_pcm_hardware ct_pcm_capture_hw = { | ||
72 | .info = (SNDRV_PCM_INFO_MMAP | | ||
73 | SNDRV_PCM_INFO_INTERLEAVED | | ||
74 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | ||
75 | SNDRV_PCM_INFO_PAUSE | | ||
76 | SNDRV_PCM_INFO_MMAP_VALID), | ||
77 | .formats = (SNDRV_PCM_FMTBIT_U8 | | ||
78 | SNDRV_PCM_FMTBIT_S16_LE | | ||
79 | SNDRV_PCM_FMTBIT_S24_3LE | | ||
80 | SNDRV_PCM_FMTBIT_S32_LE | | ||
81 | SNDRV_PCM_FMTBIT_FLOAT_LE), | ||
82 | .rates = (SNDRV_PCM_RATE_CONTINUOUS | | ||
83 | SNDRV_PCM_RATE_8000_96000), | ||
84 | .rate_min = 8000, | ||
85 | .rate_max = 96000, | ||
86 | .channels_min = 1, | ||
87 | .channels_max = 2, | ||
88 | .buffer_bytes_max = (128*1024), | ||
89 | .period_bytes_min = (384), | ||
90 | .period_bytes_max = (64*1024), | ||
91 | .periods_min = 2, | ||
92 | .periods_max = 1024, | ||
93 | .fifo_size = 0, | ||
94 | }; | ||
95 | |||
96 | static void ct_atc_pcm_interrupt(struct ct_atc_pcm *atc_pcm) | ||
97 | { | ||
98 | struct ct_atc_pcm *apcm = atc_pcm; | ||
99 | |||
100 | if (NULL == apcm->substream) | ||
101 | return; | ||
102 | |||
103 | snd_pcm_period_elapsed(apcm->substream); | ||
104 | } | ||
105 | |||
106 | static void ct_atc_pcm_free_substream(struct snd_pcm_runtime *runtime) | ||
107 | { | ||
108 | struct ct_atc_pcm *apcm = runtime->private_data; | ||
109 | struct ct_atc *atc = snd_pcm_substream_chip(apcm->substream); | ||
110 | |||
111 | atc->pcm_release_resources(atc, apcm); | ||
112 | ct_timer_instance_free(apcm->timer); | ||
113 | kfree(apcm); | ||
114 | runtime->private_data = NULL; | ||
115 | } | ||
116 | |||
117 | /* pcm playback operations */ | ||
118 | static int ct_pcm_playback_open(struct snd_pcm_substream *substream) | ||
119 | { | ||
120 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
121 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
122 | struct ct_atc_pcm *apcm; | ||
123 | int err; | ||
124 | |||
125 | apcm = kzalloc(sizeof(*apcm), GFP_KERNEL); | ||
126 | if (NULL == apcm) | ||
127 | return -ENOMEM; | ||
128 | |||
129 | apcm->substream = substream; | ||
130 | apcm->interrupt = ct_atc_pcm_interrupt; | ||
131 | runtime->private_data = apcm; | ||
132 | runtime->private_free = ct_atc_pcm_free_substream; | ||
133 | if (IEC958 == substream->pcm->device) { | ||
134 | runtime->hw = ct_spdif_passthru_playback_hw; | ||
135 | atc->spdif_out_passthru(atc, 1); | ||
136 | } else { | ||
137 | runtime->hw = ct_pcm_playback_hw; | ||
138 | if (FRONT == substream->pcm->device) | ||
139 | runtime->hw.channels_max = 8; | ||
140 | } | ||
141 | |||
142 | err = snd_pcm_hw_constraint_integer(runtime, | ||
143 | SNDRV_PCM_HW_PARAM_PERIODS); | ||
144 | if (err < 0) { | ||
145 | kfree(apcm); | ||
146 | return err; | ||
147 | } | ||
148 | err = snd_pcm_hw_constraint_minmax(runtime, | ||
149 | SNDRV_PCM_HW_PARAM_BUFFER_BYTES, | ||
150 | 1024, UINT_MAX); | ||
151 | if (err < 0) { | ||
152 | kfree(apcm); | ||
153 | return err; | ||
154 | } | ||
155 | |||
156 | apcm->timer = ct_timer_instance_new(atc->timer, apcm); | ||
157 | if (!apcm->timer) | ||
158 | return -ENOMEM; | ||
159 | |||
160 | return 0; | ||
161 | } | ||
162 | |||
163 | static int ct_pcm_playback_close(struct snd_pcm_substream *substream) | ||
164 | { | ||
165 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
166 | |||
167 | /* TODO: Notify mixer inactive. */ | ||
168 | if (IEC958 == substream->pcm->device) | ||
169 | atc->spdif_out_passthru(atc, 0); | ||
170 | |||
171 | /* The ct_atc_pcm object will be freed by runtime->private_free */ | ||
172 | |||
173 | return 0; | ||
174 | } | ||
175 | |||
176 | static int ct_pcm_hw_params(struct snd_pcm_substream *substream, | ||
177 | struct snd_pcm_hw_params *hw_params) | ||
178 | { | ||
179 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
180 | struct ct_atc_pcm *apcm = substream->runtime->private_data; | ||
181 | int err; | ||
182 | |||
183 | err = snd_pcm_lib_malloc_pages(substream, | ||
184 | params_buffer_bytes(hw_params)); | ||
185 | if (err < 0) | ||
186 | return err; | ||
187 | /* clear previous resources */ | ||
188 | atc->pcm_release_resources(atc, apcm); | ||
189 | return err; | ||
190 | } | ||
191 | |||
192 | static int ct_pcm_hw_free(struct snd_pcm_substream *substream) | ||
193 | { | ||
194 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
195 | struct ct_atc_pcm *apcm = substream->runtime->private_data; | ||
196 | |||
197 | /* clear previous resources */ | ||
198 | atc->pcm_release_resources(atc, apcm); | ||
199 | /* Free snd-allocated pages */ | ||
200 | return snd_pcm_lib_free_pages(substream); | ||
201 | } | ||
202 | |||
203 | |||
204 | static int ct_pcm_playback_prepare(struct snd_pcm_substream *substream) | ||
205 | { | ||
206 | int err; | ||
207 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
208 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
209 | struct ct_atc_pcm *apcm = runtime->private_data; | ||
210 | |||
211 | if (IEC958 == substream->pcm->device) | ||
212 | err = atc->spdif_passthru_playback_prepare(atc, apcm); | ||
213 | else | ||
214 | err = atc->pcm_playback_prepare(atc, apcm); | ||
215 | |||
216 | if (err < 0) { | ||
217 | printk(KERN_ERR "ctxfi: Preparing pcm playback failed!!!\n"); | ||
218 | return err; | ||
219 | } | ||
220 | |||
221 | return 0; | ||
222 | } | ||
223 | |||
224 | static int | ||
225 | ct_pcm_playback_trigger(struct snd_pcm_substream *substream, int cmd) | ||
226 | { | ||
227 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
228 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
229 | struct ct_atc_pcm *apcm = runtime->private_data; | ||
230 | |||
231 | switch (cmd) { | ||
232 | case SNDRV_PCM_TRIGGER_START: | ||
233 | case SNDRV_PCM_TRIGGER_RESUME: | ||
234 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | ||
235 | atc->pcm_playback_start(atc, apcm); | ||
236 | break; | ||
237 | case SNDRV_PCM_TRIGGER_STOP: | ||
238 | case SNDRV_PCM_TRIGGER_SUSPEND: | ||
239 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: | ||
240 | atc->pcm_playback_stop(atc, apcm); | ||
241 | break; | ||
242 | default: | ||
243 | break; | ||
244 | } | ||
245 | |||
246 | return 0; | ||
247 | } | ||
248 | |||
249 | static snd_pcm_uframes_t | ||
250 | ct_pcm_playback_pointer(struct snd_pcm_substream *substream) | ||
251 | { | ||
252 | unsigned long position; | ||
253 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
254 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
255 | struct ct_atc_pcm *apcm = runtime->private_data; | ||
256 | |||
257 | /* Read out playback position */ | ||
258 | position = atc->pcm_playback_position(atc, apcm); | ||
259 | position = bytes_to_frames(runtime, position); | ||
260 | if (position >= runtime->buffer_size) | ||
261 | position = 0; | ||
262 | return position; | ||
263 | } | ||
264 | |||
265 | /* pcm capture operations */ | ||
266 | static int ct_pcm_capture_open(struct snd_pcm_substream *substream) | ||
267 | { | ||
268 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
269 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
270 | struct ct_atc_pcm *apcm; | ||
271 | int err; | ||
272 | |||
273 | apcm = kzalloc(sizeof(*apcm), GFP_KERNEL); | ||
274 | if (NULL == apcm) | ||
275 | return -ENOMEM; | ||
276 | |||
277 | apcm->started = 0; | ||
278 | apcm->substream = substream; | ||
279 | apcm->interrupt = ct_atc_pcm_interrupt; | ||
280 | runtime->private_data = apcm; | ||
281 | runtime->private_free = ct_atc_pcm_free_substream; | ||
282 | runtime->hw = ct_pcm_capture_hw; | ||
283 | runtime->hw.rate_max = atc->rsr * atc->msr; | ||
284 | |||
285 | err = snd_pcm_hw_constraint_integer(runtime, | ||
286 | SNDRV_PCM_HW_PARAM_PERIODS); | ||
287 | if (err < 0) { | ||
288 | kfree(apcm); | ||
289 | return err; | ||
290 | } | ||
291 | err = snd_pcm_hw_constraint_minmax(runtime, | ||
292 | SNDRV_PCM_HW_PARAM_BUFFER_BYTES, | ||
293 | 1024, UINT_MAX); | ||
294 | if (err < 0) { | ||
295 | kfree(apcm); | ||
296 | return err; | ||
297 | } | ||
298 | |||
299 | apcm->timer = ct_timer_instance_new(atc->timer, apcm); | ||
300 | if (!apcm->timer) | ||
301 | return -ENOMEM; | ||
302 | |||
303 | return 0; | ||
304 | } | ||
305 | |||
306 | static int ct_pcm_capture_close(struct snd_pcm_substream *substream) | ||
307 | { | ||
308 | /* The ct_atc_pcm object will be freed by runtime->private_free */ | ||
309 | /* TODO: Notify mixer inactive. */ | ||
310 | return 0; | ||
311 | } | ||
312 | |||
313 | static int ct_pcm_capture_prepare(struct snd_pcm_substream *substream) | ||
314 | { | ||
315 | int err; | ||
316 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
317 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
318 | struct ct_atc_pcm *apcm = runtime->private_data; | ||
319 | |||
320 | err = atc->pcm_capture_prepare(atc, apcm); | ||
321 | if (err < 0) { | ||
322 | printk(KERN_ERR "ctxfi: Preparing pcm capture failed!!!\n"); | ||
323 | return err; | ||
324 | } | ||
325 | |||
326 | return 0; | ||
327 | } | ||
328 | |||
329 | static int | ||
330 | ct_pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd) | ||
331 | { | ||
332 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
333 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
334 | struct ct_atc_pcm *apcm = runtime->private_data; | ||
335 | |||
336 | switch (cmd) { | ||
337 | case SNDRV_PCM_TRIGGER_START: | ||
338 | atc->pcm_capture_start(atc, apcm); | ||
339 | break; | ||
340 | case SNDRV_PCM_TRIGGER_STOP: | ||
341 | atc->pcm_capture_stop(atc, apcm); | ||
342 | break; | ||
343 | default: | ||
344 | atc->pcm_capture_stop(atc, apcm); | ||
345 | break; | ||
346 | } | ||
347 | |||
348 | return 0; | ||
349 | } | ||
350 | |||
351 | static snd_pcm_uframes_t | ||
352 | ct_pcm_capture_pointer(struct snd_pcm_substream *substream) | ||
353 | { | ||
354 | unsigned long position; | ||
355 | struct ct_atc *atc = snd_pcm_substream_chip(substream); | ||
356 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
357 | struct ct_atc_pcm *apcm = runtime->private_data; | ||
358 | |||
359 | /* Read out playback position */ | ||
360 | position = atc->pcm_capture_position(atc, apcm); | ||
361 | position = bytes_to_frames(runtime, position); | ||
362 | if (position >= runtime->buffer_size) | ||
363 | position = 0; | ||
364 | return position; | ||
365 | } | ||
366 | |||
367 | /* PCM operators for playback */ | ||
368 | static struct snd_pcm_ops ct_pcm_playback_ops = { | ||
369 | .open = ct_pcm_playback_open, | ||
370 | .close = ct_pcm_playback_close, | ||
371 | .ioctl = snd_pcm_lib_ioctl, | ||
372 | .hw_params = ct_pcm_hw_params, | ||
373 | .hw_free = ct_pcm_hw_free, | ||
374 | .prepare = ct_pcm_playback_prepare, | ||
375 | .trigger = ct_pcm_playback_trigger, | ||
376 | .pointer = ct_pcm_playback_pointer, | ||
377 | .page = snd_pcm_sgbuf_ops_page, | ||
378 | }; | ||
379 | |||
380 | /* PCM operators for capture */ | ||
381 | static struct snd_pcm_ops ct_pcm_capture_ops = { | ||
382 | .open = ct_pcm_capture_open, | ||
383 | .close = ct_pcm_capture_close, | ||
384 | .ioctl = snd_pcm_lib_ioctl, | ||
385 | .hw_params = ct_pcm_hw_params, | ||
386 | .hw_free = ct_pcm_hw_free, | ||
387 | .prepare = ct_pcm_capture_prepare, | ||
388 | .trigger = ct_pcm_capture_trigger, | ||
389 | .pointer = ct_pcm_capture_pointer, | ||
390 | .page = snd_pcm_sgbuf_ops_page, | ||
391 | }; | ||
392 | |||
393 | /* Create ALSA pcm device */ | ||
394 | int ct_alsa_pcm_create(struct ct_atc *atc, | ||
395 | enum CTALSADEVS device, | ||
396 | const char *device_name) | ||
397 | { | ||
398 | struct snd_pcm *pcm; | ||
399 | int err; | ||
400 | int playback_count, capture_count; | ||
401 | |||
402 | playback_count = (IEC958 == device) ? 1 : 8; | ||
403 | capture_count = (FRONT == device) ? 1 : 0; | ||
404 | err = snd_pcm_new(atc->card, "ctxfi", device, | ||
405 | playback_count, capture_count, &pcm); | ||
406 | if (err < 0) { | ||
407 | printk(KERN_ERR "ctxfi: snd_pcm_new failed!! Err=%d\n", err); | ||
408 | return err; | ||
409 | } | ||
410 | |||
411 | pcm->private_data = atc; | ||
412 | pcm->info_flags = 0; | ||
413 | pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX; | ||
414 | strlcpy(pcm->name, device_name, sizeof(pcm->name)); | ||
415 | |||
416 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &ct_pcm_playback_ops); | ||
417 | |||
418 | if (FRONT == device) | ||
419 | snd_pcm_set_ops(pcm, | ||
420 | SNDRV_PCM_STREAM_CAPTURE, &ct_pcm_capture_ops); | ||
421 | |||
422 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, | ||
423 | snd_dma_pci_data(atc->pci), 128*1024, 128*1024); | ||
424 | |||
425 | #ifdef CONFIG_PM | ||
426 | atc->pcms[device] = pcm; | ||
427 | #endif | ||
428 | |||
429 | return 0; | ||
430 | } | ||
diff --git a/sound/pci/ctxfi/ctpcm.h b/sound/pci/ctxfi/ctpcm.h new file mode 100644 index 000000000000..178da0dca647 --- /dev/null +++ b/sound/pci/ctxfi/ctpcm.h | |||
@@ -0,0 +1,27 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctpcm.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of the pcm device functions. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date Mar 28 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #ifndef CTPCM_H | ||
19 | #define CTPCM_H | ||
20 | |||
21 | #include "ctatc.h" | ||
22 | |||
23 | int ct_alsa_pcm_create(struct ct_atc *atc, | ||
24 | enum CTALSADEVS device, | ||
25 | const char *device_name); | ||
26 | |||
27 | #endif /* CTPCM_H */ | ||
diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c new file mode 100644 index 000000000000..889c495bb7d1 --- /dev/null +++ b/sound/pci/ctxfi/ctresource.c | |||
@@ -0,0 +1,301 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctresource.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of some generic helper functions. | ||
12 | * | ||
13 | * @Author Liu Chun | ||
14 | * @Date May 15 2008 | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #include "ctresource.h" | ||
19 | #include "cthardware.h" | ||
20 | #include <linux/err.h> | ||
21 | #include <linux/slab.h> | ||
22 | |||
23 | #define AUDIO_SLOT_BLOCK_NUM 256 | ||
24 | |||
25 | /* Resource allocation based on bit-map management mechanism */ | ||
26 | static int | ||
27 | get_resource(u8 *rscs, unsigned int amount, | ||
28 | unsigned int multi, unsigned int *ridx) | ||
29 | { | ||
30 | int i, j, k, n; | ||
31 | |||
32 | /* Check whether there are sufficient resources to meet request. */ | ||
33 | for (i = 0, n = multi; i < amount; i++) { | ||
34 | j = i / 8; | ||
35 | k = i % 8; | ||
36 | if (rscs[j] & ((u8)1 << k)) { | ||
37 | n = multi; | ||
38 | continue; | ||
39 | } | ||
40 | if (!(--n)) | ||
41 | break; /* found sufficient contiguous resources */ | ||
42 | } | ||
43 | |||
44 | if (i >= amount) { | ||
45 | /* Can not find sufficient contiguous resources */ | ||
46 | return -ENOENT; | ||
47 | } | ||
48 | |||
49 | /* Mark the contiguous bits in resource bit-map as used */ | ||
50 | for (n = multi; n > 0; n--) { | ||
51 | j = i / 8; | ||
52 | k = i % 8; | ||
53 | rscs[j] |= ((u8)1 << k); | ||
54 | i--; | ||
55 | } | ||
56 | |||
57 | *ridx = i + 1; | ||
58 | |||
59 | return 0; | ||
60 | } | ||
61 | |||
62 | static int put_resource(u8 *rscs, unsigned int multi, unsigned int idx) | ||
63 | { | ||
64 | unsigned int i, j, k, n; | ||
65 | |||
66 | /* Mark the contiguous bits in resource bit-map as used */ | ||
67 | for (n = multi, i = idx; n > 0; n--) { | ||
68 | j = i / 8; | ||
69 | k = i % 8; | ||
70 | rscs[j] &= ~((u8)1 << k); | ||
71 | i++; | ||
72 | } | ||
73 | |||
74 | return 0; | ||
75 | } | ||
76 | |||
77 | int mgr_get_resource(struct rsc_mgr *mgr, unsigned int n, unsigned int *ridx) | ||
78 | { | ||
79 | int err; | ||
80 | |||
81 | if (n > mgr->avail) | ||
82 | return -ENOENT; | ||
83 | |||
84 | err = get_resource(mgr->rscs, mgr->amount, n, ridx); | ||
85 | if (!err) | ||
86 | mgr->avail -= n; | ||
87 | |||
88 | return err; | ||
89 | } | ||
90 | |||
91 | int mgr_put_resource(struct rsc_mgr *mgr, unsigned int n, unsigned int idx) | ||
92 | { | ||
93 | put_resource(mgr->rscs, n, idx); | ||
94 | mgr->avail += n; | ||
95 | |||
96 | return 0; | ||
97 | } | ||
98 | |||
99 | static unsigned char offset_in_audio_slot_block[NUM_RSCTYP] = { | ||
100 | /* SRC channel is at Audio Ring slot 1 every 16 slots. */ | ||
101 | [SRC] = 0x1, | ||
102 | [AMIXER] = 0x4, | ||
103 | [SUM] = 0xc, | ||
104 | }; | ||
105 | |||
106 | static int rsc_index(const struct rsc *rsc) | ||
107 | { | ||
108 | return rsc->conj; | ||
109 | } | ||
110 | |||
111 | static int audio_ring_slot(const struct rsc *rsc) | ||
112 | { | ||
113 | return (rsc->conj << 4) + offset_in_audio_slot_block[rsc->type]; | ||
114 | } | ||
115 | |||
116 | static int rsc_next_conj(struct rsc *rsc) | ||
117 | { | ||
118 | unsigned int i; | ||
119 | for (i = 0; (i < 8) && (!(rsc->msr & (0x1 << i))); ) | ||
120 | i++; | ||
121 | rsc->conj += (AUDIO_SLOT_BLOCK_NUM >> i); | ||
122 | return rsc->conj; | ||
123 | } | ||
124 | |||
125 | static int rsc_master(struct rsc *rsc) | ||
126 | { | ||
127 | return rsc->conj = rsc->idx; | ||
128 | } | ||
129 | |||
130 | static struct rsc_ops rsc_generic_ops = { | ||
131 | .index = rsc_index, | ||
132 | .output_slot = audio_ring_slot, | ||
133 | .master = rsc_master, | ||
134 | .next_conj = rsc_next_conj, | ||
135 | }; | ||
136 | |||
137 | int rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, void *hw) | ||
138 | { | ||
139 | int err = 0; | ||
140 | |||
141 | rsc->idx = idx; | ||
142 | rsc->conj = idx; | ||
143 | rsc->type = type; | ||
144 | rsc->msr = msr; | ||
145 | rsc->hw = hw; | ||
146 | rsc->ops = &rsc_generic_ops; | ||
147 | if (NULL == hw) { | ||
148 | rsc->ctrl_blk = NULL; | ||
149 | return 0; | ||
150 | } | ||
151 | |||
152 | switch (type) { | ||
153 | case SRC: | ||
154 | err = ((struct hw *)hw)->src_rsc_get_ctrl_blk(&rsc->ctrl_blk); | ||
155 | break; | ||
156 | case AMIXER: | ||
157 | err = ((struct hw *)hw)-> | ||
158 | amixer_rsc_get_ctrl_blk(&rsc->ctrl_blk); | ||
159 | break; | ||
160 | case SRCIMP: | ||
161 | case SUM: | ||
162 | case DAIO: | ||
163 | break; | ||
164 | default: | ||
165 | printk(KERN_ERR | ||
166 | "ctxfi: Invalid resource type value %d!\n", type); | ||
167 | return -EINVAL; | ||
168 | } | ||
169 | |||
170 | if (err) { | ||
171 | printk(KERN_ERR | ||
172 | "ctxfi: Failed to get resource control block!\n"); | ||
173 | return err; | ||
174 | } | ||
175 | |||
176 | return 0; | ||
177 | } | ||
178 | |||
179 | int rsc_uninit(struct rsc *rsc) | ||
180 | { | ||
181 | if ((NULL != rsc->hw) && (NULL != rsc->ctrl_blk)) { | ||
182 | switch (rsc->type) { | ||
183 | case SRC: | ||
184 | ((struct hw *)rsc->hw)-> | ||
185 | src_rsc_put_ctrl_blk(rsc->ctrl_blk); | ||
186 | break; | ||
187 | case AMIXER: | ||
188 | ((struct hw *)rsc->hw)-> | ||
189 | amixer_rsc_put_ctrl_blk(rsc->ctrl_blk); | ||
190 | break; | ||
191 | case SUM: | ||
192 | case DAIO: | ||
193 | break; | ||
194 | default: | ||
195 | printk(KERN_ERR "ctxfi: " | ||
196 | "Invalid resource type value %d!\n", rsc->type); | ||
197 | break; | ||
198 | } | ||
199 | |||
200 | rsc->hw = rsc->ctrl_blk = NULL; | ||
201 | } | ||
202 | |||
203 | rsc->idx = rsc->conj = 0; | ||
204 | rsc->type = NUM_RSCTYP; | ||
205 | rsc->msr = 0; | ||
206 | |||
207 | return 0; | ||
208 | } | ||
209 | |||
210 | int rsc_mgr_init(struct rsc_mgr *mgr, enum RSCTYP type, | ||
211 | unsigned int amount, void *hw_obj) | ||
212 | { | ||
213 | int err = 0; | ||
214 | struct hw *hw = hw_obj; | ||
215 | |||
216 | mgr->type = NUM_RSCTYP; | ||
217 | |||
218 | mgr->rscs = kzalloc(((amount + 8 - 1) / 8), GFP_KERNEL); | ||
219 | if (NULL == mgr->rscs) | ||
220 | return -ENOMEM; | ||
221 | |||
222 | switch (type) { | ||
223 | case SRC: | ||
224 | err = hw->src_mgr_get_ctrl_blk(&mgr->ctrl_blk); | ||
225 | break; | ||
226 | case SRCIMP: | ||
227 | err = hw->srcimp_mgr_get_ctrl_blk(&mgr->ctrl_blk); | ||
228 | break; | ||
229 | case AMIXER: | ||
230 | err = hw->amixer_mgr_get_ctrl_blk(&mgr->ctrl_blk); | ||
231 | break; | ||
232 | case DAIO: | ||
233 | err = hw->daio_mgr_get_ctrl_blk(hw, &mgr->ctrl_blk); | ||
234 | break; | ||
235 | case SUM: | ||
236 | break; | ||
237 | default: | ||
238 | printk(KERN_ERR | ||
239 | "ctxfi: Invalid resource type value %d!\n", type); | ||
240 | err = -EINVAL; | ||
241 | goto error; | ||
242 | } | ||
243 | |||
244 | if (err) { | ||
245 | printk(KERN_ERR | ||
246 | "ctxfi: Failed to get manager control block!\n"); | ||
247 | goto error; | ||
248 | } | ||
249 | |||
250 | mgr->type = type; | ||
251 | mgr->avail = mgr->amount = amount; | ||
252 | mgr->hw = hw; | ||
253 | |||
254 | return 0; | ||
255 | |||
256 | error: | ||
257 | kfree(mgr->rscs); | ||
258 | return err; | ||
259 | } | ||
260 | |||
261 | int rsc_mgr_uninit(struct rsc_mgr *mgr) | ||
262 | { | ||
263 | if (NULL != mgr->rscs) { | ||
264 | kfree(mgr->rscs); | ||
265 | mgr->rscs = NULL; | ||
266 | } | ||
267 | |||
268 | if ((NULL != mgr->hw) && (NULL != mgr->ctrl_blk)) { | ||
269 | switch (mgr->type) { | ||
270 | case SRC: | ||
271 | ((struct hw *)mgr->hw)-> | ||
272 | src_mgr_put_ctrl_blk(mgr->ctrl_blk); | ||
273 | break; | ||
274 | case SRCIMP: | ||
275 | ((struct hw *)mgr->hw)-> | ||
276 | srcimp_mgr_put_ctrl_blk(mgr->ctrl_blk); | ||
277 | break; | ||
278 | case AMIXER: | ||
279 | ((struct hw *)mgr->hw)-> | ||
280 | amixer_mgr_put_ctrl_blk(mgr->ctrl_blk); | ||
281 | break; | ||
282 | case DAIO: | ||
283 | ((struct hw *)mgr->hw)-> | ||
284 | daio_mgr_put_ctrl_blk(mgr->ctrl_blk); | ||
285 | break; | ||
286 | case SUM: | ||
287 | break; | ||
288 | default: | ||
289 | printk(KERN_ERR "ctxfi: " | ||
290 | "Invalid resource type value %d!\n", mgr->type); | ||
291 | break; | ||
292 | } | ||
293 | |||
294 | mgr->hw = mgr->ctrl_blk = NULL; | ||
295 | } | ||
296 | |||
297 | mgr->type = NUM_RSCTYP; | ||
298 | mgr->avail = mgr->amount = 0; | ||
299 | |||
300 | return 0; | ||
301 | } | ||
diff --git a/sound/pci/ctxfi/ctresource.h b/sound/pci/ctxfi/ctresource.h new file mode 100644 index 000000000000..0838c2e84f8b --- /dev/null +++ b/sound/pci/ctxfi/ctresource.h | |||
@@ -0,0 +1,72 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctresource.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of generic hardware resources for | ||
12 | * resource management. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date May 13 2008 | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #ifndef CTRESOURCE_H | ||
20 | #define CTRESOURCE_H | ||
21 | |||
22 | #include <linux/types.h> | ||
23 | |||
24 | enum RSCTYP { | ||
25 | SRC, | ||
26 | SRCIMP, | ||
27 | AMIXER, | ||
28 | SUM, | ||
29 | DAIO, | ||
30 | NUM_RSCTYP /* This must be the last one and less than 16 */ | ||
31 | }; | ||
32 | |||
33 | struct rsc_ops; | ||
34 | |||
35 | struct rsc { | ||
36 | u32 idx:12; /* The index of a resource */ | ||
37 | u32 type:4; /* The type (RSCTYP) of a resource */ | ||
38 | u32 conj:12; /* Current conjugate index */ | ||
39 | u32 msr:4; /* The Master Sample Rate a resource working on */ | ||
40 | void *ctrl_blk; /* Chip specific control info block for a resource */ | ||
41 | void *hw; /* Chip specific object for hardware access means */ | ||
42 | struct rsc_ops *ops; /* Generic resource operations */ | ||
43 | }; | ||
44 | |||
45 | struct rsc_ops { | ||
46 | int (*master)(struct rsc *rsc); /* Move to master resource */ | ||
47 | int (*next_conj)(struct rsc *rsc); /* Move to next conjugate resource */ | ||
48 | int (*index)(const struct rsc *rsc); /* Return the index of resource */ | ||
49 | /* Return the output slot number */ | ||
50 | int (*output_slot)(const struct rsc *rsc); | ||
51 | }; | ||
52 | |||
53 | int rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, void *hw); | ||
54 | int rsc_uninit(struct rsc *rsc); | ||
55 | |||
56 | struct rsc_mgr { | ||
57 | enum RSCTYP type; /* The type (RSCTYP) of resource to manage */ | ||
58 | unsigned int amount; /* The total amount of a kind of resource */ | ||
59 | unsigned int avail; /* The amount of currently available resources */ | ||
60 | unsigned char *rscs; /* The bit-map for resource allocation */ | ||
61 | void *ctrl_blk; /* Chip specific control info block */ | ||
62 | void *hw; /* Chip specific object for hardware access */ | ||
63 | }; | ||
64 | |||
65 | /* Resource management is based on bit-map mechanism */ | ||
66 | int rsc_mgr_init(struct rsc_mgr *mgr, enum RSCTYP type, | ||
67 | unsigned int amount, void *hw); | ||
68 | int rsc_mgr_uninit(struct rsc_mgr *mgr); | ||
69 | int mgr_get_resource(struct rsc_mgr *mgr, unsigned int n, unsigned int *ridx); | ||
70 | int mgr_put_resource(struct rsc_mgr *mgr, unsigned int n, unsigned int idx); | ||
71 | |||
72 | #endif /* CTRESOURCE_H */ | ||
diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c new file mode 100644 index 000000000000..e1c145d8b702 --- /dev/null +++ b/sound/pci/ctxfi/ctsrc.c | |||
@@ -0,0 +1,886 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctsrc.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of the Sample Rate Convertor | ||
12 | * resource management object. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date May 13 2008 | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #include "ctsrc.h" | ||
20 | #include "cthardware.h" | ||
21 | #include <linux/slab.h> | ||
22 | |||
23 | #define SRC_RESOURCE_NUM 64 | ||
24 | #define SRCIMP_RESOURCE_NUM 256 | ||
25 | |||
26 | static unsigned int conj_mask; | ||
27 | |||
28 | static int src_default_config_memrd(struct src *src); | ||
29 | static int src_default_config_memwr(struct src *src); | ||
30 | static int src_default_config_arcrw(struct src *src); | ||
31 | |||
32 | static int (*src_default_config[3])(struct src *) = { | ||
33 | [MEMRD] = src_default_config_memrd, | ||
34 | [MEMWR] = src_default_config_memwr, | ||
35 | [ARCRW] = src_default_config_arcrw | ||
36 | }; | ||
37 | |||
38 | static int src_set_state(struct src *src, unsigned int state) | ||
39 | { | ||
40 | struct hw *hw; | ||
41 | |||
42 | hw = src->rsc.hw; | ||
43 | hw->src_set_state(src->rsc.ctrl_blk, state); | ||
44 | |||
45 | return 0; | ||
46 | } | ||
47 | |||
48 | static int src_set_bm(struct src *src, unsigned int bm) | ||
49 | { | ||
50 | struct hw *hw; | ||
51 | |||
52 | hw = src->rsc.hw; | ||
53 | hw->src_set_bm(src->rsc.ctrl_blk, bm); | ||
54 | |||
55 | return 0; | ||
56 | } | ||
57 | |||
58 | static int src_set_sf(struct src *src, unsigned int sf) | ||
59 | { | ||
60 | struct hw *hw; | ||
61 | |||
62 | hw = src->rsc.hw; | ||
63 | hw->src_set_sf(src->rsc.ctrl_blk, sf); | ||
64 | |||
65 | return 0; | ||
66 | } | ||
67 | |||
68 | static int src_set_pm(struct src *src, unsigned int pm) | ||
69 | { | ||
70 | struct hw *hw; | ||
71 | |||
72 | hw = src->rsc.hw; | ||
73 | hw->src_set_pm(src->rsc.ctrl_blk, pm); | ||
74 | |||
75 | return 0; | ||
76 | } | ||
77 | |||
78 | static int src_set_rom(struct src *src, unsigned int rom) | ||
79 | { | ||
80 | struct hw *hw; | ||
81 | |||
82 | hw = src->rsc.hw; | ||
83 | hw->src_set_rom(src->rsc.ctrl_blk, rom); | ||
84 | |||
85 | return 0; | ||
86 | } | ||
87 | |||
88 | static int src_set_vo(struct src *src, unsigned int vo) | ||
89 | { | ||
90 | struct hw *hw; | ||
91 | |||
92 | hw = src->rsc.hw; | ||
93 | hw->src_set_vo(src->rsc.ctrl_blk, vo); | ||
94 | |||
95 | return 0; | ||
96 | } | ||
97 | |||
98 | static int src_set_st(struct src *src, unsigned int st) | ||
99 | { | ||
100 | struct hw *hw; | ||
101 | |||
102 | hw = src->rsc.hw; | ||
103 | hw->src_set_st(src->rsc.ctrl_blk, st); | ||
104 | |||
105 | return 0; | ||
106 | } | ||
107 | |||
108 | static int src_set_bp(struct src *src, unsigned int bp) | ||
109 | { | ||
110 | struct hw *hw; | ||
111 | |||
112 | hw = src->rsc.hw; | ||
113 | hw->src_set_bp(src->rsc.ctrl_blk, bp); | ||
114 | |||
115 | return 0; | ||
116 | } | ||
117 | |||
118 | static int src_set_cisz(struct src *src, unsigned int cisz) | ||
119 | { | ||
120 | struct hw *hw; | ||
121 | |||
122 | hw = src->rsc.hw; | ||
123 | hw->src_set_cisz(src->rsc.ctrl_blk, cisz); | ||
124 | |||
125 | return 0; | ||
126 | } | ||
127 | |||
128 | static int src_set_ca(struct src *src, unsigned int ca) | ||
129 | { | ||
130 | struct hw *hw; | ||
131 | |||
132 | hw = src->rsc.hw; | ||
133 | hw->src_set_ca(src->rsc.ctrl_blk, ca); | ||
134 | |||
135 | return 0; | ||
136 | } | ||
137 | |||
138 | static int src_set_sa(struct src *src, unsigned int sa) | ||
139 | { | ||
140 | struct hw *hw; | ||
141 | |||
142 | hw = src->rsc.hw; | ||
143 | hw->src_set_sa(src->rsc.ctrl_blk, sa); | ||
144 | |||
145 | return 0; | ||
146 | } | ||
147 | |||
148 | static int src_set_la(struct src *src, unsigned int la) | ||
149 | { | ||
150 | struct hw *hw; | ||
151 | |||
152 | hw = src->rsc.hw; | ||
153 | hw->src_set_la(src->rsc.ctrl_blk, la); | ||
154 | |||
155 | return 0; | ||
156 | } | ||
157 | |||
158 | static int src_set_pitch(struct src *src, unsigned int pitch) | ||
159 | { | ||
160 | struct hw *hw; | ||
161 | |||
162 | hw = src->rsc.hw; | ||
163 | hw->src_set_pitch(src->rsc.ctrl_blk, pitch); | ||
164 | |||
165 | return 0; | ||
166 | } | ||
167 | |||
168 | static int src_set_clear_zbufs(struct src *src) | ||
169 | { | ||
170 | struct hw *hw; | ||
171 | |||
172 | hw = src->rsc.hw; | ||
173 | hw->src_set_clear_zbufs(src->rsc.ctrl_blk, 1); | ||
174 | |||
175 | return 0; | ||
176 | } | ||
177 | |||
178 | static int src_commit_write(struct src *src) | ||
179 | { | ||
180 | struct hw *hw; | ||
181 | int i; | ||
182 | unsigned int dirty = 0; | ||
183 | |||
184 | hw = src->rsc.hw; | ||
185 | src->rsc.ops->master(&src->rsc); | ||
186 | if (src->rsc.msr > 1) { | ||
187 | /* Save dirty flags for conjugate resource programming */ | ||
188 | dirty = hw->src_get_dirty(src->rsc.ctrl_blk) & conj_mask; | ||
189 | } | ||
190 | hw->src_commit_write(hw, src->rsc.ops->index(&src->rsc), | ||
191 | src->rsc.ctrl_blk); | ||
192 | |||
193 | /* Program conjugate parameter mixer resources */ | ||
194 | if (MEMWR == src->mode) | ||
195 | return 0; | ||
196 | |||
197 | for (i = 1; i < src->rsc.msr; i++) { | ||
198 | src->rsc.ops->next_conj(&src->rsc); | ||
199 | hw->src_set_dirty(src->rsc.ctrl_blk, dirty); | ||
200 | hw->src_commit_write(hw, src->rsc.ops->index(&src->rsc), | ||
201 | src->rsc.ctrl_blk); | ||
202 | } | ||
203 | src->rsc.ops->master(&src->rsc); | ||
204 | |||
205 | return 0; | ||
206 | } | ||
207 | |||
208 | static int src_get_ca(struct src *src) | ||
209 | { | ||
210 | struct hw *hw; | ||
211 | |||
212 | hw = src->rsc.hw; | ||
213 | return hw->src_get_ca(hw, src->rsc.ops->index(&src->rsc), | ||
214 | src->rsc.ctrl_blk); | ||
215 | } | ||
216 | |||
217 | static int src_init(struct src *src) | ||
218 | { | ||
219 | src_default_config[src->mode](src); | ||
220 | |||
221 | return 0; | ||
222 | } | ||
223 | |||
224 | static struct src *src_next_interleave(struct src *src) | ||
225 | { | ||
226 | return src->intlv; | ||
227 | } | ||
228 | |||
229 | static int src_default_config_memrd(struct src *src) | ||
230 | { | ||
231 | struct hw *hw = src->rsc.hw; | ||
232 | unsigned int rsr, msr; | ||
233 | |||
234 | hw->src_set_state(src->rsc.ctrl_blk, SRC_STATE_OFF); | ||
235 | hw->src_set_bm(src->rsc.ctrl_blk, 1); | ||
236 | for (rsr = 0, msr = src->rsc.msr; msr > 1; msr >>= 1) | ||
237 | rsr++; | ||
238 | |||
239 | hw->src_set_rsr(src->rsc.ctrl_blk, rsr); | ||
240 | hw->src_set_sf(src->rsc.ctrl_blk, SRC_SF_S16); | ||
241 | hw->src_set_wr(src->rsc.ctrl_blk, 0); | ||
242 | hw->src_set_pm(src->rsc.ctrl_blk, 0); | ||
243 | hw->src_set_rom(src->rsc.ctrl_blk, 0); | ||
244 | hw->src_set_vo(src->rsc.ctrl_blk, 0); | ||
245 | hw->src_set_st(src->rsc.ctrl_blk, 0); | ||
246 | hw->src_set_ilsz(src->rsc.ctrl_blk, src->multi - 1); | ||
247 | hw->src_set_cisz(src->rsc.ctrl_blk, 0x80); | ||
248 | hw->src_set_sa(src->rsc.ctrl_blk, 0x0); | ||
249 | hw->src_set_la(src->rsc.ctrl_blk, 0x1000); | ||
250 | hw->src_set_ca(src->rsc.ctrl_blk, 0x80); | ||
251 | hw->src_set_pitch(src->rsc.ctrl_blk, 0x1000000); | ||
252 | hw->src_set_clear_zbufs(src->rsc.ctrl_blk, 1); | ||
253 | |||
254 | src->rsc.ops->master(&src->rsc); | ||
255 | hw->src_commit_write(hw, src->rsc.ops->index(&src->rsc), | ||
256 | src->rsc.ctrl_blk); | ||
257 | |||
258 | for (msr = 1; msr < src->rsc.msr; msr++) { | ||
259 | src->rsc.ops->next_conj(&src->rsc); | ||
260 | hw->src_set_pitch(src->rsc.ctrl_blk, 0x1000000); | ||
261 | hw->src_commit_write(hw, src->rsc.ops->index(&src->rsc), | ||
262 | src->rsc.ctrl_blk); | ||
263 | } | ||
264 | src->rsc.ops->master(&src->rsc); | ||
265 | |||
266 | return 0; | ||
267 | } | ||
268 | |||
269 | static int src_default_config_memwr(struct src *src) | ||
270 | { | ||
271 | struct hw *hw = src->rsc.hw; | ||
272 | |||
273 | hw->src_set_state(src->rsc.ctrl_blk, SRC_STATE_OFF); | ||
274 | hw->src_set_bm(src->rsc.ctrl_blk, 1); | ||
275 | hw->src_set_rsr(src->rsc.ctrl_blk, 0); | ||
276 | hw->src_set_sf(src->rsc.ctrl_blk, SRC_SF_S16); | ||
277 | hw->src_set_wr(src->rsc.ctrl_blk, 1); | ||
278 | hw->src_set_pm(src->rsc.ctrl_blk, 0); | ||
279 | hw->src_set_rom(src->rsc.ctrl_blk, 0); | ||
280 | hw->src_set_vo(src->rsc.ctrl_blk, 0); | ||
281 | hw->src_set_st(src->rsc.ctrl_blk, 0); | ||
282 | hw->src_set_ilsz(src->rsc.ctrl_blk, 0); | ||
283 | hw->src_set_cisz(src->rsc.ctrl_blk, 0x80); | ||
284 | hw->src_set_sa(src->rsc.ctrl_blk, 0x0); | ||
285 | hw->src_set_la(src->rsc.ctrl_blk, 0x1000); | ||
286 | hw->src_set_ca(src->rsc.ctrl_blk, 0x80); | ||
287 | hw->src_set_pitch(src->rsc.ctrl_blk, 0x1000000); | ||
288 | hw->src_set_clear_zbufs(src->rsc.ctrl_blk, 1); | ||
289 | |||
290 | src->rsc.ops->master(&src->rsc); | ||
291 | hw->src_commit_write(hw, src->rsc.ops->index(&src->rsc), | ||
292 | src->rsc.ctrl_blk); | ||
293 | |||
294 | return 0; | ||
295 | } | ||
296 | |||
297 | static int src_default_config_arcrw(struct src *src) | ||
298 | { | ||
299 | struct hw *hw = src->rsc.hw; | ||
300 | unsigned int rsr, msr; | ||
301 | unsigned int dirty; | ||
302 | |||
303 | hw->src_set_state(src->rsc.ctrl_blk, SRC_STATE_OFF); | ||
304 | hw->src_set_bm(src->rsc.ctrl_blk, 0); | ||
305 | for (rsr = 0, msr = src->rsc.msr; msr > 1; msr >>= 1) | ||
306 | rsr++; | ||
307 | |||
308 | hw->src_set_rsr(src->rsc.ctrl_blk, rsr); | ||
309 | hw->src_set_sf(src->rsc.ctrl_blk, SRC_SF_F32); | ||
310 | hw->src_set_wr(src->rsc.ctrl_blk, 0); | ||
311 | hw->src_set_pm(src->rsc.ctrl_blk, 0); | ||
312 | hw->src_set_rom(src->rsc.ctrl_blk, 0); | ||
313 | hw->src_set_vo(src->rsc.ctrl_blk, 0); | ||
314 | hw->src_set_st(src->rsc.ctrl_blk, 0); | ||
315 | hw->src_set_ilsz(src->rsc.ctrl_blk, 0); | ||
316 | hw->src_set_cisz(src->rsc.ctrl_blk, 0x80); | ||
317 | hw->src_set_sa(src->rsc.ctrl_blk, 0x0); | ||
318 | /*hw->src_set_sa(src->rsc.ctrl_blk, 0x100);*/ | ||
319 | hw->src_set_la(src->rsc.ctrl_blk, 0x1000); | ||
320 | /*hw->src_set_la(src->rsc.ctrl_blk, 0x03ffffe0);*/ | ||
321 | hw->src_set_ca(src->rsc.ctrl_blk, 0x80); | ||
322 | hw->src_set_pitch(src->rsc.ctrl_blk, 0x1000000); | ||
323 | hw->src_set_clear_zbufs(src->rsc.ctrl_blk, 1); | ||
324 | |||
325 | dirty = hw->src_get_dirty(src->rsc.ctrl_blk); | ||
326 | src->rsc.ops->master(&src->rsc); | ||
327 | for (msr = 0; msr < src->rsc.msr; msr++) { | ||
328 | hw->src_set_dirty(src->rsc.ctrl_blk, dirty); | ||
329 | hw->src_commit_write(hw, src->rsc.ops->index(&src->rsc), | ||
330 | src->rsc.ctrl_blk); | ||
331 | src->rsc.ops->next_conj(&src->rsc); | ||
332 | } | ||
333 | src->rsc.ops->master(&src->rsc); | ||
334 | |||
335 | return 0; | ||
336 | } | ||
337 | |||
338 | static struct src_rsc_ops src_rsc_ops = { | ||
339 | .set_state = src_set_state, | ||
340 | .set_bm = src_set_bm, | ||
341 | .set_sf = src_set_sf, | ||
342 | .set_pm = src_set_pm, | ||
343 | .set_rom = src_set_rom, | ||
344 | .set_vo = src_set_vo, | ||
345 | .set_st = src_set_st, | ||
346 | .set_bp = src_set_bp, | ||
347 | .set_cisz = src_set_cisz, | ||
348 | .set_ca = src_set_ca, | ||
349 | .set_sa = src_set_sa, | ||
350 | .set_la = src_set_la, | ||
351 | .set_pitch = src_set_pitch, | ||
352 | .set_clr_zbufs = src_set_clear_zbufs, | ||
353 | .commit_write = src_commit_write, | ||
354 | .get_ca = src_get_ca, | ||
355 | .init = src_init, | ||
356 | .next_interleave = src_next_interleave, | ||
357 | }; | ||
358 | |||
359 | static int | ||
360 | src_rsc_init(struct src *src, u32 idx, | ||
361 | const struct src_desc *desc, struct src_mgr *mgr) | ||
362 | { | ||
363 | int err; | ||
364 | int i, n; | ||
365 | struct src *p; | ||
366 | |||
367 | n = (MEMRD == desc->mode) ? desc->multi : 1; | ||
368 | for (i = 0, p = src; i < n; i++, p++) { | ||
369 | err = rsc_init(&p->rsc, idx + i, SRC, desc->msr, mgr->mgr.hw); | ||
370 | if (err) | ||
371 | goto error1; | ||
372 | |||
373 | /* Initialize src specific rsc operations */ | ||
374 | p->ops = &src_rsc_ops; | ||
375 | p->multi = (0 == i) ? desc->multi : 1; | ||
376 | p->mode = desc->mode; | ||
377 | src_default_config[desc->mode](p); | ||
378 | mgr->src_enable(mgr, p); | ||
379 | p->intlv = p + 1; | ||
380 | } | ||
381 | (--p)->intlv = NULL; /* Set @intlv of the last SRC to NULL */ | ||
382 | |||
383 | mgr->commit_write(mgr); | ||
384 | |||
385 | return 0; | ||
386 | |||
387 | error1: | ||
388 | for (i--, p--; i >= 0; i--, p--) { | ||
389 | mgr->src_disable(mgr, p); | ||
390 | rsc_uninit(&p->rsc); | ||
391 | } | ||
392 | mgr->commit_write(mgr); | ||
393 | return err; | ||
394 | } | ||
395 | |||
396 | static int src_rsc_uninit(struct src *src, struct src_mgr *mgr) | ||
397 | { | ||
398 | int i, n; | ||
399 | struct src *p; | ||
400 | |||
401 | n = (MEMRD == src->mode) ? src->multi : 1; | ||
402 | for (i = 0, p = src; i < n; i++, p++) { | ||
403 | mgr->src_disable(mgr, p); | ||
404 | rsc_uninit(&p->rsc); | ||
405 | p->multi = 0; | ||
406 | p->ops = NULL; | ||
407 | p->mode = NUM_SRCMODES; | ||
408 | p->intlv = NULL; | ||
409 | } | ||
410 | mgr->commit_write(mgr); | ||
411 | |||
412 | return 0; | ||
413 | } | ||
414 | |||
415 | static int | ||
416 | get_src_rsc(struct src_mgr *mgr, const struct src_desc *desc, struct src **rsrc) | ||
417 | { | ||
418 | unsigned int idx = SRC_RESOURCE_NUM; | ||
419 | int err; | ||
420 | struct src *src; | ||
421 | unsigned long flags; | ||
422 | |||
423 | *rsrc = NULL; | ||
424 | |||
425 | /* Check whether there are sufficient src resources to meet request. */ | ||
426 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
427 | if (MEMRD == desc->mode) | ||
428 | err = mgr_get_resource(&mgr->mgr, desc->multi, &idx); | ||
429 | else | ||
430 | err = mgr_get_resource(&mgr->mgr, 1, &idx); | ||
431 | |||
432 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
433 | if (err) { | ||
434 | printk(KERN_ERR "ctxfi: Can't meet SRC resource request!\n"); | ||
435 | return err; | ||
436 | } | ||
437 | |||
438 | /* Allocate mem for master src resource */ | ||
439 | if (MEMRD == desc->mode) | ||
440 | src = kzalloc(sizeof(*src)*desc->multi, GFP_KERNEL); | ||
441 | else | ||
442 | src = kzalloc(sizeof(*src), GFP_KERNEL); | ||
443 | |||
444 | if (NULL == src) { | ||
445 | err = -ENOMEM; | ||
446 | goto error1; | ||
447 | } | ||
448 | |||
449 | err = src_rsc_init(src, idx, desc, mgr); | ||
450 | if (err) | ||
451 | goto error2; | ||
452 | |||
453 | *rsrc = src; | ||
454 | |||
455 | return 0; | ||
456 | |||
457 | error2: | ||
458 | kfree(src); | ||
459 | error1: | ||
460 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
461 | if (MEMRD == desc->mode) | ||
462 | mgr_put_resource(&mgr->mgr, desc->multi, idx); | ||
463 | else | ||
464 | mgr_put_resource(&mgr->mgr, 1, idx); | ||
465 | |||
466 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
467 | return err; | ||
468 | } | ||
469 | |||
470 | static int put_src_rsc(struct src_mgr *mgr, struct src *src) | ||
471 | { | ||
472 | unsigned long flags; | ||
473 | |||
474 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
475 | src->rsc.ops->master(&src->rsc); | ||
476 | if (MEMRD == src->mode) | ||
477 | mgr_put_resource(&mgr->mgr, src->multi, | ||
478 | src->rsc.ops->index(&src->rsc)); | ||
479 | else | ||
480 | mgr_put_resource(&mgr->mgr, 1, src->rsc.ops->index(&src->rsc)); | ||
481 | |||
482 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
483 | src_rsc_uninit(src, mgr); | ||
484 | kfree(src); | ||
485 | |||
486 | return 0; | ||
487 | } | ||
488 | |||
489 | static int src_enable_s(struct src_mgr *mgr, struct src *src) | ||
490 | { | ||
491 | struct hw *hw = mgr->mgr.hw; | ||
492 | int i; | ||
493 | |||
494 | src->rsc.ops->master(&src->rsc); | ||
495 | for (i = 0; i < src->rsc.msr; i++) { | ||
496 | hw->src_mgr_enbs_src(mgr->mgr.ctrl_blk, | ||
497 | src->rsc.ops->index(&src->rsc)); | ||
498 | src->rsc.ops->next_conj(&src->rsc); | ||
499 | } | ||
500 | src->rsc.ops->master(&src->rsc); | ||
501 | |||
502 | return 0; | ||
503 | } | ||
504 | |||
505 | static int src_enable(struct src_mgr *mgr, struct src *src) | ||
506 | { | ||
507 | struct hw *hw = mgr->mgr.hw; | ||
508 | int i; | ||
509 | |||
510 | src->rsc.ops->master(&src->rsc); | ||
511 | for (i = 0; i < src->rsc.msr; i++) { | ||
512 | hw->src_mgr_enb_src(mgr->mgr.ctrl_blk, | ||
513 | src->rsc.ops->index(&src->rsc)); | ||
514 | src->rsc.ops->next_conj(&src->rsc); | ||
515 | } | ||
516 | src->rsc.ops->master(&src->rsc); | ||
517 | |||
518 | return 0; | ||
519 | } | ||
520 | |||
521 | static int src_disable(struct src_mgr *mgr, struct src *src) | ||
522 | { | ||
523 | struct hw *hw = mgr->mgr.hw; | ||
524 | int i; | ||
525 | |||
526 | src->rsc.ops->master(&src->rsc); | ||
527 | for (i = 0; i < src->rsc.msr; i++) { | ||
528 | hw->src_mgr_dsb_src(mgr->mgr.ctrl_blk, | ||
529 | src->rsc.ops->index(&src->rsc)); | ||
530 | src->rsc.ops->next_conj(&src->rsc); | ||
531 | } | ||
532 | src->rsc.ops->master(&src->rsc); | ||
533 | |||
534 | return 0; | ||
535 | } | ||
536 | |||
537 | static int src_mgr_commit_write(struct src_mgr *mgr) | ||
538 | { | ||
539 | struct hw *hw = mgr->mgr.hw; | ||
540 | |||
541 | hw->src_mgr_commit_write(hw, mgr->mgr.ctrl_blk); | ||
542 | |||
543 | return 0; | ||
544 | } | ||
545 | |||
546 | int src_mgr_create(void *hw, struct src_mgr **rsrc_mgr) | ||
547 | { | ||
548 | int err, i; | ||
549 | struct src_mgr *src_mgr; | ||
550 | |||
551 | *rsrc_mgr = NULL; | ||
552 | src_mgr = kzalloc(sizeof(*src_mgr), GFP_KERNEL); | ||
553 | if (NULL == src_mgr) | ||
554 | return -ENOMEM; | ||
555 | |||
556 | err = rsc_mgr_init(&src_mgr->mgr, SRC, SRC_RESOURCE_NUM, hw); | ||
557 | if (err) | ||
558 | goto error1; | ||
559 | |||
560 | spin_lock_init(&src_mgr->mgr_lock); | ||
561 | conj_mask = ((struct hw *)hw)->src_dirty_conj_mask(); | ||
562 | |||
563 | src_mgr->get_src = get_src_rsc; | ||
564 | src_mgr->put_src = put_src_rsc; | ||
565 | src_mgr->src_enable_s = src_enable_s; | ||
566 | src_mgr->src_enable = src_enable; | ||
567 | src_mgr->src_disable = src_disable; | ||
568 | src_mgr->commit_write = src_mgr_commit_write; | ||
569 | |||
570 | /* Disable all SRC resources. */ | ||
571 | for (i = 0; i < 256; i++) | ||
572 | ((struct hw *)hw)->src_mgr_dsb_src(src_mgr->mgr.ctrl_blk, i); | ||
573 | |||
574 | ((struct hw *)hw)->src_mgr_commit_write(hw, src_mgr->mgr.ctrl_blk); | ||
575 | |||
576 | *rsrc_mgr = src_mgr; | ||
577 | |||
578 | return 0; | ||
579 | |||
580 | error1: | ||
581 | kfree(src_mgr); | ||
582 | return err; | ||
583 | } | ||
584 | |||
585 | int src_mgr_destroy(struct src_mgr *src_mgr) | ||
586 | { | ||
587 | rsc_mgr_uninit(&src_mgr->mgr); | ||
588 | kfree(src_mgr); | ||
589 | |||
590 | return 0; | ||
591 | } | ||
592 | |||
593 | /* SRCIMP resource manager operations */ | ||
594 | |||
595 | static int srcimp_master(struct rsc *rsc) | ||
596 | { | ||
597 | rsc->conj = 0; | ||
598 | return rsc->idx = container_of(rsc, struct srcimp, rsc)->idx[0]; | ||
599 | } | ||
600 | |||
601 | static int srcimp_next_conj(struct rsc *rsc) | ||
602 | { | ||
603 | rsc->conj++; | ||
604 | return container_of(rsc, struct srcimp, rsc)->idx[rsc->conj]; | ||
605 | } | ||
606 | |||
607 | static int srcimp_index(const struct rsc *rsc) | ||
608 | { | ||
609 | return container_of(rsc, struct srcimp, rsc)->idx[rsc->conj]; | ||
610 | } | ||
611 | |||
612 | static struct rsc_ops srcimp_basic_rsc_ops = { | ||
613 | .master = srcimp_master, | ||
614 | .next_conj = srcimp_next_conj, | ||
615 | .index = srcimp_index, | ||
616 | .output_slot = NULL, | ||
617 | }; | ||
618 | |||
619 | static int srcimp_map(struct srcimp *srcimp, struct src *src, struct rsc *input) | ||
620 | { | ||
621 | struct imapper *entry; | ||
622 | int i; | ||
623 | |||
624 | srcimp->rsc.ops->master(&srcimp->rsc); | ||
625 | src->rsc.ops->master(&src->rsc); | ||
626 | input->ops->master(input); | ||
627 | |||
628 | /* Program master and conjugate resources */ | ||
629 | for (i = 0; i < srcimp->rsc.msr; i++) { | ||
630 | entry = &srcimp->imappers[i]; | ||
631 | entry->slot = input->ops->output_slot(input); | ||
632 | entry->user = src->rsc.ops->index(&src->rsc); | ||
633 | entry->addr = srcimp->rsc.ops->index(&srcimp->rsc); | ||
634 | srcimp->mgr->imap_add(srcimp->mgr, entry); | ||
635 | srcimp->mapped |= (0x1 << i); | ||
636 | |||
637 | srcimp->rsc.ops->next_conj(&srcimp->rsc); | ||
638 | input->ops->next_conj(input); | ||
639 | } | ||
640 | |||
641 | srcimp->rsc.ops->master(&srcimp->rsc); | ||
642 | input->ops->master(input); | ||
643 | |||
644 | return 0; | ||
645 | } | ||
646 | |||
647 | static int srcimp_unmap(struct srcimp *srcimp) | ||
648 | { | ||
649 | int i; | ||
650 | |||
651 | /* Program master and conjugate resources */ | ||
652 | for (i = 0; i < srcimp->rsc.msr; i++) { | ||
653 | if (srcimp->mapped & (0x1 << i)) { | ||
654 | srcimp->mgr->imap_delete(srcimp->mgr, | ||
655 | &srcimp->imappers[i]); | ||
656 | srcimp->mapped &= ~(0x1 << i); | ||
657 | } | ||
658 | } | ||
659 | |||
660 | return 0; | ||
661 | } | ||
662 | |||
663 | static struct srcimp_rsc_ops srcimp_ops = { | ||
664 | .map = srcimp_map, | ||
665 | .unmap = srcimp_unmap | ||
666 | }; | ||
667 | |||
668 | static int srcimp_rsc_init(struct srcimp *srcimp, | ||
669 | const struct srcimp_desc *desc, | ||
670 | struct srcimp_mgr *mgr) | ||
671 | { | ||
672 | int err; | ||
673 | |||
674 | err = rsc_init(&srcimp->rsc, srcimp->idx[0], | ||
675 | SRCIMP, desc->msr, mgr->mgr.hw); | ||
676 | if (err) | ||
677 | return err; | ||
678 | |||
679 | /* Reserve memory for imapper nodes */ | ||
680 | srcimp->imappers = kzalloc(sizeof(struct imapper)*desc->msr, | ||
681 | GFP_KERNEL); | ||
682 | if (NULL == srcimp->imappers) { | ||
683 | err = -ENOMEM; | ||
684 | goto error1; | ||
685 | } | ||
686 | |||
687 | /* Set srcimp specific operations */ | ||
688 | srcimp->rsc.ops = &srcimp_basic_rsc_ops; | ||
689 | srcimp->ops = &srcimp_ops; | ||
690 | srcimp->mgr = mgr; | ||
691 | |||
692 | srcimp->rsc.ops->master(&srcimp->rsc); | ||
693 | |||
694 | return 0; | ||
695 | |||
696 | error1: | ||
697 | rsc_uninit(&srcimp->rsc); | ||
698 | return err; | ||
699 | } | ||
700 | |||
701 | static int srcimp_rsc_uninit(struct srcimp *srcimp) | ||
702 | { | ||
703 | if (NULL != srcimp->imappers) { | ||
704 | kfree(srcimp->imappers); | ||
705 | srcimp->imappers = NULL; | ||
706 | } | ||
707 | srcimp->ops = NULL; | ||
708 | srcimp->mgr = NULL; | ||
709 | rsc_uninit(&srcimp->rsc); | ||
710 | |||
711 | return 0; | ||
712 | } | ||
713 | |||
714 | static int get_srcimp_rsc(struct srcimp_mgr *mgr, | ||
715 | const struct srcimp_desc *desc, | ||
716 | struct srcimp **rsrcimp) | ||
717 | { | ||
718 | int err, i; | ||
719 | unsigned int idx; | ||
720 | struct srcimp *srcimp; | ||
721 | unsigned long flags; | ||
722 | |||
723 | *rsrcimp = NULL; | ||
724 | |||
725 | /* Allocate mem for SRCIMP resource */ | ||
726 | srcimp = kzalloc(sizeof(*srcimp), GFP_KERNEL); | ||
727 | if (NULL == srcimp) { | ||
728 | err = -ENOMEM; | ||
729 | return err; | ||
730 | } | ||
731 | |||
732 | /* Check whether there are sufficient SRCIMP resources. */ | ||
733 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
734 | for (i = 0; i < desc->msr; i++) { | ||
735 | err = mgr_get_resource(&mgr->mgr, 1, &idx); | ||
736 | if (err) | ||
737 | break; | ||
738 | |||
739 | srcimp->idx[i] = idx; | ||
740 | } | ||
741 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
742 | if (err) { | ||
743 | printk(KERN_ERR "ctxfi: Can't meet SRCIMP resource request!\n"); | ||
744 | goto error1; | ||
745 | } | ||
746 | |||
747 | err = srcimp_rsc_init(srcimp, desc, mgr); | ||
748 | if (err) | ||
749 | goto error1; | ||
750 | |||
751 | *rsrcimp = srcimp; | ||
752 | |||
753 | return 0; | ||
754 | |||
755 | error1: | ||
756 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
757 | for (i--; i >= 0; i--) | ||
758 | mgr_put_resource(&mgr->mgr, 1, srcimp->idx[i]); | ||
759 | |||
760 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
761 | kfree(srcimp); | ||
762 | return err; | ||
763 | } | ||
764 | |||
765 | static int put_srcimp_rsc(struct srcimp_mgr *mgr, struct srcimp *srcimp) | ||
766 | { | ||
767 | unsigned long flags; | ||
768 | int i; | ||
769 | |||
770 | spin_lock_irqsave(&mgr->mgr_lock, flags); | ||
771 | for (i = 0; i < srcimp->rsc.msr; i++) | ||
772 | mgr_put_resource(&mgr->mgr, 1, srcimp->idx[i]); | ||
773 | |||
774 | spin_unlock_irqrestore(&mgr->mgr_lock, flags); | ||
775 | srcimp_rsc_uninit(srcimp); | ||
776 | kfree(srcimp); | ||
777 | |||
778 | return 0; | ||
779 | } | ||
780 | |||
781 | static int srcimp_map_op(void *data, struct imapper *entry) | ||
782 | { | ||
783 | struct rsc_mgr *mgr = &((struct srcimp_mgr *)data)->mgr; | ||
784 | struct hw *hw = mgr->hw; | ||
785 | |||
786 | hw->srcimp_mgr_set_imaparc(mgr->ctrl_blk, entry->slot); | ||
787 | hw->srcimp_mgr_set_imapuser(mgr->ctrl_blk, entry->user); | ||
788 | hw->srcimp_mgr_set_imapnxt(mgr->ctrl_blk, entry->next); | ||
789 | hw->srcimp_mgr_set_imapaddr(mgr->ctrl_blk, entry->addr); | ||
790 | hw->srcimp_mgr_commit_write(mgr->hw, mgr->ctrl_blk); | ||
791 | |||
792 | return 0; | ||
793 | } | ||
794 | |||
795 | static int srcimp_imap_add(struct srcimp_mgr *mgr, struct imapper *entry) | ||
796 | { | ||
797 | unsigned long flags; | ||
798 | int err; | ||
799 | |||
800 | spin_lock_irqsave(&mgr->imap_lock, flags); | ||
801 | if ((0 == entry->addr) && (mgr->init_imap_added)) { | ||
802 | input_mapper_delete(&mgr->imappers, | ||
803 | mgr->init_imap, srcimp_map_op, mgr); | ||
804 | mgr->init_imap_added = 0; | ||
805 | } | ||
806 | err = input_mapper_add(&mgr->imappers, entry, srcimp_map_op, mgr); | ||
807 | spin_unlock_irqrestore(&mgr->imap_lock, flags); | ||
808 | |||
809 | return err; | ||
810 | } | ||
811 | |||
812 | static int srcimp_imap_delete(struct srcimp_mgr *mgr, struct imapper *entry) | ||
813 | { | ||
814 | unsigned long flags; | ||
815 | int err; | ||
816 | |||
817 | spin_lock_irqsave(&mgr->imap_lock, flags); | ||
818 | err = input_mapper_delete(&mgr->imappers, entry, srcimp_map_op, mgr); | ||
819 | if (list_empty(&mgr->imappers)) { | ||
820 | input_mapper_add(&mgr->imappers, mgr->init_imap, | ||
821 | srcimp_map_op, mgr); | ||
822 | mgr->init_imap_added = 1; | ||
823 | } | ||
824 | spin_unlock_irqrestore(&mgr->imap_lock, flags); | ||
825 | |||
826 | return err; | ||
827 | } | ||
828 | |||
829 | int srcimp_mgr_create(void *hw, struct srcimp_mgr **rsrcimp_mgr) | ||
830 | { | ||
831 | int err; | ||
832 | struct srcimp_mgr *srcimp_mgr; | ||
833 | struct imapper *entry; | ||
834 | |||
835 | *rsrcimp_mgr = NULL; | ||
836 | srcimp_mgr = kzalloc(sizeof(*srcimp_mgr), GFP_KERNEL); | ||
837 | if (NULL == srcimp_mgr) | ||
838 | return -ENOMEM; | ||
839 | |||
840 | err = rsc_mgr_init(&srcimp_mgr->mgr, SRCIMP, SRCIMP_RESOURCE_NUM, hw); | ||
841 | if (err) | ||
842 | goto error1; | ||
843 | |||
844 | spin_lock_init(&srcimp_mgr->mgr_lock); | ||
845 | spin_lock_init(&srcimp_mgr->imap_lock); | ||
846 | INIT_LIST_HEAD(&srcimp_mgr->imappers); | ||
847 | entry = kzalloc(sizeof(*entry), GFP_KERNEL); | ||
848 | if (NULL == entry) { | ||
849 | err = -ENOMEM; | ||
850 | goto error2; | ||
851 | } | ||
852 | entry->slot = entry->addr = entry->next = entry->user = 0; | ||
853 | list_add(&entry->list, &srcimp_mgr->imappers); | ||
854 | srcimp_mgr->init_imap = entry; | ||
855 | srcimp_mgr->init_imap_added = 1; | ||
856 | |||
857 | srcimp_mgr->get_srcimp = get_srcimp_rsc; | ||
858 | srcimp_mgr->put_srcimp = put_srcimp_rsc; | ||
859 | srcimp_mgr->imap_add = srcimp_imap_add; | ||
860 | srcimp_mgr->imap_delete = srcimp_imap_delete; | ||
861 | |||
862 | *rsrcimp_mgr = srcimp_mgr; | ||
863 | |||
864 | return 0; | ||
865 | |||
866 | error2: | ||
867 | rsc_mgr_uninit(&srcimp_mgr->mgr); | ||
868 | error1: | ||
869 | kfree(srcimp_mgr); | ||
870 | return err; | ||
871 | } | ||
872 | |||
873 | int srcimp_mgr_destroy(struct srcimp_mgr *srcimp_mgr) | ||
874 | { | ||
875 | unsigned long flags; | ||
876 | |||
877 | /* free src input mapper list */ | ||
878 | spin_lock_irqsave(&srcimp_mgr->imap_lock, flags); | ||
879 | free_input_mapper_list(&srcimp_mgr->imappers); | ||
880 | spin_unlock_irqrestore(&srcimp_mgr->imap_lock, flags); | ||
881 | |||
882 | rsc_mgr_uninit(&srcimp_mgr->mgr); | ||
883 | kfree(srcimp_mgr); | ||
884 | |||
885 | return 0; | ||
886 | } | ||
diff --git a/sound/pci/ctxfi/ctsrc.h b/sound/pci/ctxfi/ctsrc.h new file mode 100644 index 000000000000..259366aabcac --- /dev/null +++ b/sound/pci/ctxfi/ctsrc.h | |||
@@ -0,0 +1,149 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctsrc.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of the Sample Rate Convertor | ||
12 | * resource management object. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date May 13 2008 | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #ifndef CTSRC_H | ||
20 | #define CTSRC_H | ||
21 | |||
22 | #include "ctresource.h" | ||
23 | #include "ctimap.h" | ||
24 | #include <linux/spinlock.h> | ||
25 | #include <linux/list.h> | ||
26 | |||
27 | #define SRC_STATE_OFF 0x0 | ||
28 | #define SRC_STATE_INIT 0x4 | ||
29 | #define SRC_STATE_RUN 0x5 | ||
30 | |||
31 | #define SRC_SF_U8 0x0 | ||
32 | #define SRC_SF_S16 0x1 | ||
33 | #define SRC_SF_S24 0x2 | ||
34 | #define SRC_SF_S32 0x3 | ||
35 | #define SRC_SF_F32 0x4 | ||
36 | |||
37 | /* Define the descriptor of a src resource */ | ||
38 | enum SRCMODE { | ||
39 | MEMRD, /* Read data from host memory */ | ||
40 | MEMWR, /* Write data to host memory */ | ||
41 | ARCRW, /* Read from and write to audio ring channel */ | ||
42 | NUM_SRCMODES | ||
43 | }; | ||
44 | |||
45 | struct src_rsc_ops; | ||
46 | |||
47 | struct src { | ||
48 | struct rsc rsc; /* Basic resource info */ | ||
49 | struct src *intlv; /* Pointer to next interleaved SRC in a series */ | ||
50 | struct src_rsc_ops *ops; /* SRC specific operations */ | ||
51 | /* Number of contiguous srcs for interleaved usage */ | ||
52 | unsigned char multi; | ||
53 | unsigned char mode; /* Working mode of this SRC resource */ | ||
54 | }; | ||
55 | |||
56 | struct src_rsc_ops { | ||
57 | int (*set_state)(struct src *src, unsigned int state); | ||
58 | int (*set_bm)(struct src *src, unsigned int bm); | ||
59 | int (*set_sf)(struct src *src, unsigned int sf); | ||
60 | int (*set_pm)(struct src *src, unsigned int pm); | ||
61 | int (*set_rom)(struct src *src, unsigned int rom); | ||
62 | int (*set_vo)(struct src *src, unsigned int vo); | ||
63 | int (*set_st)(struct src *src, unsigned int st); | ||
64 | int (*set_bp)(struct src *src, unsigned int bp); | ||
65 | int (*set_cisz)(struct src *src, unsigned int cisz); | ||
66 | int (*set_ca)(struct src *src, unsigned int ca); | ||
67 | int (*set_sa)(struct src *src, unsigned int sa); | ||
68 | int (*set_la)(struct src *src, unsigned int la); | ||
69 | int (*set_pitch)(struct src *src, unsigned int pitch); | ||
70 | int (*set_clr_zbufs)(struct src *src); | ||
71 | int (*commit_write)(struct src *src); | ||
72 | int (*get_ca)(struct src *src); | ||
73 | int (*init)(struct src *src); | ||
74 | struct src* (*next_interleave)(struct src *src); | ||
75 | }; | ||
76 | |||
77 | /* Define src resource request description info */ | ||
78 | struct src_desc { | ||
79 | /* Number of contiguous master srcs for interleaved usage */ | ||
80 | unsigned char multi; | ||
81 | unsigned char msr; | ||
82 | unsigned char mode; /* Working mode of the requested srcs */ | ||
83 | }; | ||
84 | |||
85 | /* Define src manager object */ | ||
86 | struct src_mgr { | ||
87 | struct rsc_mgr mgr; /* Basic resource manager info */ | ||
88 | spinlock_t mgr_lock; | ||
89 | |||
90 | /* request src resource */ | ||
91 | int (*get_src)(struct src_mgr *mgr, | ||
92 | const struct src_desc *desc, struct src **rsrc); | ||
93 | /* return src resource */ | ||
94 | int (*put_src)(struct src_mgr *mgr, struct src *src); | ||
95 | int (*src_enable_s)(struct src_mgr *mgr, struct src *src); | ||
96 | int (*src_enable)(struct src_mgr *mgr, struct src *src); | ||
97 | int (*src_disable)(struct src_mgr *mgr, struct src *src); | ||
98 | int (*commit_write)(struct src_mgr *mgr); | ||
99 | }; | ||
100 | |||
101 | /* Define the descriptor of a SRC Input Mapper resource */ | ||
102 | struct srcimp_mgr; | ||
103 | struct srcimp_rsc_ops; | ||
104 | |||
105 | struct srcimp { | ||
106 | struct rsc rsc; | ||
107 | unsigned char idx[8]; | ||
108 | struct imapper *imappers; | ||
109 | unsigned int mapped; /* A bit-map indicating which conj rsc is mapped */ | ||
110 | struct srcimp_mgr *mgr; | ||
111 | struct srcimp_rsc_ops *ops; | ||
112 | }; | ||
113 | |||
114 | struct srcimp_rsc_ops { | ||
115 | int (*map)(struct srcimp *srcimp, struct src *user, struct rsc *input); | ||
116 | int (*unmap)(struct srcimp *srcimp); | ||
117 | }; | ||
118 | |||
119 | /* Define SRCIMP resource request description info */ | ||
120 | struct srcimp_desc { | ||
121 | unsigned int msr; | ||
122 | }; | ||
123 | |||
124 | struct srcimp_mgr { | ||
125 | struct rsc_mgr mgr; /* Basic resource manager info */ | ||
126 | spinlock_t mgr_lock; | ||
127 | spinlock_t imap_lock; | ||
128 | struct list_head imappers; | ||
129 | struct imapper *init_imap; | ||
130 | unsigned int init_imap_added; | ||
131 | |||
132 | /* request srcimp resource */ | ||
133 | int (*get_srcimp)(struct srcimp_mgr *mgr, | ||
134 | const struct srcimp_desc *desc, | ||
135 | struct srcimp **rsrcimp); | ||
136 | /* return srcimp resource */ | ||
137 | int (*put_srcimp)(struct srcimp_mgr *mgr, struct srcimp *srcimp); | ||
138 | int (*imap_add)(struct srcimp_mgr *mgr, struct imapper *entry); | ||
139 | int (*imap_delete)(struct srcimp_mgr *mgr, struct imapper *entry); | ||
140 | }; | ||
141 | |||
142 | /* Constructor and destructor of SRC resource manager */ | ||
143 | int src_mgr_create(void *hw, struct src_mgr **rsrc_mgr); | ||
144 | int src_mgr_destroy(struct src_mgr *src_mgr); | ||
145 | /* Constructor and destructor of SRCIMP resource manager */ | ||
146 | int srcimp_mgr_create(void *hw, struct srcimp_mgr **rsrc_mgr); | ||
147 | int srcimp_mgr_destroy(struct srcimp_mgr *srcimp_mgr); | ||
148 | |||
149 | #endif /* CTSRC_H */ | ||
diff --git a/sound/pci/ctxfi/cttimer.c b/sound/pci/ctxfi/cttimer.c new file mode 100644 index 000000000000..93b0aedc36d4 --- /dev/null +++ b/sound/pci/ctxfi/cttimer.c | |||
@@ -0,0 +1,443 @@ | |||
1 | /* | ||
2 | * PCM timer handling on ctxfi | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | */ | ||
8 | |||
9 | #include <linux/slab.h> | ||
10 | #include <linux/math64.h> | ||
11 | #include <linux/moduleparam.h> | ||
12 | #include <sound/core.h> | ||
13 | #include <sound/pcm.h> | ||
14 | #include "ctatc.h" | ||
15 | #include "cthardware.h" | ||
16 | #include "cttimer.h" | ||
17 | |||
18 | static int use_system_timer; | ||
19 | MODULE_PARM_DESC(use_system_timer, "Foce to use system-timer"); | ||
20 | module_param(use_system_timer, bool, S_IRUGO); | ||
21 | |||
22 | struct ct_timer_ops { | ||
23 | void (*init)(struct ct_timer_instance *); | ||
24 | void (*prepare)(struct ct_timer_instance *); | ||
25 | void (*start)(struct ct_timer_instance *); | ||
26 | void (*stop)(struct ct_timer_instance *); | ||
27 | void (*free_instance)(struct ct_timer_instance *); | ||
28 | void (*interrupt)(struct ct_timer *); | ||
29 | void (*free_global)(struct ct_timer *); | ||
30 | }; | ||
31 | |||
32 | /* timer instance -- assigned to each PCM stream */ | ||
33 | struct ct_timer_instance { | ||
34 | spinlock_t lock; | ||
35 | struct ct_timer *timer_base; | ||
36 | struct ct_atc_pcm *apcm; | ||
37 | struct snd_pcm_substream *substream; | ||
38 | struct timer_list timer; | ||
39 | struct list_head instance_list; | ||
40 | struct list_head running_list; | ||
41 | unsigned int position; | ||
42 | unsigned int frag_count; | ||
43 | unsigned int running:1; | ||
44 | unsigned int need_update:1; | ||
45 | }; | ||
46 | |||
47 | /* timer instance manager */ | ||
48 | struct ct_timer { | ||
49 | spinlock_t lock; /* global timer lock (for xfitimer) */ | ||
50 | spinlock_t list_lock; /* lock for instance list */ | ||
51 | struct ct_atc *atc; | ||
52 | struct ct_timer_ops *ops; | ||
53 | struct list_head instance_head; | ||
54 | struct list_head running_head; | ||
55 | unsigned int wc; /* current wallclock */ | ||
56 | unsigned int irq_handling:1; /* in IRQ handling */ | ||
57 | unsigned int reprogram:1; /* need to reprogram the internval */ | ||
58 | unsigned int running:1; /* global timer running */ | ||
59 | }; | ||
60 | |||
61 | |||
62 | /* | ||
63 | * system-timer-based updates | ||
64 | */ | ||
65 | |||
66 | static void ct_systimer_callback(unsigned long data) | ||
67 | { | ||
68 | struct ct_timer_instance *ti = (struct ct_timer_instance *)data; | ||
69 | struct snd_pcm_substream *substream = ti->substream; | ||
70 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
71 | struct ct_atc_pcm *apcm = ti->apcm; | ||
72 | unsigned int period_size = runtime->period_size; | ||
73 | unsigned int buffer_size = runtime->buffer_size; | ||
74 | unsigned long flags; | ||
75 | unsigned int position, dist, interval; | ||
76 | |||
77 | position = substream->ops->pointer(substream); | ||
78 | dist = (position + buffer_size - ti->position) % buffer_size; | ||
79 | if (dist >= period_size || | ||
80 | position / period_size != ti->position / period_size) { | ||
81 | apcm->interrupt(apcm); | ||
82 | ti->position = position; | ||
83 | } | ||
84 | /* Add extra HZ*5/1000 to avoid overrun issue when recording | ||
85 | * at 8kHz in 8-bit format or at 88kHz in 24-bit format. */ | ||
86 | interval = ((period_size - (position % period_size)) | ||
87 | * HZ + (runtime->rate - 1)) / runtime->rate + HZ * 5 / 1000; | ||
88 | spin_lock_irqsave(&ti->lock, flags); | ||
89 | if (ti->running) | ||
90 | mod_timer(&ti->timer, jiffies + interval); | ||
91 | spin_unlock_irqrestore(&ti->lock, flags); | ||
92 | } | ||
93 | |||
94 | static void ct_systimer_init(struct ct_timer_instance *ti) | ||
95 | { | ||
96 | setup_timer(&ti->timer, ct_systimer_callback, | ||
97 | (unsigned long)ti); | ||
98 | } | ||
99 | |||
100 | static void ct_systimer_start(struct ct_timer_instance *ti) | ||
101 | { | ||
102 | struct snd_pcm_runtime *runtime = ti->substream->runtime; | ||
103 | unsigned long flags; | ||
104 | |||
105 | spin_lock_irqsave(&ti->lock, flags); | ||
106 | ti->running = 1; | ||
107 | mod_timer(&ti->timer, | ||
108 | jiffies + (runtime->period_size * HZ + | ||
109 | (runtime->rate - 1)) / runtime->rate); | ||
110 | spin_unlock_irqrestore(&ti->lock, flags); | ||
111 | } | ||
112 | |||
113 | static void ct_systimer_stop(struct ct_timer_instance *ti) | ||
114 | { | ||
115 | unsigned long flags; | ||
116 | |||
117 | spin_lock_irqsave(&ti->lock, flags); | ||
118 | ti->running = 0; | ||
119 | del_timer(&ti->timer); | ||
120 | spin_unlock_irqrestore(&ti->lock, flags); | ||
121 | } | ||
122 | |||
123 | static void ct_systimer_prepare(struct ct_timer_instance *ti) | ||
124 | { | ||
125 | ct_systimer_stop(ti); | ||
126 | try_to_del_timer_sync(&ti->timer); | ||
127 | } | ||
128 | |||
129 | #define ct_systimer_free ct_systimer_prepare | ||
130 | |||
131 | static struct ct_timer_ops ct_systimer_ops = { | ||
132 | .init = ct_systimer_init, | ||
133 | .free_instance = ct_systimer_free, | ||
134 | .prepare = ct_systimer_prepare, | ||
135 | .start = ct_systimer_start, | ||
136 | .stop = ct_systimer_stop, | ||
137 | }; | ||
138 | |||
139 | |||
140 | /* | ||
141 | * Handling multiple streams using a global emu20k1 timer irq | ||
142 | */ | ||
143 | |||
144 | #define CT_TIMER_FREQ 48000 | ||
145 | #define MIN_TICKS 1 | ||
146 | #define MAX_TICKS ((1 << 13) - 1) | ||
147 | |||
148 | static void ct_xfitimer_irq_rearm(struct ct_timer *atimer, int ticks) | ||
149 | { | ||
150 | struct hw *hw = atimer->atc->hw; | ||
151 | if (ticks > MAX_TICKS) | ||
152 | ticks = MAX_TICKS; | ||
153 | hw->set_timer_tick(hw, ticks); | ||
154 | if (!atimer->running) | ||
155 | hw->set_timer_irq(hw, 1); | ||
156 | atimer->running = 1; | ||
157 | } | ||
158 | |||
159 | static void ct_xfitimer_irq_stop(struct ct_timer *atimer) | ||
160 | { | ||
161 | if (atimer->running) { | ||
162 | struct hw *hw = atimer->atc->hw; | ||
163 | hw->set_timer_irq(hw, 0); | ||
164 | hw->set_timer_tick(hw, 0); | ||
165 | atimer->running = 0; | ||
166 | } | ||
167 | } | ||
168 | |||
169 | static inline unsigned int ct_xfitimer_get_wc(struct ct_timer *atimer) | ||
170 | { | ||
171 | struct hw *hw = atimer->atc->hw; | ||
172 | return hw->get_wc(hw); | ||
173 | } | ||
174 | |||
175 | /* | ||
176 | * reprogram the timer interval; | ||
177 | * checks the running instance list and determines the next timer interval. | ||
178 | * also updates the each stream position, returns the number of streams | ||
179 | * to call snd_pcm_period_elapsed() appropriately | ||
180 | * | ||
181 | * call this inside the lock and irq disabled | ||
182 | */ | ||
183 | static int ct_xfitimer_reprogram(struct ct_timer *atimer, int can_update) | ||
184 | { | ||
185 | struct ct_timer_instance *ti; | ||
186 | unsigned int min_intr = (unsigned int)-1; | ||
187 | int updates = 0; | ||
188 | unsigned int wc, diff; | ||
189 | |||
190 | if (list_empty(&atimer->running_head)) { | ||
191 | ct_xfitimer_irq_stop(atimer); | ||
192 | atimer->reprogram = 0; /* clear flag */ | ||
193 | return 0; | ||
194 | } | ||
195 | |||
196 | wc = ct_xfitimer_get_wc(atimer); | ||
197 | diff = wc - atimer->wc; | ||
198 | atimer->wc = wc; | ||
199 | list_for_each_entry(ti, &atimer->running_head, running_list) { | ||
200 | if (ti->frag_count > diff) | ||
201 | ti->frag_count -= diff; | ||
202 | else { | ||
203 | unsigned int pos; | ||
204 | unsigned int period_size, rate; | ||
205 | |||
206 | period_size = ti->substream->runtime->period_size; | ||
207 | rate = ti->substream->runtime->rate; | ||
208 | pos = ti->substream->ops->pointer(ti->substream); | ||
209 | if (pos / period_size != ti->position / period_size) { | ||
210 | ti->need_update = 1; | ||
211 | ti->position = pos; | ||
212 | updates++; | ||
213 | } | ||
214 | pos %= period_size; | ||
215 | pos = period_size - pos; | ||
216 | ti->frag_count = div_u64((u64)pos * CT_TIMER_FREQ + | ||
217 | rate - 1, rate); | ||
218 | } | ||
219 | if (ti->need_update && !can_update) | ||
220 | min_intr = 0; /* pending to the next irq */ | ||
221 | if (ti->frag_count < min_intr) | ||
222 | min_intr = ti->frag_count; | ||
223 | } | ||
224 | |||
225 | if (min_intr < MIN_TICKS) | ||
226 | min_intr = MIN_TICKS; | ||
227 | ct_xfitimer_irq_rearm(atimer, min_intr); | ||
228 | atimer->reprogram = 0; /* clear flag */ | ||
229 | return updates; | ||
230 | } | ||
231 | |||
232 | /* look through the instance list and call period_elapsed if needed */ | ||
233 | static void ct_xfitimer_check_period(struct ct_timer *atimer) | ||
234 | { | ||
235 | struct ct_timer_instance *ti; | ||
236 | unsigned long flags; | ||
237 | |||
238 | spin_lock_irqsave(&atimer->list_lock, flags); | ||
239 | list_for_each_entry(ti, &atimer->instance_head, instance_list) { | ||
240 | if (ti->running && ti->need_update) { | ||
241 | ti->need_update = 0; | ||
242 | ti->apcm->interrupt(ti->apcm); | ||
243 | } | ||
244 | } | ||
245 | spin_unlock_irqrestore(&atimer->list_lock, flags); | ||
246 | } | ||
247 | |||
248 | /* Handle timer-interrupt */ | ||
249 | static void ct_xfitimer_callback(struct ct_timer *atimer) | ||
250 | { | ||
251 | int update; | ||
252 | unsigned long flags; | ||
253 | |||
254 | spin_lock_irqsave(&atimer->lock, flags); | ||
255 | atimer->irq_handling = 1; | ||
256 | do { | ||
257 | update = ct_xfitimer_reprogram(atimer, 1); | ||
258 | spin_unlock(&atimer->lock); | ||
259 | if (update) | ||
260 | ct_xfitimer_check_period(atimer); | ||
261 | spin_lock(&atimer->lock); | ||
262 | } while (atimer->reprogram); | ||
263 | atimer->irq_handling = 0; | ||
264 | spin_unlock_irqrestore(&atimer->lock, flags); | ||
265 | } | ||
266 | |||
267 | static void ct_xfitimer_prepare(struct ct_timer_instance *ti) | ||
268 | { | ||
269 | ti->frag_count = ti->substream->runtime->period_size; | ||
270 | ti->running = 0; | ||
271 | ti->need_update = 0; | ||
272 | } | ||
273 | |||
274 | |||
275 | /* start/stop the timer */ | ||
276 | static void ct_xfitimer_update(struct ct_timer *atimer) | ||
277 | { | ||
278 | unsigned long flags; | ||
279 | |||
280 | spin_lock_irqsave(&atimer->lock, flags); | ||
281 | if (atimer->irq_handling) { | ||
282 | /* reached from IRQ handler; let it handle later */ | ||
283 | atimer->reprogram = 1; | ||
284 | spin_unlock_irqrestore(&atimer->lock, flags); | ||
285 | return; | ||
286 | } | ||
287 | |||
288 | ct_xfitimer_irq_stop(atimer); | ||
289 | ct_xfitimer_reprogram(atimer, 0); | ||
290 | spin_unlock_irqrestore(&atimer->lock, flags); | ||
291 | } | ||
292 | |||
293 | static void ct_xfitimer_start(struct ct_timer_instance *ti) | ||
294 | { | ||
295 | struct ct_timer *atimer = ti->timer_base; | ||
296 | unsigned long flags; | ||
297 | |||
298 | spin_lock_irqsave(&atimer->lock, flags); | ||
299 | if (list_empty(&ti->running_list)) | ||
300 | atimer->wc = ct_xfitimer_get_wc(atimer); | ||
301 | ti->running = 1; | ||
302 | ti->need_update = 0; | ||
303 | list_add(&ti->running_list, &atimer->running_head); | ||
304 | spin_unlock_irqrestore(&atimer->lock, flags); | ||
305 | ct_xfitimer_update(atimer); | ||
306 | } | ||
307 | |||
308 | static void ct_xfitimer_stop(struct ct_timer_instance *ti) | ||
309 | { | ||
310 | struct ct_timer *atimer = ti->timer_base; | ||
311 | unsigned long flags; | ||
312 | |||
313 | spin_lock_irqsave(&atimer->lock, flags); | ||
314 | list_del_init(&ti->running_list); | ||
315 | ti->running = 0; | ||
316 | spin_unlock_irqrestore(&atimer->lock, flags); | ||
317 | ct_xfitimer_update(atimer); | ||
318 | } | ||
319 | |||
320 | static void ct_xfitimer_free_global(struct ct_timer *atimer) | ||
321 | { | ||
322 | ct_xfitimer_irq_stop(atimer); | ||
323 | } | ||
324 | |||
325 | static struct ct_timer_ops ct_xfitimer_ops = { | ||
326 | .prepare = ct_xfitimer_prepare, | ||
327 | .start = ct_xfitimer_start, | ||
328 | .stop = ct_xfitimer_stop, | ||
329 | .interrupt = ct_xfitimer_callback, | ||
330 | .free_global = ct_xfitimer_free_global, | ||
331 | }; | ||
332 | |||
333 | /* | ||
334 | * timer instance | ||
335 | */ | ||
336 | |||
337 | struct ct_timer_instance * | ||
338 | ct_timer_instance_new(struct ct_timer *atimer, struct ct_atc_pcm *apcm) | ||
339 | { | ||
340 | struct ct_timer_instance *ti; | ||
341 | |||
342 | ti = kzalloc(sizeof(*ti), GFP_KERNEL); | ||
343 | if (!ti) | ||
344 | return NULL; | ||
345 | spin_lock_init(&ti->lock); | ||
346 | INIT_LIST_HEAD(&ti->instance_list); | ||
347 | INIT_LIST_HEAD(&ti->running_list); | ||
348 | ti->timer_base = atimer; | ||
349 | ti->apcm = apcm; | ||
350 | ti->substream = apcm->substream; | ||
351 | if (atimer->ops->init) | ||
352 | atimer->ops->init(ti); | ||
353 | |||
354 | spin_lock_irq(&atimer->list_lock); | ||
355 | list_add(&ti->instance_list, &atimer->instance_head); | ||
356 | spin_unlock_irq(&atimer->list_lock); | ||
357 | |||
358 | return ti; | ||
359 | } | ||
360 | |||
361 | void ct_timer_prepare(struct ct_timer_instance *ti) | ||
362 | { | ||
363 | if (ti->timer_base->ops->prepare) | ||
364 | ti->timer_base->ops->prepare(ti); | ||
365 | ti->position = 0; | ||
366 | ti->running = 0; | ||
367 | } | ||
368 | |||
369 | void ct_timer_start(struct ct_timer_instance *ti) | ||
370 | { | ||
371 | struct ct_timer *atimer = ti->timer_base; | ||
372 | atimer->ops->start(ti); | ||
373 | } | ||
374 | |||
375 | void ct_timer_stop(struct ct_timer_instance *ti) | ||
376 | { | ||
377 | struct ct_timer *atimer = ti->timer_base; | ||
378 | atimer->ops->stop(ti); | ||
379 | } | ||
380 | |||
381 | void ct_timer_instance_free(struct ct_timer_instance *ti) | ||
382 | { | ||
383 | struct ct_timer *atimer = ti->timer_base; | ||
384 | |||
385 | atimer->ops->stop(ti); /* to be sure */ | ||
386 | if (atimer->ops->free_instance) | ||
387 | atimer->ops->free_instance(ti); | ||
388 | |||
389 | spin_lock_irq(&atimer->list_lock); | ||
390 | list_del(&ti->instance_list); | ||
391 | spin_unlock_irq(&atimer->list_lock); | ||
392 | |||
393 | kfree(ti); | ||
394 | } | ||
395 | |||
396 | /* | ||
397 | * timer manager | ||
398 | */ | ||
399 | |||
400 | static void ct_timer_interrupt(void *data, unsigned int status) | ||
401 | { | ||
402 | struct ct_timer *timer = data; | ||
403 | |||
404 | /* Interval timer interrupt */ | ||
405 | if ((status & IT_INT) && timer->ops->interrupt) | ||
406 | timer->ops->interrupt(timer); | ||
407 | } | ||
408 | |||
409 | struct ct_timer *ct_timer_new(struct ct_atc *atc) | ||
410 | { | ||
411 | struct ct_timer *atimer; | ||
412 | struct hw *hw; | ||
413 | |||
414 | atimer = kzalloc(sizeof(*atimer), GFP_KERNEL); | ||
415 | if (!atimer) | ||
416 | return NULL; | ||
417 | spin_lock_init(&atimer->lock); | ||
418 | spin_lock_init(&atimer->list_lock); | ||
419 | INIT_LIST_HEAD(&atimer->instance_head); | ||
420 | INIT_LIST_HEAD(&atimer->running_head); | ||
421 | atimer->atc = atc; | ||
422 | hw = atc->hw; | ||
423 | if (!use_system_timer && hw->set_timer_irq) { | ||
424 | snd_printd(KERN_INFO "ctxfi: Use xfi-native timer\n"); | ||
425 | atimer->ops = &ct_xfitimer_ops; | ||
426 | hw->irq_callback_data = atimer; | ||
427 | hw->irq_callback = ct_timer_interrupt; | ||
428 | } else { | ||
429 | snd_printd(KERN_INFO "ctxfi: Use system timer\n"); | ||
430 | atimer->ops = &ct_systimer_ops; | ||
431 | } | ||
432 | return atimer; | ||
433 | } | ||
434 | |||
435 | void ct_timer_free(struct ct_timer *atimer) | ||
436 | { | ||
437 | struct hw *hw = atimer->atc->hw; | ||
438 | hw->irq_callback = NULL; | ||
439 | if (atimer->ops->free_global) | ||
440 | atimer->ops->free_global(atimer); | ||
441 | kfree(atimer); | ||
442 | } | ||
443 | |||
diff --git a/sound/pci/ctxfi/cttimer.h b/sound/pci/ctxfi/cttimer.h new file mode 100644 index 000000000000..979348229291 --- /dev/null +++ b/sound/pci/ctxfi/cttimer.h | |||
@@ -0,0 +1,29 @@ | |||
1 | /* | ||
2 | * Timer handling | ||
3 | */ | ||
4 | |||
5 | #ifndef __CTTIMER_H | ||
6 | #define __CTTIMER_H | ||
7 | |||
8 | #include <linux/spinlock.h> | ||
9 | #include <linux/timer.h> | ||
10 | #include <linux/list.h> | ||
11 | |||
12 | struct snd_pcm_substream; | ||
13 | struct ct_atc; | ||
14 | struct ct_atc_pcm; | ||
15 | |||
16 | struct ct_timer; | ||
17 | struct ct_timer_instance; | ||
18 | |||
19 | struct ct_timer *ct_timer_new(struct ct_atc *atc); | ||
20 | void ct_timer_free(struct ct_timer *atimer); | ||
21 | |||
22 | struct ct_timer_instance * | ||
23 | ct_timer_instance_new(struct ct_timer *atimer, struct ct_atc_pcm *apcm); | ||
24 | void ct_timer_instance_free(struct ct_timer_instance *ti); | ||
25 | void ct_timer_start(struct ct_timer_instance *ti); | ||
26 | void ct_timer_stop(struct ct_timer_instance *ti); | ||
27 | void ct_timer_prepare(struct ct_timer_instance *ti); | ||
28 | |||
29 | #endif /* __CTTIMER_H */ | ||
diff --git a/sound/pci/ctxfi/ctvmem.c b/sound/pci/ctxfi/ctvmem.c new file mode 100644 index 000000000000..67665a7e43c6 --- /dev/null +++ b/sound/pci/ctxfi/ctvmem.c | |||
@@ -0,0 +1,250 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctvmem.c | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the implementation of virtual memory management object | ||
12 | * for card device. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date Apr 1 2008 | ||
16 | */ | ||
17 | |||
18 | #include "ctvmem.h" | ||
19 | #include <linux/slab.h> | ||
20 | #include <linux/mm.h> | ||
21 | #include <linux/io.h> | ||
22 | #include <sound/pcm.h> | ||
23 | |||
24 | #define CT_PTES_PER_PAGE (CT_PAGE_SIZE / sizeof(void *)) | ||
25 | #define CT_ADDRS_PER_PAGE (CT_PTES_PER_PAGE * CT_PAGE_SIZE) | ||
26 | |||
27 | /* * | ||
28 | * Find or create vm block based on requested @size. | ||
29 | * @size must be page aligned. | ||
30 | * */ | ||
31 | static struct ct_vm_block * | ||
32 | get_vm_block(struct ct_vm *vm, unsigned int size) | ||
33 | { | ||
34 | struct ct_vm_block *block = NULL, *entry; | ||
35 | struct list_head *pos; | ||
36 | |||
37 | size = CT_PAGE_ALIGN(size); | ||
38 | if (size > vm->size) { | ||
39 | printk(KERN_ERR "ctxfi: Fail! No sufficient device virtural " | ||
40 | "memory space available!\n"); | ||
41 | return NULL; | ||
42 | } | ||
43 | |||
44 | mutex_lock(&vm->lock); | ||
45 | list_for_each(pos, &vm->unused) { | ||
46 | entry = list_entry(pos, struct ct_vm_block, list); | ||
47 | if (entry->size >= size) | ||
48 | break; /* found a block that is big enough */ | ||
49 | } | ||
50 | if (pos == &vm->unused) | ||
51 | goto out; | ||
52 | |||
53 | if (entry->size == size) { | ||
54 | /* Move the vm node from unused list to used list directly */ | ||
55 | list_del(&entry->list); | ||
56 | list_add(&entry->list, &vm->used); | ||
57 | vm->size -= size; | ||
58 | block = entry; | ||
59 | goto out; | ||
60 | } | ||
61 | |||
62 | block = kzalloc(sizeof(*block), GFP_KERNEL); | ||
63 | if (NULL == block) | ||
64 | goto out; | ||
65 | |||
66 | block->addr = entry->addr; | ||
67 | block->size = size; | ||
68 | list_add(&block->list, &vm->used); | ||
69 | entry->addr += size; | ||
70 | entry->size -= size; | ||
71 | vm->size -= size; | ||
72 | |||
73 | out: | ||
74 | mutex_unlock(&vm->lock); | ||
75 | return block; | ||
76 | } | ||
77 | |||
78 | static void put_vm_block(struct ct_vm *vm, struct ct_vm_block *block) | ||
79 | { | ||
80 | struct ct_vm_block *entry, *pre_ent; | ||
81 | struct list_head *pos, *pre; | ||
82 | |||
83 | block->size = CT_PAGE_ALIGN(block->size); | ||
84 | |||
85 | mutex_lock(&vm->lock); | ||
86 | list_del(&block->list); | ||
87 | vm->size += block->size; | ||
88 | |||
89 | list_for_each(pos, &vm->unused) { | ||
90 | entry = list_entry(pos, struct ct_vm_block, list); | ||
91 | if (entry->addr >= (block->addr + block->size)) | ||
92 | break; /* found a position */ | ||
93 | } | ||
94 | if (pos == &vm->unused) { | ||
95 | list_add_tail(&block->list, &vm->unused); | ||
96 | entry = block; | ||
97 | } else { | ||
98 | if ((block->addr + block->size) == entry->addr) { | ||
99 | entry->addr = block->addr; | ||
100 | entry->size += block->size; | ||
101 | kfree(block); | ||
102 | } else { | ||
103 | __list_add(&block->list, pos->prev, pos); | ||
104 | entry = block; | ||
105 | } | ||
106 | } | ||
107 | |||
108 | pos = &entry->list; | ||
109 | pre = pos->prev; | ||
110 | while (pre != &vm->unused) { | ||
111 | entry = list_entry(pos, struct ct_vm_block, list); | ||
112 | pre_ent = list_entry(pre, struct ct_vm_block, list); | ||
113 | if ((pre_ent->addr + pre_ent->size) > entry->addr) | ||
114 | break; | ||
115 | |||
116 | pre_ent->size += entry->size; | ||
117 | list_del(pos); | ||
118 | kfree(entry); | ||
119 | pos = pre; | ||
120 | pre = pos->prev; | ||
121 | } | ||
122 | mutex_unlock(&vm->lock); | ||
123 | } | ||
124 | |||
125 | /* Map host addr (kmalloced/vmalloced) to device logical addr. */ | ||
126 | static struct ct_vm_block * | ||
127 | ct_vm_map(struct ct_vm *vm, struct snd_pcm_substream *substream, int size) | ||
128 | { | ||
129 | struct ct_vm_block *block; | ||
130 | unsigned int pte_start; | ||
131 | unsigned i, pages; | ||
132 | unsigned long *ptp; | ||
133 | |||
134 | block = get_vm_block(vm, size); | ||
135 | if (block == NULL) { | ||
136 | printk(KERN_ERR "ctxfi: No virtual memory block that is big " | ||
137 | "enough to allocate!\n"); | ||
138 | return NULL; | ||
139 | } | ||
140 | |||
141 | ptp = vm->ptp[0]; | ||
142 | pte_start = (block->addr >> CT_PAGE_SHIFT); | ||
143 | pages = block->size >> CT_PAGE_SHIFT; | ||
144 | for (i = 0; i < pages; i++) { | ||
145 | unsigned long addr; | ||
146 | addr = snd_pcm_sgbuf_get_addr(substream, i << CT_PAGE_SHIFT); | ||
147 | ptp[pte_start + i] = addr; | ||
148 | } | ||
149 | |||
150 | block->size = size; | ||
151 | return block; | ||
152 | } | ||
153 | |||
154 | static void ct_vm_unmap(struct ct_vm *vm, struct ct_vm_block *block) | ||
155 | { | ||
156 | /* do unmapping */ | ||
157 | put_vm_block(vm, block); | ||
158 | } | ||
159 | |||
160 | /* * | ||
161 | * return the host (kmalloced) addr of the @index-th device | ||
162 | * page talbe page on success, or NULL on failure. | ||
163 | * The first returned NULL indicates the termination. | ||
164 | * */ | ||
165 | static void * | ||
166 | ct_get_ptp_virt(struct ct_vm *vm, int index) | ||
167 | { | ||
168 | void *addr; | ||
169 | |||
170 | addr = (index >= CT_PTP_NUM) ? NULL : vm->ptp[index]; | ||
171 | |||
172 | return addr; | ||
173 | } | ||
174 | |||
175 | int ct_vm_create(struct ct_vm **rvm) | ||
176 | { | ||
177 | struct ct_vm *vm; | ||
178 | struct ct_vm_block *block; | ||
179 | int i; | ||
180 | |||
181 | *rvm = NULL; | ||
182 | |||
183 | vm = kzalloc(sizeof(*vm), GFP_KERNEL); | ||
184 | if (NULL == vm) | ||
185 | return -ENOMEM; | ||
186 | |||
187 | mutex_init(&vm->lock); | ||
188 | |||
189 | /* Allocate page table pages */ | ||
190 | for (i = 0; i < CT_PTP_NUM; i++) { | ||
191 | vm->ptp[i] = kmalloc(PAGE_SIZE, GFP_KERNEL); | ||
192 | if (NULL == vm->ptp[i]) | ||
193 | break; | ||
194 | } | ||
195 | if (!i) { | ||
196 | /* no page table pages are allocated */ | ||
197 | kfree(vm); | ||
198 | return -ENOMEM; | ||
199 | } | ||
200 | vm->size = CT_ADDRS_PER_PAGE * i; | ||
201 | /* Initialise remaining ptps */ | ||
202 | for (; i < CT_PTP_NUM; i++) | ||
203 | vm->ptp[i] = NULL; | ||
204 | |||
205 | vm->map = ct_vm_map; | ||
206 | vm->unmap = ct_vm_unmap; | ||
207 | vm->get_ptp_virt = ct_get_ptp_virt; | ||
208 | INIT_LIST_HEAD(&vm->unused); | ||
209 | INIT_LIST_HEAD(&vm->used); | ||
210 | block = kzalloc(sizeof(*block), GFP_KERNEL); | ||
211 | if (NULL != block) { | ||
212 | block->addr = 0; | ||
213 | block->size = vm->size; | ||
214 | list_add(&block->list, &vm->unused); | ||
215 | } | ||
216 | |||
217 | *rvm = vm; | ||
218 | return 0; | ||
219 | } | ||
220 | |||
221 | /* The caller must ensure no mapping pages are being used | ||
222 | * by hardware before calling this function */ | ||
223 | void ct_vm_destroy(struct ct_vm *vm) | ||
224 | { | ||
225 | int i; | ||
226 | struct list_head *pos; | ||
227 | struct ct_vm_block *entry; | ||
228 | |||
229 | /* free used and unused list nodes */ | ||
230 | while (!list_empty(&vm->used)) { | ||
231 | pos = vm->used.next; | ||
232 | list_del(pos); | ||
233 | entry = list_entry(pos, struct ct_vm_block, list); | ||
234 | kfree(entry); | ||
235 | } | ||
236 | while (!list_empty(&vm->unused)) { | ||
237 | pos = vm->unused.next; | ||
238 | list_del(pos); | ||
239 | entry = list_entry(pos, struct ct_vm_block, list); | ||
240 | kfree(entry); | ||
241 | } | ||
242 | |||
243 | /* free allocated page table pages */ | ||
244 | for (i = 0; i < CT_PTP_NUM; i++) | ||
245 | kfree(vm->ptp[i]); | ||
246 | |||
247 | vm->size = 0; | ||
248 | |||
249 | kfree(vm); | ||
250 | } | ||
diff --git a/sound/pci/ctxfi/ctvmem.h b/sound/pci/ctxfi/ctvmem.h new file mode 100644 index 000000000000..01e4fd0386a3 --- /dev/null +++ b/sound/pci/ctxfi/ctvmem.h | |||
@@ -0,0 +1,61 @@ | |||
1 | /** | ||
2 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
3 | * | ||
4 | * This source file is released under GPL v2 license (no other versions). | ||
5 | * See the COPYING file included in the main directory of this source | ||
6 | * distribution for the license terms and conditions. | ||
7 | * | ||
8 | * @File ctvmem.h | ||
9 | * | ||
10 | * @Brief | ||
11 | * This file contains the definition of virtual memory management object | ||
12 | * for card device. | ||
13 | * | ||
14 | * @Author Liu Chun | ||
15 | * @Date Mar 28 2008 | ||
16 | */ | ||
17 | |||
18 | #ifndef CTVMEM_H | ||
19 | #define CTVMEM_H | ||
20 | |||
21 | #define CT_PTP_NUM 1 /* num of device page table pages */ | ||
22 | |||
23 | #include <linux/mutex.h> | ||
24 | #include <linux/list.h> | ||
25 | |||
26 | /* The chip can handle the page table of 4k pages | ||
27 | * (emu20k1 can handle even 8k pages, but we don't use it right now) | ||
28 | */ | ||
29 | #define CT_PAGE_SIZE 4096 | ||
30 | #define CT_PAGE_SHIFT 12 | ||
31 | #define CT_PAGE_MASK (~(PAGE_SIZE - 1)) | ||
32 | #define CT_PAGE_ALIGN(addr) ALIGN(addr, CT_PAGE_SIZE) | ||
33 | |||
34 | struct ct_vm_block { | ||
35 | unsigned int addr; /* starting logical addr of this block */ | ||
36 | unsigned int size; /* size of this device virtual mem block */ | ||
37 | struct list_head list; | ||
38 | }; | ||
39 | |||
40 | struct snd_pcm_substream; | ||
41 | |||
42 | /* Virtual memory management object for card device */ | ||
43 | struct ct_vm { | ||
44 | void *ptp[CT_PTP_NUM]; /* Device page table pages */ | ||
45 | unsigned int size; /* Available addr space in bytes */ | ||
46 | struct list_head unused; /* List of unused blocks */ | ||
47 | struct list_head used; /* List of used blocks */ | ||
48 | struct mutex lock; | ||
49 | |||
50 | /* Map host addr (kmalloced/vmalloced) to device logical addr. */ | ||
51 | struct ct_vm_block *(*map)(struct ct_vm *, struct snd_pcm_substream *, | ||
52 | int size); | ||
53 | /* Unmap device logical addr area. */ | ||
54 | void (*unmap)(struct ct_vm *, struct ct_vm_block *block); | ||
55 | void *(*get_ptp_virt)(struct ct_vm *vm, int index); | ||
56 | }; | ||
57 | |||
58 | int ct_vm_create(struct ct_vm **rvm); | ||
59 | void ct_vm_destroy(struct ct_vm *vm); | ||
60 | |||
61 | #endif /* CTVMEM_H */ | ||
diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c new file mode 100644 index 000000000000..76541748e7bc --- /dev/null +++ b/sound/pci/ctxfi/xfi.c | |||
@@ -0,0 +1,164 @@ | |||
1 | /* | ||
2 | * xfi linux driver. | ||
3 | * | ||
4 | * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved. | ||
5 | * | ||
6 | * This source file is released under GPL v2 license (no other versions). | ||
7 | * See the COPYING file included in the main directory of this source | ||
8 | * distribution for the license terms and conditions. | ||
9 | */ | ||
10 | |||
11 | #include <linux/init.h> | ||
12 | #include <linux/pci.h> | ||
13 | #include <linux/moduleparam.h> | ||
14 | #include <linux/pci_ids.h> | ||
15 | #include <sound/core.h> | ||
16 | #include <sound/initval.h> | ||
17 | #include "ctatc.h" | ||
18 | #include "cthardware.h" | ||
19 | |||
20 | MODULE_AUTHOR("Creative Technology Ltd"); | ||
21 | MODULE_DESCRIPTION("X-Fi driver version 1.03"); | ||
22 | MODULE_LICENSE("GPL v2"); | ||
23 | MODULE_SUPPORTED_DEVICE("{{Creative Labs, Sound Blaster X-Fi}"); | ||
24 | |||
25 | static unsigned int reference_rate = 48000; | ||
26 | static unsigned int multiple = 2; | ||
27 | MODULE_PARM_DESC(reference_rate, "Reference rate (default=48000)"); | ||
28 | module_param(reference_rate, uint, S_IRUGO); | ||
29 | MODULE_PARM_DESC(multiple, "Rate multiplier (default=2)"); | ||
30 | module_param(multiple, uint, S_IRUGO); | ||
31 | |||
32 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; | ||
33 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; | ||
34 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; | ||
35 | |||
36 | module_param_array(index, int, NULL, 0444); | ||
37 | MODULE_PARM_DESC(index, "Index value for Creative X-Fi driver"); | ||
38 | module_param_array(id, charp, NULL, 0444); | ||
39 | MODULE_PARM_DESC(id, "ID string for Creative X-Fi driver"); | ||
40 | module_param_array(enable, bool, NULL, 0444); | ||
41 | MODULE_PARM_DESC(enable, "Enable Creative X-Fi driver"); | ||
42 | |||
43 | static struct pci_device_id ct_pci_dev_ids[] = { | ||
44 | /* only X-Fi is supported, so... */ | ||
45 | { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_20K1), | ||
46 | .driver_data = ATC20K1, | ||
47 | }, | ||
48 | { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_20K2), | ||
49 | .driver_data = ATC20K2, | ||
50 | }, | ||
51 | { 0, } | ||
52 | }; | ||
53 | MODULE_DEVICE_TABLE(pci, ct_pci_dev_ids); | ||
54 | |||
55 | static int __devinit | ||
56 | ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | ||
57 | { | ||
58 | static int dev; | ||
59 | struct snd_card *card; | ||
60 | struct ct_atc *atc; | ||
61 | int err; | ||
62 | |||
63 | if (dev >= SNDRV_CARDS) | ||
64 | return -ENODEV; | ||
65 | |||
66 | if (!enable[dev]) { | ||
67 | dev++; | ||
68 | return -ENOENT; | ||
69 | } | ||
70 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | ||
71 | if (err) | ||
72 | return err; | ||
73 | if ((reference_rate != 48000) && (reference_rate != 44100)) { | ||
74 | printk(KERN_ERR "ctxfi: Invalid reference_rate value %u!!!\n", | ||
75 | reference_rate); | ||
76 | printk(KERN_ERR "ctxfi: The valid values for reference_rate " | ||
77 | "are 48000 and 44100, Value 48000 is assumed.\n"); | ||
78 | reference_rate = 48000; | ||
79 | } | ||
80 | if ((multiple != 1) && (multiple != 2)) { | ||
81 | printk(KERN_ERR "ctxfi: Invalid multiple value %u!!!\n", | ||
82 | multiple); | ||
83 | printk(KERN_ERR "ctxfi: The valid values for multiple are " | ||
84 | "1 and 2, Value 2 is assumed.\n"); | ||
85 | multiple = 2; | ||
86 | } | ||
87 | err = ct_atc_create(card, pci, reference_rate, multiple, | ||
88 | pci_id->driver_data, &atc); | ||
89 | if (err < 0) | ||
90 | goto error; | ||
91 | |||
92 | card->private_data = atc; | ||
93 | |||
94 | /* Create alsa devices supported by this card */ | ||
95 | err = ct_atc_create_alsa_devs(atc); | ||
96 | if (err < 0) | ||
97 | goto error; | ||
98 | |||
99 | strcpy(card->driver, "SB-XFi"); | ||
100 | strcpy(card->shortname, "Creative X-Fi"); | ||
101 | snprintf(card->longname, sizeof(card->longname), "%s %s %s", | ||
102 | card->shortname, atc->chip_name, atc->model_name); | ||
103 | |||
104 | err = snd_card_register(card); | ||
105 | if (err < 0) | ||
106 | goto error; | ||
107 | |||
108 | pci_set_drvdata(pci, card); | ||
109 | dev++; | ||
110 | |||
111 | return 0; | ||
112 | |||
113 | error: | ||
114 | snd_card_free(card); | ||
115 | return err; | ||
116 | } | ||
117 | |||
118 | static void __devexit ct_card_remove(struct pci_dev *pci) | ||
119 | { | ||
120 | snd_card_free(pci_get_drvdata(pci)); | ||
121 | pci_set_drvdata(pci, NULL); | ||
122 | } | ||
123 | |||
124 | #ifdef CONFIG_PM | ||
125 | static int ct_card_suspend(struct pci_dev *pci, pm_message_t state) | ||
126 | { | ||
127 | struct snd_card *card = pci_get_drvdata(pci); | ||
128 | struct ct_atc *atc = card->private_data; | ||
129 | |||
130 | return atc->suspend(atc, state); | ||
131 | } | ||
132 | |||
133 | static int ct_card_resume(struct pci_dev *pci) | ||
134 | { | ||
135 | struct snd_card *card = pci_get_drvdata(pci); | ||
136 | struct ct_atc *atc = card->private_data; | ||
137 | |||
138 | return atc->resume(atc); | ||
139 | } | ||
140 | #endif | ||
141 | |||
142 | static struct pci_driver ct_driver = { | ||
143 | .name = "SB-XFi", | ||
144 | .id_table = ct_pci_dev_ids, | ||
145 | .probe = ct_card_probe, | ||
146 | .remove = __devexit_p(ct_card_remove), | ||
147 | #ifdef CONFIG_PM | ||
148 | .suspend = ct_card_suspend, | ||
149 | .resume = ct_card_resume, | ||
150 | #endif | ||
151 | }; | ||
152 | |||
153 | static int __init ct_card_init(void) | ||
154 | { | ||
155 | return pci_register_driver(&ct_driver); | ||
156 | } | ||
157 | |||
158 | static void __exit ct_card_exit(void) | ||
159 | { | ||
160 | pci_unregister_driver(&ct_driver); | ||
161 | } | ||
162 | |||
163 | module_init(ct_card_init) | ||
164 | module_exit(ct_card_exit) | ||
diff --git a/sound/pci/emu10k1/Makefile b/sound/pci/emu10k1/Makefile index cf2d5636d8be..fc5591e7777e 100644 --- a/sound/pci/emu10k1/Makefile +++ b/sound/pci/emu10k1/Makefile | |||
@@ -9,15 +9,7 @@ snd-emu10k1-objs := emu10k1.o emu10k1_main.o \ | |||
9 | snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o | 9 | snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o |
10 | snd-emu10k1x-objs := emu10k1x.o | 10 | snd-emu10k1x-objs := emu10k1x.o |
11 | 11 | ||
12 | # | ||
13 | # this function returns: | ||
14 | # "m" - CONFIG_SND_SEQUENCER is m | ||
15 | # <empty string> - CONFIG_SND_SEQUENCER is undefined | ||
16 | # otherwise parameter #1 value | ||
17 | # | ||
18 | sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) | ||
19 | |||
20 | # Toplevel Module Dependency | 12 | # Toplevel Module Dependency |
21 | obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o | 13 | obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o |
22 | obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-emu10k1-synth.o | 14 | obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emu10k1-synth.o |
23 | obj-$(CONFIG_SND_EMU10K1X) += snd-emu10k1x.o | 15 | obj-$(CONFIG_SND_EMU10K1X) += snd-emu10k1x.o |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 1970f0e70f37..4d3ad793e98f 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -858,7 +858,6 @@ static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct s | |||
858 | } | 858 | } |
859 | 859 | ||
860 | pcm->info_flags = 0; | 860 | pcm->info_flags = 0; |
861 | pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX; | ||
862 | switch(device) { | 861 | switch(device) { |
863 | case 0: | 862 | case 0: |
864 | strcpy(pcm->name, "EMU10K1X Front"); | 863 | strcpy(pcm->name, "EMU10K1X Front"); |
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 78f62fd404c2..55b83ef73c63 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c | |||
@@ -1736,7 +1736,7 @@ static struct snd_pcm_hardware snd_emu10k1_fx8010_playback = | |||
1736 | .buffer_bytes_max = (128*1024), | 1736 | .buffer_bytes_max = (128*1024), |
1737 | .period_bytes_min = 1024, | 1737 | .period_bytes_min = 1024, |
1738 | .period_bytes_max = (128*1024), | 1738 | .period_bytes_max = (128*1024), |
1739 | .periods_min = 1, | 1739 | .periods_min = 2, |
1740 | .periods_max = 1024, | 1740 | .periods_max = 1024, |
1741 | .fifo_size = 0, | 1741 | .fifo_size = 0, |
1742 | }; | 1742 | }; |
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index eb2a19b894a0..04438f1d682d 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig | |||
@@ -2,7 +2,6 @@ menuconfig SND_HDA_INTEL | |||
2 | tristate "Intel HD Audio" | 2 | tristate "Intel HD Audio" |
3 | select SND_PCM | 3 | select SND_PCM |
4 | select SND_VMASTER | 4 | select SND_VMASTER |
5 | select SND_JACK if INPUT=y || INPUT=SND | ||
6 | help | 5 | help |
7 | Say Y here to include support for Intel "High Definition | 6 | Say Y here to include support for Intel "High Definition |
8 | Audio" (Azalia) and its compatible devices. | 7 | Audio" (Azalia) and its compatible devices. |
@@ -39,6 +38,14 @@ config SND_HDA_INPUT_BEEP | |||
39 | Say Y here to build a digital beep interface for HD-audio | 38 | Say Y here to build a digital beep interface for HD-audio |
40 | driver. This interface is used to generate digital beeps. | 39 | driver. This interface is used to generate digital beeps. |
41 | 40 | ||
41 | config SND_HDA_INPUT_JACK | ||
42 | bool "Support jack plugging notification via input layer" | ||
43 | depends on INPUT=y || INPUT=SND_HDA_INTEL | ||
44 | select SND_JACK | ||
45 | help | ||
46 | Say Y here to enable the jack plugging notification via | ||
47 | input layer. | ||
48 | |||
42 | config SND_HDA_CODEC_REALTEK | 49 | config SND_HDA_CODEC_REALTEK |
43 | bool "Build Realtek HD-audio codec support" | 50 | bool "Build Realtek HD-audio codec support" |
44 | default y | 51 | default y |
@@ -139,6 +146,19 @@ config SND_HDA_CODEC_CONEXANT | |||
139 | snd-hda-codec-conexant. | 146 | snd-hda-codec-conexant. |
140 | This module is automatically loaded at probing. | 147 | This module is automatically loaded at probing. |
141 | 148 | ||
149 | config SND_HDA_CODEC_CA0110 | ||
150 | bool "Build Creative CA0110-IBG codec support" | ||
151 | depends on SND_HDA_INTEL | ||
152 | default y | ||
153 | help | ||
154 | Say Y here to include Creative CA0110-IBG codec support in | ||
155 | snd-hda-intel driver, found on some Creative X-Fi cards. | ||
156 | |||
157 | When the HD-audio driver is built as a module, the codec | ||
158 | support code is also built as another module, | ||
159 | snd-hda-codec-ca0110. | ||
160 | This module is automatically loaded at probing. | ||
161 | |||
142 | config SND_HDA_CODEC_CMEDIA | 162 | config SND_HDA_CODEC_CMEDIA |
143 | bool "Build C-Media HD-audio codec support" | 163 | bool "Build C-Media HD-audio codec support" |
144 | default y | 164 | default y |
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile index 50f9d0967251..e3081d4586cc 100644 --- a/sound/pci/hda/Makefile +++ b/sound/pci/hda/Makefile | |||
@@ -13,6 +13,7 @@ snd-hda-codec-analog-objs := patch_analog.o | |||
13 | snd-hda-codec-idt-objs := patch_sigmatel.o | 13 | snd-hda-codec-idt-objs := patch_sigmatel.o |
14 | snd-hda-codec-si3054-objs := patch_si3054.o | 14 | snd-hda-codec-si3054-objs := patch_si3054.o |
15 | snd-hda-codec-atihdmi-objs := patch_atihdmi.o | 15 | snd-hda-codec-atihdmi-objs := patch_atihdmi.o |
16 | snd-hda-codec-ca0110-objs := patch_ca0110.o | ||
16 | snd-hda-codec-conexant-objs := patch_conexant.o | 17 | snd-hda-codec-conexant-objs := patch_conexant.o |
17 | snd-hda-codec-via-objs := patch_via.o | 18 | snd-hda-codec-via-objs := patch_via.o |
18 | snd-hda-codec-nvhdmi-objs := patch_nvhdmi.o | 19 | snd-hda-codec-nvhdmi-objs := patch_nvhdmi.o |
@@ -40,6 +41,9 @@ endif | |||
40 | ifdef CONFIG_SND_HDA_CODEC_ATIHDMI | 41 | ifdef CONFIG_SND_HDA_CODEC_ATIHDMI |
41 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-atihdmi.o | 42 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-atihdmi.o |
42 | endif | 43 | endif |
44 | ifdef CONFIG_SND_HDA_CODEC_CA0110 | ||
45 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-ca0110.o | ||
46 | endif | ||
43 | ifdef CONFIG_SND_HDA_CODEC_CONEXANT | 47 | ifdef CONFIG_SND_HDA_CODEC_CONEXANT |
44 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-conexant.o | 48 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-conexant.o |
45 | endif | 49 | endif |
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c index 4de5bacd3929..29272f2e95a0 100644 --- a/sound/pci/hda/hda_beep.c +++ b/sound/pci/hda/hda_beep.c | |||
@@ -45,6 +45,46 @@ static void snd_hda_generate_beep(struct work_struct *work) | |||
45 | AC_VERB_SET_BEEP_CONTROL, beep->tone); | 45 | AC_VERB_SET_BEEP_CONTROL, beep->tone); |
46 | } | 46 | } |
47 | 47 | ||
48 | /* (non-standard) Linear beep tone calculation for IDT/STAC codecs | ||
49 | * | ||
50 | * The tone frequency of beep generator on IDT/STAC codecs is | ||
51 | * defined from the 8bit tone parameter, in Hz, | ||
52 | * freq = 48000 * (257 - tone) / 1024 | ||
53 | * that is from 12kHz to 93.75kHz in step of 46.875 hz | ||
54 | */ | ||
55 | static int beep_linear_tone(struct hda_beep *beep, int hz) | ||
56 | { | ||
57 | hz *= 1000; /* fixed point */ | ||
58 | hz = hz - DIGBEEP_HZ_MIN; | ||
59 | if (hz < 0) | ||
60 | hz = 0; /* turn off PC beep*/ | ||
61 | else if (hz >= (DIGBEEP_HZ_MAX - DIGBEEP_HZ_MIN)) | ||
62 | hz = 0xff; | ||
63 | else { | ||
64 | hz /= DIGBEEP_HZ_STEP; | ||
65 | hz++; | ||
66 | } | ||
67 | return hz; | ||
68 | } | ||
69 | |||
70 | /* HD-audio standard beep tone parameter calculation | ||
71 | * | ||
72 | * The tone frequency in Hz is calculated as | ||
73 | * freq = 48000 / (tone * 4) | ||
74 | * from 47Hz to 12kHz | ||
75 | */ | ||
76 | static int beep_standard_tone(struct hda_beep *beep, int hz) | ||
77 | { | ||
78 | if (hz <= 0) | ||
79 | return 0; /* disabled */ | ||
80 | hz = 12000 / hz; | ||
81 | if (hz > 0xff) | ||
82 | return 0xff; | ||
83 | if (hz <= 0) | ||
84 | return 1; | ||
85 | return hz; | ||
86 | } | ||
87 | |||
48 | static int snd_hda_beep_event(struct input_dev *dev, unsigned int type, | 88 | static int snd_hda_beep_event(struct input_dev *dev, unsigned int type, |
49 | unsigned int code, int hz) | 89 | unsigned int code, int hz) |
50 | { | 90 | { |
@@ -55,21 +95,14 @@ static int snd_hda_beep_event(struct input_dev *dev, unsigned int type, | |||
55 | if (hz) | 95 | if (hz) |
56 | hz = 1000; | 96 | hz = 1000; |
57 | case SND_TONE: | 97 | case SND_TONE: |
58 | hz *= 1000; /* fixed point */ | 98 | if (beep->linear_tone) |
59 | hz = hz - DIGBEEP_HZ_MIN; | 99 | beep->tone = beep_linear_tone(beep, hz); |
60 | if (hz < 0) | 100 | else |
61 | hz = 0; /* turn off PC beep*/ | 101 | beep->tone = beep_standard_tone(beep, hz); |
62 | else if (hz >= (DIGBEEP_HZ_MAX - DIGBEEP_HZ_MIN)) | ||
63 | hz = 0xff; | ||
64 | else { | ||
65 | hz /= DIGBEEP_HZ_STEP; | ||
66 | hz++; | ||
67 | } | ||
68 | break; | 102 | break; |
69 | default: | 103 | default: |
70 | return -1; | 104 | return -1; |
71 | } | 105 | } |
72 | beep->tone = hz; | ||
73 | 106 | ||
74 | /* schedule beep event */ | 107 | /* schedule beep event */ |
75 | schedule_work(&beep->beep_work); | 108 | schedule_work(&beep->beep_work); |
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h index 51bf6a5daf39..0c3de787c717 100644 --- a/sound/pci/hda/hda_beep.h +++ b/sound/pci/hda/hda_beep.h | |||
@@ -30,8 +30,9 @@ struct hda_beep { | |||
30 | struct hda_codec *codec; | 30 | struct hda_codec *codec; |
31 | char phys[32]; | 31 | char phys[32]; |
32 | int tone; | 32 | int tone; |
33 | int nid; | 33 | hda_nid_t nid; |
34 | int enabled; | 34 | unsigned int enabled:1; |
35 | unsigned int linear_tone:1; /* linear tone for IDT/STAC codec */ | ||
35 | struct work_struct beep_work; /* scheduled task for beep event */ | 36 | struct work_struct beep_work; /* scheduled task for beep event */ |
36 | }; | 37 | }; |
37 | 38 | ||
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 8820faf6c9d8..462e2cedaa6a 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -48,6 +48,7 @@ static struct hda_vendor_id hda_vendor_ids[] = { | |||
48 | { 0x1095, "Silicon Image" }, | 48 | { 0x1095, "Silicon Image" }, |
49 | { 0x10de, "Nvidia" }, | 49 | { 0x10de, "Nvidia" }, |
50 | { 0x10ec, "Realtek" }, | 50 | { 0x10ec, "Realtek" }, |
51 | { 0x1102, "Creative" }, | ||
51 | { 0x1106, "VIA" }, | 52 | { 0x1106, "VIA" }, |
52 | { 0x111d, "IDT" }, | 53 | { 0x111d, "IDT" }, |
53 | { 0x11c1, "LSI" }, | 54 | { 0x11c1, "LSI" }, |
@@ -157,6 +158,39 @@ make_codec_cmd(struct hda_codec *codec, hda_nid_t nid, int direct, | |||
157 | return val; | 158 | return val; |
158 | } | 159 | } |
159 | 160 | ||
161 | /* | ||
162 | * Send and receive a verb | ||
163 | */ | ||
164 | static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd, | ||
165 | unsigned int *res) | ||
166 | { | ||
167 | struct hda_bus *bus = codec->bus; | ||
168 | int err; | ||
169 | |||
170 | if (res) | ||
171 | *res = -1; | ||
172 | again: | ||
173 | snd_hda_power_up(codec); | ||
174 | mutex_lock(&bus->cmd_mutex); | ||
175 | err = bus->ops.command(bus, cmd); | ||
176 | if (!err && res) | ||
177 | *res = bus->ops.get_response(bus); | ||
178 | mutex_unlock(&bus->cmd_mutex); | ||
179 | snd_hda_power_down(codec); | ||
180 | if (res && *res == -1 && bus->rirb_error) { | ||
181 | if (bus->response_reset) { | ||
182 | snd_printd("hda_codec: resetting BUS due to " | ||
183 | "fatal communication error\n"); | ||
184 | bus->ops.bus_reset(bus); | ||
185 | } | ||
186 | goto again; | ||
187 | } | ||
188 | /* clear reset-flag when the communication gets recovered */ | ||
189 | if (!err) | ||
190 | bus->response_reset = 0; | ||
191 | return err; | ||
192 | } | ||
193 | |||
160 | /** | 194 | /** |
161 | * snd_hda_codec_read - send a command and get the response | 195 | * snd_hda_codec_read - send a command and get the response |
162 | * @codec: the HDA codec | 196 | * @codec: the HDA codec |
@@ -173,18 +207,9 @@ unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid, | |||
173 | int direct, | 207 | int direct, |
174 | unsigned int verb, unsigned int parm) | 208 | unsigned int verb, unsigned int parm) |
175 | { | 209 | { |
176 | struct hda_bus *bus = codec->bus; | 210 | unsigned cmd = make_codec_cmd(codec, nid, direct, verb, parm); |
177 | unsigned int res; | 211 | unsigned int res; |
178 | 212 | codec_exec_verb(codec, cmd, &res); | |
179 | res = make_codec_cmd(codec, nid, direct, verb, parm); | ||
180 | snd_hda_power_up(codec); | ||
181 | mutex_lock(&bus->cmd_mutex); | ||
182 | if (!bus->ops.command(bus, res)) | ||
183 | res = bus->ops.get_response(bus); | ||
184 | else | ||
185 | res = (unsigned int)-1; | ||
186 | mutex_unlock(&bus->cmd_mutex); | ||
187 | snd_hda_power_down(codec); | ||
188 | return res; | 213 | return res; |
189 | } | 214 | } |
190 | EXPORT_SYMBOL_HDA(snd_hda_codec_read); | 215 | EXPORT_SYMBOL_HDA(snd_hda_codec_read); |
@@ -204,17 +229,10 @@ EXPORT_SYMBOL_HDA(snd_hda_codec_read); | |||
204 | int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct, | 229 | int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct, |
205 | unsigned int verb, unsigned int parm) | 230 | unsigned int verb, unsigned int parm) |
206 | { | 231 | { |
207 | struct hda_bus *bus = codec->bus; | 232 | unsigned int cmd = make_codec_cmd(codec, nid, direct, verb, parm); |
208 | unsigned int res; | 233 | unsigned int res; |
209 | int err; | 234 | return codec_exec_verb(codec, cmd, |
210 | 235 | codec->bus->sync_write ? &res : NULL); | |
211 | res = make_codec_cmd(codec, nid, direct, verb, parm); | ||
212 | snd_hda_power_up(codec); | ||
213 | mutex_lock(&bus->cmd_mutex); | ||
214 | err = bus->ops.command(bus, res); | ||
215 | mutex_unlock(&bus->cmd_mutex); | ||
216 | snd_hda_power_down(codec); | ||
217 | return err; | ||
218 | } | 236 | } |
219 | EXPORT_SYMBOL_HDA(snd_hda_codec_write); | 237 | EXPORT_SYMBOL_HDA(snd_hda_codec_write); |
220 | 238 | ||
@@ -613,7 +631,10 @@ static int get_codec_name(struct hda_codec *codec) | |||
613 | const struct hda_vendor_id *c; | 631 | const struct hda_vendor_id *c; |
614 | const char *vendor = NULL; | 632 | const char *vendor = NULL; |
615 | u16 vendor_id = codec->vendor_id >> 16; | 633 | u16 vendor_id = codec->vendor_id >> 16; |
616 | char tmp[16], name[32]; | 634 | char tmp[16]; |
635 | |||
636 | if (codec->vendor_name) | ||
637 | goto get_chip_name; | ||
617 | 638 | ||
618 | for (c = hda_vendor_ids; c->id; c++) { | 639 | for (c = hda_vendor_ids; c->id; c++) { |
619 | if (c->id == vendor_id) { | 640 | if (c->id == vendor_id) { |
@@ -625,14 +646,21 @@ static int get_codec_name(struct hda_codec *codec) | |||
625 | sprintf(tmp, "Generic %04x", vendor_id); | 646 | sprintf(tmp, "Generic %04x", vendor_id); |
626 | vendor = tmp; | 647 | vendor = tmp; |
627 | } | 648 | } |
649 | codec->vendor_name = kstrdup(vendor, GFP_KERNEL); | ||
650 | if (!codec->vendor_name) | ||
651 | return -ENOMEM; | ||
652 | |||
653 | get_chip_name: | ||
654 | if (codec->chip_name) | ||
655 | return 0; | ||
656 | |||
628 | if (codec->preset && codec->preset->name) | 657 | if (codec->preset && codec->preset->name) |
629 | snprintf(name, sizeof(name), "%s %s", vendor, | 658 | codec->chip_name = kstrdup(codec->preset->name, GFP_KERNEL); |
630 | codec->preset->name); | 659 | else { |
631 | else | 660 | sprintf(tmp, "ID %x", codec->vendor_id & 0xffff); |
632 | snprintf(name, sizeof(name), "%s ID %x", vendor, | 661 | codec->chip_name = kstrdup(tmp, GFP_KERNEL); |
633 | codec->vendor_id & 0xffff); | 662 | } |
634 | codec->name = kstrdup(name, GFP_KERNEL); | 663 | if (!codec->chip_name) |
635 | if (!codec->name) | ||
636 | return -ENOMEM; | 664 | return -ENOMEM; |
637 | return 0; | 665 | return 0; |
638 | } | 666 | } |
@@ -838,7 +866,8 @@ static void snd_hda_codec_free(struct hda_codec *codec) | |||
838 | module_put(codec->owner); | 866 | module_put(codec->owner); |
839 | free_hda_cache(&codec->amp_cache); | 867 | free_hda_cache(&codec->amp_cache); |
840 | free_hda_cache(&codec->cmd_cache); | 868 | free_hda_cache(&codec->cmd_cache); |
841 | kfree(codec->name); | 869 | kfree(codec->vendor_name); |
870 | kfree(codec->chip_name); | ||
842 | kfree(codec->modelname); | 871 | kfree(codec->modelname); |
843 | kfree(codec->wcaps); | 872 | kfree(codec->wcaps); |
844 | kfree(codec); | 873 | kfree(codec); |
@@ -943,8 +972,6 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr | |||
943 | snd_hda_codec_read(codec, nid, 0, | 972 | snd_hda_codec_read(codec, nid, 0, |
944 | AC_VERB_GET_SUBSYSTEM_ID, 0); | 973 | AC_VERB_GET_SUBSYSTEM_ID, 0); |
945 | } | 974 | } |
946 | if (bus->modelname) | ||
947 | codec->modelname = kstrdup(bus->modelname, GFP_KERNEL); | ||
948 | 975 | ||
949 | /* power-up all before initialization */ | 976 | /* power-up all before initialization */ |
950 | hda_set_power_state(codec, | 977 | hda_set_power_state(codec, |
@@ -979,15 +1006,16 @@ int snd_hda_codec_configure(struct hda_codec *codec) | |||
979 | int err; | 1006 | int err; |
980 | 1007 | ||
981 | codec->preset = find_codec_preset(codec); | 1008 | codec->preset = find_codec_preset(codec); |
982 | if (!codec->name) { | 1009 | if (!codec->vendor_name || !codec->chip_name) { |
983 | err = get_codec_name(codec); | 1010 | err = get_codec_name(codec); |
984 | if (err < 0) | 1011 | if (err < 0) |
985 | return err; | 1012 | return err; |
986 | } | 1013 | } |
987 | /* audio codec should override the mixer name */ | 1014 | /* audio codec should override the mixer name */ |
988 | if (codec->afg || !*codec->bus->card->mixername) | 1015 | if (codec->afg || !*codec->bus->card->mixername) |
989 | strlcpy(codec->bus->card->mixername, codec->name, | 1016 | snprintf(codec->bus->card->mixername, |
990 | sizeof(codec->bus->card->mixername)); | 1017 | sizeof(codec->bus->card->mixername), |
1018 | "%s %s", codec->vendor_name, codec->chip_name); | ||
991 | 1019 | ||
992 | if (is_generic_config(codec)) { | 1020 | if (is_generic_config(codec)) { |
993 | err = snd_hda_parse_generic_codec(codec); | 1021 | err = snd_hda_parse_generic_codec(codec); |
@@ -1055,6 +1083,8 @@ EXPORT_SYMBOL_HDA(snd_hda_codec_cleanup_stream); | |||
1055 | /* FIXME: more better hash key? */ | 1083 | /* FIXME: more better hash key? */ |
1056 | #define HDA_HASH_KEY(nid,dir,idx) (u32)((nid) + ((idx) << 16) + ((dir) << 24)) | 1084 | #define HDA_HASH_KEY(nid,dir,idx) (u32)((nid) + ((idx) << 16) + ((dir) << 24)) |
1057 | #define HDA_HASH_PINCAP_KEY(nid) (u32)((nid) + (0x02 << 24)) | 1085 | #define HDA_HASH_PINCAP_KEY(nid) (u32)((nid) + (0x02 << 24)) |
1086 | #define HDA_HASH_PARPCM_KEY(nid) (u32)((nid) + (0x03 << 24)) | ||
1087 | #define HDA_HASH_PARSTR_KEY(nid) (u32)((nid) + (0x04 << 24)) | ||
1058 | #define INFO_AMP_CAPS (1<<0) | 1088 | #define INFO_AMP_CAPS (1<<0) |
1059 | #define INFO_AMP_VOL(ch) (1 << (1 + (ch))) | 1089 | #define INFO_AMP_VOL(ch) (1 << (1 + (ch))) |
1060 | 1090 | ||
@@ -1145,19 +1175,32 @@ int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir, | |||
1145 | } | 1175 | } |
1146 | EXPORT_SYMBOL_HDA(snd_hda_override_amp_caps); | 1176 | EXPORT_SYMBOL_HDA(snd_hda_override_amp_caps); |
1147 | 1177 | ||
1148 | u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid) | 1178 | static unsigned int |
1179 | query_caps_hash(struct hda_codec *codec, hda_nid_t nid, u32 key, | ||
1180 | unsigned int (*func)(struct hda_codec *, hda_nid_t)) | ||
1149 | { | 1181 | { |
1150 | struct hda_amp_info *info; | 1182 | struct hda_amp_info *info; |
1151 | 1183 | ||
1152 | info = get_alloc_amp_hash(codec, HDA_HASH_PINCAP_KEY(nid)); | 1184 | info = get_alloc_amp_hash(codec, key); |
1153 | if (!info) | 1185 | if (!info) |
1154 | return 0; | 1186 | return 0; |
1155 | if (!info->head.val) { | 1187 | if (!info->head.val) { |
1156 | info->amp_caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP); | ||
1157 | info->head.val |= INFO_AMP_CAPS; | 1188 | info->head.val |= INFO_AMP_CAPS; |
1189 | info->amp_caps = func(codec, nid); | ||
1158 | } | 1190 | } |
1159 | return info->amp_caps; | 1191 | return info->amp_caps; |
1160 | } | 1192 | } |
1193 | |||
1194 | static unsigned int read_pin_cap(struct hda_codec *codec, hda_nid_t nid) | ||
1195 | { | ||
1196 | return snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP); | ||
1197 | } | ||
1198 | |||
1199 | u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid) | ||
1200 | { | ||
1201 | return query_caps_hash(codec, nid, HDA_HASH_PINCAP_KEY(nid), | ||
1202 | read_pin_cap); | ||
1203 | } | ||
1161 | EXPORT_SYMBOL_HDA(snd_hda_query_pin_caps); | 1204 | EXPORT_SYMBOL_HDA(snd_hda_query_pin_caps); |
1162 | 1205 | ||
1163 | /* | 1206 | /* |
@@ -1432,6 +1475,8 @@ _snd_hda_find_mixer_ctl(struct hda_codec *codec, | |||
1432 | memset(&id, 0, sizeof(id)); | 1475 | memset(&id, 0, sizeof(id)); |
1433 | id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; | 1476 | id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; |
1434 | id.index = idx; | 1477 | id.index = idx; |
1478 | if (snd_BUG_ON(strlen(name) >= sizeof(id.name))) | ||
1479 | return NULL; | ||
1435 | strcpy(id.name, name); | 1480 | strcpy(id.name, name); |
1436 | return snd_ctl_find_id(codec->bus->card, &id); | 1481 | return snd_ctl_find_id(codec->bus->card, &id); |
1437 | } | 1482 | } |
@@ -2242,28 +2287,22 @@ EXPORT_SYMBOL_HDA(snd_hda_create_spdif_in_ctls); | |||
2242 | int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid, | 2287 | int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid, |
2243 | int direct, unsigned int verb, unsigned int parm) | 2288 | int direct, unsigned int verb, unsigned int parm) |
2244 | { | 2289 | { |
2245 | struct hda_bus *bus = codec->bus; | 2290 | int err = snd_hda_codec_write(codec, nid, direct, verb, parm); |
2246 | unsigned int res; | 2291 | struct hda_cache_head *c; |
2247 | int err; | 2292 | u32 key; |
2248 | 2293 | ||
2249 | res = make_codec_cmd(codec, nid, direct, verb, parm); | 2294 | if (err < 0) |
2250 | snd_hda_power_up(codec); | 2295 | return err; |
2251 | mutex_lock(&bus->cmd_mutex); | 2296 | /* parm may contain the verb stuff for get/set amp */ |
2252 | err = bus->ops.command(bus, res); | 2297 | verb = verb | (parm >> 8); |
2253 | if (!err) { | 2298 | parm &= 0xff; |
2254 | struct hda_cache_head *c; | 2299 | key = build_cmd_cache_key(nid, verb); |
2255 | u32 key; | 2300 | mutex_lock(&codec->bus->cmd_mutex); |
2256 | /* parm may contain the verb stuff for get/set amp */ | 2301 | c = get_alloc_hash(&codec->cmd_cache, key); |
2257 | verb = verb | (parm >> 8); | 2302 | if (c) |
2258 | parm &= 0xff; | 2303 | c->val = parm; |
2259 | key = build_cmd_cache_key(nid, verb); | 2304 | mutex_unlock(&codec->bus->cmd_mutex); |
2260 | c = get_alloc_hash(&codec->cmd_cache, key); | 2305 | return 0; |
2261 | if (c) | ||
2262 | c->val = parm; | ||
2263 | } | ||
2264 | mutex_unlock(&bus->cmd_mutex); | ||
2265 | snd_hda_power_down(codec); | ||
2266 | return err; | ||
2267 | } | 2306 | } |
2268 | EXPORT_SYMBOL_HDA(snd_hda_codec_write_cache); | 2307 | EXPORT_SYMBOL_HDA(snd_hda_codec_write_cache); |
2269 | 2308 | ||
@@ -2321,7 +2360,8 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, | |||
2321 | if (wcaps & AC_WCAP_POWER) { | 2360 | if (wcaps & AC_WCAP_POWER) { |
2322 | unsigned int wid_type = (wcaps & AC_WCAP_TYPE) >> | 2361 | unsigned int wid_type = (wcaps & AC_WCAP_TYPE) >> |
2323 | AC_WCAP_TYPE_SHIFT; | 2362 | AC_WCAP_TYPE_SHIFT; |
2324 | if (wid_type == AC_WID_PIN) { | 2363 | if (power_state == AC_PWRST_D3 && |
2364 | wid_type == AC_WID_PIN) { | ||
2325 | unsigned int pincap; | 2365 | unsigned int pincap; |
2326 | /* | 2366 | /* |
2327 | * don't power down the widget if it controls | 2367 | * don't power down the widget if it controls |
@@ -2333,7 +2373,7 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, | |||
2333 | nid, 0, | 2373 | nid, 0, |
2334 | AC_VERB_GET_EAPD_BTLENABLE, 0); | 2374 | AC_VERB_GET_EAPD_BTLENABLE, 0); |
2335 | eapd &= 0x02; | 2375 | eapd &= 0x02; |
2336 | if (power_state == AC_PWRST_D3 && eapd) | 2376 | if (eapd) |
2337 | continue; | 2377 | continue; |
2338 | } | 2378 | } |
2339 | } | 2379 | } |
@@ -2544,6 +2584,41 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate, | |||
2544 | } | 2584 | } |
2545 | EXPORT_SYMBOL_HDA(snd_hda_calc_stream_format); | 2585 | EXPORT_SYMBOL_HDA(snd_hda_calc_stream_format); |
2546 | 2586 | ||
2587 | static unsigned int get_pcm_param(struct hda_codec *codec, hda_nid_t nid) | ||
2588 | { | ||
2589 | unsigned int val = 0; | ||
2590 | if (nid != codec->afg && | ||
2591 | (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD)) | ||
2592 | val = snd_hda_param_read(codec, nid, AC_PAR_PCM); | ||
2593 | if (!val || val == -1) | ||
2594 | val = snd_hda_param_read(codec, codec->afg, AC_PAR_PCM); | ||
2595 | if (!val || val == -1) | ||
2596 | return 0; | ||
2597 | return val; | ||
2598 | } | ||
2599 | |||
2600 | static unsigned int query_pcm_param(struct hda_codec *codec, hda_nid_t nid) | ||
2601 | { | ||
2602 | return query_caps_hash(codec, nid, HDA_HASH_PARPCM_KEY(nid), | ||
2603 | get_pcm_param); | ||
2604 | } | ||
2605 | |||
2606 | static unsigned int get_stream_param(struct hda_codec *codec, hda_nid_t nid) | ||
2607 | { | ||
2608 | unsigned int streams = snd_hda_param_read(codec, nid, AC_PAR_STREAM); | ||
2609 | if (!streams || streams == -1) | ||
2610 | streams = snd_hda_param_read(codec, codec->afg, AC_PAR_STREAM); | ||
2611 | if (!streams || streams == -1) | ||
2612 | return 0; | ||
2613 | return streams; | ||
2614 | } | ||
2615 | |||
2616 | static unsigned int query_stream_param(struct hda_codec *codec, hda_nid_t nid) | ||
2617 | { | ||
2618 | return query_caps_hash(codec, nid, HDA_HASH_PARSTR_KEY(nid), | ||
2619 | get_stream_param); | ||
2620 | } | ||
2621 | |||
2547 | /** | 2622 | /** |
2548 | * snd_hda_query_supported_pcm - query the supported PCM rates and formats | 2623 | * snd_hda_query_supported_pcm - query the supported PCM rates and formats |
2549 | * @codec: the HDA codec | 2624 | * @codec: the HDA codec |
@@ -2562,15 +2637,8 @@ static int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid, | |||
2562 | { | 2637 | { |
2563 | unsigned int i, val, wcaps; | 2638 | unsigned int i, val, wcaps; |
2564 | 2639 | ||
2565 | val = 0; | ||
2566 | wcaps = get_wcaps(codec, nid); | 2640 | wcaps = get_wcaps(codec, nid); |
2567 | if (nid != codec->afg && (wcaps & AC_WCAP_FORMAT_OVRD)) { | 2641 | val = query_pcm_param(codec, nid); |
2568 | val = snd_hda_param_read(codec, nid, AC_PAR_PCM); | ||
2569 | if (val == -1) | ||
2570 | return -EIO; | ||
2571 | } | ||
2572 | if (!val) | ||
2573 | val = snd_hda_param_read(codec, codec->afg, AC_PAR_PCM); | ||
2574 | 2642 | ||
2575 | if (ratesp) { | 2643 | if (ratesp) { |
2576 | u32 rates = 0; | 2644 | u32 rates = 0; |
@@ -2592,15 +2660,9 @@ static int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid, | |||
2592 | u64 formats = 0; | 2660 | u64 formats = 0; |
2593 | unsigned int streams, bps; | 2661 | unsigned int streams, bps; |
2594 | 2662 | ||
2595 | streams = snd_hda_param_read(codec, nid, AC_PAR_STREAM); | 2663 | streams = query_stream_param(codec, nid); |
2596 | if (streams == -1) | 2664 | if (!streams) |
2597 | return -EIO; | 2665 | return -EIO; |
2598 | if (!streams) { | ||
2599 | streams = snd_hda_param_read(codec, codec->afg, | ||
2600 | AC_PAR_STREAM); | ||
2601 | if (streams == -1) | ||
2602 | return -EIO; | ||
2603 | } | ||
2604 | 2666 | ||
2605 | bps = 0; | 2667 | bps = 0; |
2606 | if (streams & AC_SUPFMT_PCM) { | 2668 | if (streams & AC_SUPFMT_PCM) { |
@@ -2674,17 +2736,9 @@ int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid, | |||
2674 | int i; | 2736 | int i; |
2675 | unsigned int val = 0, rate, stream; | 2737 | unsigned int val = 0, rate, stream; |
2676 | 2738 | ||
2677 | if (nid != codec->afg && | 2739 | val = query_pcm_param(codec, nid); |
2678 | (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD)) { | 2740 | if (!val) |
2679 | val = snd_hda_param_read(codec, nid, AC_PAR_PCM); | 2741 | return 0; |
2680 | if (val == -1) | ||
2681 | return 0; | ||
2682 | } | ||
2683 | if (!val) { | ||
2684 | val = snd_hda_param_read(codec, codec->afg, AC_PAR_PCM); | ||
2685 | if (val == -1) | ||
2686 | return 0; | ||
2687 | } | ||
2688 | 2742 | ||
2689 | rate = format & 0xff00; | 2743 | rate = format & 0xff00; |
2690 | for (i = 0; i < AC_PAR_PCM_RATE_BITS; i++) | 2744 | for (i = 0; i < AC_PAR_PCM_RATE_BITS; i++) |
@@ -2696,12 +2750,8 @@ int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid, | |||
2696 | if (i >= AC_PAR_PCM_RATE_BITS) | 2750 | if (i >= AC_PAR_PCM_RATE_BITS) |
2697 | return 0; | 2751 | return 0; |
2698 | 2752 | ||
2699 | stream = snd_hda_param_read(codec, nid, AC_PAR_STREAM); | 2753 | stream = query_stream_param(codec, nid); |
2700 | if (stream == -1) | 2754 | if (!stream) |
2701 | return 0; | ||
2702 | if (!stream && nid != codec->afg) | ||
2703 | stream = snd_hda_param_read(codec, codec->afg, AC_PAR_STREAM); | ||
2704 | if (!stream || stream == -1) | ||
2705 | return 0; | 2755 | return 0; |
2706 | 2756 | ||
2707 | if (stream & AC_SUPFMT_PCM) { | 2757 | if (stream & AC_SUPFMT_PCM) { |
@@ -3835,11 +3885,10 @@ EXPORT_SYMBOL_HDA(auto_pin_cfg_labels); | |||
3835 | /** | 3885 | /** |
3836 | * snd_hda_suspend - suspend the codecs | 3886 | * snd_hda_suspend - suspend the codecs |
3837 | * @bus: the HDA bus | 3887 | * @bus: the HDA bus |
3838 | * @state: suspsend state | ||
3839 | * | 3888 | * |
3840 | * Returns 0 if successful. | 3889 | * Returns 0 if successful. |
3841 | */ | 3890 | */ |
3842 | int snd_hda_suspend(struct hda_bus *bus, pm_message_t state) | 3891 | int snd_hda_suspend(struct hda_bus *bus) |
3843 | { | 3892 | { |
3844 | struct hda_codec *codec; | 3893 | struct hda_codec *codec; |
3845 | 3894 | ||
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 2fdecf4b0eb6..cad79efaabc9 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
@@ -574,6 +574,8 @@ struct hda_bus_ops { | |||
574 | /* attach a PCM stream */ | 574 | /* attach a PCM stream */ |
575 | int (*attach_pcm)(struct hda_bus *bus, struct hda_codec *codec, | 575 | int (*attach_pcm)(struct hda_bus *bus, struct hda_codec *codec, |
576 | struct hda_pcm *pcm); | 576 | struct hda_pcm *pcm); |
577 | /* reset bus for retry verb */ | ||
578 | void (*bus_reset)(struct hda_bus *bus); | ||
577 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 579 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
578 | /* notify power-up/down from codec to controller */ | 580 | /* notify power-up/down from codec to controller */ |
579 | void (*pm_notify)(struct hda_bus *bus); | 581 | void (*pm_notify)(struct hda_bus *bus); |
@@ -622,7 +624,13 @@ struct hda_bus { | |||
622 | 624 | ||
623 | /* misc op flags */ | 625 | /* misc op flags */ |
624 | unsigned int needs_damn_long_delay :1; | 626 | unsigned int needs_damn_long_delay :1; |
627 | unsigned int allow_bus_reset:1; /* allow bus reset at fatal error */ | ||
628 | unsigned int sync_write:1; /* sync after verb write */ | ||
629 | /* status for codec/controller */ | ||
625 | unsigned int shutdown :1; /* being unloaded */ | 630 | unsigned int shutdown :1; /* being unloaded */ |
631 | unsigned int rirb_error:1; /* error in codec communication */ | ||
632 | unsigned int response_reset:1; /* controller was reset */ | ||
633 | unsigned int in_reset:1; /* during reset operation */ | ||
626 | }; | 634 | }; |
627 | 635 | ||
628 | /* | 636 | /* |
@@ -747,7 +755,8 @@ struct hda_codec { | |||
747 | /* detected preset */ | 755 | /* detected preset */ |
748 | const struct hda_codec_preset *preset; | 756 | const struct hda_codec_preset *preset; |
749 | struct module *owner; | 757 | struct module *owner; |
750 | const char *name; /* codec name */ | 758 | const char *vendor_name; /* codec vendor name */ |
759 | const char *chip_name; /* codec chip name */ | ||
751 | const char *modelname; /* model name for preset */ | 760 | const char *modelname; /* model name for preset */ |
752 | 761 | ||
753 | /* set by patch */ | 762 | /* set by patch */ |
@@ -905,7 +914,7 @@ void snd_hda_get_codec_name(struct hda_codec *codec, char *name, int namelen); | |||
905 | * power management | 914 | * power management |
906 | */ | 915 | */ |
907 | #ifdef CONFIG_PM | 916 | #ifdef CONFIG_PM |
908 | int snd_hda_suspend(struct hda_bus *bus, pm_message_t state); | 917 | int snd_hda_suspend(struct hda_bus *bus); |
909 | int snd_hda_resume(struct hda_bus *bus); | 918 | int snd_hda_resume(struct hda_bus *bus); |
910 | #endif | 919 | #endif |
911 | 920 | ||
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c index 1c57505c2874..6812fbe80fa4 100644 --- a/sound/pci/hda/hda_hwdep.c +++ b/sound/pci/hda/hda_hwdep.c | |||
@@ -242,7 +242,8 @@ CODEC_INFO_SHOW(subsystem_id); | |||
242 | CODEC_INFO_SHOW(revision_id); | 242 | CODEC_INFO_SHOW(revision_id); |
243 | CODEC_INFO_SHOW(afg); | 243 | CODEC_INFO_SHOW(afg); |
244 | CODEC_INFO_SHOW(mfg); | 244 | CODEC_INFO_SHOW(mfg); |
245 | CODEC_INFO_STR_SHOW(name); | 245 | CODEC_INFO_STR_SHOW(vendor_name); |
246 | CODEC_INFO_STR_SHOW(chip_name); | ||
246 | CODEC_INFO_STR_SHOW(modelname); | 247 | CODEC_INFO_STR_SHOW(modelname); |
247 | 248 | ||
248 | #define CODEC_INFO_STORE(type) \ | 249 | #define CODEC_INFO_STORE(type) \ |
@@ -275,7 +276,8 @@ static ssize_t type##_store(struct device *dev, \ | |||
275 | CODEC_INFO_STORE(vendor_id); | 276 | CODEC_INFO_STORE(vendor_id); |
276 | CODEC_INFO_STORE(subsystem_id); | 277 | CODEC_INFO_STORE(subsystem_id); |
277 | CODEC_INFO_STORE(revision_id); | 278 | CODEC_INFO_STORE(revision_id); |
278 | CODEC_INFO_STR_STORE(name); | 279 | CODEC_INFO_STR_STORE(vendor_name); |
280 | CODEC_INFO_STR_STORE(chip_name); | ||
279 | CODEC_INFO_STR_STORE(modelname); | 281 | CODEC_INFO_STR_STORE(modelname); |
280 | 282 | ||
281 | #define CODEC_ACTION_STORE(type) \ | 283 | #define CODEC_ACTION_STORE(type) \ |
@@ -499,7 +501,8 @@ static struct device_attribute codec_attrs[] = { | |||
499 | CODEC_ATTR_RW(revision_id), | 501 | CODEC_ATTR_RW(revision_id), |
500 | CODEC_ATTR_RO(afg), | 502 | CODEC_ATTR_RO(afg), |
501 | CODEC_ATTR_RO(mfg), | 503 | CODEC_ATTR_RO(mfg), |
502 | CODEC_ATTR_RW(name), | 504 | CODEC_ATTR_RW(vendor_name), |
505 | CODEC_ATTR_RW(chip_name), | ||
503 | CODEC_ATTR_RW(modelname), | 506 | CODEC_ATTR_RW(modelname), |
504 | CODEC_ATTR_RW(init_verbs), | 507 | CODEC_ATTR_RW(init_verbs), |
505 | CODEC_ATTR_RW(hints), | 508 | CODEC_ATTR_RW(hints), |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 3128e1a6bc65..4e9ea7080270 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -128,21 +128,33 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6}," | |||
128 | "{ULI, M5461}}"); | 128 | "{ULI, M5461}}"); |
129 | MODULE_DESCRIPTION("Intel HDA driver"); | 129 | MODULE_DESCRIPTION("Intel HDA driver"); |
130 | 130 | ||
131 | #ifdef CONFIG_SND_VERBOSE_PRINTK | ||
132 | #define SFX /* nop */ | ||
133 | #else | ||
131 | #define SFX "hda-intel: " | 134 | #define SFX "hda-intel: " |
132 | 135 | #endif | |
133 | 136 | ||
134 | /* | 137 | /* |
135 | * registers | 138 | * registers |
136 | */ | 139 | */ |
137 | #define ICH6_REG_GCAP 0x00 | 140 | #define ICH6_REG_GCAP 0x00 |
141 | #define ICH6_GCAP_64OK (1 << 0) /* 64bit address support */ | ||
142 | #define ICH6_GCAP_NSDO (3 << 1) /* # of serial data out signals */ | ||
143 | #define ICH6_GCAP_BSS (31 << 3) /* # of bidirectional streams */ | ||
144 | #define ICH6_GCAP_ISS (15 << 8) /* # of input streams */ | ||
145 | #define ICH6_GCAP_OSS (15 << 12) /* # of output streams */ | ||
138 | #define ICH6_REG_VMIN 0x02 | 146 | #define ICH6_REG_VMIN 0x02 |
139 | #define ICH6_REG_VMAJ 0x03 | 147 | #define ICH6_REG_VMAJ 0x03 |
140 | #define ICH6_REG_OUTPAY 0x04 | 148 | #define ICH6_REG_OUTPAY 0x04 |
141 | #define ICH6_REG_INPAY 0x06 | 149 | #define ICH6_REG_INPAY 0x06 |
142 | #define ICH6_REG_GCTL 0x08 | 150 | #define ICH6_REG_GCTL 0x08 |
151 | #define ICH6_GCTL_RESET (1 << 0) /* controller reset */ | ||
152 | #define ICH6_GCTL_FCNTRL (1 << 1) /* flush control */ | ||
153 | #define ICH6_GCTL_UNSOL (1 << 8) /* accept unsol. response enable */ | ||
143 | #define ICH6_REG_WAKEEN 0x0c | 154 | #define ICH6_REG_WAKEEN 0x0c |
144 | #define ICH6_REG_STATESTS 0x0e | 155 | #define ICH6_REG_STATESTS 0x0e |
145 | #define ICH6_REG_GSTS 0x10 | 156 | #define ICH6_REG_GSTS 0x10 |
157 | #define ICH6_GSTS_FSTS (1 << 1) /* flush status */ | ||
146 | #define ICH6_REG_INTCTL 0x20 | 158 | #define ICH6_REG_INTCTL 0x20 |
147 | #define ICH6_REG_INTSTS 0x24 | 159 | #define ICH6_REG_INTSTS 0x24 |
148 | #define ICH6_REG_WALCLK 0x30 | 160 | #define ICH6_REG_WALCLK 0x30 |
@@ -150,17 +162,27 @@ MODULE_DESCRIPTION("Intel HDA driver"); | |||
150 | #define ICH6_REG_CORBLBASE 0x40 | 162 | #define ICH6_REG_CORBLBASE 0x40 |
151 | #define ICH6_REG_CORBUBASE 0x44 | 163 | #define ICH6_REG_CORBUBASE 0x44 |
152 | #define ICH6_REG_CORBWP 0x48 | 164 | #define ICH6_REG_CORBWP 0x48 |
153 | #define ICH6_REG_CORBRP 0x4A | 165 | #define ICH6_REG_CORBRP 0x4a |
166 | #define ICH6_CORBRP_RST (1 << 15) /* read pointer reset */ | ||
154 | #define ICH6_REG_CORBCTL 0x4c | 167 | #define ICH6_REG_CORBCTL 0x4c |
168 | #define ICH6_CORBCTL_RUN (1 << 1) /* enable DMA */ | ||
169 | #define ICH6_CORBCTL_CMEIE (1 << 0) /* enable memory error irq */ | ||
155 | #define ICH6_REG_CORBSTS 0x4d | 170 | #define ICH6_REG_CORBSTS 0x4d |
171 | #define ICH6_CORBSTS_CMEI (1 << 0) /* memory error indication */ | ||
156 | #define ICH6_REG_CORBSIZE 0x4e | 172 | #define ICH6_REG_CORBSIZE 0x4e |
157 | 173 | ||
158 | #define ICH6_REG_RIRBLBASE 0x50 | 174 | #define ICH6_REG_RIRBLBASE 0x50 |
159 | #define ICH6_REG_RIRBUBASE 0x54 | 175 | #define ICH6_REG_RIRBUBASE 0x54 |
160 | #define ICH6_REG_RIRBWP 0x58 | 176 | #define ICH6_REG_RIRBWP 0x58 |
177 | #define ICH6_RIRBWP_RST (1 << 15) /* write pointer reset */ | ||
161 | #define ICH6_REG_RINTCNT 0x5a | 178 | #define ICH6_REG_RINTCNT 0x5a |
162 | #define ICH6_REG_RIRBCTL 0x5c | 179 | #define ICH6_REG_RIRBCTL 0x5c |
180 | #define ICH6_RBCTL_IRQ_EN (1 << 0) /* enable IRQ */ | ||
181 | #define ICH6_RBCTL_DMA_EN (1 << 1) /* enable DMA */ | ||
182 | #define ICH6_RBCTL_OVERRUN_EN (1 << 2) /* enable overrun irq */ | ||
163 | #define ICH6_REG_RIRBSTS 0x5d | 183 | #define ICH6_REG_RIRBSTS 0x5d |
184 | #define ICH6_RBSTS_IRQ (1 << 0) /* response irq */ | ||
185 | #define ICH6_RBSTS_OVERRUN (1 << 2) /* overrun irq */ | ||
164 | #define ICH6_REG_RIRBSIZE 0x5e | 186 | #define ICH6_REG_RIRBSIZE 0x5e |
165 | 187 | ||
166 | #define ICH6_REG_IC 0x60 | 188 | #define ICH6_REG_IC 0x60 |
@@ -257,16 +279,6 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; | |||
257 | #define ICH6_INT_CTRL_EN 0x40000000 /* controller interrupt enable bit */ | 279 | #define ICH6_INT_CTRL_EN 0x40000000 /* controller interrupt enable bit */ |
258 | #define ICH6_INT_GLOBAL_EN 0x80000000 /* global interrupt enable bit */ | 280 | #define ICH6_INT_GLOBAL_EN 0x80000000 /* global interrupt enable bit */ |
259 | 281 | ||
260 | /* GCTL unsolicited response enable bit */ | ||
261 | #define ICH6_GCTL_UREN (1<<8) | ||
262 | |||
263 | /* GCTL reset bit */ | ||
264 | #define ICH6_GCTL_RESET (1<<0) | ||
265 | |||
266 | /* CORB/RIRB control, read/write pointer */ | ||
267 | #define ICH6_RBCTL_DMA_EN 0x02 /* enable DMA */ | ||
268 | #define ICH6_RBCTL_IRQ_EN 0x01 /* enable IRQ */ | ||
269 | #define ICH6_RBRWP_CLR 0x8000 /* read/write pointer clear */ | ||
270 | /* below are so far hardcoded - should read registers in future */ | 282 | /* below are so far hardcoded - should read registers in future */ |
271 | #define ICH6_MAX_CORB_ENTRIES 256 | 283 | #define ICH6_MAX_CORB_ENTRIES 256 |
272 | #define ICH6_MAX_RIRB_ENTRIES 256 | 284 | #define ICH6_MAX_RIRB_ENTRIES 256 |
@@ -512,25 +524,25 @@ static void azx_init_cmd_io(struct azx *chip) | |||
512 | /* set the corb write pointer to 0 */ | 524 | /* set the corb write pointer to 0 */ |
513 | azx_writew(chip, CORBWP, 0); | 525 | azx_writew(chip, CORBWP, 0); |
514 | /* reset the corb hw read pointer */ | 526 | /* reset the corb hw read pointer */ |
515 | azx_writew(chip, CORBRP, ICH6_RBRWP_CLR); | 527 | azx_writew(chip, CORBRP, ICH6_CORBRP_RST); |
516 | /* enable corb dma */ | 528 | /* enable corb dma */ |
517 | azx_writeb(chip, CORBCTL, ICH6_RBCTL_DMA_EN); | 529 | azx_writeb(chip, CORBCTL, ICH6_CORBCTL_RUN); |
518 | 530 | ||
519 | /* RIRB set up */ | 531 | /* RIRB set up */ |
520 | chip->rirb.addr = chip->rb.addr + 2048; | 532 | chip->rirb.addr = chip->rb.addr + 2048; |
521 | chip->rirb.buf = (u32 *)(chip->rb.area + 2048); | 533 | chip->rirb.buf = (u32 *)(chip->rb.area + 2048); |
534 | chip->rirb.wp = chip->rirb.rp = chip->rirb.cmds = 0; | ||
522 | azx_writel(chip, RIRBLBASE, (u32)chip->rirb.addr); | 535 | azx_writel(chip, RIRBLBASE, (u32)chip->rirb.addr); |
523 | azx_writel(chip, RIRBUBASE, upper_32_bits(chip->rirb.addr)); | 536 | azx_writel(chip, RIRBUBASE, upper_32_bits(chip->rirb.addr)); |
524 | 537 | ||
525 | /* set the rirb size to 256 entries (ULI requires explicitly) */ | 538 | /* set the rirb size to 256 entries (ULI requires explicitly) */ |
526 | azx_writeb(chip, RIRBSIZE, 0x02); | 539 | azx_writeb(chip, RIRBSIZE, 0x02); |
527 | /* reset the rirb hw write pointer */ | 540 | /* reset the rirb hw write pointer */ |
528 | azx_writew(chip, RIRBWP, ICH6_RBRWP_CLR); | 541 | azx_writew(chip, RIRBWP, ICH6_RIRBWP_RST); |
529 | /* set N=1, get RIRB response interrupt for new entry */ | 542 | /* set N=1, get RIRB response interrupt for new entry */ |
530 | azx_writew(chip, RINTCNT, 1); | 543 | azx_writew(chip, RINTCNT, 1); |
531 | /* enable rirb dma and response irq */ | 544 | /* enable rirb dma and response irq */ |
532 | azx_writeb(chip, RIRBCTL, ICH6_RBCTL_DMA_EN | ICH6_RBCTL_IRQ_EN); | 545 | azx_writeb(chip, RIRBCTL, ICH6_RBCTL_DMA_EN | ICH6_RBCTL_IRQ_EN); |
533 | chip->rirb.rp = chip->rirb.cmds = 0; | ||
534 | } | 546 | } |
535 | 547 | ||
536 | static void azx_free_cmd_io(struct azx *chip) | 548 | static void azx_free_cmd_io(struct azx *chip) |
@@ -606,6 +618,7 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus) | |||
606 | } | 618 | } |
607 | if (!chip->rirb.cmds) { | 619 | if (!chip->rirb.cmds) { |
608 | smp_rmb(); | 620 | smp_rmb(); |
621 | bus->rirb_error = 0; | ||
609 | return chip->rirb.res; /* the last value */ | 622 | return chip->rirb.res; /* the last value */ |
610 | } | 623 | } |
611 | if (time_after(jiffies, timeout)) | 624 | if (time_after(jiffies, timeout)) |
@@ -619,19 +632,21 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus) | |||
619 | } | 632 | } |
620 | 633 | ||
621 | if (chip->msi) { | 634 | if (chip->msi) { |
622 | snd_printk(KERN_WARNING "hda_intel: No response from codec, " | 635 | snd_printk(KERN_WARNING SFX "No response from codec, " |
623 | "disabling MSI: last cmd=0x%08x\n", chip->last_cmd); | 636 | "disabling MSI: last cmd=0x%08x\n", chip->last_cmd); |
624 | free_irq(chip->irq, chip); | 637 | free_irq(chip->irq, chip); |
625 | chip->irq = -1; | 638 | chip->irq = -1; |
626 | pci_disable_msi(chip->pci); | 639 | pci_disable_msi(chip->pci); |
627 | chip->msi = 0; | 640 | chip->msi = 0; |
628 | if (azx_acquire_irq(chip, 1) < 0) | 641 | if (azx_acquire_irq(chip, 1) < 0) { |
642 | bus->rirb_error = 1; | ||
629 | return -1; | 643 | return -1; |
644 | } | ||
630 | goto again; | 645 | goto again; |
631 | } | 646 | } |
632 | 647 | ||
633 | if (!chip->polling_mode) { | 648 | if (!chip->polling_mode) { |
634 | snd_printk(KERN_WARNING "hda_intel: azx_get_response timeout, " | 649 | snd_printk(KERN_WARNING SFX "azx_get_response timeout, " |
635 | "switching to polling mode: last cmd=0x%08x\n", | 650 | "switching to polling mode: last cmd=0x%08x\n", |
636 | chip->last_cmd); | 651 | chip->last_cmd); |
637 | chip->polling_mode = 1; | 652 | chip->polling_mode = 1; |
@@ -646,14 +661,23 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus) | |||
646 | return -1; | 661 | return -1; |
647 | } | 662 | } |
648 | 663 | ||
664 | /* a fatal communication error; need either to reset or to fallback | ||
665 | * to the single_cmd mode | ||
666 | */ | ||
667 | bus->rirb_error = 1; | ||
668 | if (bus->allow_bus_reset && !bus->response_reset && !bus->in_reset) { | ||
669 | bus->response_reset = 1; | ||
670 | return -1; /* give a chance to retry */ | ||
671 | } | ||
672 | |||
649 | snd_printk(KERN_ERR "hda_intel: azx_get_response timeout, " | 673 | snd_printk(KERN_ERR "hda_intel: azx_get_response timeout, " |
650 | "switching to single_cmd mode: last cmd=0x%08x\n", | 674 | "switching to single_cmd mode: last cmd=0x%08x\n", |
651 | chip->last_cmd); | 675 | chip->last_cmd); |
652 | chip->rirb.rp = azx_readb(chip, RIRBWP); | ||
653 | chip->rirb.cmds = 0; | ||
654 | /* switch to single_cmd mode */ | ||
655 | chip->single_cmd = 1; | 676 | chip->single_cmd = 1; |
677 | bus->response_reset = 0; | ||
678 | /* re-initialize CORB/RIRB */ | ||
656 | azx_free_cmd_io(chip); | 679 | azx_free_cmd_io(chip); |
680 | azx_init_cmd_io(chip); | ||
657 | return -1; | 681 | return -1; |
658 | } | 682 | } |
659 | 683 | ||
@@ -667,12 +691,34 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus) | |||
667 | * I left the codes, however, for debugging/testing purposes. | 691 | * I left the codes, however, for debugging/testing purposes. |
668 | */ | 692 | */ |
669 | 693 | ||
694 | /* receive a response */ | ||
695 | static int azx_single_wait_for_response(struct azx *chip) | ||
696 | { | ||
697 | int timeout = 50; | ||
698 | |||
699 | while (timeout--) { | ||
700 | /* check IRV busy bit */ | ||
701 | if (azx_readw(chip, IRS) & ICH6_IRS_VALID) { | ||
702 | /* reuse rirb.res as the response return value */ | ||
703 | chip->rirb.res = azx_readl(chip, IR); | ||
704 | return 0; | ||
705 | } | ||
706 | udelay(1); | ||
707 | } | ||
708 | if (printk_ratelimit()) | ||
709 | snd_printd(SFX "get_response timeout: IRS=0x%x\n", | ||
710 | azx_readw(chip, IRS)); | ||
711 | chip->rirb.res = -1; | ||
712 | return -EIO; | ||
713 | } | ||
714 | |||
670 | /* send a command */ | 715 | /* send a command */ |
671 | static int azx_single_send_cmd(struct hda_bus *bus, u32 val) | 716 | static int azx_single_send_cmd(struct hda_bus *bus, u32 val) |
672 | { | 717 | { |
673 | struct azx *chip = bus->private_data; | 718 | struct azx *chip = bus->private_data; |
674 | int timeout = 50; | 719 | int timeout = 50; |
675 | 720 | ||
721 | bus->rirb_error = 0; | ||
676 | while (timeout--) { | 722 | while (timeout--) { |
677 | /* check ICB busy bit */ | 723 | /* check ICB busy bit */ |
678 | if (!((azx_readw(chip, IRS) & ICH6_IRS_BUSY))) { | 724 | if (!((azx_readw(chip, IRS) & ICH6_IRS_BUSY))) { |
@@ -682,7 +728,7 @@ static int azx_single_send_cmd(struct hda_bus *bus, u32 val) | |||
682 | azx_writel(chip, IC, val); | 728 | azx_writel(chip, IC, val); |
683 | azx_writew(chip, IRS, azx_readw(chip, IRS) | | 729 | azx_writew(chip, IRS, azx_readw(chip, IRS) | |
684 | ICH6_IRS_BUSY); | 730 | ICH6_IRS_BUSY); |
685 | return 0; | 731 | return azx_single_wait_for_response(chip); |
686 | } | 732 | } |
687 | udelay(1); | 733 | udelay(1); |
688 | } | 734 | } |
@@ -696,18 +742,7 @@ static int azx_single_send_cmd(struct hda_bus *bus, u32 val) | |||
696 | static unsigned int azx_single_get_response(struct hda_bus *bus) | 742 | static unsigned int azx_single_get_response(struct hda_bus *bus) |
697 | { | 743 | { |
698 | struct azx *chip = bus->private_data; | 744 | struct azx *chip = bus->private_data; |
699 | int timeout = 50; | 745 | return chip->rirb.res; |
700 | |||
701 | while (timeout--) { | ||
702 | /* check IRV busy bit */ | ||
703 | if (azx_readw(chip, IRS) & ICH6_IRS_VALID) | ||
704 | return azx_readl(chip, IR); | ||
705 | udelay(1); | ||
706 | } | ||
707 | if (printk_ratelimit()) | ||
708 | snd_printd(SFX "get_response timeout: IRS=0x%x\n", | ||
709 | azx_readw(chip, IRS)); | ||
710 | return (unsigned int)-1; | ||
711 | } | 746 | } |
712 | 747 | ||
713 | /* | 748 | /* |
@@ -775,17 +810,17 @@ static int azx_reset(struct azx *chip) | |||
775 | 810 | ||
776 | /* check to see if controller is ready */ | 811 | /* check to see if controller is ready */ |
777 | if (!azx_readb(chip, GCTL)) { | 812 | if (!azx_readb(chip, GCTL)) { |
778 | snd_printd("azx_reset: controller not ready!\n"); | 813 | snd_printd(SFX "azx_reset: controller not ready!\n"); |
779 | return -EBUSY; | 814 | return -EBUSY; |
780 | } | 815 | } |
781 | 816 | ||
782 | /* Accept unsolicited responses */ | 817 | /* Accept unsolicited responses */ |
783 | azx_writel(chip, GCTL, azx_readl(chip, GCTL) | ICH6_GCTL_UREN); | 818 | azx_writel(chip, GCTL, azx_readl(chip, GCTL) | ICH6_GCTL_UNSOL); |
784 | 819 | ||
785 | /* detect codecs */ | 820 | /* detect codecs */ |
786 | if (!chip->codec_mask) { | 821 | if (!chip->codec_mask) { |
787 | chip->codec_mask = azx_readw(chip, STATESTS); | 822 | chip->codec_mask = azx_readw(chip, STATESTS); |
788 | snd_printdd("codec_mask = 0x%x\n", chip->codec_mask); | 823 | snd_printdd(SFX "codec_mask = 0x%x\n", chip->codec_mask); |
789 | } | 824 | } |
790 | 825 | ||
791 | return 0; | 826 | return 0; |
@@ -895,8 +930,7 @@ static void azx_init_chip(struct azx *chip) | |||
895 | azx_int_enable(chip); | 930 | azx_int_enable(chip); |
896 | 931 | ||
897 | /* initialize the codec command I/O */ | 932 | /* initialize the codec command I/O */ |
898 | if (!chip->single_cmd) | 933 | azx_init_cmd_io(chip); |
899 | azx_init_cmd_io(chip); | ||
900 | 934 | ||
901 | /* program the position buffer */ | 935 | /* program the position buffer */ |
902 | azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr); | 936 | azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr); |
@@ -953,12 +987,12 @@ static void azx_init_pci(struct azx *chip) | |||
953 | case AZX_DRIVER_SCH: | 987 | case AZX_DRIVER_SCH: |
954 | pci_read_config_word(chip->pci, INTEL_SCH_HDA_DEVC, &snoop); | 988 | pci_read_config_word(chip->pci, INTEL_SCH_HDA_DEVC, &snoop); |
955 | if (snoop & INTEL_SCH_HDA_DEVC_NOSNOOP) { | 989 | if (snoop & INTEL_SCH_HDA_DEVC_NOSNOOP) { |
956 | pci_write_config_word(chip->pci, INTEL_SCH_HDA_DEVC, \ | 990 | pci_write_config_word(chip->pci, INTEL_SCH_HDA_DEVC, |
957 | snoop & (~INTEL_SCH_HDA_DEVC_NOSNOOP)); | 991 | snoop & (~INTEL_SCH_HDA_DEVC_NOSNOOP)); |
958 | pci_read_config_word(chip->pci, | 992 | pci_read_config_word(chip->pci, |
959 | INTEL_SCH_HDA_DEVC, &snoop); | 993 | INTEL_SCH_HDA_DEVC, &snoop); |
960 | snd_printdd("HDA snoop disabled, enabling ... %s\n",\ | 994 | snd_printdd(SFX "HDA snoop disabled, enabling ... %s\n", |
961 | (snoop & INTEL_SCH_HDA_DEVC_NOSNOOP) \ | 995 | (snoop & INTEL_SCH_HDA_DEVC_NOSNOOP) |
962 | ? "Failed" : "OK"); | 996 | ? "Failed" : "OK"); |
963 | } | 997 | } |
964 | break; | 998 | break; |
@@ -1012,7 +1046,7 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id) | |||
1012 | /* clear rirb int */ | 1046 | /* clear rirb int */ |
1013 | status = azx_readb(chip, RIRBSTS); | 1047 | status = azx_readb(chip, RIRBSTS); |
1014 | if (status & RIRB_INT_MASK) { | 1048 | if (status & RIRB_INT_MASK) { |
1015 | if (!chip->single_cmd && (status & RIRB_INT_RESPONSE)) | 1049 | if (status & RIRB_INT_RESPONSE) |
1016 | azx_update_rirb(chip); | 1050 | azx_update_rirb(chip); |
1017 | azx_writeb(chip, RIRBSTS, RIRB_INT_MASK); | 1051 | azx_writeb(chip, RIRBSTS, RIRB_INT_MASK); |
1018 | } | 1052 | } |
@@ -1098,7 +1132,7 @@ static int azx_setup_periods(struct azx *chip, | |||
1098 | pos_align; | 1132 | pos_align; |
1099 | pos_adj = frames_to_bytes(runtime, pos_adj); | 1133 | pos_adj = frames_to_bytes(runtime, pos_adj); |
1100 | if (pos_adj >= period_bytes) { | 1134 | if (pos_adj >= period_bytes) { |
1101 | snd_printk(KERN_WARNING "Too big adjustment %d\n", | 1135 | snd_printk(KERN_WARNING SFX "Too big adjustment %d\n", |
1102 | bdl_pos_adj[chip->dev_index]); | 1136 | bdl_pos_adj[chip->dev_index]); |
1103 | pos_adj = 0; | 1137 | pos_adj = 0; |
1104 | } else { | 1138 | } else { |
@@ -1122,7 +1156,7 @@ static int azx_setup_periods(struct azx *chip, | |||
1122 | return 0; | 1156 | return 0; |
1123 | 1157 | ||
1124 | error: | 1158 | error: |
1125 | snd_printk(KERN_ERR "Too many BDL entries: buffer=%d, period=%d\n", | 1159 | snd_printk(KERN_ERR SFX "Too many BDL entries: buffer=%d, period=%d\n", |
1126 | azx_dev->bufsize, period_bytes); | 1160 | azx_dev->bufsize, period_bytes); |
1127 | return -EINVAL; | 1161 | return -EINVAL; |
1128 | } | 1162 | } |
@@ -1215,7 +1249,7 @@ static int probe_codec(struct azx *chip, int addr) | |||
1215 | chip->probing = 0; | 1249 | chip->probing = 0; |
1216 | if (res == -1) | 1250 | if (res == -1) |
1217 | return -EIO; | 1251 | return -EIO; |
1218 | snd_printdd("hda_intel: codec #%d probed OK\n", addr); | 1252 | snd_printdd(SFX "codec #%d probed OK\n", addr); |
1219 | return 0; | 1253 | return 0; |
1220 | } | 1254 | } |
1221 | 1255 | ||
@@ -1223,6 +1257,26 @@ static int azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec, | |||
1223 | struct hda_pcm *cpcm); | 1257 | struct hda_pcm *cpcm); |
1224 | static void azx_stop_chip(struct azx *chip); | 1258 | static void azx_stop_chip(struct azx *chip); |
1225 | 1259 | ||
1260 | static void azx_bus_reset(struct hda_bus *bus) | ||
1261 | { | ||
1262 | struct azx *chip = bus->private_data; | ||
1263 | |||
1264 | bus->in_reset = 1; | ||
1265 | azx_stop_chip(chip); | ||
1266 | azx_init_chip(chip); | ||
1267 | #ifdef CONFIG_PM | ||
1268 | if (chip->initialized) { | ||
1269 | int i; | ||
1270 | |||
1271 | for (i = 0; i < AZX_MAX_PCMS; i++) | ||
1272 | snd_pcm_suspend_all(chip->pcm[i]); | ||
1273 | snd_hda_suspend(chip->bus); | ||
1274 | snd_hda_resume(chip->bus); | ||
1275 | } | ||
1276 | #endif | ||
1277 | bus->in_reset = 0; | ||
1278 | } | ||
1279 | |||
1226 | /* | 1280 | /* |
1227 | * Codec initialization | 1281 | * Codec initialization |
1228 | */ | 1282 | */ |
@@ -1246,6 +1300,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model, | |||
1246 | bus_temp.ops.command = azx_send_cmd; | 1300 | bus_temp.ops.command = azx_send_cmd; |
1247 | bus_temp.ops.get_response = azx_get_response; | 1301 | bus_temp.ops.get_response = azx_get_response; |
1248 | bus_temp.ops.attach_pcm = azx_attach_pcm_stream; | 1302 | bus_temp.ops.attach_pcm = azx_attach_pcm_stream; |
1303 | bus_temp.ops.bus_reset = azx_bus_reset; | ||
1249 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 1304 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
1250 | bus_temp.power_save = &power_save; | 1305 | bus_temp.power_save = &power_save; |
1251 | bus_temp.ops.pm_notify = azx_power_notify; | 1306 | bus_temp.ops.pm_notify = azx_power_notify; |
@@ -1270,8 +1325,8 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model, | |||
1270 | /* Some BIOSen give you wrong codec addresses | 1325 | /* Some BIOSen give you wrong codec addresses |
1271 | * that don't exist | 1326 | * that don't exist |
1272 | */ | 1327 | */ |
1273 | snd_printk(KERN_WARNING | 1328 | snd_printk(KERN_WARNING SFX |
1274 | "hda_intel: Codec #%d probe error; " | 1329 | "Codec #%d probe error; " |
1275 | "disabling it...\n", c); | 1330 | "disabling it...\n", c); |
1276 | chip->codec_mask &= ~(1 << c); | 1331 | chip->codec_mask &= ~(1 << c); |
1277 | /* More badly, accessing to a non-existing | 1332 | /* More badly, accessing to a non-existing |
@@ -1487,7 +1542,7 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream) | |||
1487 | bufsize = snd_pcm_lib_buffer_bytes(substream); | 1542 | bufsize = snd_pcm_lib_buffer_bytes(substream); |
1488 | period_bytes = snd_pcm_lib_period_bytes(substream); | 1543 | period_bytes = snd_pcm_lib_period_bytes(substream); |
1489 | 1544 | ||
1490 | snd_printdd("azx_pcm_prepare: bufsize=0x%x, format=0x%x\n", | 1545 | snd_printdd(SFX "azx_pcm_prepare: bufsize=0x%x, format=0x%x\n", |
1491 | bufsize, format_val); | 1546 | bufsize, format_val); |
1492 | 1547 | ||
1493 | if (bufsize != azx_dev->bufsize || | 1548 | if (bufsize != azx_dev->bufsize || |
@@ -1830,7 +1885,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec, | |||
1830 | &pcm); | 1885 | &pcm); |
1831 | if (err < 0) | 1886 | if (err < 0) |
1832 | return err; | 1887 | return err; |
1833 | strcpy(pcm->name, cpcm->name); | 1888 | strlcpy(pcm->name, cpcm->name, sizeof(pcm->name)); |
1834 | apcm = kzalloc(sizeof(*apcm), GFP_KERNEL); | 1889 | apcm = kzalloc(sizeof(*apcm), GFP_KERNEL); |
1835 | if (apcm == NULL) | 1890 | if (apcm == NULL) |
1836 | return -ENOMEM; | 1891 | return -ENOMEM; |
@@ -1973,7 +2028,7 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state) | |||
1973 | for (i = 0; i < AZX_MAX_PCMS; i++) | 2028 | for (i = 0; i < AZX_MAX_PCMS; i++) |
1974 | snd_pcm_suspend_all(chip->pcm[i]); | 2029 | snd_pcm_suspend_all(chip->pcm[i]); |
1975 | if (chip->initialized) | 2030 | if (chip->initialized) |
1976 | snd_hda_suspend(chip->bus, state); | 2031 | snd_hda_suspend(chip->bus); |
1977 | azx_stop_chip(chip); | 2032 | azx_stop_chip(chip); |
1978 | if (chip->irq >= 0) { | 2033 | if (chip->irq >= 0) { |
1979 | free_irq(chip->irq, chip); | 2034 | free_irq(chip->irq, chip); |
@@ -2265,14 +2320,14 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, | |||
2265 | synchronize_irq(chip->irq); | 2320 | synchronize_irq(chip->irq); |
2266 | 2321 | ||
2267 | gcap = azx_readw(chip, GCAP); | 2322 | gcap = azx_readw(chip, GCAP); |
2268 | snd_printdd("chipset global capabilities = 0x%x\n", gcap); | 2323 | snd_printdd(SFX "chipset global capabilities = 0x%x\n", gcap); |
2269 | 2324 | ||
2270 | /* ATI chips seems buggy about 64bit DMA addresses */ | 2325 | /* ATI chips seems buggy about 64bit DMA addresses */ |
2271 | if (chip->driver_type == AZX_DRIVER_ATI) | 2326 | if (chip->driver_type == AZX_DRIVER_ATI) |
2272 | gcap &= ~0x01; | 2327 | gcap &= ~ICH6_GCAP_64OK; |
2273 | 2328 | ||
2274 | /* allow 64bit DMA address if supported by H/W */ | 2329 | /* allow 64bit DMA address if supported by H/W */ |
2275 | if ((gcap & 0x01) && !pci_set_dma_mask(pci, DMA_BIT_MASK(64))) | 2330 | if ((gcap & ICH6_GCAP_64OK) && !pci_set_dma_mask(pci, DMA_BIT_MASK(64))) |
2276 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(64)); | 2331 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(64)); |
2277 | else { | 2332 | else { |
2278 | pci_set_dma_mask(pci, DMA_BIT_MASK(32)); | 2333 | pci_set_dma_mask(pci, DMA_BIT_MASK(32)); |
@@ -2309,7 +2364,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, | |||
2309 | chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev), | 2364 | chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev), |
2310 | GFP_KERNEL); | 2365 | GFP_KERNEL); |
2311 | if (!chip->azx_dev) { | 2366 | if (!chip->azx_dev) { |
2312 | snd_printk(KERN_ERR "cannot malloc azx_dev\n"); | 2367 | snd_printk(KERN_ERR SFX "cannot malloc azx_dev\n"); |
2313 | goto errout; | 2368 | goto errout; |
2314 | } | 2369 | } |
2315 | 2370 | ||
@@ -2332,11 +2387,9 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, | |||
2332 | goto errout; | 2387 | goto errout; |
2333 | } | 2388 | } |
2334 | /* allocate CORB/RIRB */ | 2389 | /* allocate CORB/RIRB */ |
2335 | if (!chip->single_cmd) { | 2390 | err = azx_alloc_cmd_io(chip); |
2336 | err = azx_alloc_cmd_io(chip); | 2391 | if (err < 0) |
2337 | if (err < 0) | 2392 | goto errout; |
2338 | goto errout; | ||
2339 | } | ||
2340 | 2393 | ||
2341 | /* initialize streams */ | 2394 | /* initialize streams */ |
2342 | azx_init_stream(chip); | 2395 | azx_init_stream(chip); |
@@ -2359,9 +2412,11 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, | |||
2359 | } | 2412 | } |
2360 | 2413 | ||
2361 | strcpy(card->driver, "HDA-Intel"); | 2414 | strcpy(card->driver, "HDA-Intel"); |
2362 | strcpy(card->shortname, driver_short_names[chip->driver_type]); | 2415 | strlcpy(card->shortname, driver_short_names[chip->driver_type], |
2363 | sprintf(card->longname, "%s at 0x%lx irq %i", | 2416 | sizeof(card->shortname)); |
2364 | card->shortname, chip->addr, chip->irq); | 2417 | snprintf(card->longname, sizeof(card->longname), |
2418 | "%s at 0x%lx irq %i", | ||
2419 | card->shortname, chip->addr, chip->irq); | ||
2365 | 2420 | ||
2366 | *rchip = chip; | 2421 | *rchip = chip; |
2367 | return 0; | 2422 | return 0; |
@@ -2514,6 +2569,20 @@ static struct pci_device_id azx_ids[] = { | |||
2514 | { PCI_DEVICE(0x10de, 0x0d97), .driver_data = AZX_DRIVER_NVIDIA }, | 2569 | { PCI_DEVICE(0x10de, 0x0d97), .driver_data = AZX_DRIVER_NVIDIA }, |
2515 | /* Teradici */ | 2570 | /* Teradici */ |
2516 | { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA }, | 2571 | { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA }, |
2572 | /* Creative X-Fi (CA0110-IBG) */ | ||
2573 | #if !defined(CONFIG_SND_CTXFI) && !defined(CONFIG_SND_CTXFI_MODULE) | ||
2574 | /* the following entry conflicts with snd-ctxfi driver, | ||
2575 | * as ctxfi driver mutates from HD-audio to native mode with | ||
2576 | * a special command sequence. | ||
2577 | */ | ||
2578 | { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_ANY_ID), | ||
2579 | .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, | ||
2580 | .class_mask = 0xffffff, | ||
2581 | .driver_data = AZX_DRIVER_GENERIC }, | ||
2582 | #else | ||
2583 | /* this entry seems still valid -- i.e. without emu20kx chip */ | ||
2584 | { PCI_DEVICE(0x1102, 0x0009), .driver_data = AZX_DRIVER_GENERIC }, | ||
2585 | #endif | ||
2517 | /* AMD Generic, PCI class code and Vendor ID for HD Audio */ | 2586 | /* AMD Generic, PCI class code and Vendor ID for HD Audio */ |
2518 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID), | 2587 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID), |
2519 | .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, | 2588 | .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, |
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 93d7499350c6..418c5d1badaa 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c | |||
@@ -466,8 +466,12 @@ static void print_codec_info(struct snd_info_entry *entry, | |||
466 | hda_nid_t nid; | 466 | hda_nid_t nid; |
467 | int i, nodes; | 467 | int i, nodes; |
468 | 468 | ||
469 | snd_iprintf(buffer, "Codec: %s\n", | 469 | snd_iprintf(buffer, "Codec: "); |
470 | codec->name ? codec->name : "Not Set"); | 470 | if (codec->vendor_name && codec->chip_name) |
471 | snd_iprintf(buffer, "%s %s\n", | ||
472 | codec->vendor_name, codec->chip_name); | ||
473 | else | ||
474 | snd_iprintf(buffer, "Not Set\n"); | ||
471 | snd_iprintf(buffer, "Address: %d\n", codec->addr); | 475 | snd_iprintf(buffer, "Address: %d\n", codec->addr); |
472 | snd_iprintf(buffer, "Function Id: 0x%x\n", codec->function_id); | 476 | snd_iprintf(buffer, "Function Id: 0x%x\n", codec->function_id); |
473 | snd_iprintf(buffer, "Vendor Id: 0x%08x\n", codec->vendor_id); | 477 | snd_iprintf(buffer, "Vendor Id: 0x%08x\n", codec->vendor_id); |
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c new file mode 100644 index 000000000000..392d108c3558 --- /dev/null +++ b/sound/pci/hda/patch_ca0110.c | |||
@@ -0,0 +1,573 @@ | |||
1 | /* | ||
2 | * HD audio interface patch for Creative X-Fi CA0110-IBG chip | ||
3 | * | ||
4 | * Copyright (c) 2008 Takashi Iwai <tiwai@suse.de> | ||
5 | * | ||
6 | * This driver is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This driver is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | |||
21 | #include <linux/init.h> | ||
22 | #include <linux/delay.h> | ||
23 | #include <linux/slab.h> | ||
24 | #include <linux/pci.h> | ||
25 | #include <sound/core.h> | ||
26 | #include "hda_codec.h" | ||
27 | #include "hda_local.h" | ||
28 | |||
29 | /* | ||
30 | */ | ||
31 | |||
32 | struct ca0110_spec { | ||
33 | struct auto_pin_cfg autocfg; | ||
34 | struct hda_multi_out multiout; | ||
35 | hda_nid_t out_pins[AUTO_CFG_MAX_OUTS]; | ||
36 | hda_nid_t dacs[AUTO_CFG_MAX_OUTS]; | ||
37 | hda_nid_t hp_dac; | ||
38 | hda_nid_t input_pins[AUTO_PIN_LAST]; | ||
39 | hda_nid_t adcs[AUTO_PIN_LAST]; | ||
40 | hda_nid_t dig_out; | ||
41 | hda_nid_t dig_in; | ||
42 | unsigned int num_inputs; | ||
43 | const char *input_labels[AUTO_PIN_LAST]; | ||
44 | struct hda_pcm pcm_rec[2]; /* PCM information */ | ||
45 | }; | ||
46 | |||
47 | /* | ||
48 | * PCM callbacks | ||
49 | */ | ||
50 | static int ca0110_playback_pcm_open(struct hda_pcm_stream *hinfo, | ||
51 | struct hda_codec *codec, | ||
52 | struct snd_pcm_substream *substream) | ||
53 | { | ||
54 | struct ca0110_spec *spec = codec->spec; | ||
55 | return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream, | ||
56 | hinfo); | ||
57 | } | ||
58 | |||
59 | static int ca0110_playback_pcm_prepare(struct hda_pcm_stream *hinfo, | ||
60 | struct hda_codec *codec, | ||
61 | unsigned int stream_tag, | ||
62 | unsigned int format, | ||
63 | struct snd_pcm_substream *substream) | ||
64 | { | ||
65 | struct ca0110_spec *spec = codec->spec; | ||
66 | return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, | ||
67 | stream_tag, format, substream); | ||
68 | } | ||
69 | |||
70 | static int ca0110_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, | ||
71 | struct hda_codec *codec, | ||
72 | struct snd_pcm_substream *substream) | ||
73 | { | ||
74 | struct ca0110_spec *spec = codec->spec; | ||
75 | return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout); | ||
76 | } | ||
77 | |||
78 | /* | ||
79 | * Digital out | ||
80 | */ | ||
81 | static int ca0110_dig_playback_pcm_open(struct hda_pcm_stream *hinfo, | ||
82 | struct hda_codec *codec, | ||
83 | struct snd_pcm_substream *substream) | ||
84 | { | ||
85 | struct ca0110_spec *spec = codec->spec; | ||
86 | return snd_hda_multi_out_dig_open(codec, &spec->multiout); | ||
87 | } | ||
88 | |||
89 | static int ca0110_dig_playback_pcm_close(struct hda_pcm_stream *hinfo, | ||
90 | struct hda_codec *codec, | ||
91 | struct snd_pcm_substream *substream) | ||
92 | { | ||
93 | struct ca0110_spec *spec = codec->spec; | ||
94 | return snd_hda_multi_out_dig_close(codec, &spec->multiout); | ||
95 | } | ||
96 | |||
97 | static int ca0110_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo, | ||
98 | struct hda_codec *codec, | ||
99 | unsigned int stream_tag, | ||
100 | unsigned int format, | ||
101 | struct snd_pcm_substream *substream) | ||
102 | { | ||
103 | struct ca0110_spec *spec = codec->spec; | ||
104 | return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag, | ||
105 | format, substream); | ||
106 | } | ||
107 | |||
108 | /* | ||
109 | * Analog capture | ||
110 | */ | ||
111 | static int ca0110_capture_pcm_prepare(struct hda_pcm_stream *hinfo, | ||
112 | struct hda_codec *codec, | ||
113 | unsigned int stream_tag, | ||
114 | unsigned int format, | ||
115 | struct snd_pcm_substream *substream) | ||
116 | { | ||
117 | struct ca0110_spec *spec = codec->spec; | ||
118 | |||
119 | snd_hda_codec_setup_stream(codec, spec->adcs[substream->number], | ||
120 | stream_tag, 0, format); | ||
121 | return 0; | ||
122 | } | ||
123 | |||
124 | static int ca0110_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, | ||
125 | struct hda_codec *codec, | ||
126 | struct snd_pcm_substream *substream) | ||
127 | { | ||
128 | struct ca0110_spec *spec = codec->spec; | ||
129 | |||
130 | snd_hda_codec_cleanup_stream(codec, spec->adcs[substream->number]); | ||
131 | return 0; | ||
132 | } | ||
133 | |||
134 | /* | ||
135 | */ | ||
136 | |||
137 | static char *dirstr[2] = { "Playback", "Capture" }; | ||
138 | |||
139 | static int _add_switch(struct hda_codec *codec, hda_nid_t nid, const char *pfx, | ||
140 | int chan, int dir) | ||
141 | { | ||
142 | char namestr[44]; | ||
143 | int type = dir ? HDA_INPUT : HDA_OUTPUT; | ||
144 | struct snd_kcontrol_new knew = | ||
145 | HDA_CODEC_MUTE_MONO(namestr, nid, chan, 0, type); | ||
146 | sprintf(namestr, "%s %s Switch", pfx, dirstr[dir]); | ||
147 | return snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec)); | ||
148 | } | ||
149 | |||
150 | static int _add_volume(struct hda_codec *codec, hda_nid_t nid, const char *pfx, | ||
151 | int chan, int dir) | ||
152 | { | ||
153 | char namestr[44]; | ||
154 | int type = dir ? HDA_INPUT : HDA_OUTPUT; | ||
155 | struct snd_kcontrol_new knew = | ||
156 | HDA_CODEC_VOLUME_MONO(namestr, nid, chan, 0, type); | ||
157 | sprintf(namestr, "%s %s Volume", pfx, dirstr[dir]); | ||
158 | return snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec)); | ||
159 | } | ||
160 | |||
161 | #define add_out_switch(codec, nid, pfx) _add_switch(codec, nid, pfx, 3, 0) | ||
162 | #define add_out_volume(codec, nid, pfx) _add_volume(codec, nid, pfx, 3, 0) | ||
163 | #define add_in_switch(codec, nid, pfx) _add_switch(codec, nid, pfx, 3, 1) | ||
164 | #define add_in_volume(codec, nid, pfx) _add_volume(codec, nid, pfx, 3, 1) | ||
165 | #define add_mono_switch(codec, nid, pfx, chan) \ | ||
166 | _add_switch(codec, nid, pfx, chan, 0) | ||
167 | #define add_mono_volume(codec, nid, pfx, chan) \ | ||
168 | _add_volume(codec, nid, pfx, chan, 0) | ||
169 | |||
170 | static int ca0110_build_controls(struct hda_codec *codec) | ||
171 | { | ||
172 | struct ca0110_spec *spec = codec->spec; | ||
173 | struct auto_pin_cfg *cfg = &spec->autocfg; | ||
174 | static char *prefix[AUTO_CFG_MAX_OUTS] = { | ||
175 | "Front", "Surround", NULL, "Side", "Multi" | ||
176 | }; | ||
177 | hda_nid_t mutenid; | ||
178 | int i, err; | ||
179 | |||
180 | for (i = 0; i < spec->multiout.num_dacs; i++) { | ||
181 | if (get_wcaps(codec, spec->out_pins[i]) & AC_WCAP_OUT_AMP) | ||
182 | mutenid = spec->out_pins[i]; | ||
183 | else | ||
184 | mutenid = spec->multiout.dac_nids[i]; | ||
185 | if (!prefix[i]) { | ||
186 | err = add_mono_switch(codec, mutenid, | ||
187 | "Center", 1); | ||
188 | if (err < 0) | ||
189 | return err; | ||
190 | err = add_mono_switch(codec, mutenid, | ||
191 | "LFE", 1); | ||
192 | if (err < 0) | ||
193 | return err; | ||
194 | err = add_mono_volume(codec, spec->multiout.dac_nids[i], | ||
195 | "Center", 1); | ||
196 | if (err < 0) | ||
197 | return err; | ||
198 | err = add_mono_volume(codec, spec->multiout.dac_nids[i], | ||
199 | "LFE", 1); | ||
200 | if (err < 0) | ||
201 | return err; | ||
202 | } else { | ||
203 | err = add_out_switch(codec, mutenid, | ||
204 | prefix[i]); | ||
205 | if (err < 0) | ||
206 | return err; | ||
207 | err = add_out_volume(codec, spec->multiout.dac_nids[i], | ||
208 | prefix[i]); | ||
209 | if (err < 0) | ||
210 | return err; | ||
211 | } | ||
212 | } | ||
213 | if (cfg->hp_outs) { | ||
214 | if (get_wcaps(codec, cfg->hp_pins[0]) & AC_WCAP_OUT_AMP) | ||
215 | mutenid = cfg->hp_pins[0]; | ||
216 | else | ||
217 | mutenid = spec->multiout.dac_nids[i]; | ||
218 | |||
219 | err = add_out_switch(codec, mutenid, "Headphone"); | ||
220 | if (err < 0) | ||
221 | return err; | ||
222 | if (spec->hp_dac) { | ||
223 | err = add_out_volume(codec, spec->hp_dac, "Headphone"); | ||
224 | if (err < 0) | ||
225 | return err; | ||
226 | } | ||
227 | } | ||
228 | for (i = 0; i < spec->num_inputs; i++) { | ||
229 | const char *label = spec->input_labels[i]; | ||
230 | if (get_wcaps(codec, spec->input_pins[i]) & AC_WCAP_IN_AMP) | ||
231 | mutenid = spec->input_pins[i]; | ||
232 | else | ||
233 | mutenid = spec->adcs[i]; | ||
234 | err = add_in_switch(codec, mutenid, label); | ||
235 | if (err < 0) | ||
236 | return err; | ||
237 | err = add_in_volume(codec, spec->adcs[i], label); | ||
238 | if (err < 0) | ||
239 | return err; | ||
240 | } | ||
241 | |||
242 | if (spec->dig_out) { | ||
243 | err = snd_hda_create_spdif_out_ctls(codec, spec->dig_out); | ||
244 | if (err < 0) | ||
245 | return err; | ||
246 | err = snd_hda_create_spdif_share_sw(codec, &spec->multiout); | ||
247 | if (err < 0) | ||
248 | return err; | ||
249 | spec->multiout.share_spdif = 1; | ||
250 | } | ||
251 | if (spec->dig_in) { | ||
252 | err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in); | ||
253 | if (err < 0) | ||
254 | return err; | ||
255 | err = add_in_volume(codec, spec->dig_in, "IEC958"); | ||
256 | } | ||
257 | return 0; | ||
258 | } | ||
259 | |||
260 | /* | ||
261 | */ | ||
262 | static struct hda_pcm_stream ca0110_pcm_analog_playback = { | ||
263 | .substreams = 1, | ||
264 | .channels_min = 2, | ||
265 | .channels_max = 8, | ||
266 | .ops = { | ||
267 | .open = ca0110_playback_pcm_open, | ||
268 | .prepare = ca0110_playback_pcm_prepare, | ||
269 | .cleanup = ca0110_playback_pcm_cleanup | ||
270 | }, | ||
271 | }; | ||
272 | |||
273 | static struct hda_pcm_stream ca0110_pcm_analog_capture = { | ||
274 | .substreams = 1, | ||
275 | .channels_min = 2, | ||
276 | .channels_max = 2, | ||
277 | .ops = { | ||
278 | .prepare = ca0110_capture_pcm_prepare, | ||
279 | .cleanup = ca0110_capture_pcm_cleanup | ||
280 | }, | ||
281 | }; | ||
282 | |||
283 | static struct hda_pcm_stream ca0110_pcm_digital_playback = { | ||
284 | .substreams = 1, | ||
285 | .channels_min = 2, | ||
286 | .channels_max = 2, | ||
287 | .ops = { | ||
288 | .open = ca0110_dig_playback_pcm_open, | ||
289 | .close = ca0110_dig_playback_pcm_close, | ||
290 | .prepare = ca0110_dig_playback_pcm_prepare | ||
291 | }, | ||
292 | }; | ||
293 | |||
294 | static struct hda_pcm_stream ca0110_pcm_digital_capture = { | ||
295 | .substreams = 1, | ||
296 | .channels_min = 2, | ||
297 | .channels_max = 2, | ||
298 | }; | ||
299 | |||
300 | static int ca0110_build_pcms(struct hda_codec *codec) | ||
301 | { | ||
302 | struct ca0110_spec *spec = codec->spec; | ||
303 | struct hda_pcm *info = spec->pcm_rec; | ||
304 | |||
305 | codec->pcm_info = info; | ||
306 | codec->num_pcms = 0; | ||
307 | |||
308 | info->name = "CA0110 Analog"; | ||
309 | info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ca0110_pcm_analog_playback; | ||
310 | info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->dacs[0]; | ||
311 | info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = | ||
312 | spec->multiout.max_channels; | ||
313 | info->stream[SNDRV_PCM_STREAM_CAPTURE] = ca0110_pcm_analog_capture; | ||
314 | info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec->num_inputs; | ||
315 | info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adcs[0]; | ||
316 | codec->num_pcms++; | ||
317 | |||
318 | if (!spec->dig_out && !spec->dig_in) | ||
319 | return 0; | ||
320 | |||
321 | info++; | ||
322 | info->name = "CA0110 Digital"; | ||
323 | info->pcm_type = HDA_PCM_TYPE_SPDIF; | ||
324 | if (spec->dig_out) { | ||
325 | info->stream[SNDRV_PCM_STREAM_PLAYBACK] = | ||
326 | ca0110_pcm_digital_playback; | ||
327 | info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->dig_out; | ||
328 | } | ||
329 | if (spec->dig_in) { | ||
330 | info->stream[SNDRV_PCM_STREAM_CAPTURE] = | ||
331 | ca0110_pcm_digital_capture; | ||
332 | info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in; | ||
333 | } | ||
334 | codec->num_pcms++; | ||
335 | |||
336 | return 0; | ||
337 | } | ||
338 | |||
339 | static void init_output(struct hda_codec *codec, hda_nid_t pin, hda_nid_t dac) | ||
340 | { | ||
341 | if (pin) { | ||
342 | snd_hda_codec_write(codec, pin, 0, | ||
343 | AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP); | ||
344 | if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP) | ||
345 | snd_hda_codec_write(codec, pin, 0, | ||
346 | AC_VERB_SET_AMP_GAIN_MUTE, | ||
347 | AMP_OUT_UNMUTE); | ||
348 | } | ||
349 | if (dac) | ||
350 | snd_hda_codec_write(codec, dac, 0, | ||
351 | AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO); | ||
352 | } | ||
353 | |||
354 | static void init_input(struct hda_codec *codec, hda_nid_t pin, hda_nid_t adc) | ||
355 | { | ||
356 | if (pin) { | ||
357 | snd_hda_codec_write(codec, pin, 0, | ||
358 | AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80); | ||
359 | if (get_wcaps(codec, pin) & AC_WCAP_IN_AMP) | ||
360 | snd_hda_codec_write(codec, pin, 0, | ||
361 | AC_VERB_SET_AMP_GAIN_MUTE, | ||
362 | AMP_IN_UNMUTE(0)); | ||
363 | } | ||
364 | if (adc) | ||
365 | snd_hda_codec_write(codec, adc, 0, AC_VERB_SET_AMP_GAIN_MUTE, | ||
366 | AMP_IN_UNMUTE(0)); | ||
367 | } | ||
368 | |||
369 | static int ca0110_init(struct hda_codec *codec) | ||
370 | { | ||
371 | struct ca0110_spec *spec = codec->spec; | ||
372 | struct auto_pin_cfg *cfg = &spec->autocfg; | ||
373 | int i; | ||
374 | |||
375 | for (i = 0; i < spec->multiout.num_dacs; i++) | ||
376 | init_output(codec, spec->out_pins[i], | ||
377 | spec->multiout.dac_nids[i]); | ||
378 | init_output(codec, cfg->hp_pins[0], spec->hp_dac); | ||
379 | init_output(codec, cfg->dig_out_pins[0], spec->dig_out); | ||
380 | |||
381 | for (i = 0; i < spec->num_inputs; i++) | ||
382 | init_input(codec, spec->input_pins[i], spec->adcs[i]); | ||
383 | init_input(codec, cfg->dig_in_pin, spec->dig_in); | ||
384 | return 0; | ||
385 | } | ||
386 | |||
387 | static void ca0110_free(struct hda_codec *codec) | ||
388 | { | ||
389 | kfree(codec->spec); | ||
390 | } | ||
391 | |||
392 | static struct hda_codec_ops ca0110_patch_ops = { | ||
393 | .build_controls = ca0110_build_controls, | ||
394 | .build_pcms = ca0110_build_pcms, | ||
395 | .init = ca0110_init, | ||
396 | .free = ca0110_free, | ||
397 | }; | ||
398 | |||
399 | |||
400 | static void parse_line_outs(struct hda_codec *codec) | ||
401 | { | ||
402 | struct ca0110_spec *spec = codec->spec; | ||
403 | struct auto_pin_cfg *cfg = &spec->autocfg; | ||
404 | int i, n; | ||
405 | unsigned int def_conf; | ||
406 | hda_nid_t nid; | ||
407 | |||
408 | n = 0; | ||
409 | for (i = 0; i < cfg->line_outs; i++) { | ||
410 | nid = cfg->line_out_pins[i]; | ||
411 | def_conf = snd_hda_codec_get_pincfg(codec, nid); | ||
412 | if (!def_conf) | ||
413 | continue; /* invalid pin */ | ||
414 | if (snd_hda_get_connections(codec, nid, &spec->dacs[i], 1) != 1) | ||
415 | continue; | ||
416 | spec->out_pins[n++] = nid; | ||
417 | } | ||
418 | spec->multiout.dac_nids = spec->dacs; | ||
419 | spec->multiout.num_dacs = n; | ||
420 | spec->multiout.max_channels = n * 2; | ||
421 | } | ||
422 | |||
423 | static void parse_hp_out(struct hda_codec *codec) | ||
424 | { | ||
425 | struct ca0110_spec *spec = codec->spec; | ||
426 | struct auto_pin_cfg *cfg = &spec->autocfg; | ||
427 | int i; | ||
428 | unsigned int def_conf; | ||
429 | hda_nid_t nid, dac; | ||
430 | |||
431 | if (!cfg->hp_outs) | ||
432 | return; | ||
433 | nid = cfg->hp_pins[0]; | ||
434 | def_conf = snd_hda_codec_get_pincfg(codec, nid); | ||
435 | if (!def_conf) { | ||
436 | cfg->hp_outs = 0; | ||
437 | return; | ||
438 | } | ||
439 | if (snd_hda_get_connections(codec, nid, &dac, 1) != 1) | ||
440 | return; | ||
441 | |||
442 | for (i = 0; i < cfg->line_outs; i++) | ||
443 | if (dac == spec->dacs[i]) | ||
444 | break; | ||
445 | if (i >= cfg->line_outs) { | ||
446 | spec->hp_dac = dac; | ||
447 | spec->multiout.hp_nid = dac; | ||
448 | } | ||
449 | } | ||
450 | |||
451 | static void parse_input(struct hda_codec *codec) | ||
452 | { | ||
453 | struct ca0110_spec *spec = codec->spec; | ||
454 | struct auto_pin_cfg *cfg = &spec->autocfg; | ||
455 | hda_nid_t nid, pin; | ||
456 | int n, i, j; | ||
457 | |||
458 | n = 0; | ||
459 | nid = codec->start_nid; | ||
460 | for (i = 0; i < codec->num_nodes; i++, nid++) { | ||
461 | unsigned int wcaps = get_wcaps(codec, nid); | ||
462 | unsigned int type = (wcaps & AC_WCAP_TYPE) >> | ||
463 | AC_WCAP_TYPE_SHIFT; | ||
464 | if (type != AC_WID_AUD_IN) | ||
465 | continue; | ||
466 | if (snd_hda_get_connections(codec, nid, &pin, 1) != 1) | ||
467 | continue; | ||
468 | if (pin == cfg->dig_in_pin) { | ||
469 | spec->dig_in = nid; | ||
470 | continue; | ||
471 | } | ||
472 | for (j = 0; j < AUTO_PIN_LAST; j++) | ||
473 | if (cfg->input_pins[j] == pin) | ||
474 | break; | ||
475 | if (j >= AUTO_PIN_LAST) | ||
476 | continue; | ||
477 | spec->input_pins[n] = pin; | ||
478 | spec->input_labels[n] = auto_pin_cfg_labels[j]; | ||
479 | spec->adcs[n] = nid; | ||
480 | n++; | ||
481 | } | ||
482 | spec->num_inputs = n; | ||
483 | } | ||
484 | |||
485 | static void parse_digital(struct hda_codec *codec) | ||
486 | { | ||
487 | struct ca0110_spec *spec = codec->spec; | ||
488 | struct auto_pin_cfg *cfg = &spec->autocfg; | ||
489 | |||
490 | if (cfg->dig_outs && | ||
491 | snd_hda_get_connections(codec, cfg->dig_out_pins[0], | ||
492 | &spec->dig_out, 1) == 1) | ||
493 | spec->multiout.dig_out_nid = cfg->dig_out_pins[0]; | ||
494 | } | ||
495 | |||
496 | static int ca0110_parse_auto_config(struct hda_codec *codec) | ||
497 | { | ||
498 | struct ca0110_spec *spec = codec->spec; | ||
499 | int err; | ||
500 | |||
501 | err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL); | ||
502 | if (err < 0) | ||
503 | return err; | ||
504 | |||
505 | parse_line_outs(codec); | ||
506 | parse_hp_out(codec); | ||
507 | parse_digital(codec); | ||
508 | parse_input(codec); | ||
509 | return 0; | ||
510 | } | ||
511 | |||
512 | |||
513 | int patch_ca0110(struct hda_codec *codec) | ||
514 | { | ||
515 | struct ca0110_spec *spec; | ||
516 | int err; | ||
517 | |||
518 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); | ||
519 | if (!spec) | ||
520 | return -ENOMEM; | ||
521 | codec->spec = spec; | ||
522 | |||
523 | codec->bus->needs_damn_long_delay = 1; | ||
524 | |||
525 | err = ca0110_parse_auto_config(codec); | ||
526 | if (err < 0) | ||
527 | goto error; | ||
528 | |||
529 | codec->patch_ops = ca0110_patch_ops; | ||
530 | |||
531 | return 0; | ||
532 | |||
533 | error: | ||
534 | kfree(codec->spec); | ||
535 | codec->spec = NULL; | ||
536 | return err; | ||
537 | } | ||
538 | |||
539 | |||
540 | /* | ||
541 | * patch entries | ||
542 | */ | ||
543 | static struct hda_codec_preset snd_hda_preset_ca0110[] = { | ||
544 | { .id = 0x1102000a, .name = "CA0110-IBG", .patch = patch_ca0110 }, | ||
545 | { .id = 0x1102000b, .name = "CA0110-IBG", .patch = patch_ca0110 }, | ||
546 | { .id = 0x1102000d, .name = "SB0880 X-Fi", .patch = patch_ca0110 }, | ||
547 | {} /* terminator */ | ||
548 | }; | ||
549 | |||
550 | MODULE_ALIAS("snd-hda-codec-id:1102000a"); | ||
551 | MODULE_ALIAS("snd-hda-codec-id:1102000b"); | ||
552 | MODULE_ALIAS("snd-hda-codec-id:1102000d"); | ||
553 | |||
554 | MODULE_LICENSE("GPL"); | ||
555 | MODULE_DESCRIPTION("Creative CA0110-IBG HD-audio codec"); | ||
556 | |||
557 | static struct hda_codec_preset_list ca0110_list = { | ||
558 | .preset = snd_hda_preset_ca0110, | ||
559 | .owner = THIS_MODULE, | ||
560 | }; | ||
561 | |||
562 | static int __init patch_ca0110_init(void) | ||
563 | { | ||
564 | return snd_hda_add_codec_preset(&ca0110_list); | ||
565 | } | ||
566 | |||
567 | static void __exit patch_ca0110_exit(void) | ||
568 | { | ||
569 | snd_hda_delete_codec_preset(&ca0110_list); | ||
570 | } | ||
571 | |||
572 | module_init(patch_ca0110_init) | ||
573 | module_exit(patch_ca0110_exit) | ||
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 4fcbe21829ab..ac868c59f9e3 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
@@ -349,7 +349,7 @@ static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol, | |||
349 | &spec->cur_mux[adc_idx]); | 349 | &spec->cur_mux[adc_idx]); |
350 | } | 350 | } |
351 | 351 | ||
352 | #ifdef CONFIG_SND_JACK | 352 | #ifdef CONFIG_SND_HDA_INPUT_JACK |
353 | static void conexant_free_jack_priv(struct snd_jack *jack) | 353 | static void conexant_free_jack_priv(struct snd_jack *jack) |
354 | { | 354 | { |
355 | struct conexant_jack *jacks = jack->private_data; | 355 | struct conexant_jack *jacks = jack->private_data; |
@@ -463,7 +463,7 @@ static int conexant_init(struct hda_codec *codec) | |||
463 | 463 | ||
464 | static void conexant_free(struct hda_codec *codec) | 464 | static void conexant_free(struct hda_codec *codec) |
465 | { | 465 | { |
466 | #ifdef CONFIG_SND_JACK | 466 | #ifdef CONFIG_SND_HDA_INPUT_JACK |
467 | struct conexant_spec *spec = codec->spec; | 467 | struct conexant_spec *spec = codec->spec; |
468 | if (spec->jacks.list) { | 468 | if (spec->jacks.list) { |
469 | struct conexant_jack *jacks = spec->jacks.list; | 469 | struct conexant_jack *jacks = spec->jacks.list; |
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index d57d8132a06e..f5792e2eea82 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c | |||
@@ -35,9 +35,28 @@ struct nvhdmi_spec { | |||
35 | struct hda_pcm pcm_rec; | 35 | struct hda_pcm pcm_rec; |
36 | }; | 36 | }; |
37 | 37 | ||
38 | #define Nv_VERB_SET_Channel_Allocation 0xF79 | ||
39 | #define Nv_VERB_SET_Info_Frame_Checksum 0xF7A | ||
40 | #define Nv_VERB_SET_Audio_Protection_On 0xF98 | ||
41 | #define Nv_VERB_SET_Audio_Protection_Off 0xF99 | ||
42 | |||
43 | #define Nv_Master_Convert_nid 0x04 | ||
44 | #define Nv_Master_Pin_nid 0x05 | ||
45 | |||
46 | static hda_nid_t nvhdmi_convert_nids[4] = { | ||
47 | /*front, rear, clfe, rear_surr */ | ||
48 | 0x6, 0x8, 0xa, 0xc, | ||
49 | }; | ||
50 | |||
38 | static struct hda_verb nvhdmi_basic_init[] = { | 51 | static struct hda_verb nvhdmi_basic_init[] = { |
52 | /* set audio protect on */ | ||
53 | { 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1}, | ||
39 | /* enable digital output on pin widget */ | 54 | /* enable digital output on pin widget */ |
40 | { 0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | 55 | { 0x5, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, |
56 | { 0x7, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, | ||
57 | { 0x9, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, | ||
58 | { 0xb, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, | ||
59 | { 0xd, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, | ||
41 | {} /* terminator */ | 60 | {} /* terminator */ |
42 | }; | 61 | }; |
43 | 62 | ||
@@ -66,48 +85,205 @@ static int nvhdmi_init(struct hda_codec *codec) | |||
66 | * Digital out | 85 | * Digital out |
67 | */ | 86 | */ |
68 | static int nvhdmi_dig_playback_pcm_open(struct hda_pcm_stream *hinfo, | 87 | static int nvhdmi_dig_playback_pcm_open(struct hda_pcm_stream *hinfo, |
69 | struct hda_codec *codec, | 88 | struct hda_codec *codec, |
70 | struct snd_pcm_substream *substream) | 89 | struct snd_pcm_substream *substream) |
71 | { | 90 | { |
72 | struct nvhdmi_spec *spec = codec->spec; | 91 | struct nvhdmi_spec *spec = codec->spec; |
73 | return snd_hda_multi_out_dig_open(codec, &spec->multiout); | 92 | return snd_hda_multi_out_dig_open(codec, &spec->multiout); |
74 | } | 93 | } |
75 | 94 | ||
76 | static int nvhdmi_dig_playback_pcm_close(struct hda_pcm_stream *hinfo, | 95 | static int nvhdmi_dig_playback_pcm_close_8ch(struct hda_pcm_stream *hinfo, |
77 | struct hda_codec *codec, | 96 | struct hda_codec *codec, |
78 | struct snd_pcm_substream *substream) | 97 | struct snd_pcm_substream *substream) |
79 | { | 98 | { |
80 | struct nvhdmi_spec *spec = codec->spec; | 99 | struct nvhdmi_spec *spec = codec->spec; |
100 | int i; | ||
101 | |||
102 | snd_hda_codec_write(codec, Nv_Master_Convert_nid, | ||
103 | 0, AC_VERB_SET_CHANNEL_STREAMID, 0); | ||
104 | for (i = 0; i < 4; i++) { | ||
105 | /* set the stream id */ | ||
106 | snd_hda_codec_write(codec, nvhdmi_convert_nids[i], 0, | ||
107 | AC_VERB_SET_CHANNEL_STREAMID, 0); | ||
108 | /* set the stream format */ | ||
109 | snd_hda_codec_write(codec, nvhdmi_convert_nids[i], 0, | ||
110 | AC_VERB_SET_STREAM_FORMAT, 0); | ||
111 | } | ||
112 | |||
81 | return snd_hda_multi_out_dig_close(codec, &spec->multiout); | 113 | return snd_hda_multi_out_dig_close(codec, &spec->multiout); |
82 | } | 114 | } |
83 | 115 | ||
84 | static int nvhdmi_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo, | 116 | static int nvhdmi_dig_playback_pcm_close_2ch(struct hda_pcm_stream *hinfo, |
85 | struct hda_codec *codec, | 117 | struct hda_codec *codec, |
86 | unsigned int stream_tag, | 118 | struct snd_pcm_substream *substream) |
87 | unsigned int format, | 119 | { |
88 | struct snd_pcm_substream *substream) | 120 | struct nvhdmi_spec *spec = codec->spec; |
121 | return snd_hda_multi_out_dig_close(codec, &spec->multiout); | ||
122 | } | ||
123 | |||
124 | static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo, | ||
125 | struct hda_codec *codec, | ||
126 | unsigned int stream_tag, | ||
127 | unsigned int format, | ||
128 | struct snd_pcm_substream *substream) | ||
129 | { | ||
130 | int chs; | ||
131 | unsigned int dataDCC1, dataDCC2, chan, chanmask, channel_id; | ||
132 | int i; | ||
133 | |||
134 | mutex_lock(&codec->spdif_mutex); | ||
135 | |||
136 | chs = substream->runtime->channels; | ||
137 | chan = chs ? (chs - 1) : 1; | ||
138 | |||
139 | switch (chs) { | ||
140 | default: | ||
141 | case 0: | ||
142 | case 2: | ||
143 | chanmask = 0x00; | ||
144 | break; | ||
145 | case 4: | ||
146 | chanmask = 0x08; | ||
147 | break; | ||
148 | case 6: | ||
149 | chanmask = 0x0b; | ||
150 | break; | ||
151 | case 8: | ||
152 | chanmask = 0x13; | ||
153 | break; | ||
154 | } | ||
155 | dataDCC1 = AC_DIG1_ENABLE | AC_DIG1_COPYRIGHT; | ||
156 | dataDCC2 = 0x2; | ||
157 | |||
158 | /* set the Audio InforFrame Channel Allocation */ | ||
159 | snd_hda_codec_write(codec, 0x1, 0, | ||
160 | Nv_VERB_SET_Channel_Allocation, chanmask); | ||
161 | |||
162 | /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */ | ||
163 | if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) | ||
164 | snd_hda_codec_write(codec, | ||
165 | Nv_Master_Convert_nid, | ||
166 | 0, | ||
167 | AC_VERB_SET_DIGI_CONVERT_1, | ||
168 | codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff); | ||
169 | |||
170 | /* set the stream id */ | ||
171 | snd_hda_codec_write(codec, Nv_Master_Convert_nid, 0, | ||
172 | AC_VERB_SET_CHANNEL_STREAMID, (stream_tag << 4) | 0x0); | ||
173 | |||
174 | /* set the stream format */ | ||
175 | snd_hda_codec_write(codec, Nv_Master_Convert_nid, 0, | ||
176 | AC_VERB_SET_STREAM_FORMAT, format); | ||
177 | |||
178 | /* turn on again (if needed) */ | ||
179 | /* enable and set the channel status audio/data flag */ | ||
180 | if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) { | ||
181 | snd_hda_codec_write(codec, | ||
182 | Nv_Master_Convert_nid, | ||
183 | 0, | ||
184 | AC_VERB_SET_DIGI_CONVERT_1, | ||
185 | codec->spdif_ctls & 0xff); | ||
186 | snd_hda_codec_write(codec, | ||
187 | Nv_Master_Convert_nid, | ||
188 | 0, | ||
189 | AC_VERB_SET_DIGI_CONVERT_2, dataDCC2); | ||
190 | } | ||
191 | |||
192 | for (i = 0; i < 4; i++) { | ||
193 | if (chs == 2) | ||
194 | channel_id = 0; | ||
195 | else | ||
196 | channel_id = i * 2; | ||
197 | |||
198 | /* turn off SPDIF once; | ||
199 | *otherwise the IEC958 bits won't be updated | ||
200 | */ | ||
201 | if (codec->spdif_status_reset && | ||
202 | (codec->spdif_ctls & AC_DIG1_ENABLE)) | ||
203 | snd_hda_codec_write(codec, | ||
204 | nvhdmi_convert_nids[i], | ||
205 | 0, | ||
206 | AC_VERB_SET_DIGI_CONVERT_1, | ||
207 | codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff); | ||
208 | /* set the stream id */ | ||
209 | snd_hda_codec_write(codec, | ||
210 | nvhdmi_convert_nids[i], | ||
211 | 0, | ||
212 | AC_VERB_SET_CHANNEL_STREAMID, | ||
213 | (stream_tag << 4) | channel_id); | ||
214 | /* set the stream format */ | ||
215 | snd_hda_codec_write(codec, | ||
216 | nvhdmi_convert_nids[i], | ||
217 | 0, | ||
218 | AC_VERB_SET_STREAM_FORMAT, | ||
219 | format); | ||
220 | /* turn on again (if needed) */ | ||
221 | /* enable and set the channel status audio/data flag */ | ||
222 | if (codec->spdif_status_reset && | ||
223 | (codec->spdif_ctls & AC_DIG1_ENABLE)) { | ||
224 | snd_hda_codec_write(codec, | ||
225 | nvhdmi_convert_nids[i], | ||
226 | 0, | ||
227 | AC_VERB_SET_DIGI_CONVERT_1, | ||
228 | codec->spdif_ctls & 0xff); | ||
229 | snd_hda_codec_write(codec, | ||
230 | nvhdmi_convert_nids[i], | ||
231 | 0, | ||
232 | AC_VERB_SET_DIGI_CONVERT_2, dataDCC2); | ||
233 | } | ||
234 | } | ||
235 | |||
236 | /* set the Audio Info Frame Checksum */ | ||
237 | snd_hda_codec_write(codec, 0x1, 0, | ||
238 | Nv_VERB_SET_Info_Frame_Checksum, | ||
239 | (0x71 - chan - chanmask)); | ||
240 | |||
241 | mutex_unlock(&codec->spdif_mutex); | ||
242 | return 0; | ||
243 | } | ||
244 | |||
245 | static int nvhdmi_dig_playback_pcm_prepare_2ch(struct hda_pcm_stream *hinfo, | ||
246 | struct hda_codec *codec, | ||
247 | unsigned int stream_tag, | ||
248 | unsigned int format, | ||
249 | struct snd_pcm_substream *substream) | ||
89 | { | 250 | { |
90 | struct nvhdmi_spec *spec = codec->spec; | 251 | struct nvhdmi_spec *spec = codec->spec; |
91 | return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag, | 252 | return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag, |
92 | format, substream); | 253 | format, substream); |
93 | } | 254 | } |
94 | 255 | ||
95 | static struct hda_pcm_stream nvhdmi_pcm_digital_playback = { | 256 | static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch = { |
257 | .substreams = 1, | ||
258 | .channels_min = 2, | ||
259 | .channels_max = 8, | ||
260 | .nid = Nv_Master_Convert_nid, | ||
261 | .rates = SNDRV_PCM_RATE_48000, | ||
262 | .maxbps = 16, | ||
263 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | ||
264 | .ops = { | ||
265 | .open = nvhdmi_dig_playback_pcm_open, | ||
266 | .close = nvhdmi_dig_playback_pcm_close_8ch, | ||
267 | .prepare = nvhdmi_dig_playback_pcm_prepare_8ch | ||
268 | }, | ||
269 | }; | ||
270 | |||
271 | static struct hda_pcm_stream nvhdmi_pcm_digital_playback_2ch = { | ||
96 | .substreams = 1, | 272 | .substreams = 1, |
97 | .channels_min = 2, | 273 | .channels_min = 2, |
98 | .channels_max = 2, | 274 | .channels_max = 2, |
99 | .nid = 0x4, /* NID to query formats and rates and setup streams */ | 275 | .nid = Nv_Master_Convert_nid, |
100 | .rates = SNDRV_PCM_RATE_48000, | 276 | .rates = SNDRV_PCM_RATE_48000, |
101 | .maxbps = 16, | 277 | .maxbps = 16, |
102 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 278 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
103 | .ops = { | 279 | .ops = { |
104 | .open = nvhdmi_dig_playback_pcm_open, | 280 | .open = nvhdmi_dig_playback_pcm_open, |
105 | .close = nvhdmi_dig_playback_pcm_close, | 281 | .close = nvhdmi_dig_playback_pcm_close_2ch, |
106 | .prepare = nvhdmi_dig_playback_pcm_prepare | 282 | .prepare = nvhdmi_dig_playback_pcm_prepare_2ch |
107 | }, | 283 | }, |
108 | }; | 284 | }; |
109 | 285 | ||
110 | static int nvhdmi_build_pcms(struct hda_codec *codec) | 286 | static int nvhdmi_build_pcms_8ch(struct hda_codec *codec) |
111 | { | 287 | { |
112 | struct nvhdmi_spec *spec = codec->spec; | 288 | struct nvhdmi_spec *spec = codec->spec; |
113 | struct hda_pcm *info = &spec->pcm_rec; | 289 | struct hda_pcm *info = &spec->pcm_rec; |
@@ -117,7 +293,24 @@ static int nvhdmi_build_pcms(struct hda_codec *codec) | |||
117 | 293 | ||
118 | info->name = "NVIDIA HDMI"; | 294 | info->name = "NVIDIA HDMI"; |
119 | info->pcm_type = HDA_PCM_TYPE_HDMI; | 295 | info->pcm_type = HDA_PCM_TYPE_HDMI; |
120 | info->stream[SNDRV_PCM_STREAM_PLAYBACK] = nvhdmi_pcm_digital_playback; | 296 | info->stream[SNDRV_PCM_STREAM_PLAYBACK] |
297 | = nvhdmi_pcm_digital_playback_8ch; | ||
298 | |||
299 | return 0; | ||
300 | } | ||
301 | |||
302 | static int nvhdmi_build_pcms_2ch(struct hda_codec *codec) | ||
303 | { | ||
304 | struct nvhdmi_spec *spec = codec->spec; | ||
305 | struct hda_pcm *info = &spec->pcm_rec; | ||
306 | |||
307 | codec->num_pcms = 1; | ||
308 | codec->pcm_info = info; | ||
309 | |||
310 | info->name = "NVIDIA HDMI"; | ||
311 | info->pcm_type = HDA_PCM_TYPE_HDMI; | ||
312 | info->stream[SNDRV_PCM_STREAM_PLAYBACK] | ||
313 | = nvhdmi_pcm_digital_playback_2ch; | ||
121 | 314 | ||
122 | return 0; | 315 | return 0; |
123 | } | 316 | } |
@@ -127,14 +320,40 @@ static void nvhdmi_free(struct hda_codec *codec) | |||
127 | kfree(codec->spec); | 320 | kfree(codec->spec); |
128 | } | 321 | } |
129 | 322 | ||
130 | static struct hda_codec_ops nvhdmi_patch_ops = { | 323 | static struct hda_codec_ops nvhdmi_patch_ops_8ch = { |
324 | .build_controls = nvhdmi_build_controls, | ||
325 | .build_pcms = nvhdmi_build_pcms_8ch, | ||
326 | .init = nvhdmi_init, | ||
327 | .free = nvhdmi_free, | ||
328 | }; | ||
329 | |||
330 | static struct hda_codec_ops nvhdmi_patch_ops_2ch = { | ||
131 | .build_controls = nvhdmi_build_controls, | 331 | .build_controls = nvhdmi_build_controls, |
132 | .build_pcms = nvhdmi_build_pcms, | 332 | .build_pcms = nvhdmi_build_pcms_2ch, |
133 | .init = nvhdmi_init, | 333 | .init = nvhdmi_init, |
134 | .free = nvhdmi_free, | 334 | .free = nvhdmi_free, |
135 | }; | 335 | }; |
136 | 336 | ||
137 | static int patch_nvhdmi(struct hda_codec *codec) | 337 | static int patch_nvhdmi_8ch(struct hda_codec *codec) |
338 | { | ||
339 | struct nvhdmi_spec *spec; | ||
340 | |||
341 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); | ||
342 | if (spec == NULL) | ||
343 | return -ENOMEM; | ||
344 | |||
345 | codec->spec = spec; | ||
346 | |||
347 | spec->multiout.num_dacs = 0; /* no analog */ | ||
348 | spec->multiout.max_channels = 8; | ||
349 | spec->multiout.dig_out_nid = Nv_Master_Convert_nid; | ||
350 | |||
351 | codec->patch_ops = nvhdmi_patch_ops_8ch; | ||
352 | |||
353 | return 0; | ||
354 | } | ||
355 | |||
356 | static int patch_nvhdmi_2ch(struct hda_codec *codec) | ||
138 | { | 357 | { |
139 | struct nvhdmi_spec *spec; | 358 | struct nvhdmi_spec *spec; |
140 | 359 | ||
@@ -144,13 +363,11 @@ static int patch_nvhdmi(struct hda_codec *codec) | |||
144 | 363 | ||
145 | codec->spec = spec; | 364 | codec->spec = spec; |
146 | 365 | ||
147 | spec->multiout.num_dacs = 0; /* no analog */ | 366 | spec->multiout.num_dacs = 0; /* no analog */ |
148 | spec->multiout.max_channels = 2; | 367 | spec->multiout.max_channels = 2; |
149 | spec->multiout.dig_out_nid = 0x4; /* NID for copying analog to digital, | 368 | spec->multiout.dig_out_nid = Nv_Master_Convert_nid; |
150 | * seems to be unused in pure-digital | ||
151 | * case. */ | ||
152 | 369 | ||
153 | codec->patch_ops = nvhdmi_patch_ops; | 370 | codec->patch_ops = nvhdmi_patch_ops_2ch; |
154 | 371 | ||
155 | return 0; | 372 | return 0; |
156 | } | 373 | } |
@@ -159,11 +376,11 @@ static int patch_nvhdmi(struct hda_codec *codec) | |||
159 | * patch entries | 376 | * patch entries |
160 | */ | 377 | */ |
161 | static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { | 378 | static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { |
162 | { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi }, | 379 | { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch }, |
163 | { .id = 0x10de0006, .name = "MCP78 HDMI", .patch = patch_nvhdmi }, | 380 | { .id = 0x10de0006, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch }, |
164 | { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi }, | 381 | { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi_8ch }, |
165 | { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi }, | 382 | { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, |
166 | { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi }, | 383 | { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, |
167 | {} /* terminator */ | 384 | {} /* terminator */ |
168 | }; | 385 | }; |
169 | 386 | ||
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 0fd258eba3a5..334533197425 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -190,6 +190,7 @@ enum { | |||
190 | ALC663_ASUS_MODE6, | 190 | ALC663_ASUS_MODE6, |
191 | ALC272_DELL, | 191 | ALC272_DELL, |
192 | ALC272_DELL_ZM1, | 192 | ALC272_DELL_ZM1, |
193 | ALC272_SAMSUNG_NC10, | ||
193 | ALC662_AUTO, | 194 | ALC662_AUTO, |
194 | ALC662_MODEL_LAST, | 195 | ALC662_MODEL_LAST, |
195 | }; | 196 | }; |
@@ -205,6 +206,7 @@ enum { | |||
205 | ALC882_ASUS_A7M, | 206 | ALC882_ASUS_A7M, |
206 | ALC885_MACPRO, | 207 | ALC885_MACPRO, |
207 | ALC885_MBP3, | 208 | ALC885_MBP3, |
209 | ALC885_MB5, | ||
208 | ALC885_IMAC24, | 210 | ALC885_IMAC24, |
209 | ALC882_AUTO, | 211 | ALC882_AUTO, |
210 | ALC882_MODEL_LAST, | 212 | ALC882_MODEL_LAST, |
@@ -218,9 +220,12 @@ enum { | |||
218 | ALC883_6ST_DIG, | 220 | ALC883_6ST_DIG, |
219 | ALC883_TARGA_DIG, | 221 | ALC883_TARGA_DIG, |
220 | ALC883_TARGA_2ch_DIG, | 222 | ALC883_TARGA_2ch_DIG, |
223 | ALC883_TARGA_8ch_DIG, | ||
221 | ALC883_ACER, | 224 | ALC883_ACER, |
222 | ALC883_ACER_ASPIRE, | 225 | ALC883_ACER_ASPIRE, |
223 | ALC888_ACER_ASPIRE_4930G, | 226 | ALC888_ACER_ASPIRE_4930G, |
227 | ALC888_ACER_ASPIRE_6530G, | ||
228 | ALC888_ACER_ASPIRE_8930G, | ||
224 | ALC883_MEDION, | 229 | ALC883_MEDION, |
225 | ALC883_MEDION_MD2, | 230 | ALC883_MEDION_MD2, |
226 | ALC883_LAPTOP_EAPD, | 231 | ALC883_LAPTOP_EAPD, |
@@ -238,21 +243,25 @@ enum { | |||
238 | ALC883_3ST_6ch_INTEL, | 243 | ALC883_3ST_6ch_INTEL, |
239 | ALC888_ASUS_M90V, | 244 | ALC888_ASUS_M90V, |
240 | ALC888_ASUS_EEE1601, | 245 | ALC888_ASUS_EEE1601, |
246 | ALC889A_MB31, | ||
241 | ALC1200_ASUS_P5Q, | 247 | ALC1200_ASUS_P5Q, |
248 | ALC883_SONY_VAIO_TT, | ||
242 | ALC883_AUTO, | 249 | ALC883_AUTO, |
243 | ALC883_MODEL_LAST, | 250 | ALC883_MODEL_LAST, |
244 | }; | 251 | }; |
245 | 252 | ||
246 | /* styles of capture selection */ | ||
247 | enum { | ||
248 | CAPT_MUX = 0, /* only mux based */ | ||
249 | CAPT_MIX, /* only mixer based */ | ||
250 | CAPT_1MUX_MIX, /* first mux and other mixers */ | ||
251 | }; | ||
252 | |||
253 | /* for GPIO Poll */ | 253 | /* for GPIO Poll */ |
254 | #define GPIO_MASK 0x03 | 254 | #define GPIO_MASK 0x03 |
255 | 255 | ||
256 | /* extra amp-initialization sequence types */ | ||
257 | enum { | ||
258 | ALC_INIT_NONE, | ||
259 | ALC_INIT_DEFAULT, | ||
260 | ALC_INIT_GPIO1, | ||
261 | ALC_INIT_GPIO2, | ||
262 | ALC_INIT_GPIO3, | ||
263 | }; | ||
264 | |||
256 | struct alc_spec { | 265 | struct alc_spec { |
257 | /* codec parameterization */ | 266 | /* codec parameterization */ |
258 | struct snd_kcontrol_new *mixers[5]; /* mixer arrays */ | 267 | struct snd_kcontrol_new *mixers[5]; /* mixer arrays */ |
@@ -266,13 +275,13 @@ struct alc_spec { | |||
266 | */ | 275 | */ |
267 | unsigned int num_init_verbs; | 276 | unsigned int num_init_verbs; |
268 | 277 | ||
269 | char *stream_name_analog; /* analog PCM stream */ | 278 | char stream_name_analog[16]; /* analog PCM stream */ |
270 | struct hda_pcm_stream *stream_analog_playback; | 279 | struct hda_pcm_stream *stream_analog_playback; |
271 | struct hda_pcm_stream *stream_analog_capture; | 280 | struct hda_pcm_stream *stream_analog_capture; |
272 | struct hda_pcm_stream *stream_analog_alt_playback; | 281 | struct hda_pcm_stream *stream_analog_alt_playback; |
273 | struct hda_pcm_stream *stream_analog_alt_capture; | 282 | struct hda_pcm_stream *stream_analog_alt_capture; |
274 | 283 | ||
275 | char *stream_name_digital; /* digital PCM stream */ | 284 | char stream_name_digital[16]; /* digital PCM stream */ |
276 | struct hda_pcm_stream *stream_digital_playback; | 285 | struct hda_pcm_stream *stream_digital_playback; |
277 | struct hda_pcm_stream *stream_digital_capture; | 286 | struct hda_pcm_stream *stream_digital_capture; |
278 | 287 | ||
@@ -290,7 +299,6 @@ struct alc_spec { | |||
290 | hda_nid_t *adc_nids; | 299 | hda_nid_t *adc_nids; |
291 | hda_nid_t *capsrc_nids; | 300 | hda_nid_t *capsrc_nids; |
292 | hda_nid_t dig_in_nid; /* digital-in NID; optional */ | 301 | hda_nid_t dig_in_nid; /* digital-in NID; optional */ |
293 | int capture_style; /* capture style (CAPT_*) */ | ||
294 | 302 | ||
295 | /* capture source */ | 303 | /* capture source */ |
296 | unsigned int num_mux_defs; | 304 | unsigned int num_mux_defs; |
@@ -301,6 +309,8 @@ struct alc_spec { | |||
301 | const struct hda_channel_mode *channel_mode; | 309 | const struct hda_channel_mode *channel_mode; |
302 | int num_channel_mode; | 310 | int num_channel_mode; |
303 | int need_dac_fix; | 311 | int need_dac_fix; |
312 | int const_channel_count; | ||
313 | int ext_channel_count; | ||
304 | 314 | ||
305 | /* PCM information */ | 315 | /* PCM information */ |
306 | struct hda_pcm pcm_rec[3]; /* used in alc_build_pcms() */ | 316 | struct hda_pcm pcm_rec[3]; /* used in alc_build_pcms() */ |
@@ -322,6 +332,7 @@ struct alc_spec { | |||
322 | 332 | ||
323 | /* other flags */ | 333 | /* other flags */ |
324 | unsigned int no_analog :1; /* digital I/O only */ | 334 | unsigned int no_analog :1; /* digital I/O only */ |
335 | int init_amp; | ||
325 | 336 | ||
326 | /* for virtual master */ | 337 | /* for virtual master */ |
327 | hda_nid_t vmaster_nid; | 338 | hda_nid_t vmaster_nid; |
@@ -355,6 +366,7 @@ struct alc_config_preset { | |||
355 | unsigned int num_channel_mode; | 366 | unsigned int num_channel_mode; |
356 | const struct hda_channel_mode *channel_mode; | 367 | const struct hda_channel_mode *channel_mode; |
357 | int need_dac_fix; | 368 | int need_dac_fix; |
369 | int const_channel_count; | ||
358 | unsigned int num_mux_defs; | 370 | unsigned int num_mux_defs; |
359 | const struct hda_input_mux *input_mux; | 371 | const struct hda_input_mux *input_mux; |
360 | void (*unsol_event)(struct hda_codec *, unsigned int); | 372 | void (*unsol_event)(struct hda_codec *, unsigned int); |
@@ -400,12 +412,13 @@ static int alc_mux_enum_put(struct snd_kcontrol *kcontrol, | |||
400 | unsigned int mux_idx; | 412 | unsigned int mux_idx; |
401 | hda_nid_t nid = spec->capsrc_nids ? | 413 | hda_nid_t nid = spec->capsrc_nids ? |
402 | spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx]; | 414 | spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx]; |
415 | unsigned int type; | ||
403 | 416 | ||
404 | mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx; | 417 | mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx; |
405 | imux = &spec->input_mux[mux_idx]; | 418 | imux = &spec->input_mux[mux_idx]; |
406 | 419 | ||
407 | if (spec->capture_style && | 420 | type = (get_wcaps(codec, nid) & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; |
408 | !(spec->capture_style == CAPT_1MUX_MIX && !adc_idx)) { | 421 | if (type == AC_WID_AUD_MIX) { |
409 | /* Matrix-mixer style (e.g. ALC882) */ | 422 | /* Matrix-mixer style (e.g. ALC882) */ |
410 | unsigned int *cur_val = &spec->cur_mux[adc_idx]; | 423 | unsigned int *cur_val = &spec->cur_mux[adc_idx]; |
411 | unsigned int i, idx; | 424 | unsigned int i, idx; |
@@ -449,7 +462,7 @@ static int alc_ch_mode_get(struct snd_kcontrol *kcontrol, | |||
449 | struct alc_spec *spec = codec->spec; | 462 | struct alc_spec *spec = codec->spec; |
450 | return snd_hda_ch_mode_get(codec, ucontrol, spec->channel_mode, | 463 | return snd_hda_ch_mode_get(codec, ucontrol, spec->channel_mode, |
451 | spec->num_channel_mode, | 464 | spec->num_channel_mode, |
452 | spec->multiout.max_channels); | 465 | spec->ext_channel_count); |
453 | } | 466 | } |
454 | 467 | ||
455 | static int alc_ch_mode_put(struct snd_kcontrol *kcontrol, | 468 | static int alc_ch_mode_put(struct snd_kcontrol *kcontrol, |
@@ -459,9 +472,12 @@ static int alc_ch_mode_put(struct snd_kcontrol *kcontrol, | |||
459 | struct alc_spec *spec = codec->spec; | 472 | struct alc_spec *spec = codec->spec; |
460 | int err = snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode, | 473 | int err = snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode, |
461 | spec->num_channel_mode, | 474 | spec->num_channel_mode, |
462 | &spec->multiout.max_channels); | 475 | &spec->ext_channel_count); |
463 | if (err >= 0 && spec->need_dac_fix) | 476 | if (err >= 0 && !spec->const_channel_count) { |
464 | spec->multiout.num_dacs = spec->multiout.max_channels / 2; | 477 | spec->multiout.max_channels = spec->ext_channel_count; |
478 | if (spec->need_dac_fix) | ||
479 | spec->multiout.num_dacs = spec->multiout.max_channels / 2; | ||
480 | } | ||
465 | return err; | 481 | return err; |
466 | } | 482 | } |
467 | 483 | ||
@@ -841,8 +857,13 @@ static void setup_preset(struct alc_spec *spec, | |||
841 | spec->channel_mode = preset->channel_mode; | 857 | spec->channel_mode = preset->channel_mode; |
842 | spec->num_channel_mode = preset->num_channel_mode; | 858 | spec->num_channel_mode = preset->num_channel_mode; |
843 | spec->need_dac_fix = preset->need_dac_fix; | 859 | spec->need_dac_fix = preset->need_dac_fix; |
860 | spec->const_channel_count = preset->const_channel_count; | ||
844 | 861 | ||
845 | spec->multiout.max_channels = spec->channel_mode[0].channels; | 862 | if (preset->const_channel_count) |
863 | spec->multiout.max_channels = preset->const_channel_count; | ||
864 | else | ||
865 | spec->multiout.max_channels = spec->channel_mode[0].channels; | ||
866 | spec->ext_channel_count = spec->channel_mode[0].channels; | ||
846 | 867 | ||
847 | spec->multiout.num_dacs = preset->num_dacs; | 868 | spec->multiout.num_dacs = preset->num_dacs; |
848 | spec->multiout.dac_nids = preset->dac_nids; | 869 | spec->multiout.dac_nids = preset->dac_nids; |
@@ -921,23 +942,29 @@ static void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid, | |||
921 | alc_fix_pll(codec); | 942 | alc_fix_pll(codec); |
922 | } | 943 | } |
923 | 944 | ||
924 | static void alc_sku_automute(struct hda_codec *codec) | 945 | static void alc_automute_pin(struct hda_codec *codec) |
925 | { | 946 | { |
926 | struct alc_spec *spec = codec->spec; | 947 | struct alc_spec *spec = codec->spec; |
927 | unsigned int present; | 948 | unsigned int present; |
928 | unsigned int hp_nid = spec->autocfg.hp_pins[0]; | 949 | unsigned int nid = spec->autocfg.hp_pins[0]; |
929 | unsigned int sp_nid = spec->autocfg.speaker_pins[0]; | 950 | int i; |
930 | 951 | ||
931 | /* need to execute and sync at first */ | 952 | /* need to execute and sync at first */ |
932 | snd_hda_codec_read(codec, hp_nid, 0, AC_VERB_SET_PIN_SENSE, 0); | 953 | snd_hda_codec_read(codec, nid, 0, AC_VERB_SET_PIN_SENSE, 0); |
933 | present = snd_hda_codec_read(codec, hp_nid, 0, | 954 | present = snd_hda_codec_read(codec, nid, 0, |
934 | AC_VERB_GET_PIN_SENSE, 0); | 955 | AC_VERB_GET_PIN_SENSE, 0); |
935 | spec->jack_present = (present & 0x80000000) != 0; | 956 | spec->jack_present = (present & AC_PINSENSE_PRESENCE) != 0; |
936 | snd_hda_codec_write(codec, sp_nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, | 957 | for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) { |
937 | spec->jack_present ? 0 : PIN_OUT); | 958 | nid = spec->autocfg.speaker_pins[i]; |
959 | if (!nid) | ||
960 | break; | ||
961 | snd_hda_codec_write(codec, nid, 0, | ||
962 | AC_VERB_SET_PIN_WIDGET_CONTROL, | ||
963 | spec->jack_present ? 0 : PIN_OUT); | ||
964 | } | ||
938 | } | 965 | } |
939 | 966 | ||
940 | #if 0 /* it's broken in some acses -- temporarily disabled */ | 967 | #if 0 /* it's broken in some cases -- temporarily disabled */ |
941 | static void alc_mic_automute(struct hda_codec *codec) | 968 | static void alc_mic_automute(struct hda_codec *codec) |
942 | { | 969 | { |
943 | struct alc_spec *spec = codec->spec; | 970 | struct alc_spec *spec = codec->spec; |
@@ -969,16 +996,19 @@ static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res) | |||
969 | res >>= 28; | 996 | res >>= 28; |
970 | else | 997 | else |
971 | res >>= 26; | 998 | res >>= 26; |
972 | if (res == ALC880_HP_EVENT) | 999 | switch (res) { |
973 | alc_sku_automute(codec); | 1000 | case ALC880_HP_EVENT: |
974 | 1001 | alc_automute_pin(codec); | |
975 | if (res == ALC880_MIC_EVENT) | 1002 | break; |
1003 | case ALC880_MIC_EVENT: | ||
976 | alc_mic_automute(codec); | 1004 | alc_mic_automute(codec); |
1005 | break; | ||
1006 | } | ||
977 | } | 1007 | } |
978 | 1008 | ||
979 | static void alc_inithook(struct hda_codec *codec) | 1009 | static void alc_inithook(struct hda_codec *codec) |
980 | { | 1010 | { |
981 | alc_sku_automute(codec); | 1011 | alc_automute_pin(codec); |
982 | alc_mic_automute(codec); | 1012 | alc_mic_automute(codec); |
983 | } | 1013 | } |
984 | 1014 | ||
@@ -1000,69 +1030,21 @@ static void alc888_coef_init(struct hda_codec *codec) | |||
1000 | AC_VERB_SET_PROC_COEF, 0x3030); | 1030 | AC_VERB_SET_PROC_COEF, 0x3030); |
1001 | } | 1031 | } |
1002 | 1032 | ||
1003 | /* 32-bit subsystem ID for BIOS loading in HD Audio codec. | 1033 | static void alc_auto_init_amp(struct hda_codec *codec, int type) |
1004 | * 31 ~ 16 : Manufacture ID | ||
1005 | * 15 ~ 8 : SKU ID | ||
1006 | * 7 ~ 0 : Assembly ID | ||
1007 | * port-A --> pin 39/41, port-E --> pin 14/15, port-D --> pin 35/36 | ||
1008 | */ | ||
1009 | static void alc_subsystem_id(struct hda_codec *codec, | ||
1010 | unsigned int porta, unsigned int porte, | ||
1011 | unsigned int portd) | ||
1012 | { | 1034 | { |
1013 | unsigned int ass, tmp, i; | 1035 | unsigned int tmp; |
1014 | unsigned nid; | ||
1015 | struct alc_spec *spec = codec->spec; | ||
1016 | |||
1017 | ass = codec->subsystem_id & 0xffff; | ||
1018 | if ((ass != codec->bus->pci->subsystem_device) && (ass & 1)) | ||
1019 | goto do_sku; | ||
1020 | |||
1021 | /* | ||
1022 | * 31~30 : port conetcivity | ||
1023 | * 29~21 : reserve | ||
1024 | * 20 : PCBEEP input | ||
1025 | * 19~16 : Check sum (15:1) | ||
1026 | * 15~1 : Custom | ||
1027 | * 0 : override | ||
1028 | */ | ||
1029 | nid = 0x1d; | ||
1030 | if (codec->vendor_id == 0x10ec0260) | ||
1031 | nid = 0x17; | ||
1032 | ass = snd_hda_codec_get_pincfg(codec, nid); | ||
1033 | if (!(ass & 1) && !(ass & 0x100000)) | ||
1034 | return; | ||
1035 | if ((ass >> 30) != 1) /* no physical connection */ | ||
1036 | return; | ||
1037 | 1036 | ||
1038 | /* check sum */ | 1037 | switch (type) { |
1039 | tmp = 0; | 1038 | case ALC_INIT_GPIO1: |
1040 | for (i = 1; i < 16; i++) { | ||
1041 | if ((ass >> i) & 1) | ||
1042 | tmp++; | ||
1043 | } | ||
1044 | if (((ass >> 16) & 0xf) != tmp) | ||
1045 | return; | ||
1046 | do_sku: | ||
1047 | /* | ||
1048 | * 0 : override | ||
1049 | * 1 : Swap Jack | ||
1050 | * 2 : 0 --> Desktop, 1 --> Laptop | ||
1051 | * 3~5 : External Amplifier control | ||
1052 | * 7~6 : Reserved | ||
1053 | */ | ||
1054 | tmp = (ass & 0x38) >> 3; /* external Amp control */ | ||
1055 | switch (tmp) { | ||
1056 | case 1: | ||
1057 | snd_hda_sequence_write(codec, alc_gpio1_init_verbs); | 1039 | snd_hda_sequence_write(codec, alc_gpio1_init_verbs); |
1058 | break; | 1040 | break; |
1059 | case 3: | 1041 | case ALC_INIT_GPIO2: |
1060 | snd_hda_sequence_write(codec, alc_gpio2_init_verbs); | 1042 | snd_hda_sequence_write(codec, alc_gpio2_init_verbs); |
1061 | break; | 1043 | break; |
1062 | case 7: | 1044 | case ALC_INIT_GPIO3: |
1063 | snd_hda_sequence_write(codec, alc_gpio3_init_verbs); | 1045 | snd_hda_sequence_write(codec, alc_gpio3_init_verbs); |
1064 | break; | 1046 | break; |
1065 | case 5: /* set EAPD output high */ | 1047 | case ALC_INIT_DEFAULT: |
1066 | switch (codec->vendor_id) { | 1048 | switch (codec->vendor_id) { |
1067 | case 0x10ec0260: | 1049 | case 0x10ec0260: |
1068 | snd_hda_codec_write(codec, 0x0f, 0, | 1050 | snd_hda_codec_write(codec, 0x0f, 0, |
@@ -1116,7 +1098,7 @@ do_sku: | |||
1116 | tmp | 0x2010); | 1098 | tmp | 0x2010); |
1117 | break; | 1099 | break; |
1118 | case 0x10ec0888: | 1100 | case 0x10ec0888: |
1119 | /*alc888_coef_init(codec);*/ /* called in alc_init() */ | 1101 | alc888_coef_init(codec); |
1120 | break; | 1102 | break; |
1121 | case 0x10ec0267: | 1103 | case 0x10ec0267: |
1122 | case 0x10ec0268: | 1104 | case 0x10ec0268: |
@@ -1131,7 +1113,107 @@ do_sku: | |||
1131 | tmp | 0x3000); | 1113 | tmp | 0x3000); |
1132 | break; | 1114 | break; |
1133 | } | 1115 | } |
1134 | default: | 1116 | break; |
1117 | } | ||
1118 | } | ||
1119 | |||
1120 | static void alc_init_auto_hp(struct hda_codec *codec) | ||
1121 | { | ||
1122 | struct alc_spec *spec = codec->spec; | ||
1123 | |||
1124 | if (!spec->autocfg.hp_pins[0]) | ||
1125 | return; | ||
1126 | |||
1127 | if (!spec->autocfg.speaker_pins[0]) { | ||
1128 | if (spec->autocfg.line_out_pins[0] && | ||
1129 | spec->autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT) | ||
1130 | spec->autocfg.speaker_pins[0] = | ||
1131 | spec->autocfg.line_out_pins[0]; | ||
1132 | else | ||
1133 | return; | ||
1134 | } | ||
1135 | |||
1136 | snd_printdd("realtek: Enable HP auto-muting on NID 0x%x\n", | ||
1137 | spec->autocfg.hp_pins[0]); | ||
1138 | snd_hda_codec_write_cache(codec, spec->autocfg.hp_pins[0], 0, | ||
1139 | AC_VERB_SET_UNSOLICITED_ENABLE, | ||
1140 | AC_USRSP_EN | ALC880_HP_EVENT); | ||
1141 | spec->unsol_event = alc_sku_unsol_event; | ||
1142 | } | ||
1143 | |||
1144 | /* check subsystem ID and set up device-specific initialization; | ||
1145 | * return 1 if initialized, 0 if invalid SSID | ||
1146 | */ | ||
1147 | /* 32-bit subsystem ID for BIOS loading in HD Audio codec. | ||
1148 | * 31 ~ 16 : Manufacture ID | ||
1149 | * 15 ~ 8 : SKU ID | ||
1150 | * 7 ~ 0 : Assembly ID | ||
1151 | * port-A --> pin 39/41, port-E --> pin 14/15, port-D --> pin 35/36 | ||
1152 | */ | ||
1153 | static int alc_subsystem_id(struct hda_codec *codec, | ||
1154 | hda_nid_t porta, hda_nid_t porte, | ||
1155 | hda_nid_t portd) | ||
1156 | { | ||
1157 | unsigned int ass, tmp, i; | ||
1158 | unsigned nid; | ||
1159 | struct alc_spec *spec = codec->spec; | ||
1160 | |||
1161 | ass = codec->subsystem_id & 0xffff; | ||
1162 | if ((ass != codec->bus->pci->subsystem_device) && (ass & 1)) | ||
1163 | goto do_sku; | ||
1164 | |||
1165 | /* invalid SSID, check the special NID pin defcfg instead */ | ||
1166 | /* | ||
1167 | * 31~30 : port connectivity | ||
1168 | * 29~21 : reserve | ||
1169 | * 20 : PCBEEP input | ||
1170 | * 19~16 : Check sum (15:1) | ||
1171 | * 15~1 : Custom | ||
1172 | * 0 : override | ||
1173 | */ | ||
1174 | nid = 0x1d; | ||
1175 | if (codec->vendor_id == 0x10ec0260) | ||
1176 | nid = 0x17; | ||
1177 | ass = snd_hda_codec_get_pincfg(codec, nid); | ||
1178 | snd_printd("realtek: No valid SSID, " | ||
1179 | "checking pincfg 0x%08x for NID 0x%x\n", | ||
1180 | ass, nid); | ||
1181 | if (!(ass & 1) && !(ass & 0x100000)) | ||
1182 | return 0; | ||
1183 | if ((ass >> 30) != 1) /* no physical connection */ | ||
1184 | return 0; | ||
1185 | |||
1186 | /* check sum */ | ||
1187 | tmp = 0; | ||
1188 | for (i = 1; i < 16; i++) { | ||
1189 | if ((ass >> i) & 1) | ||
1190 | tmp++; | ||
1191 | } | ||
1192 | if (((ass >> 16) & 0xf) != tmp) | ||
1193 | return 0; | ||
1194 | do_sku: | ||
1195 | snd_printd("realtek: Enabling init ASM_ID=0x%04x CODEC_ID=%08x\n", | ||
1196 | ass & 0xffff, codec->vendor_id); | ||
1197 | /* | ||
1198 | * 0 : override | ||
1199 | * 1 : Swap Jack | ||
1200 | * 2 : 0 --> Desktop, 1 --> Laptop | ||
1201 | * 3~5 : External Amplifier control | ||
1202 | * 7~6 : Reserved | ||
1203 | */ | ||
1204 | tmp = (ass & 0x38) >> 3; /* external Amp control */ | ||
1205 | switch (tmp) { | ||
1206 | case 1: | ||
1207 | spec->init_amp = ALC_INIT_GPIO1; | ||
1208 | break; | ||
1209 | case 3: | ||
1210 | spec->init_amp = ALC_INIT_GPIO2; | ||
1211 | break; | ||
1212 | case 7: | ||
1213 | spec->init_amp = ALC_INIT_GPIO3; | ||
1214 | break; | ||
1215 | case 5: | ||
1216 | spec->init_amp = ALC_INIT_DEFAULT; | ||
1135 | break; | 1217 | break; |
1136 | } | 1218 | } |
1137 | 1219 | ||
@@ -1139,7 +1221,7 @@ do_sku: | |||
1139 | * when the external headphone out jack is plugged" | 1221 | * when the external headphone out jack is plugged" |
1140 | */ | 1222 | */ |
1141 | if (!(ass & 0x8000)) | 1223 | if (!(ass & 0x8000)) |
1142 | return; | 1224 | return 1; |
1143 | /* | 1225 | /* |
1144 | * 10~8 : Jack location | 1226 | * 10~8 : Jack location |
1145 | * 12~11: Headphone out -> 00: PortA, 01: PortE, 02: PortD, 03: Resvered | 1227 | * 12~11: Headphone out -> 00: PortA, 01: PortE, 02: PortD, 03: Resvered |
@@ -1147,14 +1229,6 @@ do_sku: | |||
1147 | * 15 : 1 --> enable the function "Mute internal speaker | 1229 | * 15 : 1 --> enable the function "Mute internal speaker |
1148 | * when the external headphone out jack is plugged" | 1230 | * when the external headphone out jack is plugged" |
1149 | */ | 1231 | */ |
1150 | if (!spec->autocfg.speaker_pins[0]) { | ||
1151 | if (spec->autocfg.line_out_pins[0]) | ||
1152 | spec->autocfg.speaker_pins[0] = | ||
1153 | spec->autocfg.line_out_pins[0]; | ||
1154 | else | ||
1155 | return; | ||
1156 | } | ||
1157 | |||
1158 | if (!spec->autocfg.hp_pins[0]) { | 1232 | if (!spec->autocfg.hp_pins[0]) { |
1159 | tmp = (ass >> 11) & 0x3; /* HP to chassis */ | 1233 | tmp = (ass >> 11) & 0x3; /* HP to chassis */ |
1160 | if (tmp == 0) | 1234 | if (tmp == 0) |
@@ -1164,23 +1238,23 @@ do_sku: | |||
1164 | else if (tmp == 2) | 1238 | else if (tmp == 2) |
1165 | spec->autocfg.hp_pins[0] = portd; | 1239 | spec->autocfg.hp_pins[0] = portd; |
1166 | else | 1240 | else |
1167 | return; | 1241 | return 1; |
1168 | } | 1242 | } |
1169 | if (spec->autocfg.hp_pins[0]) | ||
1170 | snd_hda_codec_write(codec, spec->autocfg.hp_pins[0], 0, | ||
1171 | AC_VERB_SET_UNSOLICITED_ENABLE, | ||
1172 | AC_USRSP_EN | ALC880_HP_EVENT); | ||
1173 | |||
1174 | #if 0 /* it's broken in some acses -- temporarily disabled */ | ||
1175 | if (spec->autocfg.input_pins[AUTO_PIN_MIC] && | ||
1176 | spec->autocfg.input_pins[AUTO_PIN_FRONT_MIC]) | ||
1177 | snd_hda_codec_write(codec, | ||
1178 | spec->autocfg.input_pins[AUTO_PIN_MIC], 0, | ||
1179 | AC_VERB_SET_UNSOLICITED_ENABLE, | ||
1180 | AC_USRSP_EN | ALC880_MIC_EVENT); | ||
1181 | #endif /* disabled */ | ||
1182 | 1243 | ||
1183 | spec->unsol_event = alc_sku_unsol_event; | 1244 | alc_init_auto_hp(codec); |
1245 | return 1; | ||
1246 | } | ||
1247 | |||
1248 | static void alc_ssid_check(struct hda_codec *codec, | ||
1249 | hda_nid_t porta, hda_nid_t porte, hda_nid_t portd) | ||
1250 | { | ||
1251 | if (!alc_subsystem_id(codec, porta, porte, portd)) { | ||
1252 | struct alc_spec *spec = codec->spec; | ||
1253 | snd_printd("realtek: " | ||
1254 | "Enable default setup for auto mode as fallback\n"); | ||
1255 | spec->init_amp = ALC_INIT_DEFAULT; | ||
1256 | alc_init_auto_hp(codec); | ||
1257 | } | ||
1184 | } | 1258 | } |
1185 | 1259 | ||
1186 | /* | 1260 | /* |
@@ -1315,32 +1389,58 @@ static struct hda_verb alc888_fujitsu_xa3530_verbs[] = { | |||
1315 | {} | 1389 | {} |
1316 | }; | 1390 | }; |
1317 | 1391 | ||
1318 | static void alc888_fujitsu_xa3530_automute(struct hda_codec *codec) | 1392 | static void alc_automute_amp(struct hda_codec *codec) |
1319 | { | 1393 | { |
1320 | unsigned int present; | 1394 | struct alc_spec *spec = codec->spec; |
1321 | unsigned int bits; | 1395 | unsigned int val, mute; |
1322 | /* Line out presence */ | 1396 | hda_nid_t nid; |
1323 | present = snd_hda_codec_read(codec, 0x17, 0, | 1397 | int i; |
1324 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 1398 | |
1325 | /* HP out presence */ | 1399 | spec->jack_present = 0; |
1326 | present = present || snd_hda_codec_read(codec, 0x1b, 0, | 1400 | for (i = 0; i < ARRAY_SIZE(spec->autocfg.hp_pins); i++) { |
1327 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 1401 | nid = spec->autocfg.hp_pins[i]; |
1328 | bits = present ? HDA_AMP_MUTE : 0; | 1402 | if (!nid) |
1403 | break; | ||
1404 | val = snd_hda_codec_read(codec, nid, 0, | ||
1405 | AC_VERB_GET_PIN_SENSE, 0); | ||
1406 | if (val & AC_PINSENSE_PRESENCE) { | ||
1407 | spec->jack_present = 1; | ||
1408 | break; | ||
1409 | } | ||
1410 | } | ||
1411 | |||
1412 | mute = spec->jack_present ? HDA_AMP_MUTE : 0; | ||
1329 | /* Toggle internal speakers muting */ | 1413 | /* Toggle internal speakers muting */ |
1330 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | 1414 | for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) { |
1331 | HDA_AMP_MUTE, bits); | 1415 | nid = spec->autocfg.speaker_pins[i]; |
1332 | /* Toggle internal bass muting */ | 1416 | if (!nid) |
1333 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | 1417 | break; |
1334 | HDA_AMP_MUTE, bits); | 1418 | snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0, |
1419 | HDA_AMP_MUTE, mute); | ||
1420 | } | ||
1335 | } | 1421 | } |
1336 | 1422 | ||
1337 | static void alc888_fujitsu_xa3530_unsol_event(struct hda_codec *codec, | 1423 | static void alc_automute_amp_unsol_event(struct hda_codec *codec, |
1338 | unsigned int res) | 1424 | unsigned int res) |
1339 | { | 1425 | { |
1340 | if (res >> 26 == ALC880_HP_EVENT) | 1426 | if (codec->vendor_id == 0x10ec0880) |
1341 | alc888_fujitsu_xa3530_automute(codec); | 1427 | res >>= 28; |
1428 | else | ||
1429 | res >>= 26; | ||
1430 | if (res == ALC880_HP_EVENT) | ||
1431 | alc_automute_amp(codec); | ||
1342 | } | 1432 | } |
1343 | 1433 | ||
1434 | static void alc888_fujitsu_xa3530_init_hook(struct hda_codec *codec) | ||
1435 | { | ||
1436 | struct alc_spec *spec = codec->spec; | ||
1437 | |||
1438 | spec->autocfg.hp_pins[0] = 0x17; /* line-out */ | ||
1439 | spec->autocfg.hp_pins[1] = 0x1b; /* hp */ | ||
1440 | spec->autocfg.speaker_pins[0] = 0x14; /* speaker */ | ||
1441 | spec->autocfg.speaker_pins[1] = 0x15; /* bass */ | ||
1442 | alc_automute_amp(codec); | ||
1443 | } | ||
1344 | 1444 | ||
1345 | /* | 1445 | /* |
1346 | * ALC888 Acer Aspire 4930G model | 1446 | * ALC888 Acer Aspire 4930G model |
@@ -1364,6 +1464,78 @@ static struct hda_verb alc888_acer_aspire_4930g_verbs[] = { | |||
1364 | { } | 1464 | { } |
1365 | }; | 1465 | }; |
1366 | 1466 | ||
1467 | /* | ||
1468 | * ALC888 Acer Aspire 6530G model | ||
1469 | */ | ||
1470 | |||
1471 | static struct hda_verb alc888_acer_aspire_6530g_verbs[] = { | ||
1472 | /* Bias voltage on for external mic port */ | ||
1473 | {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN | PIN_VREF80}, | ||
1474 | /* Enable unsolicited event for HP jack */ | ||
1475 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | ||
1476 | /* Enable speaker output */ | ||
1477 | {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
1478 | {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
1479 | /* Enable headphone output */ | ||
1480 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | PIN_HP}, | ||
1481 | {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
1482 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
1483 | { } | ||
1484 | }; | ||
1485 | |||
1486 | /* | ||
1487 | * ALC889 Acer Aspire 8930G model | ||
1488 | */ | ||
1489 | |||
1490 | static struct hda_verb alc889_acer_aspire_8930g_verbs[] = { | ||
1491 | /* Front Mic: set to PIN_IN (empty by default) */ | ||
1492 | {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
1493 | /* Unselect Front Mic by default in input mixer 3 */ | ||
1494 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0xb)}, | ||
1495 | /* Enable unsolicited event for HP jack */ | ||
1496 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | ||
1497 | /* Connect Internal Front to Front */ | ||
1498 | {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
1499 | {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
1500 | {0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
1501 | /* Connect Internal Rear to Rear */ | ||
1502 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
1503 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
1504 | {0x1b, AC_VERB_SET_CONNECT_SEL, 0x01}, | ||
1505 | /* Connect Internal CLFE to CLFE */ | ||
1506 | {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
1507 | {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
1508 | {0x16, AC_VERB_SET_CONNECT_SEL, 0x02}, | ||
1509 | /* Connect HP out to Front */ | ||
1510 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | PIN_HP}, | ||
1511 | {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
1512 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
1513 | /* Enable all DACs */ | ||
1514 | /* DAC DISABLE/MUTE 1? */ | ||
1515 | /* setting bits 1-5 disables DAC nids 0x02-0x06 apparently. Init=0x38 */ | ||
1516 | {0x20, AC_VERB_SET_COEF_INDEX, 0x03}, | ||
1517 | {0x20, AC_VERB_SET_PROC_COEF, 0x0000}, | ||
1518 | /* DAC DISABLE/MUTE 2? */ | ||
1519 | /* some bit here disables the other DACs. Init=0x4900 */ | ||
1520 | {0x20, AC_VERB_SET_COEF_INDEX, 0x08}, | ||
1521 | {0x20, AC_VERB_SET_PROC_COEF, 0x0000}, | ||
1522 | /* Enable amplifiers */ | ||
1523 | {0x14, AC_VERB_SET_EAPD_BTLENABLE, 0x02}, | ||
1524 | {0x15, AC_VERB_SET_EAPD_BTLENABLE, 0x02}, | ||
1525 | /* DMIC fix | ||
1526 | * This laptop has a stereo digital microphone. The mics are only 1cm apart | ||
1527 | * which makes the stereo useless. However, either the mic or the ALC889 | ||
1528 | * makes the signal become a difference/sum signal instead of standard | ||
1529 | * stereo, which is annoying. So instead we flip this bit which makes the | ||
1530 | * codec replicate the sum signal to both channels, turning it into a | ||
1531 | * normal mono mic. | ||
1532 | */ | ||
1533 | /* DMIC_CONTROL? Init value = 0x0001 */ | ||
1534 | {0x20, AC_VERB_SET_COEF_INDEX, 0x0b}, | ||
1535 | {0x20, AC_VERB_SET_PROC_COEF, 0x0003}, | ||
1536 | { } | ||
1537 | }; | ||
1538 | |||
1367 | static struct hda_input_mux alc888_2_capture_sources[2] = { | 1539 | static struct hda_input_mux alc888_2_capture_sources[2] = { |
1368 | /* Front mic only available on one ADC */ | 1540 | /* Front mic only available on one ADC */ |
1369 | { | 1541 | { |
@@ -1385,6 +1557,57 @@ static struct hda_input_mux alc888_2_capture_sources[2] = { | |||
1385 | } | 1557 | } |
1386 | }; | 1558 | }; |
1387 | 1559 | ||
1560 | static struct hda_input_mux alc888_acer_aspire_6530_sources[2] = { | ||
1561 | /* Interal mic only available on one ADC */ | ||
1562 | { | ||
1563 | .num_items = 3, | ||
1564 | .items = { | ||
1565 | { "Ext Mic", 0x0 }, | ||
1566 | { "CD", 0x4 }, | ||
1567 | { "Int Mic", 0xb }, | ||
1568 | }, | ||
1569 | }, | ||
1570 | { | ||
1571 | .num_items = 2, | ||
1572 | .items = { | ||
1573 | { "Ext Mic", 0x0 }, | ||
1574 | { "CD", 0x4 }, | ||
1575 | }, | ||
1576 | } | ||
1577 | }; | ||
1578 | |||
1579 | static struct hda_input_mux alc889_capture_sources[3] = { | ||
1580 | /* Digital mic only available on first "ADC" */ | ||
1581 | { | ||
1582 | .num_items = 5, | ||
1583 | .items = { | ||
1584 | { "Mic", 0x0 }, | ||
1585 | { "Line", 0x2 }, | ||
1586 | { "CD", 0x4 }, | ||
1587 | { "Front Mic", 0xb }, | ||
1588 | { "Input Mix", 0xa }, | ||
1589 | }, | ||
1590 | }, | ||
1591 | { | ||
1592 | .num_items = 4, | ||
1593 | .items = { | ||
1594 | { "Mic", 0x0 }, | ||
1595 | { "Line", 0x2 }, | ||
1596 | { "CD", 0x4 }, | ||
1597 | { "Input Mix", 0xa }, | ||
1598 | }, | ||
1599 | }, | ||
1600 | { | ||
1601 | .num_items = 4, | ||
1602 | .items = { | ||
1603 | { "Mic", 0x0 }, | ||
1604 | { "Line", 0x2 }, | ||
1605 | { "CD", 0x4 }, | ||
1606 | { "Input Mix", 0xa }, | ||
1607 | }, | ||
1608 | } | ||
1609 | }; | ||
1610 | |||
1388 | static struct snd_kcontrol_new alc888_base_mixer[] = { | 1611 | static struct snd_kcontrol_new alc888_base_mixer[] = { |
1389 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 1612 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
1390 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 1613 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
@@ -1407,22 +1630,24 @@ static struct snd_kcontrol_new alc888_base_mixer[] = { | |||
1407 | { } /* end */ | 1630 | { } /* end */ |
1408 | }; | 1631 | }; |
1409 | 1632 | ||
1410 | static void alc888_acer_aspire_4930g_automute(struct hda_codec *codec) | 1633 | static void alc888_acer_aspire_4930g_init_hook(struct hda_codec *codec) |
1411 | { | 1634 | { |
1412 | unsigned int present; | 1635 | struct alc_spec *spec = codec->spec; |
1413 | unsigned int bits; | 1636 | |
1414 | present = snd_hda_codec_read(codec, 0x15, 0, | 1637 | spec->autocfg.hp_pins[0] = 0x15; |
1415 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 1638 | spec->autocfg.speaker_pins[0] = 0x14; |
1416 | bits = present ? HDA_AMP_MUTE : 0; | 1639 | alc_automute_amp(codec); |
1417 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
1418 | HDA_AMP_MUTE, bits); | ||
1419 | } | 1640 | } |
1420 | 1641 | ||
1421 | static void alc888_acer_aspire_4930g_unsol_event(struct hda_codec *codec, | 1642 | static void alc889_acer_aspire_8930g_init_hook(struct hda_codec *codec) |
1422 | unsigned int res) | ||
1423 | { | 1643 | { |
1424 | if (res >> 26 == ALC880_HP_EVENT) | 1644 | struct alc_spec *spec = codec->spec; |
1425 | alc888_acer_aspire_4930g_automute(codec); | 1645 | |
1646 | spec->autocfg.hp_pins[0] = 0x15; | ||
1647 | spec->autocfg.speaker_pins[0] = 0x14; | ||
1648 | spec->autocfg.speaker_pins[1] = 0x16; | ||
1649 | spec->autocfg.speaker_pins[2] = 0x1b; | ||
1650 | alc_automute_amp(codec); | ||
1426 | } | 1651 | } |
1427 | 1652 | ||
1428 | /* | 1653 | /* |
@@ -2390,21 +2615,6 @@ static struct hda_verb alc880_beep_init_verbs[] = { | |||
2390 | { } | 2615 | { } |
2391 | }; | 2616 | }; |
2392 | 2617 | ||
2393 | /* toggle speaker-output according to the hp-jack state */ | ||
2394 | static void alc880_uniwill_hp_automute(struct hda_codec *codec) | ||
2395 | { | ||
2396 | unsigned int present; | ||
2397 | unsigned char bits; | ||
2398 | |||
2399 | present = snd_hda_codec_read(codec, 0x14, 0, | ||
2400 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
2401 | bits = present ? HDA_AMP_MUTE : 0; | ||
2402 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | ||
2403 | HDA_AMP_MUTE, bits); | ||
2404 | snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0, | ||
2405 | HDA_AMP_MUTE, bits); | ||
2406 | } | ||
2407 | |||
2408 | /* auto-toggle front mic */ | 2618 | /* auto-toggle front mic */ |
2409 | static void alc880_uniwill_mic_automute(struct hda_codec *codec) | 2619 | static void alc880_uniwill_mic_automute(struct hda_codec *codec) |
2410 | { | 2620 | { |
@@ -2417,9 +2627,14 @@ static void alc880_uniwill_mic_automute(struct hda_codec *codec) | |||
2417 | snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits); | 2627 | snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits); |
2418 | } | 2628 | } |
2419 | 2629 | ||
2420 | static void alc880_uniwill_automute(struct hda_codec *codec) | 2630 | static void alc880_uniwill_init_hook(struct hda_codec *codec) |
2421 | { | 2631 | { |
2422 | alc880_uniwill_hp_automute(codec); | 2632 | struct alc_spec *spec = codec->spec; |
2633 | |||
2634 | spec->autocfg.hp_pins[0] = 0x14; | ||
2635 | spec->autocfg.speaker_pins[0] = 0x15; | ||
2636 | spec->autocfg.speaker_pins[0] = 0x16; | ||
2637 | alc_automute_amp(codec); | ||
2423 | alc880_uniwill_mic_automute(codec); | 2638 | alc880_uniwill_mic_automute(codec); |
2424 | } | 2639 | } |
2425 | 2640 | ||
@@ -2430,24 +2645,22 @@ static void alc880_uniwill_unsol_event(struct hda_codec *codec, | |||
2430 | * definition. 4bit tag is placed at 28 bit! | 2645 | * definition. 4bit tag is placed at 28 bit! |
2431 | */ | 2646 | */ |
2432 | switch (res >> 28) { | 2647 | switch (res >> 28) { |
2433 | case ALC880_HP_EVENT: | ||
2434 | alc880_uniwill_hp_automute(codec); | ||
2435 | break; | ||
2436 | case ALC880_MIC_EVENT: | 2648 | case ALC880_MIC_EVENT: |
2437 | alc880_uniwill_mic_automute(codec); | 2649 | alc880_uniwill_mic_automute(codec); |
2438 | break; | 2650 | break; |
2651 | default: | ||
2652 | alc_automute_amp_unsol_event(codec, res); | ||
2653 | break; | ||
2439 | } | 2654 | } |
2440 | } | 2655 | } |
2441 | 2656 | ||
2442 | static void alc880_uniwill_p53_hp_automute(struct hda_codec *codec) | 2657 | static void alc880_uniwill_p53_init_hook(struct hda_codec *codec) |
2443 | { | 2658 | { |
2444 | unsigned int present; | 2659 | struct alc_spec *spec = codec->spec; |
2445 | unsigned char bits; | ||
2446 | 2660 | ||
2447 | present = snd_hda_codec_read(codec, 0x14, 0, | 2661 | spec->autocfg.hp_pins[0] = 0x14; |
2448 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 2662 | spec->autocfg.speaker_pins[0] = 0x15; |
2449 | bits = present ? HDA_AMP_MUTE : 0; | 2663 | alc_automute_amp(codec); |
2450 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, HDA_AMP_MUTE, bits); | ||
2451 | } | 2664 | } |
2452 | 2665 | ||
2453 | static void alc880_uniwill_p53_dcvol_automute(struct hda_codec *codec) | 2666 | static void alc880_uniwill_p53_dcvol_automute(struct hda_codec *codec) |
@@ -2469,10 +2682,10 @@ static void alc880_uniwill_p53_unsol_event(struct hda_codec *codec, | |||
2469 | /* Looks like the unsol event is incompatible with the standard | 2682 | /* Looks like the unsol event is incompatible with the standard |
2470 | * definition. 4bit tag is placed at 28 bit! | 2683 | * definition. 4bit tag is placed at 28 bit! |
2471 | */ | 2684 | */ |
2472 | if ((res >> 28) == ALC880_HP_EVENT) | ||
2473 | alc880_uniwill_p53_hp_automute(codec); | ||
2474 | if ((res >> 28) == ALC880_DCVOL_EVENT) | 2685 | if ((res >> 28) == ALC880_DCVOL_EVENT) |
2475 | alc880_uniwill_p53_dcvol_automute(codec); | 2686 | alc880_uniwill_p53_dcvol_automute(codec); |
2687 | else | ||
2688 | alc_automute_amp_unsol_event(codec, res); | ||
2476 | } | 2689 | } |
2477 | 2690 | ||
2478 | /* | 2691 | /* |
@@ -2542,6 +2755,7 @@ static struct hda_verb alc880_pin_asus_init_verbs[] = { | |||
2542 | /* Enable GPIO mask and set output */ | 2755 | /* Enable GPIO mask and set output */ |
2543 | #define alc880_gpio1_init_verbs alc_gpio1_init_verbs | 2756 | #define alc880_gpio1_init_verbs alc_gpio1_init_verbs |
2544 | #define alc880_gpio2_init_verbs alc_gpio2_init_verbs | 2757 | #define alc880_gpio2_init_verbs alc_gpio2_init_verbs |
2758 | #define alc880_gpio3_init_verbs alc_gpio3_init_verbs | ||
2545 | 2759 | ||
2546 | /* Clevo m520g init */ | 2760 | /* Clevo m520g init */ |
2547 | static struct hda_verb alc880_pin_clevo_init_verbs[] = { | 2761 | static struct hda_verb alc880_pin_clevo_init_verbs[] = { |
@@ -2704,30 +2918,18 @@ static struct hda_verb alc880_lg_init_verbs[] = { | |||
2704 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | 2918 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, |
2705 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | 2919 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, |
2706 | /* jack sense */ | 2920 | /* jack sense */ |
2707 | {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | 0x1}, | 2921 | {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT}, |
2708 | { } | 2922 | { } |
2709 | }; | 2923 | }; |
2710 | 2924 | ||
2711 | /* toggle speaker-output according to the hp-jack state */ | 2925 | /* toggle speaker-output according to the hp-jack state */ |
2712 | static void alc880_lg_automute(struct hda_codec *codec) | 2926 | static void alc880_lg_init_hook(struct hda_codec *codec) |
2713 | { | 2927 | { |
2714 | unsigned int present; | 2928 | struct alc_spec *spec = codec->spec; |
2715 | unsigned char bits; | ||
2716 | |||
2717 | present = snd_hda_codec_read(codec, 0x1b, 0, | ||
2718 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
2719 | bits = present ? HDA_AMP_MUTE : 0; | ||
2720 | snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 0, | ||
2721 | HDA_AMP_MUTE, bits); | ||
2722 | } | ||
2723 | 2929 | ||
2724 | static void alc880_lg_unsol_event(struct hda_codec *codec, unsigned int res) | 2930 | spec->autocfg.hp_pins[0] = 0x1b; |
2725 | { | 2931 | spec->autocfg.speaker_pins[0] = 0x17; |
2726 | /* Looks like the unsol event is incompatible with the standard | 2932 | alc_automute_amp(codec); |
2727 | * definition. 4bit tag is placed at 28 bit! | ||
2728 | */ | ||
2729 | if ((res >> 28) == 0x01) | ||
2730 | alc880_lg_automute(codec); | ||
2731 | } | 2933 | } |
2732 | 2934 | ||
2733 | /* | 2935 | /* |
@@ -2801,30 +3003,18 @@ static struct hda_verb alc880_lg_lw_init_verbs[] = { | |||
2801 | {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, | 3003 | {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, |
2802 | {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | 3004 | {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, |
2803 | /* jack sense */ | 3005 | /* jack sense */ |
2804 | {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | 0x1}, | 3006 | {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT}, |
2805 | { } | 3007 | { } |
2806 | }; | 3008 | }; |
2807 | 3009 | ||
2808 | /* toggle speaker-output according to the hp-jack state */ | 3010 | /* toggle speaker-output according to the hp-jack state */ |
2809 | static void alc880_lg_lw_automute(struct hda_codec *codec) | 3011 | static void alc880_lg_lw_init_hook(struct hda_codec *codec) |
2810 | { | 3012 | { |
2811 | unsigned int present; | 3013 | struct alc_spec *spec = codec->spec; |
2812 | unsigned char bits; | ||
2813 | |||
2814 | present = snd_hda_codec_read(codec, 0x1b, 0, | ||
2815 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
2816 | bits = present ? HDA_AMP_MUTE : 0; | ||
2817 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
2818 | HDA_AMP_MUTE, bits); | ||
2819 | } | ||
2820 | 3014 | ||
2821 | static void alc880_lg_lw_unsol_event(struct hda_codec *codec, unsigned int res) | 3015 | spec->autocfg.hp_pins[0] = 0x1b; |
2822 | { | 3016 | spec->autocfg.speaker_pins[0] = 0x14; |
2823 | /* Looks like the unsol event is incompatible with the standard | 3017 | alc_automute_amp(codec); |
2824 | * definition. 4bit tag is placed at 28 bit! | ||
2825 | */ | ||
2826 | if ((res >> 28) == 0x01) | ||
2827 | alc880_lg_lw_automute(codec); | ||
2828 | } | 3018 | } |
2829 | 3019 | ||
2830 | static struct snd_kcontrol_new alc880_medion_rim_mixer[] = { | 3020 | static struct snd_kcontrol_new alc880_medion_rim_mixer[] = { |
@@ -2871,16 +3061,10 @@ static struct hda_verb alc880_medion_rim_init_verbs[] = { | |||
2871 | /* toggle speaker-output according to the hp-jack state */ | 3061 | /* toggle speaker-output according to the hp-jack state */ |
2872 | static void alc880_medion_rim_automute(struct hda_codec *codec) | 3062 | static void alc880_medion_rim_automute(struct hda_codec *codec) |
2873 | { | 3063 | { |
2874 | unsigned int present; | 3064 | struct alc_spec *spec = codec->spec; |
2875 | unsigned char bits; | 3065 | alc_automute_amp(codec); |
2876 | 3066 | /* toggle EAPD */ | |
2877 | present = snd_hda_codec_read(codec, 0x14, 0, | 3067 | if (spec->jack_present) |
2878 | AC_VERB_GET_PIN_SENSE, 0) | ||
2879 | & AC_PINSENSE_PRESENCE; | ||
2880 | bits = present ? HDA_AMP_MUTE : 0; | ||
2881 | snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0, | ||
2882 | HDA_AMP_MUTE, bits); | ||
2883 | if (present) | ||
2884 | snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0); | 3068 | snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0); |
2885 | else | 3069 | else |
2886 | snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 2); | 3070 | snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 2); |
@@ -2896,6 +3080,15 @@ static void alc880_medion_rim_unsol_event(struct hda_codec *codec, | |||
2896 | alc880_medion_rim_automute(codec); | 3080 | alc880_medion_rim_automute(codec); |
2897 | } | 3081 | } |
2898 | 3082 | ||
3083 | static void alc880_medion_rim_init_hook(struct hda_codec *codec) | ||
3084 | { | ||
3085 | struct alc_spec *spec = codec->spec; | ||
3086 | |||
3087 | spec->autocfg.hp_pins[0] = 0x14; | ||
3088 | spec->autocfg.speaker_pins[0] = 0x1b; | ||
3089 | alc880_medion_rim_automute(codec); | ||
3090 | } | ||
3091 | |||
2899 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 3092 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
2900 | static struct hda_amp_list alc880_loopbacks[] = { | 3093 | static struct hda_amp_list alc880_loopbacks[] = { |
2901 | { 0x0b, HDA_INPUT, 0 }, | 3094 | { 0x0b, HDA_INPUT, 0 }, |
@@ -2924,8 +3117,7 @@ static int alc_init(struct hda_codec *codec) | |||
2924 | unsigned int i; | 3117 | unsigned int i; |
2925 | 3118 | ||
2926 | alc_fix_pll(codec); | 3119 | alc_fix_pll(codec); |
2927 | if (codec->vendor_id == 0x10ec0888) | 3120 | alc_auto_init_amp(codec, spec->init_amp); |
2928 | alc888_coef_init(codec); | ||
2929 | 3121 | ||
2930 | for (i = 0; i < spec->num_init_verbs; i++) | 3122 | for (i = 0; i < spec->num_init_verbs; i++) |
2931 | snd_hda_sequence_write(codec, spec->init_verbs[i]); | 3123 | snd_hda_sequence_write(codec, spec->init_verbs[i]); |
@@ -3127,7 +3319,10 @@ static int alc_build_pcms(struct hda_codec *codec) | |||
3127 | if (spec->no_analog) | 3319 | if (spec->no_analog) |
3128 | goto skip_analog; | 3320 | goto skip_analog; |
3129 | 3321 | ||
3322 | snprintf(spec->stream_name_analog, sizeof(spec->stream_name_analog), | ||
3323 | "%s Analog", codec->chip_name); | ||
3130 | info->name = spec->stream_name_analog; | 3324 | info->name = spec->stream_name_analog; |
3325 | |||
3131 | if (spec->stream_analog_playback) { | 3326 | if (spec->stream_analog_playback) { |
3132 | if (snd_BUG_ON(!spec->multiout.dac_nids)) | 3327 | if (snd_BUG_ON(!spec->multiout.dac_nids)) |
3133 | return -EINVAL; | 3328 | return -EINVAL; |
@@ -3153,6 +3348,9 @@ static int alc_build_pcms(struct hda_codec *codec) | |||
3153 | skip_analog: | 3348 | skip_analog: |
3154 | /* SPDIF for stream index #1 */ | 3349 | /* SPDIF for stream index #1 */ |
3155 | if (spec->multiout.dig_out_nid || spec->dig_in_nid) { | 3350 | if (spec->multiout.dig_out_nid || spec->dig_in_nid) { |
3351 | snprintf(spec->stream_name_digital, | ||
3352 | sizeof(spec->stream_name_digital), | ||
3353 | "%s Digital", codec->chip_name); | ||
3156 | codec->num_pcms = 2; | 3354 | codec->num_pcms = 2; |
3157 | codec->slave_dig_outs = spec->multiout.slave_dig_outs; | 3355 | codec->slave_dig_outs = spec->multiout.slave_dig_outs; |
3158 | info = spec->pcm_rec + 1; | 3356 | info = spec->pcm_rec + 1; |
@@ -3755,7 +3953,7 @@ static struct alc_config_preset alc880_presets[] = { | |||
3755 | .channel_mode = alc880_2_jack_modes, | 3953 | .channel_mode = alc880_2_jack_modes, |
3756 | .input_mux = &alc880_f1734_capture_source, | 3954 | .input_mux = &alc880_f1734_capture_source, |
3757 | .unsol_event = alc880_uniwill_p53_unsol_event, | 3955 | .unsol_event = alc880_uniwill_p53_unsol_event, |
3758 | .init_hook = alc880_uniwill_p53_hp_automute, | 3956 | .init_hook = alc880_uniwill_p53_init_hook, |
3759 | }, | 3957 | }, |
3760 | [ALC880_ASUS] = { | 3958 | [ALC880_ASUS] = { |
3761 | .mixers = { alc880_asus_mixer }, | 3959 | .mixers = { alc880_asus_mixer }, |
@@ -3832,7 +4030,7 @@ static struct alc_config_preset alc880_presets[] = { | |||
3832 | .need_dac_fix = 1, | 4030 | .need_dac_fix = 1, |
3833 | .input_mux = &alc880_capture_source, | 4031 | .input_mux = &alc880_capture_source, |
3834 | .unsol_event = alc880_uniwill_unsol_event, | 4032 | .unsol_event = alc880_uniwill_unsol_event, |
3835 | .init_hook = alc880_uniwill_automute, | 4033 | .init_hook = alc880_uniwill_init_hook, |
3836 | }, | 4034 | }, |
3837 | [ALC880_UNIWILL_P53] = { | 4035 | [ALC880_UNIWILL_P53] = { |
3838 | .mixers = { alc880_uniwill_p53_mixer }, | 4036 | .mixers = { alc880_uniwill_p53_mixer }, |
@@ -3844,7 +4042,7 @@ static struct alc_config_preset alc880_presets[] = { | |||
3844 | .channel_mode = alc880_threestack_modes, | 4042 | .channel_mode = alc880_threestack_modes, |
3845 | .input_mux = &alc880_capture_source, | 4043 | .input_mux = &alc880_capture_source, |
3846 | .unsol_event = alc880_uniwill_p53_unsol_event, | 4044 | .unsol_event = alc880_uniwill_p53_unsol_event, |
3847 | .init_hook = alc880_uniwill_p53_hp_automute, | 4045 | .init_hook = alc880_uniwill_p53_init_hook, |
3848 | }, | 4046 | }, |
3849 | [ALC880_FUJITSU] = { | 4047 | [ALC880_FUJITSU] = { |
3850 | .mixers = { alc880_fujitsu_mixer }, | 4048 | .mixers = { alc880_fujitsu_mixer }, |
@@ -3858,7 +4056,7 @@ static struct alc_config_preset alc880_presets[] = { | |||
3858 | .channel_mode = alc880_2_jack_modes, | 4056 | .channel_mode = alc880_2_jack_modes, |
3859 | .input_mux = &alc880_capture_source, | 4057 | .input_mux = &alc880_capture_source, |
3860 | .unsol_event = alc880_uniwill_p53_unsol_event, | 4058 | .unsol_event = alc880_uniwill_p53_unsol_event, |
3861 | .init_hook = alc880_uniwill_p53_hp_automute, | 4059 | .init_hook = alc880_uniwill_p53_init_hook, |
3862 | }, | 4060 | }, |
3863 | [ALC880_CLEVO] = { | 4061 | [ALC880_CLEVO] = { |
3864 | .mixers = { alc880_three_stack_mixer }, | 4062 | .mixers = { alc880_three_stack_mixer }, |
@@ -3883,8 +4081,8 @@ static struct alc_config_preset alc880_presets[] = { | |||
3883 | .channel_mode = alc880_lg_ch_modes, | 4081 | .channel_mode = alc880_lg_ch_modes, |
3884 | .need_dac_fix = 1, | 4082 | .need_dac_fix = 1, |
3885 | .input_mux = &alc880_lg_capture_source, | 4083 | .input_mux = &alc880_lg_capture_source, |
3886 | .unsol_event = alc880_lg_unsol_event, | 4084 | .unsol_event = alc_automute_amp_unsol_event, |
3887 | .init_hook = alc880_lg_automute, | 4085 | .init_hook = alc880_lg_init_hook, |
3888 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 4086 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
3889 | .loopbacks = alc880_lg_loopbacks, | 4087 | .loopbacks = alc880_lg_loopbacks, |
3890 | #endif | 4088 | #endif |
@@ -3899,8 +4097,8 @@ static struct alc_config_preset alc880_presets[] = { | |||
3899 | .num_channel_mode = ARRAY_SIZE(alc880_lg_lw_modes), | 4097 | .num_channel_mode = ARRAY_SIZE(alc880_lg_lw_modes), |
3900 | .channel_mode = alc880_lg_lw_modes, | 4098 | .channel_mode = alc880_lg_lw_modes, |
3901 | .input_mux = &alc880_lg_lw_capture_source, | 4099 | .input_mux = &alc880_lg_lw_capture_source, |
3902 | .unsol_event = alc880_lg_lw_unsol_event, | 4100 | .unsol_event = alc_automute_amp_unsol_event, |
3903 | .init_hook = alc880_lg_lw_automute, | 4101 | .init_hook = alc880_lg_lw_init_hook, |
3904 | }, | 4102 | }, |
3905 | [ALC880_MEDION_RIM] = { | 4103 | [ALC880_MEDION_RIM] = { |
3906 | .mixers = { alc880_medion_rim_mixer }, | 4104 | .mixers = { alc880_medion_rim_mixer }, |
@@ -3914,7 +4112,7 @@ static struct alc_config_preset alc880_presets[] = { | |||
3914 | .channel_mode = alc880_2_jack_modes, | 4112 | .channel_mode = alc880_2_jack_modes, |
3915 | .input_mux = &alc880_medion_rim_capture_source, | 4113 | .input_mux = &alc880_medion_rim_capture_source, |
3916 | .unsol_event = alc880_medion_rim_unsol_event, | 4114 | .unsol_event = alc880_medion_rim_unsol_event, |
3917 | .init_hook = alc880_medion_rim_automute, | 4115 | .init_hook = alc880_medion_rim_init_hook, |
3918 | }, | 4116 | }, |
3919 | #ifdef CONFIG_SND_DEBUG | 4117 | #ifdef CONFIG_SND_DEBUG |
3920 | [ALC880_TEST] = { | 4118 | [ALC880_TEST] = { |
@@ -4199,7 +4397,6 @@ static void alc880_auto_init_multi_out(struct hda_codec *codec) | |||
4199 | struct alc_spec *spec = codec->spec; | 4397 | struct alc_spec *spec = codec->spec; |
4200 | int i; | 4398 | int i; |
4201 | 4399 | ||
4202 | alc_subsystem_id(codec, 0x15, 0x1b, 0x14); | ||
4203 | for (i = 0; i < spec->autocfg.line_outs; i++) { | 4400 | for (i = 0; i < spec->autocfg.line_outs; i++) { |
4204 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; | 4401 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; |
4205 | int pin_type = get_pin_type(spec->autocfg.line_out_type); | 4402 | int pin_type = get_pin_type(spec->autocfg.line_out_type); |
@@ -4304,6 +4501,8 @@ static int alc880_parse_auto_config(struct hda_codec *codec) | |||
4304 | spec->num_mux_defs = 1; | 4501 | spec->num_mux_defs = 1; |
4305 | spec->input_mux = &spec->private_imux[0]; | 4502 | spec->input_mux = &spec->private_imux[0]; |
4306 | 4503 | ||
4504 | alc_ssid_check(codec, 0x15, 0x1b, 0x14); | ||
4505 | |||
4307 | return 1; | 4506 | return 1; |
4308 | } | 4507 | } |
4309 | 4508 | ||
@@ -4361,8 +4560,8 @@ static int patch_alc880(struct hda_codec *codec) | |||
4361 | alc880_models, | 4560 | alc880_models, |
4362 | alc880_cfg_tbl); | 4561 | alc880_cfg_tbl); |
4363 | if (board_config < 0) { | 4562 | if (board_config < 0) { |
4364 | printk(KERN_INFO "hda_codec: Unknown model for ALC880, " | 4563 | printk(KERN_INFO "hda_codec: Unknown model for %s, " |
4365 | "trying auto-probe from BIOS...\n"); | 4564 | "trying auto-probe from BIOS...\n", codec->chip_name); |
4366 | board_config = ALC880_AUTO; | 4565 | board_config = ALC880_AUTO; |
4367 | } | 4566 | } |
4368 | 4567 | ||
@@ -4389,12 +4588,10 @@ static int patch_alc880(struct hda_codec *codec) | |||
4389 | if (board_config != ALC880_AUTO) | 4588 | if (board_config != ALC880_AUTO) |
4390 | setup_preset(spec, &alc880_presets[board_config]); | 4589 | setup_preset(spec, &alc880_presets[board_config]); |
4391 | 4590 | ||
4392 | spec->stream_name_analog = "ALC880 Analog"; | ||
4393 | spec->stream_analog_playback = &alc880_pcm_analog_playback; | 4591 | spec->stream_analog_playback = &alc880_pcm_analog_playback; |
4394 | spec->stream_analog_capture = &alc880_pcm_analog_capture; | 4592 | spec->stream_analog_capture = &alc880_pcm_analog_capture; |
4395 | spec->stream_analog_alt_capture = &alc880_pcm_analog_alt_capture; | 4593 | spec->stream_analog_alt_capture = &alc880_pcm_analog_alt_capture; |
4396 | 4594 | ||
4397 | spec->stream_name_digital = "ALC880 Digital"; | ||
4398 | spec->stream_digital_playback = &alc880_pcm_digital_playback; | 4595 | spec->stream_digital_playback = &alc880_pcm_digital_playback; |
4399 | spec->stream_digital_capture = &alc880_pcm_digital_capture; | 4596 | spec->stream_digital_capture = &alc880_pcm_digital_capture; |
4400 | 4597 | ||
@@ -5679,7 +5876,6 @@ static void alc260_auto_init_multi_out(struct hda_codec *codec) | |||
5679 | struct alc_spec *spec = codec->spec; | 5876 | struct alc_spec *spec = codec->spec; |
5680 | hda_nid_t nid; | 5877 | hda_nid_t nid; |
5681 | 5878 | ||
5682 | alc_subsystem_id(codec, 0x10, 0x15, 0x0f); | ||
5683 | nid = spec->autocfg.line_out_pins[0]; | 5879 | nid = spec->autocfg.line_out_pins[0]; |
5684 | if (nid) { | 5880 | if (nid) { |
5685 | int pin_type = get_pin_type(spec->autocfg.line_out_type); | 5881 | int pin_type = get_pin_type(spec->autocfg.line_out_type); |
@@ -5789,6 +5985,8 @@ static int alc260_parse_auto_config(struct hda_codec *codec) | |||
5789 | spec->num_mux_defs = 1; | 5985 | spec->num_mux_defs = 1; |
5790 | spec->input_mux = &spec->private_imux[0]; | 5986 | spec->input_mux = &spec->private_imux[0]; |
5791 | 5987 | ||
5988 | alc_ssid_check(codec, 0x10, 0x15, 0x0f); | ||
5989 | |||
5792 | return 1; | 5990 | return 1; |
5793 | } | 5991 | } |
5794 | 5992 | ||
@@ -6006,8 +6204,9 @@ static int patch_alc260(struct hda_codec *codec) | |||
6006 | alc260_models, | 6204 | alc260_models, |
6007 | alc260_cfg_tbl); | 6205 | alc260_cfg_tbl); |
6008 | if (board_config < 0) { | 6206 | if (board_config < 0) { |
6009 | snd_printd(KERN_INFO "hda_codec: Unknown model for ALC260, " | 6207 | snd_printd(KERN_INFO "hda_codec: Unknown model for %s, " |
6010 | "trying auto-probe from BIOS...\n"); | 6208 | "trying auto-probe from BIOS...\n", |
6209 | codec->chip_name); | ||
6011 | board_config = ALC260_AUTO; | 6210 | board_config = ALC260_AUTO; |
6012 | } | 6211 | } |
6013 | 6212 | ||
@@ -6034,11 +6233,9 @@ static int patch_alc260(struct hda_codec *codec) | |||
6034 | if (board_config != ALC260_AUTO) | 6233 | if (board_config != ALC260_AUTO) |
6035 | setup_preset(spec, &alc260_presets[board_config]); | 6234 | setup_preset(spec, &alc260_presets[board_config]); |
6036 | 6235 | ||
6037 | spec->stream_name_analog = "ALC260 Analog"; | ||
6038 | spec->stream_analog_playback = &alc260_pcm_analog_playback; | 6236 | spec->stream_analog_playback = &alc260_pcm_analog_playback; |
6039 | spec->stream_analog_capture = &alc260_pcm_analog_capture; | 6237 | spec->stream_analog_capture = &alc260_pcm_analog_capture; |
6040 | 6238 | ||
6041 | spec->stream_name_digital = "ALC260 Digital"; | ||
6042 | spec->stream_digital_playback = &alc260_pcm_digital_playback; | 6239 | spec->stream_digital_playback = &alc260_pcm_digital_playback; |
6043 | spec->stream_digital_capture = &alc260_pcm_digital_capture; | 6240 | spec->stream_digital_capture = &alc260_pcm_digital_capture; |
6044 | 6241 | ||
@@ -6115,6 +6312,16 @@ static struct hda_input_mux alc882_capture_source = { | |||
6115 | { "CD", 0x4 }, | 6312 | { "CD", 0x4 }, |
6116 | }, | 6313 | }, |
6117 | }; | 6314 | }; |
6315 | |||
6316 | static struct hda_input_mux mb5_capture_source = { | ||
6317 | .num_items = 3, | ||
6318 | .items = { | ||
6319 | { "Mic", 0x1 }, | ||
6320 | { "Line", 0x2 }, | ||
6321 | { "CD", 0x4 }, | ||
6322 | }, | ||
6323 | }; | ||
6324 | |||
6118 | /* | 6325 | /* |
6119 | * 2ch mode | 6326 | * 2ch mode |
6120 | */ | 6327 | */ |
@@ -6172,7 +6379,7 @@ static struct hda_channel_mode alc882_sixstack_modes[2] = { | |||
6172 | }; | 6379 | }; |
6173 | 6380 | ||
6174 | /* | 6381 | /* |
6175 | * macbook pro ALC885 can switch LineIn to LineOut without loosing Mic | 6382 | * macbook pro ALC885 can switch LineIn to LineOut without losing Mic |
6176 | */ | 6383 | */ |
6177 | 6384 | ||
6178 | /* | 6385 | /* |
@@ -6202,6 +6409,34 @@ static struct hda_channel_mode alc885_mbp_6ch_modes[2] = { | |||
6202 | { 6, alc885_mbp_ch6_init }, | 6409 | { 6, alc885_mbp_ch6_init }, |
6203 | }; | 6410 | }; |
6204 | 6411 | ||
6412 | /* | ||
6413 | * 2ch | ||
6414 | * Speakers/Woofer/HP = Front | ||
6415 | * LineIn = Input | ||
6416 | */ | ||
6417 | static struct hda_verb alc885_mb5_ch2_init[] = { | ||
6418 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
6419 | {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, | ||
6420 | { } /* end */ | ||
6421 | }; | ||
6422 | |||
6423 | /* | ||
6424 | * 6ch mode | ||
6425 | * Speakers/HP = Front | ||
6426 | * Woofer = LFE | ||
6427 | * LineIn = Surround | ||
6428 | */ | ||
6429 | static struct hda_verb alc885_mb5_ch6_init[] = { | ||
6430 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
6431 | {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
6432 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, | ||
6433 | { } /* end */ | ||
6434 | }; | ||
6435 | |||
6436 | static struct hda_channel_mode alc885_mb5_6ch_modes[2] = { | ||
6437 | { 2, alc885_mb5_ch2_init }, | ||
6438 | { 6, alc885_mb5_ch6_init }, | ||
6439 | }; | ||
6205 | 6440 | ||
6206 | /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17 | 6441 | /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17 |
6207 | * Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b | 6442 | * Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b |
@@ -6244,6 +6479,25 @@ static struct snd_kcontrol_new alc885_mbp3_mixer[] = { | |||
6244 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT), | 6479 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT), |
6245 | { } /* end */ | 6480 | { } /* end */ |
6246 | }; | 6481 | }; |
6482 | |||
6483 | static struct snd_kcontrol_new alc885_mb5_mixer[] = { | ||
6484 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT), | ||
6485 | HDA_BIND_MUTE ("Front Playback Switch", 0x0c, 0x02, HDA_INPUT), | ||
6486 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT), | ||
6487 | HDA_BIND_MUTE ("Surround Playback Switch", 0x0d, 0x02, HDA_INPUT), | ||
6488 | HDA_CODEC_VOLUME("LFE Playback Volume", 0x0e, 0x00, HDA_OUTPUT), | ||
6489 | HDA_BIND_MUTE ("LFE Playback Switch", 0x0e, 0x02, HDA_INPUT), | ||
6490 | HDA_CODEC_VOLUME("HP Playback Volume", 0x0f, 0x00, HDA_OUTPUT), | ||
6491 | HDA_BIND_MUTE ("HP Playback Switch", 0x0f, 0x02, HDA_INPUT), | ||
6492 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | ||
6493 | HDA_CODEC_MUTE ("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | ||
6494 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x01, HDA_INPUT), | ||
6495 | HDA_CODEC_MUTE ("Mic Playback Switch", 0x0b, 0x01, HDA_INPUT), | ||
6496 | HDA_CODEC_VOLUME("Line Boost", 0x15, 0x00, HDA_INPUT), | ||
6497 | HDA_CODEC_VOLUME("Mic Boost", 0x19, 0x00, HDA_INPUT), | ||
6498 | { } /* end */ | ||
6499 | }; | ||
6500 | |||
6247 | static struct snd_kcontrol_new alc882_w2jc_mixer[] = { | 6501 | static struct snd_kcontrol_new alc882_w2jc_mixer[] = { |
6248 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 6502 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
6249 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 6503 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
@@ -6471,6 +6725,55 @@ static struct hda_verb alc882_macpro_init_verbs[] = { | |||
6471 | { } | 6725 | { } |
6472 | }; | 6726 | }; |
6473 | 6727 | ||
6728 | /* Macbook 5,1 */ | ||
6729 | static struct hda_verb alc885_mb5_init_verbs[] = { | ||
6730 | /* DACs */ | ||
6731 | {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
6732 | {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
6733 | {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
6734 | {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
6735 | /* Front mixer */ | ||
6736 | {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, | ||
6737 | {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, | ||
6738 | {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, | ||
6739 | /* Surround mixer */ | ||
6740 | {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, | ||
6741 | {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, | ||
6742 | {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, | ||
6743 | /* LFE mixer */ | ||
6744 | {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, | ||
6745 | {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, | ||
6746 | {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, | ||
6747 | /* HP mixer */ | ||
6748 | {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, | ||
6749 | {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, | ||
6750 | {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, | ||
6751 | /* Front Pin (0x0c) */ | ||
6752 | {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x01}, | ||
6753 | {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
6754 | {0x18, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
6755 | /* LFE Pin (0x0e) */ | ||
6756 | {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x01}, | ||
6757 | {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
6758 | {0x1a, AC_VERB_SET_CONNECT_SEL, 0x02}, | ||
6759 | /* HP Pin (0x0f) */ | ||
6760 | {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
6761 | {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
6762 | {0x14, AC_VERB_SET_CONNECT_SEL, 0x03}, | ||
6763 | /* Front Mic pin: input vref at 80% */ | ||
6764 | {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, | ||
6765 | {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, | ||
6766 | /* Line In pin */ | ||
6767 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | ||
6768 | {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, | ||
6769 | |||
6770 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, | ||
6771 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, | ||
6772 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, | ||
6773 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, | ||
6774 | { } | ||
6775 | }; | ||
6776 | |||
6474 | /* Macbook Pro rev3 */ | 6777 | /* Macbook Pro rev3 */ |
6475 | static struct hda_verb alc885_mbp3_init_verbs[] = { | 6778 | static struct hda_verb alc885_mbp3_init_verbs[] = { |
6476 | /* Front mixer: unmute input/output amp left and right (volume = 0) */ | 6779 | /* Front mixer: unmute input/output amp left and right (volume = 0) */ |
@@ -6560,45 +6863,23 @@ static struct hda_verb alc885_imac24_init_verbs[] = { | |||
6560 | }; | 6863 | }; |
6561 | 6864 | ||
6562 | /* Toggle speaker-output according to the hp-jack state */ | 6865 | /* Toggle speaker-output according to the hp-jack state */ |
6563 | static void alc885_imac24_automute(struct hda_codec *codec) | 6866 | static void alc885_imac24_automute_init_hook(struct hda_codec *codec) |
6564 | { | 6867 | { |
6565 | unsigned int present; | 6868 | struct alc_spec *spec = codec->spec; |
6566 | |||
6567 | present = snd_hda_codec_read(codec, 0x14, 0, | ||
6568 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
6569 | snd_hda_codec_amp_stereo(codec, 0x18, HDA_OUTPUT, 0, | ||
6570 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
6571 | snd_hda_codec_amp_stereo(codec, 0x1a, HDA_OUTPUT, 0, | ||
6572 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
6573 | } | ||
6574 | 6869 | ||
6575 | /* Processes unsolicited events. */ | 6870 | spec->autocfg.hp_pins[0] = 0x14; |
6576 | static void alc885_imac24_unsol_event(struct hda_codec *codec, | 6871 | spec->autocfg.speaker_pins[0] = 0x18; |
6577 | unsigned int res) | 6872 | spec->autocfg.speaker_pins[1] = 0x1a; |
6578 | { | 6873 | alc_automute_amp(codec); |
6579 | /* Headphone insertion or removal. */ | ||
6580 | if ((res >> 26) == ALC880_HP_EVENT) | ||
6581 | alc885_imac24_automute(codec); | ||
6582 | } | 6874 | } |
6583 | 6875 | ||
6584 | static void alc885_mbp3_automute(struct hda_codec *codec) | 6876 | static void alc885_mbp3_init_hook(struct hda_codec *codec) |
6585 | { | 6877 | { |
6586 | unsigned int present; | 6878 | struct alc_spec *spec = codec->spec; |
6587 | |||
6588 | present = snd_hda_codec_read(codec, 0x15, 0, | ||
6589 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
6590 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
6591 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
6592 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | ||
6593 | HDA_AMP_MUTE, present ? 0 : HDA_AMP_MUTE); | ||
6594 | 6879 | ||
6595 | } | 6880 | spec->autocfg.hp_pins[0] = 0x15; |
6596 | static void alc885_mbp3_unsol_event(struct hda_codec *codec, | 6881 | spec->autocfg.speaker_pins[0] = 0x14; |
6597 | unsigned int res) | 6882 | alc_automute_amp(codec); |
6598 | { | ||
6599 | /* Headphone insertion or removal. */ | ||
6600 | if ((res >> 26) == ALC880_HP_EVENT) | ||
6601 | alc885_mbp3_automute(codec); | ||
6602 | } | 6883 | } |
6603 | 6884 | ||
6604 | 6885 | ||
@@ -6623,24 +6904,25 @@ static struct hda_verb alc882_targa_verbs[] = { | |||
6623 | /* toggle speaker-output according to the hp-jack state */ | 6904 | /* toggle speaker-output according to the hp-jack state */ |
6624 | static void alc882_targa_automute(struct hda_codec *codec) | 6905 | static void alc882_targa_automute(struct hda_codec *codec) |
6625 | { | 6906 | { |
6626 | unsigned int present; | 6907 | struct alc_spec *spec = codec->spec; |
6627 | 6908 | alc_automute_amp(codec); | |
6628 | present = snd_hda_codec_read(codec, 0x14, 0, | ||
6629 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
6630 | snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0, | ||
6631 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
6632 | snd_hda_codec_write_cache(codec, 1, 0, AC_VERB_SET_GPIO_DATA, | 6909 | snd_hda_codec_write_cache(codec, 1, 0, AC_VERB_SET_GPIO_DATA, |
6633 | present ? 1 : 3); | 6910 | spec->jack_present ? 1 : 3); |
6911 | } | ||
6912 | |||
6913 | static void alc882_targa_init_hook(struct hda_codec *codec) | ||
6914 | { | ||
6915 | struct alc_spec *spec = codec->spec; | ||
6916 | |||
6917 | spec->autocfg.hp_pins[0] = 0x14; | ||
6918 | spec->autocfg.speaker_pins[0] = 0x1b; | ||
6919 | alc882_targa_automute(codec); | ||
6634 | } | 6920 | } |
6635 | 6921 | ||
6636 | static void alc882_targa_unsol_event(struct hda_codec *codec, unsigned int res) | 6922 | static void alc882_targa_unsol_event(struct hda_codec *codec, unsigned int res) |
6637 | { | 6923 | { |
6638 | /* Looks like the unsol event is incompatible with the standard | 6924 | if ((res >> 26) == ALC880_HP_EVENT) |
6639 | * definition. 4bit tag is placed at 26 bit! | ||
6640 | */ | ||
6641 | if (((res >> 26) == ALC880_HP_EVENT)) { | ||
6642 | alc882_targa_automute(codec); | 6925 | alc882_targa_automute(codec); |
6643 | } | ||
6644 | } | 6926 | } |
6645 | 6927 | ||
6646 | static struct hda_verb alc882_asus_a7j_verbs[] = { | 6928 | static struct hda_verb alc882_asus_a7j_verbs[] = { |
@@ -6722,7 +7004,7 @@ static void alc885_macpro_init_hook(struct hda_codec *codec) | |||
6722 | static void alc885_imac24_init_hook(struct hda_codec *codec) | 7004 | static void alc885_imac24_init_hook(struct hda_codec *codec) |
6723 | { | 7005 | { |
6724 | alc885_macpro_init_hook(codec); | 7006 | alc885_macpro_init_hook(codec); |
6725 | alc885_imac24_automute(codec); | 7007 | alc885_imac24_automute_init_hook(codec); |
6726 | } | 7008 | } |
6727 | 7009 | ||
6728 | /* | 7010 | /* |
@@ -6797,7 +7079,7 @@ static struct hda_verb alc882_auto_init_verbs[] = { | |||
6797 | #define alc882_loopbacks alc880_loopbacks | 7079 | #define alc882_loopbacks alc880_loopbacks |
6798 | #endif | 7080 | #endif |
6799 | 7081 | ||
6800 | /* pcm configuration: identiacal with ALC880 */ | 7082 | /* pcm configuration: identical with ALC880 */ |
6801 | #define alc882_pcm_analog_playback alc880_pcm_analog_playback | 7083 | #define alc882_pcm_analog_playback alc880_pcm_analog_playback |
6802 | #define alc882_pcm_analog_capture alc880_pcm_analog_capture | 7084 | #define alc882_pcm_analog_capture alc880_pcm_analog_capture |
6803 | #define alc882_pcm_digital_playback alc880_pcm_digital_playback | 7085 | #define alc882_pcm_digital_playback alc880_pcm_digital_playback |
@@ -6815,6 +7097,7 @@ static const char *alc882_models[ALC882_MODEL_LAST] = { | |||
6815 | [ALC882_ASUS_A7J] = "asus-a7j", | 7097 | [ALC882_ASUS_A7J] = "asus-a7j", |
6816 | [ALC882_ASUS_A7M] = "asus-a7m", | 7098 | [ALC882_ASUS_A7M] = "asus-a7m", |
6817 | [ALC885_MACPRO] = "macpro", | 7099 | [ALC885_MACPRO] = "macpro", |
7100 | [ALC885_MB5] = "mb5", | ||
6818 | [ALC885_MBP3] = "mbp3", | 7101 | [ALC885_MBP3] = "mbp3", |
6819 | [ALC885_IMAC24] = "imac24", | 7102 | [ALC885_IMAC24] = "imac24", |
6820 | [ALC882_AUTO] = "auto", | 7103 | [ALC882_AUTO] = "auto", |
@@ -6892,8 +7175,20 @@ static struct alc_config_preset alc882_presets[] = { | |||
6892 | .input_mux = &alc882_capture_source, | 7175 | .input_mux = &alc882_capture_source, |
6893 | .dig_out_nid = ALC882_DIGOUT_NID, | 7176 | .dig_out_nid = ALC882_DIGOUT_NID, |
6894 | .dig_in_nid = ALC882_DIGIN_NID, | 7177 | .dig_in_nid = ALC882_DIGIN_NID, |
6895 | .unsol_event = alc885_mbp3_unsol_event, | 7178 | .unsol_event = alc_automute_amp_unsol_event, |
6896 | .init_hook = alc885_mbp3_automute, | 7179 | .init_hook = alc885_mbp3_init_hook, |
7180 | }, | ||
7181 | [ALC885_MB5] = { | ||
7182 | .mixers = { alc885_mb5_mixer, alc882_chmode_mixer }, | ||
7183 | .init_verbs = { alc885_mb5_init_verbs, | ||
7184 | alc880_gpio1_init_verbs }, | ||
7185 | .num_dacs = ARRAY_SIZE(alc882_dac_nids), | ||
7186 | .dac_nids = alc882_dac_nids, | ||
7187 | .channel_mode = alc885_mb5_6ch_modes, | ||
7188 | .num_channel_mode = ARRAY_SIZE(alc885_mb5_6ch_modes), | ||
7189 | .input_mux = &mb5_capture_source, | ||
7190 | .dig_out_nid = ALC882_DIGOUT_NID, | ||
7191 | .dig_in_nid = ALC882_DIGIN_NID, | ||
6897 | }, | 7192 | }, |
6898 | [ALC885_MACPRO] = { | 7193 | [ALC885_MACPRO] = { |
6899 | .mixers = { alc882_macpro_mixer }, | 7194 | .mixers = { alc882_macpro_mixer }, |
@@ -6917,7 +7212,7 @@ static struct alc_config_preset alc882_presets[] = { | |||
6917 | .num_channel_mode = ARRAY_SIZE(alc882_ch_modes), | 7212 | .num_channel_mode = ARRAY_SIZE(alc882_ch_modes), |
6918 | .channel_mode = alc882_ch_modes, | 7213 | .channel_mode = alc882_ch_modes, |
6919 | .input_mux = &alc882_capture_source, | 7214 | .input_mux = &alc882_capture_source, |
6920 | .unsol_event = alc885_imac24_unsol_event, | 7215 | .unsol_event = alc_automute_amp_unsol_event, |
6921 | .init_hook = alc885_imac24_init_hook, | 7216 | .init_hook = alc885_imac24_init_hook, |
6922 | }, | 7217 | }, |
6923 | [ALC882_TARGA] = { | 7218 | [ALC882_TARGA] = { |
@@ -6934,7 +7229,7 @@ static struct alc_config_preset alc882_presets[] = { | |||
6934 | .need_dac_fix = 1, | 7229 | .need_dac_fix = 1, |
6935 | .input_mux = &alc882_capture_source, | 7230 | .input_mux = &alc882_capture_source, |
6936 | .unsol_event = alc882_targa_unsol_event, | 7231 | .unsol_event = alc882_targa_unsol_event, |
6937 | .init_hook = alc882_targa_automute, | 7232 | .init_hook = alc882_targa_init_hook, |
6938 | }, | 7233 | }, |
6939 | [ALC882_ASUS_A7J] = { | 7234 | [ALC882_ASUS_A7J] = { |
6940 | .mixers = { alc882_asus_a7j_mixer, alc882_chmode_mixer }, | 7235 | .mixers = { alc882_asus_a7j_mixer, alc882_chmode_mixer }, |
@@ -7014,7 +7309,6 @@ static void alc882_auto_init_multi_out(struct hda_codec *codec) | |||
7014 | struct alc_spec *spec = codec->spec; | 7309 | struct alc_spec *spec = codec->spec; |
7015 | int i; | 7310 | int i; |
7016 | 7311 | ||
7017 | alc_subsystem_id(codec, 0x15, 0x1b, 0x14); | ||
7018 | for (i = 0; i <= HDA_SIDE; i++) { | 7312 | for (i = 0; i <= HDA_SIDE; i++) { |
7019 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; | 7313 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; |
7020 | int pin_type = get_pin_type(spec->autocfg.line_out_type); | 7314 | int pin_type = get_pin_type(spec->autocfg.line_out_type); |
@@ -7197,10 +7491,17 @@ static int patch_alc882(struct hda_codec *codec) | |||
7197 | case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */ | 7491 | case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */ |
7198 | case 0x106b00a4: /* MacbookPro4,1 */ | 7492 | case 0x106b00a4: /* MacbookPro4,1 */ |
7199 | case 0x106b2c00: /* Macbook Pro rev3 */ | 7493 | case 0x106b2c00: /* Macbook Pro rev3 */ |
7200 | case 0x106b3600: /* Macbook 3.1 */ | 7494 | /* Macbook 3.1 (0x106b3600) is handled by patch_alc883() */ |
7201 | case 0x106b3800: /* MacbookPro4,1 - latter revision */ | 7495 | case 0x106b3800: /* MacbookPro4,1 - latter revision */ |
7202 | board_config = ALC885_MBP3; | 7496 | board_config = ALC885_MBP3; |
7203 | break; | 7497 | break; |
7498 | case 0x106b3f00: /* Macbook 5,1 */ | ||
7499 | case 0x106b4000: /* Macbook Pro 5,1 - FIXME: HP jack sense | ||
7500 | * seems not working, so apparently | ||
7501 | * no perfect solution yet | ||
7502 | */ | ||
7503 | board_config = ALC885_MB5; | ||
7504 | break; | ||
7204 | default: | 7505 | default: |
7205 | /* ALC889A is handled better as ALC888-compatible */ | 7506 | /* ALC889A is handled better as ALC888-compatible */ |
7206 | if (codec->revision_id == 0x100101 || | 7507 | if (codec->revision_id == 0x100101 || |
@@ -7208,8 +7509,9 @@ static int patch_alc882(struct hda_codec *codec) | |||
7208 | alc_free(codec); | 7509 | alc_free(codec); |
7209 | return patch_alc883(codec); | 7510 | return patch_alc883(codec); |
7210 | } | 7511 | } |
7211 | printk(KERN_INFO "hda_codec: Unknown model for ALC882, " | 7512 | printk(KERN_INFO "hda_codec: Unknown model for %s, " |
7212 | "trying auto-probe from BIOS...\n"); | 7513 | "trying auto-probe from BIOS...\n", |
7514 | codec->chip_name); | ||
7213 | board_config = ALC882_AUTO; | 7515 | board_config = ALC882_AUTO; |
7214 | } | 7516 | } |
7215 | } | 7517 | } |
@@ -7239,14 +7541,6 @@ static int patch_alc882(struct hda_codec *codec) | |||
7239 | if (board_config != ALC882_AUTO) | 7541 | if (board_config != ALC882_AUTO) |
7240 | setup_preset(spec, &alc882_presets[board_config]); | 7542 | setup_preset(spec, &alc882_presets[board_config]); |
7241 | 7543 | ||
7242 | if (codec->vendor_id == 0x10ec0885) { | ||
7243 | spec->stream_name_analog = "ALC885 Analog"; | ||
7244 | spec->stream_name_digital = "ALC885 Digital"; | ||
7245 | } else { | ||
7246 | spec->stream_name_analog = "ALC882 Analog"; | ||
7247 | spec->stream_name_digital = "ALC882 Digital"; | ||
7248 | } | ||
7249 | |||
7250 | spec->stream_analog_playback = &alc882_pcm_analog_playback; | 7544 | spec->stream_analog_playback = &alc882_pcm_analog_playback; |
7251 | spec->stream_analog_capture = &alc882_pcm_analog_capture; | 7545 | spec->stream_analog_capture = &alc882_pcm_analog_capture; |
7252 | /* FIXME: setup DAC5 */ | 7546 | /* FIXME: setup DAC5 */ |
@@ -7256,7 +7550,6 @@ static int patch_alc882(struct hda_codec *codec) | |||
7256 | spec->stream_digital_playback = &alc882_pcm_digital_playback; | 7550 | spec->stream_digital_playback = &alc882_pcm_digital_playback; |
7257 | spec->stream_digital_capture = &alc882_pcm_digital_capture; | 7551 | spec->stream_digital_capture = &alc882_pcm_digital_capture; |
7258 | 7552 | ||
7259 | spec->capture_style = CAPT_MIX; /* matrix-style capture */ | ||
7260 | if (!spec->adc_nids && spec->input_mux) { | 7553 | if (!spec->adc_nids && spec->input_mux) { |
7261 | /* check whether NID 0x07 is valid */ | 7554 | /* check whether NID 0x07 is valid */ |
7262 | unsigned int wcap = get_wcaps(codec, 0x07); | 7555 | unsigned int wcap = get_wcaps(codec, 0x07); |
@@ -7399,6 +7692,17 @@ static struct hda_input_mux alc883_asus_eee1601_capture_source = { | |||
7399 | }, | 7692 | }, |
7400 | }; | 7693 | }; |
7401 | 7694 | ||
7695 | static struct hda_input_mux alc889A_mb31_capture_source = { | ||
7696 | .num_items = 2, | ||
7697 | .items = { | ||
7698 | { "Mic", 0x0 }, | ||
7699 | /* Front Mic (0x01) unused */ | ||
7700 | { "Line", 0x2 }, | ||
7701 | /* Line 2 (0x03) unused */ | ||
7702 | /* CD (0x04) unsused? */ | ||
7703 | }, | ||
7704 | }; | ||
7705 | |||
7402 | /* | 7706 | /* |
7403 | * 2ch mode | 7707 | * 2ch mode |
7404 | */ | 7708 | */ |
@@ -7448,6 +7752,73 @@ static struct hda_channel_mode alc883_3ST_6ch_modes[3] = { | |||
7448 | { 6, alc883_3ST_ch6_init }, | 7752 | { 6, alc883_3ST_ch6_init }, |
7449 | }; | 7753 | }; |
7450 | 7754 | ||
7755 | |||
7756 | /* | ||
7757 | * 2ch mode | ||
7758 | */ | ||
7759 | static struct hda_verb alc883_4ST_ch2_init[] = { | ||
7760 | { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
7761 | { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
7762 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, | ||
7763 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, | ||
7764 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, | ||
7765 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, | ||
7766 | { } /* end */ | ||
7767 | }; | ||
7768 | |||
7769 | /* | ||
7770 | * 4ch mode | ||
7771 | */ | ||
7772 | static struct hda_verb alc883_4ST_ch4_init[] = { | ||
7773 | { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
7774 | { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
7775 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, | ||
7776 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, | ||
7777 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
7778 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
7779 | { 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 }, | ||
7780 | { } /* end */ | ||
7781 | }; | ||
7782 | |||
7783 | /* | ||
7784 | * 6ch mode | ||
7785 | */ | ||
7786 | static struct hda_verb alc883_4ST_ch6_init[] = { | ||
7787 | { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
7788 | { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
7789 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
7790 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
7791 | { 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 }, | ||
7792 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
7793 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
7794 | { 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 }, | ||
7795 | { } /* end */ | ||
7796 | }; | ||
7797 | |||
7798 | /* | ||
7799 | * 8ch mode | ||
7800 | */ | ||
7801 | static struct hda_verb alc883_4ST_ch8_init[] = { | ||
7802 | { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
7803 | { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
7804 | { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03 }, | ||
7805 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
7806 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
7807 | { 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 }, | ||
7808 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
7809 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
7810 | { 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 }, | ||
7811 | { } /* end */ | ||
7812 | }; | ||
7813 | |||
7814 | static struct hda_channel_mode alc883_4ST_8ch_modes[4] = { | ||
7815 | { 2, alc883_4ST_ch2_init }, | ||
7816 | { 4, alc883_4ST_ch4_init }, | ||
7817 | { 6, alc883_4ST_ch6_init }, | ||
7818 | { 8, alc883_4ST_ch8_init }, | ||
7819 | }; | ||
7820 | |||
7821 | |||
7451 | /* | 7822 | /* |
7452 | * 2ch mode | 7823 | * 2ch mode |
7453 | */ | 7824 | */ |
@@ -7517,6 +7888,49 @@ static struct hda_channel_mode alc883_sixstack_modes[2] = { | |||
7517 | { 8, alc883_sixstack_ch8_init }, | 7888 | { 8, alc883_sixstack_ch8_init }, |
7518 | }; | 7889 | }; |
7519 | 7890 | ||
7891 | /* 2ch mode (Speaker:front, Subwoofer:CLFE, Line:input, Headphones:front) */ | ||
7892 | static struct hda_verb alc889A_mb31_ch2_init[] = { | ||
7893 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP as front */ | ||
7894 | {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */ | ||
7895 | {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Line as input */ | ||
7896 | {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Line off */ | ||
7897 | { } /* end */ | ||
7898 | }; | ||
7899 | |||
7900 | /* 4ch mode (Speaker:front, Subwoofer:CLFE, Line:CLFE, Headphones:front) */ | ||
7901 | static struct hda_verb alc889A_mb31_ch4_init[] = { | ||
7902 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP as front */ | ||
7903 | {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */ | ||
7904 | {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Line as output */ | ||
7905 | {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Line on */ | ||
7906 | { } /* end */ | ||
7907 | }; | ||
7908 | |||
7909 | /* 5ch mode (Speaker:front, Subwoofer:CLFE, Line:input, Headphones:rear) */ | ||
7910 | static struct hda_verb alc889A_mb31_ch5_init[] = { | ||
7911 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, /* HP as rear */ | ||
7912 | {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */ | ||
7913 | {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Line as input */ | ||
7914 | {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Line off */ | ||
7915 | { } /* end */ | ||
7916 | }; | ||
7917 | |||
7918 | /* 6ch mode (Speaker:front, Subwoofer:off, Line:CLFE, Headphones:Rear) */ | ||
7919 | static struct hda_verb alc889A_mb31_ch6_init[] = { | ||
7920 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, /* HP as front */ | ||
7921 | {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Subwoofer off */ | ||
7922 | {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Line as output */ | ||
7923 | {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Line on */ | ||
7924 | { } /* end */ | ||
7925 | }; | ||
7926 | |||
7927 | static struct hda_channel_mode alc889A_mb31_6ch_modes[4] = { | ||
7928 | { 2, alc889A_mb31_ch2_init }, | ||
7929 | { 4, alc889A_mb31_ch4_init }, | ||
7930 | { 5, alc889A_mb31_ch5_init }, | ||
7931 | { 6, alc889A_mb31_ch6_init }, | ||
7932 | }; | ||
7933 | |||
7520 | static struct hda_verb alc883_medion_eapd_verbs[] = { | 7934 | static struct hda_verb alc883_medion_eapd_verbs[] = { |
7521 | /* eanable EAPD on medion laptop */ | 7935 | /* eanable EAPD on medion laptop */ |
7522 | {0x20, AC_VERB_SET_COEF_INDEX, 0x07}, | 7936 | {0x20, AC_VERB_SET_COEF_INDEX, 0x07}, |
@@ -7685,7 +8099,7 @@ static struct snd_kcontrol_new alc883_fivestack_mixer[] = { | |||
7685 | { } /* end */ | 8099 | { } /* end */ |
7686 | }; | 8100 | }; |
7687 | 8101 | ||
7688 | static struct snd_kcontrol_new alc883_tagra_mixer[] = { | 8102 | static struct snd_kcontrol_new alc883_targa_mixer[] = { |
7689 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 8103 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
7690 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), | 8104 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), |
7691 | HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | 8105 | HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), |
@@ -7705,7 +8119,7 @@ static struct snd_kcontrol_new alc883_tagra_mixer[] = { | |||
7705 | { } /* end */ | 8119 | { } /* end */ |
7706 | }; | 8120 | }; |
7707 | 8121 | ||
7708 | static struct snd_kcontrol_new alc883_tagra_2ch_mixer[] = { | 8122 | static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = { |
7709 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 8123 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
7710 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), | 8124 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), |
7711 | HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | 8125 | HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), |
@@ -7770,6 +8184,19 @@ static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = { | |||
7770 | { } /* end */ | 8184 | { } /* end */ |
7771 | }; | 8185 | }; |
7772 | 8186 | ||
8187 | static struct snd_kcontrol_new alc888_acer_aspire_6530_mixer[] = { | ||
8188 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | ||
8189 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | ||
8190 | HDA_CODEC_VOLUME("LFE Playback Volume", 0x0f, 0x0, HDA_OUTPUT), | ||
8191 | HDA_BIND_MUTE("LFE Playback Switch", 0x0f, 2, HDA_INPUT), | ||
8192 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | ||
8193 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | ||
8194 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
8195 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | ||
8196 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
8197 | { } /* end */ | ||
8198 | }; | ||
8199 | |||
7773 | static struct snd_kcontrol_new alc888_lenovo_sky_mixer[] = { | 8200 | static struct snd_kcontrol_new alc888_lenovo_sky_mixer[] = { |
7774 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 8201 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
7775 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 8202 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
@@ -7782,8 +8209,6 @@ static struct snd_kcontrol_new alc888_lenovo_sky_mixer[] = { | |||
7782 | HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0d, 2, 2, HDA_INPUT), | 8209 | HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0d, 2, 2, HDA_INPUT), |
7783 | HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT), | 8210 | HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT), |
7784 | HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT), | 8211 | HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT), |
7785 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | ||
7786 | HDA_CODEC_MUTE("iSpeaker Playback Switch", 0x1a, 0x0, HDA_OUTPUT), | ||
7787 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | 8212 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), |
7788 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | 8213 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), |
7789 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | 8214 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), |
@@ -7797,6 +8222,42 @@ static struct snd_kcontrol_new alc888_lenovo_sky_mixer[] = { | |||
7797 | { } /* end */ | 8222 | { } /* end */ |
7798 | }; | 8223 | }; |
7799 | 8224 | ||
8225 | static struct snd_kcontrol_new alc889A_mb31_mixer[] = { | ||
8226 | /* Output mixers */ | ||
8227 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT), | ||
8228 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 0x02, HDA_INPUT), | ||
8229 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT), | ||
8230 | HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 0x02, HDA_INPUT), | ||
8231 | HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x00, | ||
8232 | HDA_OUTPUT), | ||
8233 | HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 0x02, HDA_INPUT), | ||
8234 | HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x00, HDA_OUTPUT), | ||
8235 | HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 0x02, HDA_INPUT), | ||
8236 | /* Output switches */ | ||
8237 | HDA_CODEC_MUTE("Enable Speaker", 0x14, 0x00, HDA_OUTPUT), | ||
8238 | HDA_CODEC_MUTE("Enable Headphones", 0x15, 0x00, HDA_OUTPUT), | ||
8239 | HDA_CODEC_MUTE_MONO("Enable LFE", 0x16, 2, 0x00, HDA_OUTPUT), | ||
8240 | /* Boost mixers */ | ||
8241 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT), | ||
8242 | HDA_CODEC_VOLUME("Line Boost", 0x1a, 0x00, HDA_INPUT), | ||
8243 | /* Input mixers */ | ||
8244 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x00, HDA_INPUT), | ||
8245 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x00, HDA_INPUT), | ||
8246 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | ||
8247 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | ||
8248 | { } /* end */ | ||
8249 | }; | ||
8250 | |||
8251 | static struct snd_kcontrol_new alc883_vaiott_mixer[] = { | ||
8252 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | ||
8253 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | ||
8254 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT), | ||
8255 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | ||
8256 | HDA_CODEC_VOLUME("Mic Boost", 0x19, 0, HDA_INPUT), | ||
8257 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | ||
8258 | { } /* end */ | ||
8259 | }; | ||
8260 | |||
7800 | static struct hda_bind_ctls alc883_bind_cap_vol = { | 8261 | static struct hda_bind_ctls alc883_bind_cap_vol = { |
7801 | .ops = &snd_hda_bind_vol, | 8262 | .ops = &snd_hda_bind_vol, |
7802 | .values = { | 8263 | .values = { |
@@ -7932,16 +8393,14 @@ static struct hda_verb alc883_init_verbs[] = { | |||
7932 | }; | 8393 | }; |
7933 | 8394 | ||
7934 | /* toggle speaker-output according to the hp-jack state */ | 8395 | /* toggle speaker-output according to the hp-jack state */ |
7935 | static void alc883_mitac_hp_automute(struct hda_codec *codec) | 8396 | static void alc883_mitac_init_hook(struct hda_codec *codec) |
7936 | { | 8397 | { |
7937 | unsigned int present; | 8398 | struct alc_spec *spec = codec->spec; |
7938 | 8399 | ||
7939 | present = snd_hda_codec_read(codec, 0x15, 0, | 8400 | spec->autocfg.hp_pins[0] = 0x15; |
7940 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 8401 | spec->autocfg.speaker_pins[0] = 0x14; |
7941 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | 8402 | spec->autocfg.speaker_pins[1] = 0x17; |
7942 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | 8403 | alc_automute_amp(codec); |
7943 | snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 0, | ||
7944 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
7945 | } | 8404 | } |
7946 | 8405 | ||
7947 | /* auto-toggle front mic */ | 8406 | /* auto-toggle front mic */ |
@@ -7958,25 +8417,6 @@ static void alc883_mitac_mic_automute(struct hda_codec *codec) | |||
7958 | } | 8417 | } |
7959 | */ | 8418 | */ |
7960 | 8419 | ||
7961 | static void alc883_mitac_automute(struct hda_codec *codec) | ||
7962 | { | ||
7963 | alc883_mitac_hp_automute(codec); | ||
7964 | /* alc883_mitac_mic_automute(codec); */ | ||
7965 | } | ||
7966 | |||
7967 | static void alc883_mitac_unsol_event(struct hda_codec *codec, | ||
7968 | unsigned int res) | ||
7969 | { | ||
7970 | switch (res >> 26) { | ||
7971 | case ALC880_HP_EVENT: | ||
7972 | alc883_mitac_hp_automute(codec); | ||
7973 | break; | ||
7974 | case ALC880_MIC_EVENT: | ||
7975 | /* alc883_mitac_mic_automute(codec); */ | ||
7976 | break; | ||
7977 | } | ||
7978 | } | ||
7979 | |||
7980 | static struct hda_verb alc883_mitac_verbs[] = { | 8420 | static struct hda_verb alc883_mitac_verbs[] = { |
7981 | /* HP */ | 8421 | /* HP */ |
7982 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, | 8422 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, |
@@ -8021,21 +8461,31 @@ static struct hda_verb alc883_2ch_fujitsu_pi2515_verbs[] = { | |||
8021 | { } /* end */ | 8461 | { } /* end */ |
8022 | }; | 8462 | }; |
8023 | 8463 | ||
8024 | static struct hda_verb alc883_tagra_verbs[] = { | 8464 | static struct hda_verb alc883_targa_verbs[] = { |
8025 | {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 8465 | {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
8026 | {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, | 8466 | {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, |
8027 | 8467 | ||
8028 | {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | 8468 | {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, |
8029 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | 8469 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, |
8030 | 8470 | ||
8031 | {0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */ | 8471 | /* Connect Line-Out side jack (SPDIF) to Side */ |
8032 | {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/surround */ | 8472 | {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, |
8033 | {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */ | 8473 | {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, |
8474 | {0x17, AC_VERB_SET_CONNECT_SEL, 0x03}, | ||
8475 | /* Connect Mic jack to CLFE */ | ||
8476 | {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
8477 | {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
8478 | {0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, | ||
8479 | /* Connect Line-in jack to Surround */ | ||
8480 | {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
8481 | {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
8482 | {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, | ||
8483 | /* Connect HP out jack to Front */ | ||
8484 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
8485 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
8486 | {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
8034 | 8487 | ||
8035 | {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | 8488 | {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, |
8036 | {0x01, AC_VERB_SET_GPIO_MASK, 0x03}, | ||
8037 | {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03}, | ||
8038 | {0x01, AC_VERB_SET_GPIO_DATA, 0x03}, | ||
8039 | 8489 | ||
8040 | { } /* end */ | 8490 | { } /* end */ |
8041 | }; | 8491 | }; |
@@ -8094,29 +8544,26 @@ static struct hda_verb alc888_6st_dell_verbs[] = { | |||
8094 | { } | 8544 | { } |
8095 | }; | 8545 | }; |
8096 | 8546 | ||
8097 | static void alc888_3st_hp_front_automute(struct hda_codec *codec) | 8547 | static struct hda_verb alc883_vaiott_verbs[] = { |
8098 | { | 8548 | /* HP */ |
8099 | unsigned int present, bits; | 8549 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, |
8550 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | ||
8100 | 8551 | ||
8101 | present = snd_hda_codec_read(codec, 0x1b, 0, | 8552 | /* enable unsolicited event */ |
8102 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 8553 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, |
8103 | bits = present ? HDA_AMP_MUTE : 0; | ||
8104 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
8105 | HDA_AMP_MUTE, bits); | ||
8106 | snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0, | ||
8107 | HDA_AMP_MUTE, bits); | ||
8108 | snd_hda_codec_amp_stereo(codec, 0x18, HDA_OUTPUT, 0, | ||
8109 | HDA_AMP_MUTE, bits); | ||
8110 | } | ||
8111 | 8554 | ||
8112 | static void alc888_3st_hp_unsol_event(struct hda_codec *codec, | 8555 | { } /* end */ |
8113 | unsigned int res) | 8556 | }; |
8557 | |||
8558 | static void alc888_3st_hp_init_hook(struct hda_codec *codec) | ||
8114 | { | 8559 | { |
8115 | switch (res >> 26) { | 8560 | struct alc_spec *spec = codec->spec; |
8116 | case ALC880_HP_EVENT: | 8561 | |
8117 | alc888_3st_hp_front_automute(codec); | 8562 | spec->autocfg.hp_pins[0] = 0x1b; |
8118 | break; | 8563 | spec->autocfg.speaker_pins[0] = 0x14; |
8119 | } | 8564 | spec->autocfg.speaker_pins[1] = 0x16; |
8565 | spec->autocfg.speaker_pins[2] = 0x18; | ||
8566 | alc_automute_amp(codec); | ||
8120 | } | 8567 | } |
8121 | 8568 | ||
8122 | static struct hda_verb alc888_3st_hp_verbs[] = { | 8569 | static struct hda_verb alc888_3st_hp_verbs[] = { |
@@ -8213,56 +8660,18 @@ static struct hda_verb alc883_medion_md2_verbs[] = { | |||
8213 | }; | 8660 | }; |
8214 | 8661 | ||
8215 | /* toggle speaker-output according to the hp-jack state */ | 8662 | /* toggle speaker-output according to the hp-jack state */ |
8216 | static void alc883_medion_md2_automute(struct hda_codec *codec) | 8663 | static void alc883_medion_md2_init_hook(struct hda_codec *codec) |
8217 | { | ||
8218 | unsigned int present; | ||
8219 | |||
8220 | present = snd_hda_codec_read(codec, 0x14, 0, | ||
8221 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
8222 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | ||
8223 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
8224 | } | ||
8225 | |||
8226 | static void alc883_medion_md2_unsol_event(struct hda_codec *codec, | ||
8227 | unsigned int res) | ||
8228 | { | ||
8229 | if ((res >> 26) == ALC880_HP_EVENT) | ||
8230 | alc883_medion_md2_automute(codec); | ||
8231 | } | ||
8232 | |||
8233 | /* toggle speaker-output according to the hp-jack state */ | ||
8234 | static void alc883_tagra_automute(struct hda_codec *codec) | ||
8235 | { | 8664 | { |
8236 | unsigned int present; | 8665 | struct alc_spec *spec = codec->spec; |
8237 | unsigned char bits; | ||
8238 | |||
8239 | present = snd_hda_codec_read(codec, 0x14, 0, | ||
8240 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
8241 | bits = present ? HDA_AMP_MUTE : 0; | ||
8242 | snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0, | ||
8243 | HDA_AMP_MUTE, bits); | ||
8244 | snd_hda_codec_write_cache(codec, 1, 0, AC_VERB_SET_GPIO_DATA, | ||
8245 | present ? 1 : 3); | ||
8246 | } | ||
8247 | 8666 | ||
8248 | static void alc883_tagra_unsol_event(struct hda_codec *codec, unsigned int res) | 8667 | spec->autocfg.hp_pins[0] = 0x14; |
8249 | { | 8668 | spec->autocfg.speaker_pins[0] = 0x15; |
8250 | if ((res >> 26) == ALC880_HP_EVENT) | 8669 | alc_automute_amp(codec); |
8251 | alc883_tagra_automute(codec); | ||
8252 | } | 8670 | } |
8253 | 8671 | ||
8254 | /* toggle speaker-output according to the hp-jack state */ | 8672 | /* toggle speaker-output according to the hp-jack state */ |
8255 | static void alc883_clevo_m720_hp_automute(struct hda_codec *codec) | 8673 | #define alc883_targa_init_hook alc882_targa_init_hook |
8256 | { | 8674 | #define alc883_targa_unsol_event alc882_targa_unsol_event |
8257 | unsigned int present; | ||
8258 | unsigned char bits; | ||
8259 | |||
8260 | present = snd_hda_codec_read(codec, 0x15, 0, AC_VERB_GET_PIN_SENSE, 0) | ||
8261 | & AC_PINSENSE_PRESENCE; | ||
8262 | bits = present ? HDA_AMP_MUTE : 0; | ||
8263 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
8264 | HDA_AMP_MUTE, bits); | ||
8265 | } | ||
8266 | 8675 | ||
8267 | static void alc883_clevo_m720_mic_automute(struct hda_codec *codec) | 8676 | static void alc883_clevo_m720_mic_automute(struct hda_codec *codec) |
8268 | { | 8677 | { |
@@ -8274,9 +8683,13 @@ static void alc883_clevo_m720_mic_automute(struct hda_codec *codec) | |||
8274 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | 8683 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); |
8275 | } | 8684 | } |
8276 | 8685 | ||
8277 | static void alc883_clevo_m720_automute(struct hda_codec *codec) | 8686 | static void alc883_clevo_m720_init_hook(struct hda_codec *codec) |
8278 | { | 8687 | { |
8279 | alc883_clevo_m720_hp_automute(codec); | 8688 | struct alc_spec *spec = codec->spec; |
8689 | |||
8690 | spec->autocfg.hp_pins[0] = 0x15; | ||
8691 | spec->autocfg.speaker_pins[0] = 0x14; | ||
8692 | alc_automute_amp(codec); | ||
8280 | alc883_clevo_m720_mic_automute(codec); | 8693 | alc883_clevo_m720_mic_automute(codec); |
8281 | } | 8694 | } |
8282 | 8695 | ||
@@ -8284,52 +8697,32 @@ static void alc883_clevo_m720_unsol_event(struct hda_codec *codec, | |||
8284 | unsigned int res) | 8697 | unsigned int res) |
8285 | { | 8698 | { |
8286 | switch (res >> 26) { | 8699 | switch (res >> 26) { |
8287 | case ALC880_HP_EVENT: | ||
8288 | alc883_clevo_m720_hp_automute(codec); | ||
8289 | break; | ||
8290 | case ALC880_MIC_EVENT: | 8700 | case ALC880_MIC_EVENT: |
8291 | alc883_clevo_m720_mic_automute(codec); | 8701 | alc883_clevo_m720_mic_automute(codec); |
8292 | break; | 8702 | break; |
8703 | default: | ||
8704 | alc_automute_amp_unsol_event(codec, res); | ||
8705 | break; | ||
8293 | } | 8706 | } |
8294 | } | 8707 | } |
8295 | 8708 | ||
8296 | /* toggle speaker-output according to the hp-jack state */ | 8709 | /* toggle speaker-output according to the hp-jack state */ |
8297 | static void alc883_2ch_fujitsu_pi2515_automute(struct hda_codec *codec) | 8710 | static void alc883_2ch_fujitsu_pi2515_init_hook(struct hda_codec *codec) |
8298 | { | 8711 | { |
8299 | unsigned int present; | 8712 | struct alc_spec *spec = codec->spec; |
8300 | unsigned char bits; | ||
8301 | |||
8302 | present = snd_hda_codec_read(codec, 0x14, 0, AC_VERB_GET_PIN_SENSE, 0) | ||
8303 | & AC_PINSENSE_PRESENCE; | ||
8304 | bits = present ? HDA_AMP_MUTE : 0; | ||
8305 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | ||
8306 | HDA_AMP_MUTE, bits); | ||
8307 | } | ||
8308 | 8713 | ||
8309 | static void alc883_2ch_fujitsu_pi2515_unsol_event(struct hda_codec *codec, | 8714 | spec->autocfg.hp_pins[0] = 0x14; |
8310 | unsigned int res) | 8715 | spec->autocfg.speaker_pins[0] = 0x15; |
8311 | { | 8716 | alc_automute_amp(codec); |
8312 | if ((res >> 26) == ALC880_HP_EVENT) | ||
8313 | alc883_2ch_fujitsu_pi2515_automute(codec); | ||
8314 | } | 8717 | } |
8315 | 8718 | ||
8316 | static void alc883_haier_w66_automute(struct hda_codec *codec) | 8719 | static void alc883_haier_w66_init_hook(struct hda_codec *codec) |
8317 | { | 8720 | { |
8318 | unsigned int present; | 8721 | struct alc_spec *spec = codec->spec; |
8319 | unsigned char bits; | ||
8320 | 8722 | ||
8321 | present = snd_hda_codec_read(codec, 0x1b, 0, | 8723 | spec->autocfg.hp_pins[0] = 0x1b; |
8322 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 8724 | spec->autocfg.speaker_pins[0] = 0x14; |
8323 | bits = present ? 0x80 : 0; | 8725 | alc_automute_amp(codec); |
8324 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
8325 | 0x80, bits); | ||
8326 | } | ||
8327 | |||
8328 | static void alc883_haier_w66_unsol_event(struct hda_codec *codec, | ||
8329 | unsigned int res) | ||
8330 | { | ||
8331 | if ((res >> 26) == ALC880_HP_EVENT) | ||
8332 | alc883_haier_w66_automute(codec); | ||
8333 | } | 8726 | } |
8334 | 8727 | ||
8335 | static void alc883_lenovo_101e_ispeaker_automute(struct hda_codec *codec) | 8728 | static void alc883_lenovo_101e_ispeaker_automute(struct hda_codec *codec) |
@@ -8337,8 +8730,8 @@ static void alc883_lenovo_101e_ispeaker_automute(struct hda_codec *codec) | |||
8337 | unsigned int present; | 8730 | unsigned int present; |
8338 | unsigned char bits; | 8731 | unsigned char bits; |
8339 | 8732 | ||
8340 | present = snd_hda_codec_read(codec, 0x14, 0, | 8733 | present = snd_hda_codec_read(codec, 0x14, 0, AC_VERB_GET_PIN_SENSE, 0) |
8341 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 8734 | & AC_PINSENSE_PRESENCE; |
8342 | bits = present ? HDA_AMP_MUTE : 0; | 8735 | bits = present ? HDA_AMP_MUTE : 0; |
8343 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | 8736 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, |
8344 | HDA_AMP_MUTE, bits); | 8737 | HDA_AMP_MUTE, bits); |
@@ -8368,23 +8761,14 @@ static void alc883_lenovo_101e_unsol_event(struct hda_codec *codec, | |||
8368 | } | 8761 | } |
8369 | 8762 | ||
8370 | /* toggle speaker-output according to the hp-jack state */ | 8763 | /* toggle speaker-output according to the hp-jack state */ |
8371 | static void alc883_acer_aspire_automute(struct hda_codec *codec) | 8764 | static void alc883_acer_aspire_init_hook(struct hda_codec *codec) |
8372 | { | 8765 | { |
8373 | unsigned int present; | 8766 | struct alc_spec *spec = codec->spec; |
8374 | 8767 | ||
8375 | present = snd_hda_codec_read(codec, 0x14, 0, | 8768 | spec->autocfg.hp_pins[0] = 0x14; |
8376 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 8769 | spec->autocfg.speaker_pins[0] = 0x15; |
8377 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | 8770 | spec->autocfg.speaker_pins[1] = 0x16; |
8378 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | 8771 | alc_automute_amp(codec); |
8379 | snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0, | ||
8380 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
8381 | } | ||
8382 | |||
8383 | static void alc883_acer_aspire_unsol_event(struct hda_codec *codec, | ||
8384 | unsigned int res) | ||
8385 | { | ||
8386 | if ((res >> 26) == ALC880_HP_EVENT) | ||
8387 | alc883_acer_aspire_automute(codec); | ||
8388 | } | 8772 | } |
8389 | 8773 | ||
8390 | static struct hda_verb alc883_acer_eapd_verbs[] = { | 8774 | static struct hda_verb alc883_acer_eapd_verbs[] = { |
@@ -8405,75 +8789,39 @@ static struct hda_verb alc883_acer_eapd_verbs[] = { | |||
8405 | { } | 8789 | { } |
8406 | }; | 8790 | }; |
8407 | 8791 | ||
8408 | static void alc888_6st_dell_front_automute(struct hda_codec *codec) | 8792 | static void alc888_6st_dell_init_hook(struct hda_codec *codec) |
8409 | { | 8793 | { |
8410 | unsigned int present; | 8794 | struct alc_spec *spec = codec->spec; |
8411 | 8795 | ||
8412 | present = snd_hda_codec_read(codec, 0x1b, 0, | 8796 | spec->autocfg.hp_pins[0] = 0x1b; |
8413 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 8797 | spec->autocfg.speaker_pins[0] = 0x14; |
8414 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | 8798 | spec->autocfg.speaker_pins[1] = 0x15; |
8415 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | 8799 | spec->autocfg.speaker_pins[2] = 0x16; |
8416 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | 8800 | spec->autocfg.speaker_pins[3] = 0x17; |
8417 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | 8801 | alc_automute_amp(codec); |
8418 | snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0, | ||
8419 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
8420 | snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 0, | ||
8421 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
8422 | } | 8802 | } |
8423 | 8803 | ||
8424 | static void alc888_6st_dell_unsol_event(struct hda_codec *codec, | 8804 | static void alc888_lenovo_sky_init_hook(struct hda_codec *codec) |
8425 | unsigned int res) | ||
8426 | { | 8805 | { |
8427 | switch (res >> 26) { | 8806 | struct alc_spec *spec = codec->spec; |
8428 | case ALC880_HP_EVENT: | ||
8429 | /* printk(KERN_DEBUG "hp_event\n"); */ | ||
8430 | alc888_6st_dell_front_automute(codec); | ||
8431 | break; | ||
8432 | } | ||
8433 | } | ||
8434 | |||
8435 | static void alc888_lenovo_sky_front_automute(struct hda_codec *codec) | ||
8436 | { | ||
8437 | unsigned int mute; | ||
8438 | unsigned int present; | ||
8439 | 8807 | ||
8440 | snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0); | 8808 | spec->autocfg.hp_pins[0] = 0x1b; |
8441 | present = snd_hda_codec_read(codec, 0x1b, 0, | 8809 | spec->autocfg.speaker_pins[0] = 0x14; |
8442 | AC_VERB_GET_PIN_SENSE, 0); | 8810 | spec->autocfg.speaker_pins[1] = 0x15; |
8443 | present = (present & 0x80000000) != 0; | 8811 | spec->autocfg.speaker_pins[2] = 0x16; |
8444 | if (present) { | 8812 | spec->autocfg.speaker_pins[3] = 0x17; |
8445 | /* mute internal speaker */ | 8813 | spec->autocfg.speaker_pins[4] = 0x1a; |
8446 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | 8814 | alc_automute_amp(codec); |
8447 | HDA_AMP_MUTE, HDA_AMP_MUTE); | ||
8448 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | ||
8449 | HDA_AMP_MUTE, HDA_AMP_MUTE); | ||
8450 | snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0, | ||
8451 | HDA_AMP_MUTE, HDA_AMP_MUTE); | ||
8452 | snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 0, | ||
8453 | HDA_AMP_MUTE, HDA_AMP_MUTE); | ||
8454 | snd_hda_codec_amp_stereo(codec, 0x1a, HDA_OUTPUT, 0, | ||
8455 | HDA_AMP_MUTE, HDA_AMP_MUTE); | ||
8456 | } else { | ||
8457 | /* unmute internal speaker if necessary */ | ||
8458 | mute = snd_hda_codec_amp_read(codec, 0x1b, 0, HDA_OUTPUT, 0); | ||
8459 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
8460 | HDA_AMP_MUTE, mute); | ||
8461 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | ||
8462 | HDA_AMP_MUTE, mute); | ||
8463 | snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0, | ||
8464 | HDA_AMP_MUTE, mute); | ||
8465 | snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 0, | ||
8466 | HDA_AMP_MUTE, mute); | ||
8467 | snd_hda_codec_amp_stereo(codec, 0x1a, HDA_OUTPUT, 0, | ||
8468 | HDA_AMP_MUTE, mute); | ||
8469 | } | ||
8470 | } | 8815 | } |
8471 | 8816 | ||
8472 | static void alc883_lenovo_sky_unsol_event(struct hda_codec *codec, | 8817 | static void alc883_vaiott_init_hook(struct hda_codec *codec) |
8473 | unsigned int res) | ||
8474 | { | 8818 | { |
8475 | if ((res >> 26) == ALC880_HP_EVENT) | 8819 | struct alc_spec *spec = codec->spec; |
8476 | alc888_lenovo_sky_front_automute(codec); | 8820 | |
8821 | spec->autocfg.hp_pins[0] = 0x15; | ||
8822 | spec->autocfg.speaker_pins[0] = 0x14; | ||
8823 | spec->autocfg.speaker_pins[1] = 0x17; | ||
8824 | alc_automute_amp(codec); | ||
8477 | } | 8825 | } |
8478 | 8826 | ||
8479 | /* | 8827 | /* |
@@ -8561,39 +8909,33 @@ static void alc883_nb_mic_automute(struct hda_codec *codec) | |||
8561 | 0x7000 | (0x01 << 8) | (present ? 0x80 : 0)); | 8909 | 0x7000 | (0x01 << 8) | (present ? 0x80 : 0)); |
8562 | } | 8910 | } |
8563 | 8911 | ||
8564 | static void alc883_M90V_speaker_automute(struct hda_codec *codec) | 8912 | static void alc883_M90V_init_hook(struct hda_codec *codec) |
8565 | { | 8913 | { |
8566 | unsigned int present; | 8914 | struct alc_spec *spec = codec->spec; |
8567 | unsigned char bits; | ||
8568 | 8915 | ||
8569 | present = snd_hda_codec_read(codec, 0x1b, 0, | 8916 | spec->autocfg.hp_pins[0] = 0x1b; |
8570 | AC_VERB_GET_PIN_SENSE, 0) | 8917 | spec->autocfg.speaker_pins[0] = 0x14; |
8571 | & AC_PINSENSE_PRESENCE; | 8918 | spec->autocfg.speaker_pins[1] = 0x15; |
8572 | bits = present ? 0 : PIN_OUT; | 8919 | spec->autocfg.speaker_pins[2] = 0x16; |
8573 | snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, | 8920 | alc_automute_pin(codec); |
8574 | bits); | ||
8575 | snd_hda_codec_write(codec, 0x15, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, | ||
8576 | bits); | ||
8577 | snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, | ||
8578 | bits); | ||
8579 | } | 8921 | } |
8580 | 8922 | ||
8581 | static void alc883_mode2_unsol_event(struct hda_codec *codec, | 8923 | static void alc883_mode2_unsol_event(struct hda_codec *codec, |
8582 | unsigned int res) | 8924 | unsigned int res) |
8583 | { | 8925 | { |
8584 | switch (res >> 26) { | 8926 | switch (res >> 26) { |
8585 | case ALC880_HP_EVENT: | ||
8586 | alc883_M90V_speaker_automute(codec); | ||
8587 | break; | ||
8588 | case ALC880_MIC_EVENT: | 8927 | case ALC880_MIC_EVENT: |
8589 | alc883_nb_mic_automute(codec); | 8928 | alc883_nb_mic_automute(codec); |
8590 | break; | 8929 | break; |
8930 | default: | ||
8931 | alc_sku_unsol_event(codec, res); | ||
8932 | break; | ||
8591 | } | 8933 | } |
8592 | } | 8934 | } |
8593 | 8935 | ||
8594 | static void alc883_mode2_inithook(struct hda_codec *codec) | 8936 | static void alc883_mode2_inithook(struct hda_codec *codec) |
8595 | { | 8937 | { |
8596 | alc883_M90V_speaker_automute(codec); | 8938 | alc883_M90V_init_hook(codec); |
8597 | alc883_nb_mic_automute(codec); | 8939 | alc883_nb_mic_automute(codec); |
8598 | } | 8940 | } |
8599 | 8941 | ||
@@ -8610,39 +8952,56 @@ static struct hda_verb alc888_asus_eee1601_verbs[] = { | |||
8610 | { } /* end */ | 8952 | { } /* end */ |
8611 | }; | 8953 | }; |
8612 | 8954 | ||
8613 | static void alc883_eee1601_speaker_automute(struct hda_codec *codec) | 8955 | static void alc883_eee1601_inithook(struct hda_codec *codec) |
8614 | { | 8956 | { |
8615 | unsigned int present; | 8957 | struct alc_spec *spec = codec->spec; |
8616 | unsigned char bits; | ||
8617 | 8958 | ||
8618 | present = snd_hda_codec_read(codec, 0x14, 0, | 8959 | spec->autocfg.hp_pins[0] = 0x14; |
8619 | AC_VERB_GET_PIN_SENSE, 0) | 8960 | spec->autocfg.speaker_pins[0] = 0x1b; |
8620 | & AC_PINSENSE_PRESENCE; | 8961 | alc_automute_pin(codec); |
8621 | bits = present ? 0 : PIN_OUT; | ||
8622 | snd_hda_codec_write(codec, 0x1b, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, | ||
8623 | bits); | ||
8624 | } | 8962 | } |
8625 | 8963 | ||
8626 | static void alc883_eee1601_unsol_event(struct hda_codec *codec, | 8964 | static struct hda_verb alc889A_mb31_verbs[] = { |
8627 | unsigned int res) | 8965 | /* Init rear pin (used as headphone output) */ |
8966 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc4}, /* Apple Headphones */ | ||
8967 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Connect to front */ | ||
8968 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | ||
8969 | /* Init line pin (used as output in 4ch and 6ch mode) */ | ||
8970 | {0x1a, AC_VERB_SET_CONNECT_SEL, 0x02}, /* Connect to CLFE */ | ||
8971 | /* Init line 2 pin (used as headphone out by default) */ | ||
8972 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Use as input */ | ||
8973 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Mute output */ | ||
8974 | { } /* end */ | ||
8975 | }; | ||
8976 | |||
8977 | /* Mute speakers according to the headphone jack state */ | ||
8978 | static void alc889A_mb31_automute(struct hda_codec *codec) | ||
8628 | { | 8979 | { |
8629 | switch (res >> 26) { | 8980 | unsigned int present; |
8630 | case ALC880_HP_EVENT: | 8981 | |
8631 | alc883_eee1601_speaker_automute(codec); | 8982 | /* Mute only in 2ch or 4ch mode */ |
8632 | break; | 8983 | if (snd_hda_codec_read(codec, 0x15, 0, AC_VERB_GET_CONNECT_SEL, 0) |
8984 | == 0x00) { | ||
8985 | present = snd_hda_codec_read(codec, 0x15, 0, | ||
8986 | AC_VERB_GET_PIN_SENSE, 0) & AC_PINSENSE_PRESENCE; | ||
8987 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
8988 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
8989 | snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0, | ||
8990 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
8633 | } | 8991 | } |
8634 | } | 8992 | } |
8635 | 8993 | ||
8636 | static void alc883_eee1601_inithook(struct hda_codec *codec) | 8994 | static void alc889A_mb31_unsol_event(struct hda_codec *codec, unsigned int res) |
8637 | { | 8995 | { |
8638 | alc883_eee1601_speaker_automute(codec); | 8996 | if ((res >> 26) == ALC880_HP_EVENT) |
8997 | alc889A_mb31_automute(codec); | ||
8639 | } | 8998 | } |
8640 | 8999 | ||
8641 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 9000 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
8642 | #define alc883_loopbacks alc880_loopbacks | 9001 | #define alc883_loopbacks alc880_loopbacks |
8643 | #endif | 9002 | #endif |
8644 | 9003 | ||
8645 | /* pcm configuration: identiacal with ALC880 */ | 9004 | /* pcm configuration: identical with ALC880 */ |
8646 | #define alc883_pcm_analog_playback alc880_pcm_analog_playback | 9005 | #define alc883_pcm_analog_playback alc880_pcm_analog_playback |
8647 | #define alc883_pcm_analog_capture alc880_pcm_analog_capture | 9006 | #define alc883_pcm_analog_capture alc880_pcm_analog_capture |
8648 | #define alc883_pcm_analog_alt_capture alc880_pcm_analog_alt_capture | 9007 | #define alc883_pcm_analog_alt_capture alc880_pcm_analog_alt_capture |
@@ -8659,9 +9018,12 @@ static const char *alc883_models[ALC883_MODEL_LAST] = { | |||
8659 | [ALC883_6ST_DIG] = "6stack-dig", | 9018 | [ALC883_6ST_DIG] = "6stack-dig", |
8660 | [ALC883_TARGA_DIG] = "targa-dig", | 9019 | [ALC883_TARGA_DIG] = "targa-dig", |
8661 | [ALC883_TARGA_2ch_DIG] = "targa-2ch-dig", | 9020 | [ALC883_TARGA_2ch_DIG] = "targa-2ch-dig", |
9021 | [ALC883_TARGA_8ch_DIG] = "targa-8ch-dig", | ||
8662 | [ALC883_ACER] = "acer", | 9022 | [ALC883_ACER] = "acer", |
8663 | [ALC883_ACER_ASPIRE] = "acer-aspire", | 9023 | [ALC883_ACER_ASPIRE] = "acer-aspire", |
8664 | [ALC888_ACER_ASPIRE_4930G] = "acer-aspire-4930g", | 9024 | [ALC888_ACER_ASPIRE_4930G] = "acer-aspire-4930g", |
9025 | [ALC888_ACER_ASPIRE_6530G] = "acer-aspire-6530g", | ||
9026 | [ALC888_ACER_ASPIRE_8930G] = "acer-aspire-8930g", | ||
8665 | [ALC883_MEDION] = "medion", | 9027 | [ALC883_MEDION] = "medion", |
8666 | [ALC883_MEDION_MD2] = "medion-md2", | 9028 | [ALC883_MEDION_MD2] = "medion-md2", |
8667 | [ALC883_LAPTOP_EAPD] = "laptop-eapd", | 9029 | [ALC883_LAPTOP_EAPD] = "laptop-eapd", |
@@ -8678,6 +9040,8 @@ static const char *alc883_models[ALC883_MODEL_LAST] = { | |||
8678 | [ALC888_FUJITSU_XA3530] = "fujitsu-xa3530", | 9040 | [ALC888_FUJITSU_XA3530] = "fujitsu-xa3530", |
8679 | [ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel", | 9041 | [ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel", |
8680 | [ALC1200_ASUS_P5Q] = "asus-p5q", | 9042 | [ALC1200_ASUS_P5Q] = "asus-p5q", |
9043 | [ALC889A_MB31] = "mb31", | ||
9044 | [ALC883_SONY_VAIO_TT] = "sony-vaio-tt", | ||
8681 | [ALC883_AUTO] = "auto", | 9045 | [ALC883_AUTO] = "auto", |
8682 | }; | 9046 | }; |
8683 | 9047 | ||
@@ -8693,14 +9057,20 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
8693 | ALC888_ACER_ASPIRE_4930G), | 9057 | ALC888_ACER_ASPIRE_4930G), |
8694 | SND_PCI_QUIRK(0x1025, 0x013f, "Acer Aspire 5930G", | 9058 | SND_PCI_QUIRK(0x1025, 0x013f, "Acer Aspire 5930G", |
8695 | ALC888_ACER_ASPIRE_4930G), | 9059 | ALC888_ACER_ASPIRE_4930G), |
9060 | SND_PCI_QUIRK(0x1025, 0x0145, "Acer Aspire 8930G", | ||
9061 | ALC888_ACER_ASPIRE_8930G), | ||
9062 | SND_PCI_QUIRK(0x1025, 0x0146, "Acer Aspire 6935G", | ||
9063 | ALC888_ACER_ASPIRE_8930G), | ||
8696 | SND_PCI_QUIRK(0x1025, 0x0157, "Acer X3200", ALC883_AUTO), | 9064 | SND_PCI_QUIRK(0x1025, 0x0157, "Acer X3200", ALC883_AUTO), |
8697 | SND_PCI_QUIRK(0x1025, 0x0158, "Acer AX1700-U3700A", ALC883_AUTO), | 9065 | SND_PCI_QUIRK(0x1025, 0x0158, "Acer AX1700-U3700A", ALC883_AUTO), |
8698 | SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G", | 9066 | SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G", |
8699 | ALC888_ACER_ASPIRE_4930G), | 9067 | ALC888_ACER_ASPIRE_4930G), |
8700 | SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G", | 9068 | SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G", |
8701 | ALC888_ACER_ASPIRE_4930G), | 9069 | ALC888_ACER_ASPIRE_6530G), |
8702 | /* default Acer */ | 9070 | /* default Acer -- disabled as it causes more problems. |
8703 | SND_PCI_QUIRK_VENDOR(0x1025, "Acer laptop", ALC883_ACER), | 9071 | * model=auto should work fine now |
9072 | */ | ||
9073 | /* SND_PCI_QUIRK_VENDOR(0x1025, "Acer laptop", ALC883_ACER), */ | ||
8704 | SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL), | 9074 | SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL), |
8705 | SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG), | 9075 | SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG), |
8706 | SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP), | 9076 | SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP), |
@@ -8736,6 +9106,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
8736 | SND_PCI_QUIRK(0x1462, 0x4314, "MSI", ALC883_TARGA_DIG), | 9106 | SND_PCI_QUIRK(0x1462, 0x4314, "MSI", ALC883_TARGA_DIG), |
8737 | SND_PCI_QUIRK(0x1462, 0x4319, "MSI", ALC883_TARGA_DIG), | 9107 | SND_PCI_QUIRK(0x1462, 0x4319, "MSI", ALC883_TARGA_DIG), |
8738 | SND_PCI_QUIRK(0x1462, 0x4324, "MSI", ALC883_TARGA_DIG), | 9108 | SND_PCI_QUIRK(0x1462, 0x4324, "MSI", ALC883_TARGA_DIG), |
9109 | SND_PCI_QUIRK(0x1462, 0x6510, "MSI GX620", ALC883_TARGA_8ch_DIG), | ||
8739 | SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG), | 9110 | SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG), |
8740 | SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG), | 9111 | SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG), |
8741 | SND_PCI_QUIRK(0x1462, 0x7250, "MSI", ALC883_6ST_DIG), | 9112 | SND_PCI_QUIRK(0x1462, 0x7250, "MSI", ALC883_6ST_DIG), |
@@ -8743,6 +9114,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
8743 | SND_PCI_QUIRK(0x1462, 0x7267, "MSI", ALC883_3ST_6ch_DIG), | 9114 | SND_PCI_QUIRK(0x1462, 0x7267, "MSI", ALC883_3ST_6ch_DIG), |
8744 | SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG), | 9115 | SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG), |
8745 | SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG), | 9116 | SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG), |
9117 | SND_PCI_QUIRK(0x1462, 0x7350, "MSI", ALC883_6ST_DIG), | ||
8746 | SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG), | 9118 | SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG), |
8747 | SND_PCI_QUIRK(0x147b, 0x1083, "Abit IP35-PRO", ALC883_6ST_DIG), | 9119 | SND_PCI_QUIRK(0x147b, 0x1083, "Abit IP35-PRO", ALC883_6ST_DIG), |
8748 | SND_PCI_QUIRK(0x1558, 0x0721, "Clevo laptop M720R", ALC883_CLEVO_M720), | 9120 | SND_PCI_QUIRK(0x1558, 0x0721, "Clevo laptop M720R", ALC883_CLEVO_M720), |
@@ -8768,6 +9140,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
8768 | SND_PCI_QUIRK(0x8086, 0x2503, "82801H", ALC883_MITAC), | 9140 | SND_PCI_QUIRK(0x8086, 0x2503, "82801H", ALC883_MITAC), |
8769 | SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC883_3ST_6ch_INTEL), | 9141 | SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC883_3ST_6ch_INTEL), |
8770 | SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch), | 9142 | SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch), |
9143 | SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC883_SONY_VAIO_TT), | ||
8771 | {} | 9144 | {} |
8772 | }; | 9145 | }; |
8773 | 9146 | ||
@@ -8838,8 +9211,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
8838 | .input_mux = &alc883_capture_source, | 9211 | .input_mux = &alc883_capture_source, |
8839 | }, | 9212 | }, |
8840 | [ALC883_TARGA_DIG] = { | 9213 | [ALC883_TARGA_DIG] = { |
8841 | .mixers = { alc883_tagra_mixer, alc883_chmode_mixer }, | 9214 | .mixers = { alc883_targa_mixer, alc883_chmode_mixer }, |
8842 | .init_verbs = { alc883_init_verbs, alc883_tagra_verbs}, | 9215 | .init_verbs = { alc883_init_verbs, alc883_targa_verbs}, |
8843 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 9216 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
8844 | .dac_nids = alc883_dac_nids, | 9217 | .dac_nids = alc883_dac_nids, |
8845 | .dig_out_nid = ALC883_DIGOUT_NID, | 9218 | .dig_out_nid = ALC883_DIGOUT_NID, |
@@ -8847,12 +9220,12 @@ static struct alc_config_preset alc883_presets[] = { | |||
8847 | .channel_mode = alc883_3ST_6ch_modes, | 9220 | .channel_mode = alc883_3ST_6ch_modes, |
8848 | .need_dac_fix = 1, | 9221 | .need_dac_fix = 1, |
8849 | .input_mux = &alc883_capture_source, | 9222 | .input_mux = &alc883_capture_source, |
8850 | .unsol_event = alc883_tagra_unsol_event, | 9223 | .unsol_event = alc883_targa_unsol_event, |
8851 | .init_hook = alc883_tagra_automute, | 9224 | .init_hook = alc883_targa_init_hook, |
8852 | }, | 9225 | }, |
8853 | [ALC883_TARGA_2ch_DIG] = { | 9226 | [ALC883_TARGA_2ch_DIG] = { |
8854 | .mixers = { alc883_tagra_2ch_mixer}, | 9227 | .mixers = { alc883_targa_2ch_mixer}, |
8855 | .init_verbs = { alc883_init_verbs, alc883_tagra_verbs}, | 9228 | .init_verbs = { alc883_init_verbs, alc883_targa_verbs}, |
8856 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 9229 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
8857 | .dac_nids = alc883_dac_nids, | 9230 | .dac_nids = alc883_dac_nids, |
8858 | .adc_nids = alc883_adc_nids_alt, | 9231 | .adc_nids = alc883_adc_nids_alt, |
@@ -8861,8 +9234,26 @@ static struct alc_config_preset alc883_presets[] = { | |||
8861 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | 9234 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), |
8862 | .channel_mode = alc883_3ST_2ch_modes, | 9235 | .channel_mode = alc883_3ST_2ch_modes, |
8863 | .input_mux = &alc883_capture_source, | 9236 | .input_mux = &alc883_capture_source, |
8864 | .unsol_event = alc883_tagra_unsol_event, | 9237 | .unsol_event = alc883_targa_unsol_event, |
8865 | .init_hook = alc883_tagra_automute, | 9238 | .init_hook = alc883_targa_init_hook, |
9239 | }, | ||
9240 | [ALC883_TARGA_8ch_DIG] = { | ||
9241 | .mixers = { alc883_base_mixer, alc883_chmode_mixer }, | ||
9242 | .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs, | ||
9243 | alc883_targa_verbs }, | ||
9244 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
9245 | .dac_nids = alc883_dac_nids, | ||
9246 | .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev), | ||
9247 | .adc_nids = alc883_adc_nids_rev, | ||
9248 | .capsrc_nids = alc883_capsrc_nids_rev, | ||
9249 | .dig_out_nid = ALC883_DIGOUT_NID, | ||
9250 | .dig_in_nid = ALC883_DIGIN_NID, | ||
9251 | .num_channel_mode = ARRAY_SIZE(alc883_4ST_8ch_modes), | ||
9252 | .channel_mode = alc883_4ST_8ch_modes, | ||
9253 | .need_dac_fix = 1, | ||
9254 | .input_mux = &alc883_capture_source, | ||
9255 | .unsol_event = alc883_targa_unsol_event, | ||
9256 | .init_hook = alc883_targa_init_hook, | ||
8866 | }, | 9257 | }, |
8867 | [ALC883_ACER] = { | 9258 | [ALC883_ACER] = { |
8868 | .mixers = { alc883_base_mixer }, | 9259 | .mixers = { alc883_base_mixer }, |
@@ -8887,8 +9278,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
8887 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | 9278 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), |
8888 | .channel_mode = alc883_3ST_2ch_modes, | 9279 | .channel_mode = alc883_3ST_2ch_modes, |
8889 | .input_mux = &alc883_capture_source, | 9280 | .input_mux = &alc883_capture_source, |
8890 | .unsol_event = alc883_acer_aspire_unsol_event, | 9281 | .unsol_event = alc_automute_amp_unsol_event, |
8891 | .init_hook = alc883_acer_aspire_automute, | 9282 | .init_hook = alc883_acer_aspire_init_hook, |
8892 | }, | 9283 | }, |
8893 | [ALC888_ACER_ASPIRE_4930G] = { | 9284 | [ALC888_ACER_ASPIRE_4930G] = { |
8894 | .mixers = { alc888_base_mixer, | 9285 | .mixers = { alc888_base_mixer, |
@@ -8907,8 +9298,47 @@ static struct alc_config_preset alc883_presets[] = { | |||
8907 | .num_mux_defs = | 9298 | .num_mux_defs = |
8908 | ARRAY_SIZE(alc888_2_capture_sources), | 9299 | ARRAY_SIZE(alc888_2_capture_sources), |
8909 | .input_mux = alc888_2_capture_sources, | 9300 | .input_mux = alc888_2_capture_sources, |
8910 | .unsol_event = alc888_acer_aspire_4930g_unsol_event, | 9301 | .unsol_event = alc_automute_amp_unsol_event, |
8911 | .init_hook = alc888_acer_aspire_4930g_automute, | 9302 | .init_hook = alc888_acer_aspire_4930g_init_hook, |
9303 | }, | ||
9304 | [ALC888_ACER_ASPIRE_6530G] = { | ||
9305 | .mixers = { alc888_acer_aspire_6530_mixer }, | ||
9306 | .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs, | ||
9307 | alc888_acer_aspire_6530g_verbs }, | ||
9308 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
9309 | .dac_nids = alc883_dac_nids, | ||
9310 | .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev), | ||
9311 | .adc_nids = alc883_adc_nids_rev, | ||
9312 | .capsrc_nids = alc883_capsrc_nids_rev, | ||
9313 | .dig_out_nid = ALC883_DIGOUT_NID, | ||
9314 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | ||
9315 | .channel_mode = alc883_3ST_2ch_modes, | ||
9316 | .num_mux_defs = | ||
9317 | ARRAY_SIZE(alc888_2_capture_sources), | ||
9318 | .input_mux = alc888_acer_aspire_6530_sources, | ||
9319 | .unsol_event = alc_automute_amp_unsol_event, | ||
9320 | .init_hook = alc888_acer_aspire_4930g_init_hook, | ||
9321 | }, | ||
9322 | [ALC888_ACER_ASPIRE_8930G] = { | ||
9323 | .mixers = { alc888_base_mixer, | ||
9324 | alc883_chmode_mixer }, | ||
9325 | .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs, | ||
9326 | alc889_acer_aspire_8930g_verbs }, | ||
9327 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
9328 | .dac_nids = alc883_dac_nids, | ||
9329 | .num_adc_nids = ARRAY_SIZE(alc889_adc_nids), | ||
9330 | .adc_nids = alc889_adc_nids, | ||
9331 | .capsrc_nids = alc889_capsrc_nids, | ||
9332 | .dig_out_nid = ALC883_DIGOUT_NID, | ||
9333 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes), | ||
9334 | .channel_mode = alc883_3ST_6ch_modes, | ||
9335 | .need_dac_fix = 1, | ||
9336 | .const_channel_count = 6, | ||
9337 | .num_mux_defs = | ||
9338 | ARRAY_SIZE(alc889_capture_sources), | ||
9339 | .input_mux = alc889_capture_sources, | ||
9340 | .unsol_event = alc_automute_amp_unsol_event, | ||
9341 | .init_hook = alc889_acer_aspire_8930g_init_hook, | ||
8912 | }, | 9342 | }, |
8913 | [ALC883_MEDION] = { | 9343 | [ALC883_MEDION] = { |
8914 | .mixers = { alc883_fivestack_mixer, | 9344 | .mixers = { alc883_fivestack_mixer, |
@@ -8932,8 +9362,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
8932 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | 9362 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), |
8933 | .channel_mode = alc883_3ST_2ch_modes, | 9363 | .channel_mode = alc883_3ST_2ch_modes, |
8934 | .input_mux = &alc883_capture_source, | 9364 | .input_mux = &alc883_capture_source, |
8935 | .unsol_event = alc883_medion_md2_unsol_event, | 9365 | .unsol_event = alc_automute_amp_unsol_event, |
8936 | .init_hook = alc883_medion_md2_automute, | 9366 | .init_hook = alc883_medion_md2_init_hook, |
8937 | }, | 9367 | }, |
8938 | [ALC883_LAPTOP_EAPD] = { | 9368 | [ALC883_LAPTOP_EAPD] = { |
8939 | .mixers = { alc883_base_mixer }, | 9369 | .mixers = { alc883_base_mixer }, |
@@ -8954,7 +9384,7 @@ static struct alc_config_preset alc883_presets[] = { | |||
8954 | .channel_mode = alc883_3ST_2ch_modes, | 9384 | .channel_mode = alc883_3ST_2ch_modes, |
8955 | .input_mux = &alc883_capture_source, | 9385 | .input_mux = &alc883_capture_source, |
8956 | .unsol_event = alc883_clevo_m720_unsol_event, | 9386 | .unsol_event = alc883_clevo_m720_unsol_event, |
8957 | .init_hook = alc883_clevo_m720_automute, | 9387 | .init_hook = alc883_clevo_m720_init_hook, |
8958 | }, | 9388 | }, |
8959 | [ALC883_LENOVO_101E_2ch] = { | 9389 | [ALC883_LENOVO_101E_2ch] = { |
8960 | .mixers = { alc883_lenovo_101e_2ch_mixer}, | 9390 | .mixers = { alc883_lenovo_101e_2ch_mixer}, |
@@ -8978,8 +9408,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
8978 | .channel_mode = alc883_3ST_2ch_modes, | 9408 | .channel_mode = alc883_3ST_2ch_modes, |
8979 | .need_dac_fix = 1, | 9409 | .need_dac_fix = 1, |
8980 | .input_mux = &alc883_lenovo_nb0763_capture_source, | 9410 | .input_mux = &alc883_lenovo_nb0763_capture_source, |
8981 | .unsol_event = alc883_medion_md2_unsol_event, | 9411 | .unsol_event = alc_automute_amp_unsol_event, |
8982 | .init_hook = alc883_medion_md2_automute, | 9412 | .init_hook = alc883_medion_md2_init_hook, |
8983 | }, | 9413 | }, |
8984 | [ALC888_LENOVO_MS7195_DIG] = { | 9414 | [ALC888_LENOVO_MS7195_DIG] = { |
8985 | .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer }, | 9415 | .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer }, |
@@ -8995,7 +9425,7 @@ static struct alc_config_preset alc883_presets[] = { | |||
8995 | .init_hook = alc888_lenovo_ms7195_front_automute, | 9425 | .init_hook = alc888_lenovo_ms7195_front_automute, |
8996 | }, | 9426 | }, |
8997 | [ALC883_HAIER_W66] = { | 9427 | [ALC883_HAIER_W66] = { |
8998 | .mixers = { alc883_tagra_2ch_mixer}, | 9428 | .mixers = { alc883_targa_2ch_mixer}, |
8999 | .init_verbs = { alc883_init_verbs, alc883_haier_w66_verbs}, | 9429 | .init_verbs = { alc883_init_verbs, alc883_haier_w66_verbs}, |
9000 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 9430 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
9001 | .dac_nids = alc883_dac_nids, | 9431 | .dac_nids = alc883_dac_nids, |
@@ -9003,8 +9433,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
9003 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | 9433 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), |
9004 | .channel_mode = alc883_3ST_2ch_modes, | 9434 | .channel_mode = alc883_3ST_2ch_modes, |
9005 | .input_mux = &alc883_capture_source, | 9435 | .input_mux = &alc883_capture_source, |
9006 | .unsol_event = alc883_haier_w66_unsol_event, | 9436 | .unsol_event = alc_automute_amp_unsol_event, |
9007 | .init_hook = alc883_haier_w66_automute, | 9437 | .init_hook = alc883_haier_w66_init_hook, |
9008 | }, | 9438 | }, |
9009 | [ALC888_3ST_HP] = { | 9439 | [ALC888_3ST_HP] = { |
9010 | .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer }, | 9440 | .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer }, |
@@ -9015,8 +9445,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
9015 | .channel_mode = alc888_3st_hp_modes, | 9445 | .channel_mode = alc888_3st_hp_modes, |
9016 | .need_dac_fix = 1, | 9446 | .need_dac_fix = 1, |
9017 | .input_mux = &alc883_capture_source, | 9447 | .input_mux = &alc883_capture_source, |
9018 | .unsol_event = alc888_3st_hp_unsol_event, | 9448 | .unsol_event = alc_automute_amp_unsol_event, |
9019 | .init_hook = alc888_3st_hp_front_automute, | 9449 | .init_hook = alc888_3st_hp_init_hook, |
9020 | }, | 9450 | }, |
9021 | [ALC888_6ST_DELL] = { | 9451 | [ALC888_6ST_DELL] = { |
9022 | .mixers = { alc883_base_mixer, alc883_chmode_mixer }, | 9452 | .mixers = { alc883_base_mixer, alc883_chmode_mixer }, |
@@ -9028,8 +9458,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
9028 | .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes), | 9458 | .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes), |
9029 | .channel_mode = alc883_sixstack_modes, | 9459 | .channel_mode = alc883_sixstack_modes, |
9030 | .input_mux = &alc883_capture_source, | 9460 | .input_mux = &alc883_capture_source, |
9031 | .unsol_event = alc888_6st_dell_unsol_event, | 9461 | .unsol_event = alc_automute_amp_unsol_event, |
9032 | .init_hook = alc888_6st_dell_front_automute, | 9462 | .init_hook = alc888_6st_dell_init_hook, |
9033 | }, | 9463 | }, |
9034 | [ALC883_MITAC] = { | 9464 | [ALC883_MITAC] = { |
9035 | .mixers = { alc883_mitac_mixer }, | 9465 | .mixers = { alc883_mitac_mixer }, |
@@ -9039,8 +9469,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
9039 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | 9469 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), |
9040 | .channel_mode = alc883_3ST_2ch_modes, | 9470 | .channel_mode = alc883_3ST_2ch_modes, |
9041 | .input_mux = &alc883_capture_source, | 9471 | .input_mux = &alc883_capture_source, |
9042 | .unsol_event = alc883_mitac_unsol_event, | 9472 | .unsol_event = alc_automute_amp_unsol_event, |
9043 | .init_hook = alc883_mitac_automute, | 9473 | .init_hook = alc883_mitac_init_hook, |
9044 | }, | 9474 | }, |
9045 | [ALC883_FUJITSU_PI2515] = { | 9475 | [ALC883_FUJITSU_PI2515] = { |
9046 | .mixers = { alc883_2ch_fujitsu_pi2515_mixer }, | 9476 | .mixers = { alc883_2ch_fujitsu_pi2515_mixer }, |
@@ -9052,8 +9482,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
9052 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | 9482 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), |
9053 | .channel_mode = alc883_3ST_2ch_modes, | 9483 | .channel_mode = alc883_3ST_2ch_modes, |
9054 | .input_mux = &alc883_fujitsu_pi2515_capture_source, | 9484 | .input_mux = &alc883_fujitsu_pi2515_capture_source, |
9055 | .unsol_event = alc883_2ch_fujitsu_pi2515_unsol_event, | 9485 | .unsol_event = alc_automute_amp_unsol_event, |
9056 | .init_hook = alc883_2ch_fujitsu_pi2515_automute, | 9486 | .init_hook = alc883_2ch_fujitsu_pi2515_init_hook, |
9057 | }, | 9487 | }, |
9058 | [ALC888_FUJITSU_XA3530] = { | 9488 | [ALC888_FUJITSU_XA3530] = { |
9059 | .mixers = { alc888_base_mixer, alc883_chmode_mixer }, | 9489 | .mixers = { alc888_base_mixer, alc883_chmode_mixer }, |
@@ -9070,8 +9500,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
9070 | .num_mux_defs = | 9500 | .num_mux_defs = |
9071 | ARRAY_SIZE(alc888_2_capture_sources), | 9501 | ARRAY_SIZE(alc888_2_capture_sources), |
9072 | .input_mux = alc888_2_capture_sources, | 9502 | .input_mux = alc888_2_capture_sources, |
9073 | .unsol_event = alc888_fujitsu_xa3530_unsol_event, | 9503 | .unsol_event = alc_automute_amp_unsol_event, |
9074 | .init_hook = alc888_fujitsu_xa3530_automute, | 9504 | .init_hook = alc888_fujitsu_xa3530_init_hook, |
9075 | }, | 9505 | }, |
9076 | [ALC888_LENOVO_SKY] = { | 9506 | [ALC888_LENOVO_SKY] = { |
9077 | .mixers = { alc888_lenovo_sky_mixer, alc883_chmode_mixer }, | 9507 | .mixers = { alc888_lenovo_sky_mixer, alc883_chmode_mixer }, |
@@ -9083,8 +9513,8 @@ static struct alc_config_preset alc883_presets[] = { | |||
9083 | .channel_mode = alc883_sixstack_modes, | 9513 | .channel_mode = alc883_sixstack_modes, |
9084 | .need_dac_fix = 1, | 9514 | .need_dac_fix = 1, |
9085 | .input_mux = &alc883_lenovo_sky_capture_source, | 9515 | .input_mux = &alc883_lenovo_sky_capture_source, |
9086 | .unsol_event = alc883_lenovo_sky_unsol_event, | 9516 | .unsol_event = alc_automute_amp_unsol_event, |
9087 | .init_hook = alc888_lenovo_sky_front_automute, | 9517 | .init_hook = alc888_lenovo_sky_init_hook, |
9088 | }, | 9518 | }, |
9089 | [ALC888_ASUS_M90V] = { | 9519 | [ALC888_ASUS_M90V] = { |
9090 | .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer }, | 9520 | .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer }, |
@@ -9112,7 +9542,7 @@ static struct alc_config_preset alc883_presets[] = { | |||
9112 | .channel_mode = alc883_3ST_2ch_modes, | 9542 | .channel_mode = alc883_3ST_2ch_modes, |
9113 | .need_dac_fix = 1, | 9543 | .need_dac_fix = 1, |
9114 | .input_mux = &alc883_asus_eee1601_capture_source, | 9544 | .input_mux = &alc883_asus_eee1601_capture_source, |
9115 | .unsol_event = alc883_eee1601_unsol_event, | 9545 | .unsol_event = alc_sku_unsol_event, |
9116 | .init_hook = alc883_eee1601_inithook, | 9546 | .init_hook = alc883_eee1601_inithook, |
9117 | }, | 9547 | }, |
9118 | [ALC1200_ASUS_P5Q] = { | 9548 | [ALC1200_ASUS_P5Q] = { |
@@ -9127,6 +9557,32 @@ static struct alc_config_preset alc883_presets[] = { | |||
9127 | .channel_mode = alc883_sixstack_modes, | 9557 | .channel_mode = alc883_sixstack_modes, |
9128 | .input_mux = &alc883_capture_source, | 9558 | .input_mux = &alc883_capture_source, |
9129 | }, | 9559 | }, |
9560 | [ALC889A_MB31] = { | ||
9561 | .mixers = { alc889A_mb31_mixer, alc883_chmode_mixer}, | ||
9562 | .init_verbs = { alc883_init_verbs, alc889A_mb31_verbs, | ||
9563 | alc880_gpio1_init_verbs }, | ||
9564 | .adc_nids = alc883_adc_nids, | ||
9565 | .num_adc_nids = ARRAY_SIZE(alc883_adc_nids), | ||
9566 | .dac_nids = alc883_dac_nids, | ||
9567 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
9568 | .channel_mode = alc889A_mb31_6ch_modes, | ||
9569 | .num_channel_mode = ARRAY_SIZE(alc889A_mb31_6ch_modes), | ||
9570 | .input_mux = &alc889A_mb31_capture_source, | ||
9571 | .dig_out_nid = ALC883_DIGOUT_NID, | ||
9572 | .unsol_event = alc889A_mb31_unsol_event, | ||
9573 | .init_hook = alc889A_mb31_automute, | ||
9574 | }, | ||
9575 | [ALC883_SONY_VAIO_TT] = { | ||
9576 | .mixers = { alc883_vaiott_mixer }, | ||
9577 | .init_verbs = { alc883_init_verbs, alc883_vaiott_verbs }, | ||
9578 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
9579 | .dac_nids = alc883_dac_nids, | ||
9580 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | ||
9581 | .channel_mode = alc883_3ST_2ch_modes, | ||
9582 | .input_mux = &alc883_capture_source, | ||
9583 | .unsol_event = alc_automute_amp_unsol_event, | ||
9584 | .init_hook = alc883_vaiott_init_hook, | ||
9585 | }, | ||
9130 | }; | 9586 | }; |
9131 | 9587 | ||
9132 | 9588 | ||
@@ -9155,7 +9611,6 @@ static void alc883_auto_init_multi_out(struct hda_codec *codec) | |||
9155 | struct alc_spec *spec = codec->spec; | 9611 | struct alc_spec *spec = codec->spec; |
9156 | int i; | 9612 | int i; |
9157 | 9613 | ||
9158 | alc_subsystem_id(codec, 0x15, 0x1b, 0x14); | ||
9159 | for (i = 0; i <= HDA_SIDE; i++) { | 9614 | for (i = 0; i <= HDA_SIDE; i++) { |
9160 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; | 9615 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; |
9161 | int pin_type = get_pin_type(spec->autocfg.line_out_type); | 9616 | int pin_type = get_pin_type(spec->autocfg.line_out_type); |
@@ -9273,10 +9728,18 @@ static int patch_alc883(struct hda_codec *codec) | |||
9273 | board_config = snd_hda_check_board_config(codec, ALC883_MODEL_LAST, | 9728 | board_config = snd_hda_check_board_config(codec, ALC883_MODEL_LAST, |
9274 | alc883_models, | 9729 | alc883_models, |
9275 | alc883_cfg_tbl); | 9730 | alc883_cfg_tbl); |
9276 | if (board_config < 0) { | 9731 | if (board_config < 0 || board_config >= ALC883_MODEL_LAST) { |
9277 | printk(KERN_INFO "hda_codec: Unknown model for ALC883, " | 9732 | /* Pick up systems that don't supply PCI SSID */ |
9278 | "trying auto-probe from BIOS...\n"); | 9733 | switch (codec->subsystem_id) { |
9279 | board_config = ALC883_AUTO; | 9734 | case 0x106b3600: /* Macbook 3.1 */ |
9735 | board_config = ALC889A_MB31; | ||
9736 | break; | ||
9737 | default: | ||
9738 | printk(KERN_INFO | ||
9739 | "hda_codec: Unknown model for %s, trying " | ||
9740 | "auto-probe from BIOS...\n", codec->chip_name); | ||
9741 | board_config = ALC883_AUTO; | ||
9742 | } | ||
9280 | } | 9743 | } |
9281 | 9744 | ||
9282 | if (board_config == ALC883_AUTO) { | 9745 | if (board_config == ALC883_AUTO) { |
@@ -9304,43 +9767,29 @@ static int patch_alc883(struct hda_codec *codec) | |||
9304 | 9767 | ||
9305 | switch (codec->vendor_id) { | 9768 | switch (codec->vendor_id) { |
9306 | case 0x10ec0888: | 9769 | case 0x10ec0888: |
9307 | if (codec->revision_id == 0x100101) { | ||
9308 | spec->stream_name_analog = "ALC1200 Analog"; | ||
9309 | spec->stream_name_digital = "ALC1200 Digital"; | ||
9310 | } else { | ||
9311 | spec->stream_name_analog = "ALC888 Analog"; | ||
9312 | spec->stream_name_digital = "ALC888 Digital"; | ||
9313 | } | ||
9314 | if (!spec->num_adc_nids) { | 9770 | if (!spec->num_adc_nids) { |
9315 | spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids); | 9771 | spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids); |
9316 | spec->adc_nids = alc883_adc_nids; | 9772 | spec->adc_nids = alc883_adc_nids; |
9317 | } | 9773 | } |
9318 | if (!spec->capsrc_nids) | 9774 | if (!spec->capsrc_nids) |
9319 | spec->capsrc_nids = alc883_capsrc_nids; | 9775 | spec->capsrc_nids = alc883_capsrc_nids; |
9320 | spec->capture_style = CAPT_MIX; /* matrix-style capture */ | 9776 | spec->init_amp = ALC_INIT_DEFAULT; /* always initialize */ |
9321 | break; | 9777 | break; |
9322 | case 0x10ec0889: | 9778 | case 0x10ec0889: |
9323 | spec->stream_name_analog = "ALC889 Analog"; | ||
9324 | spec->stream_name_digital = "ALC889 Digital"; | ||
9325 | if (!spec->num_adc_nids) { | 9779 | if (!spec->num_adc_nids) { |
9326 | spec->num_adc_nids = ARRAY_SIZE(alc889_adc_nids); | 9780 | spec->num_adc_nids = ARRAY_SIZE(alc889_adc_nids); |
9327 | spec->adc_nids = alc889_adc_nids; | 9781 | spec->adc_nids = alc889_adc_nids; |
9328 | } | 9782 | } |
9329 | if (!spec->capsrc_nids) | 9783 | if (!spec->capsrc_nids) |
9330 | spec->capsrc_nids = alc889_capsrc_nids; | 9784 | spec->capsrc_nids = alc889_capsrc_nids; |
9331 | spec->capture_style = CAPT_1MUX_MIX; /* 1mux/Nmix-style | ||
9332 | capture */ | ||
9333 | break; | 9785 | break; |
9334 | default: | 9786 | default: |
9335 | spec->stream_name_analog = "ALC883 Analog"; | ||
9336 | spec->stream_name_digital = "ALC883 Digital"; | ||
9337 | if (!spec->num_adc_nids) { | 9787 | if (!spec->num_adc_nids) { |
9338 | spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids); | 9788 | spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids); |
9339 | spec->adc_nids = alc883_adc_nids; | 9789 | spec->adc_nids = alc883_adc_nids; |
9340 | } | 9790 | } |
9341 | if (!spec->capsrc_nids) | 9791 | if (!spec->capsrc_nids) |
9342 | spec->capsrc_nids = alc883_capsrc_nids; | 9792 | spec->capsrc_nids = alc883_capsrc_nids; |
9343 | spec->capture_style = CAPT_MIX; /* matrix-style capture */ | ||
9344 | break; | 9793 | break; |
9345 | } | 9794 | } |
9346 | 9795 | ||
@@ -9413,24 +9862,6 @@ static struct snd_kcontrol_new alc262_base_mixer[] = { | |||
9413 | { } /* end */ | 9862 | { } /* end */ |
9414 | }; | 9863 | }; |
9415 | 9864 | ||
9416 | static struct snd_kcontrol_new alc262_hippo1_mixer[] = { | ||
9417 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | ||
9418 | HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT), | ||
9419 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | ||
9420 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | ||
9421 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | ||
9422 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | ||
9423 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
9424 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
9425 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | ||
9426 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT), | ||
9427 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT), | ||
9428 | HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), | ||
9429 | /*HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0D, 0x0, HDA_OUTPUT),*/ | ||
9430 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | ||
9431 | { } /* end */ | ||
9432 | }; | ||
9433 | |||
9434 | /* update HP, line and mono-out pins according to the master switch */ | 9865 | /* update HP, line and mono-out pins according to the master switch */ |
9435 | static void alc262_hp_master_update(struct hda_codec *codec) | 9866 | static void alc262_hp_master_update(struct hda_codec *codec) |
9436 | { | 9867 | { |
@@ -9486,14 +9917,7 @@ static void alc262_hp_wildwest_unsol_event(struct hda_codec *codec, | |||
9486 | alc262_hp_wildwest_automute(codec); | 9917 | alc262_hp_wildwest_automute(codec); |
9487 | } | 9918 | } |
9488 | 9919 | ||
9489 | static int alc262_hp_master_sw_get(struct snd_kcontrol *kcontrol, | 9920 | #define alc262_hp_master_sw_get alc260_hp_master_sw_get |
9490 | struct snd_ctl_elem_value *ucontrol) | ||
9491 | { | ||
9492 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | ||
9493 | struct alc_spec *spec = codec->spec; | ||
9494 | *ucontrol->value.integer.value = spec->master_sw; | ||
9495 | return 0; | ||
9496 | } | ||
9497 | 9921 | ||
9498 | static int alc262_hp_master_sw_put(struct snd_kcontrol *kcontrol, | 9922 | static int alc262_hp_master_sw_put(struct snd_kcontrol *kcontrol, |
9499 | struct snd_ctl_elem_value *ucontrol) | 9923 | struct snd_ctl_elem_value *ucontrol) |
@@ -9509,14 +9933,17 @@ static int alc262_hp_master_sw_put(struct snd_kcontrol *kcontrol, | |||
9509 | return 1; | 9933 | return 1; |
9510 | } | 9934 | } |
9511 | 9935 | ||
9936 | #define ALC262_HP_MASTER_SWITCH \ | ||
9937 | { \ | ||
9938 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ | ||
9939 | .name = "Master Playback Switch", \ | ||
9940 | .info = snd_ctl_boolean_mono_info, \ | ||
9941 | .get = alc262_hp_master_sw_get, \ | ||
9942 | .put = alc262_hp_master_sw_put, \ | ||
9943 | } | ||
9944 | |||
9512 | static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = { | 9945 | static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = { |
9513 | { | 9946 | ALC262_HP_MASTER_SWITCH, |
9514 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
9515 | .name = "Master Playback Switch", | ||
9516 | .info = snd_ctl_boolean_mono_info, | ||
9517 | .get = alc262_hp_master_sw_get, | ||
9518 | .put = alc262_hp_master_sw_put, | ||
9519 | }, | ||
9520 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 9947 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
9521 | HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT), | 9948 | HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT), |
9522 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | 9949 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT), |
@@ -9540,13 +9967,7 @@ static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = { | |||
9540 | }; | 9967 | }; |
9541 | 9968 | ||
9542 | static struct snd_kcontrol_new alc262_HP_BPC_WildWest_mixer[] = { | 9969 | static struct snd_kcontrol_new alc262_HP_BPC_WildWest_mixer[] = { |
9543 | { | 9970 | ALC262_HP_MASTER_SWITCH, |
9544 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
9545 | .name = "Master Playback Switch", | ||
9546 | .info = snd_ctl_boolean_mono_info, | ||
9547 | .get = alc262_hp_master_sw_get, | ||
9548 | .put = alc262_hp_master_sw_put, | ||
9549 | }, | ||
9550 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 9971 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
9551 | HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | 9972 | HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), |
9552 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | 9973 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT), |
@@ -9573,32 +9994,13 @@ static struct snd_kcontrol_new alc262_HP_BPC_WildWest_option_mixer[] = { | |||
9573 | }; | 9994 | }; |
9574 | 9995 | ||
9575 | /* mute/unmute internal speaker according to the hp jack and mute state */ | 9996 | /* mute/unmute internal speaker according to the hp jack and mute state */ |
9576 | static void alc262_hp_t5735_automute(struct hda_codec *codec, int force) | 9997 | static void alc262_hp_t5735_init_hook(struct hda_codec *codec) |
9577 | { | 9998 | { |
9578 | struct alc_spec *spec = codec->spec; | 9999 | struct alc_spec *spec = codec->spec; |
9579 | 10000 | ||
9580 | if (force || !spec->sense_updated) { | 10001 | spec->autocfg.hp_pins[0] = 0x15; |
9581 | unsigned int present; | 10002 | spec->autocfg.speaker_pins[0] = 0x0c; /* HACK: not actually a pin */ |
9582 | present = snd_hda_codec_read(codec, 0x15, 0, | 10003 | alc_automute_amp(codec); |
9583 | AC_VERB_GET_PIN_SENSE, 0); | ||
9584 | spec->jack_present = (present & AC_PINSENSE_PRESENCE) != 0; | ||
9585 | spec->sense_updated = 1; | ||
9586 | } | ||
9587 | snd_hda_codec_amp_stereo(codec, 0x0c, HDA_OUTPUT, 0, HDA_AMP_MUTE, | ||
9588 | spec->jack_present ? HDA_AMP_MUTE : 0); | ||
9589 | } | ||
9590 | |||
9591 | static void alc262_hp_t5735_unsol_event(struct hda_codec *codec, | ||
9592 | unsigned int res) | ||
9593 | { | ||
9594 | if ((res >> 26) != ALC880_HP_EVENT) | ||
9595 | return; | ||
9596 | alc262_hp_t5735_automute(codec, 1); | ||
9597 | } | ||
9598 | |||
9599 | static void alc262_hp_t5735_init_hook(struct hda_codec *codec) | ||
9600 | { | ||
9601 | alc262_hp_t5735_automute(codec, 1); | ||
9602 | } | 10004 | } |
9603 | 10005 | ||
9604 | static struct snd_kcontrol_new alc262_hp_t5735_mixer[] = { | 10006 | static struct snd_kcontrol_new alc262_hp_t5735_mixer[] = { |
@@ -9651,46 +10053,132 @@ static struct hda_input_mux alc262_hp_rp5700_capture_source = { | |||
9651 | }, | 10053 | }, |
9652 | }; | 10054 | }; |
9653 | 10055 | ||
9654 | /* bind hp and internal speaker mute (with plug check) */ | 10056 | /* bind hp and internal speaker mute (with plug check) as master switch */ |
9655 | static int alc262_sony_master_sw_put(struct snd_kcontrol *kcontrol, | 10057 | static void alc262_hippo_master_update(struct hda_codec *codec) |
9656 | struct snd_ctl_elem_value *ucontrol) | ||
9657 | { | 10058 | { |
9658 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 10059 | struct alc_spec *spec = codec->spec; |
9659 | long *valp = ucontrol->value.integer.value; | 10060 | hda_nid_t hp_nid = spec->autocfg.hp_pins[0]; |
9660 | int change; | 10061 | hda_nid_t line_nid = spec->autocfg.line_out_pins[0]; |
10062 | hda_nid_t speaker_nid = spec->autocfg.speaker_pins[0]; | ||
10063 | unsigned int mute; | ||
9661 | 10064 | ||
9662 | /* change hp mute */ | 10065 | /* HP */ |
9663 | change = snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0, | 10066 | mute = spec->master_sw ? 0 : HDA_AMP_MUTE; |
9664 | HDA_AMP_MUTE, | 10067 | snd_hda_codec_amp_stereo(codec, hp_nid, HDA_OUTPUT, 0, |
9665 | valp[0] ? 0 : HDA_AMP_MUTE); | 10068 | HDA_AMP_MUTE, mute); |
9666 | change |= snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0, | 10069 | /* mute internal speaker per jack sense */ |
9667 | HDA_AMP_MUTE, | 10070 | if (spec->jack_present) |
9668 | valp[1] ? 0 : HDA_AMP_MUTE); | 10071 | mute = HDA_AMP_MUTE; |
9669 | if (change) { | 10072 | if (line_nid) |
9670 | /* change speaker according to HP jack state */ | 10073 | snd_hda_codec_amp_stereo(codec, line_nid, HDA_OUTPUT, 0, |
9671 | struct alc_spec *spec = codec->spec; | 10074 | HDA_AMP_MUTE, mute); |
9672 | unsigned int mute; | 10075 | if (speaker_nid && speaker_nid != line_nid) |
9673 | if (spec->jack_present) | 10076 | snd_hda_codec_amp_stereo(codec, speaker_nid, HDA_OUTPUT, 0, |
9674 | mute = HDA_AMP_MUTE; | ||
9675 | else | ||
9676 | mute = snd_hda_codec_amp_read(codec, 0x15, 0, | ||
9677 | HDA_OUTPUT, 0); | ||
9678 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
9679 | HDA_AMP_MUTE, mute); | 10077 | HDA_AMP_MUTE, mute); |
10078 | } | ||
10079 | |||
10080 | #define alc262_hippo_master_sw_get alc262_hp_master_sw_get | ||
10081 | |||
10082 | static int alc262_hippo_master_sw_put(struct snd_kcontrol *kcontrol, | ||
10083 | struct snd_ctl_elem_value *ucontrol) | ||
10084 | { | ||
10085 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | ||
10086 | struct alc_spec *spec = codec->spec; | ||
10087 | int val = !!*ucontrol->value.integer.value; | ||
10088 | |||
10089 | if (val == spec->master_sw) | ||
10090 | return 0; | ||
10091 | spec->master_sw = val; | ||
10092 | alc262_hippo_master_update(codec); | ||
10093 | return 1; | ||
10094 | } | ||
10095 | |||
10096 | #define ALC262_HIPPO_MASTER_SWITCH \ | ||
10097 | { \ | ||
10098 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ | ||
10099 | .name = "Master Playback Switch", \ | ||
10100 | .info = snd_ctl_boolean_mono_info, \ | ||
10101 | .get = alc262_hippo_master_sw_get, \ | ||
10102 | .put = alc262_hippo_master_sw_put, \ | ||
9680 | } | 10103 | } |
9681 | return change; | 10104 | |
10105 | static struct snd_kcontrol_new alc262_hippo_mixer[] = { | ||
10106 | ALC262_HIPPO_MASTER_SWITCH, | ||
10107 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | ||
10108 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | ||
10109 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | ||
10110 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | ||
10111 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | ||
10112 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
10113 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
10114 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | ||
10115 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT), | ||
10116 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT), | ||
10117 | HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), | ||
10118 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | ||
10119 | { } /* end */ | ||
10120 | }; | ||
10121 | |||
10122 | static struct snd_kcontrol_new alc262_hippo1_mixer[] = { | ||
10123 | HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | ||
10124 | ALC262_HIPPO_MASTER_SWITCH, | ||
10125 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | ||
10126 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | ||
10127 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | ||
10128 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | ||
10129 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
10130 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
10131 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | ||
10132 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT), | ||
10133 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT), | ||
10134 | HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), | ||
10135 | { } /* end */ | ||
10136 | }; | ||
10137 | |||
10138 | /* mute/unmute internal speaker according to the hp jack and mute state */ | ||
10139 | static void alc262_hippo_automute(struct hda_codec *codec) | ||
10140 | { | ||
10141 | struct alc_spec *spec = codec->spec; | ||
10142 | hda_nid_t hp_nid = spec->autocfg.hp_pins[0]; | ||
10143 | unsigned int present; | ||
10144 | |||
10145 | /* need to execute and sync at first */ | ||
10146 | snd_hda_codec_read(codec, hp_nid, 0, AC_VERB_SET_PIN_SENSE, 0); | ||
10147 | present = snd_hda_codec_read(codec, hp_nid, 0, | ||
10148 | AC_VERB_GET_PIN_SENSE, 0); | ||
10149 | spec->jack_present = (present & 0x80000000) != 0; | ||
10150 | alc262_hippo_master_update(codec); | ||
9682 | } | 10151 | } |
9683 | 10152 | ||
10153 | static void alc262_hippo_unsol_event(struct hda_codec *codec, unsigned int res) | ||
10154 | { | ||
10155 | if ((res >> 26) != ALC880_HP_EVENT) | ||
10156 | return; | ||
10157 | alc262_hippo_automute(codec); | ||
10158 | } | ||
10159 | |||
10160 | static void alc262_hippo_init_hook(struct hda_codec *codec) | ||
10161 | { | ||
10162 | struct alc_spec *spec = codec->spec; | ||
10163 | |||
10164 | spec->autocfg.hp_pins[0] = 0x15; | ||
10165 | spec->autocfg.speaker_pins[0] = 0x14; | ||
10166 | alc262_hippo_automute(codec); | ||
10167 | } | ||
10168 | |||
10169 | static void alc262_hippo1_init_hook(struct hda_codec *codec) | ||
10170 | { | ||
10171 | struct alc_spec *spec = codec->spec; | ||
10172 | |||
10173 | spec->autocfg.hp_pins[0] = 0x1b; | ||
10174 | spec->autocfg.speaker_pins[0] = 0x14; | ||
10175 | alc262_hippo_automute(codec); | ||
10176 | } | ||
10177 | |||
10178 | |||
9684 | static struct snd_kcontrol_new alc262_sony_mixer[] = { | 10179 | static struct snd_kcontrol_new alc262_sony_mixer[] = { |
9685 | HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 10180 | HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
9686 | { | 10181 | ALC262_HIPPO_MASTER_SWITCH, |
9687 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
9688 | .name = "Master Playback Switch", | ||
9689 | .info = snd_hda_mixer_amp_switch_info, | ||
9690 | .get = snd_hda_mixer_amp_switch_get, | ||
9691 | .put = alc262_sony_master_sw_put, | ||
9692 | .private_value = HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT), | ||
9693 | }, | ||
9694 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 10182 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
9695 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 10183 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
9696 | HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x01, HDA_INPUT), | 10184 | HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x01, HDA_INPUT), |
@@ -9699,8 +10187,8 @@ static struct snd_kcontrol_new alc262_sony_mixer[] = { | |||
9699 | }; | 10187 | }; |
9700 | 10188 | ||
9701 | static struct snd_kcontrol_new alc262_benq_t31_mixer[] = { | 10189 | static struct snd_kcontrol_new alc262_benq_t31_mixer[] = { |
9702 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 10190 | HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
9703 | HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT), | 10191 | ALC262_HIPPO_MASTER_SWITCH, |
9704 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT), | 10192 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT), |
9705 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 10193 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
9706 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 10194 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
@@ -9741,34 +10229,15 @@ static struct hda_verb alc262_tyan_verbs[] = { | |||
9741 | }; | 10229 | }; |
9742 | 10230 | ||
9743 | /* unsolicited event for HP jack sensing */ | 10231 | /* unsolicited event for HP jack sensing */ |
9744 | static void alc262_tyan_automute(struct hda_codec *codec) | 10232 | static void alc262_tyan_init_hook(struct hda_codec *codec) |
9745 | { | 10233 | { |
9746 | unsigned int mute; | 10234 | struct alc_spec *spec = codec->spec; |
9747 | unsigned int present; | ||
9748 | 10235 | ||
9749 | snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0); | 10236 | spec->autocfg.hp_pins[0] = 0x1b; |
9750 | present = snd_hda_codec_read(codec, 0x1b, 0, | 10237 | spec->autocfg.speaker_pins[0] = 0x15; |
9751 | AC_VERB_GET_PIN_SENSE, 0); | 10238 | alc_automute_amp(codec); |
9752 | present = (present & 0x80000000) != 0; | ||
9753 | if (present) { | ||
9754 | /* mute line output on ATX panel */ | ||
9755 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | ||
9756 | HDA_AMP_MUTE, HDA_AMP_MUTE); | ||
9757 | } else { | ||
9758 | /* unmute line output if necessary */ | ||
9759 | mute = snd_hda_codec_amp_read(codec, 0x1b, 0, HDA_OUTPUT, 0); | ||
9760 | snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, | ||
9761 | HDA_AMP_MUTE, mute); | ||
9762 | } | ||
9763 | } | 10239 | } |
9764 | 10240 | ||
9765 | static void alc262_tyan_unsol_event(struct hda_codec *codec, | ||
9766 | unsigned int res) | ||
9767 | { | ||
9768 | if ((res >> 26) != ALC880_HP_EVENT) | ||
9769 | return; | ||
9770 | alc262_tyan_automute(codec); | ||
9771 | } | ||
9772 | 10241 | ||
9773 | #define alc262_capture_mixer alc882_capture_mixer | 10242 | #define alc262_capture_mixer alc882_capture_mixer |
9774 | #define alc262_capture_alt_mixer alc882_capture_alt_mixer | 10243 | #define alc262_capture_alt_mixer alc882_capture_alt_mixer |
@@ -9923,99 +10392,25 @@ static void alc262_dmic_automute(struct hda_codec *codec) | |||
9923 | AC_VERB_SET_CONNECT_SEL, present ? 0x0 : 0x09); | 10392 | AC_VERB_SET_CONNECT_SEL, present ? 0x0 : 0x09); |
9924 | } | 10393 | } |
9925 | 10394 | ||
9926 | /* toggle speaker-output according to the hp-jack state */ | ||
9927 | static void alc262_toshiba_s06_speaker_automute(struct hda_codec *codec) | ||
9928 | { | ||
9929 | unsigned int present; | ||
9930 | unsigned char bits; | ||
9931 | |||
9932 | present = snd_hda_codec_read(codec, 0x15, 0, | ||
9933 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
9934 | bits = present ? 0 : PIN_OUT; | ||
9935 | snd_hda_codec_write(codec, 0x14, 0, | ||
9936 | AC_VERB_SET_PIN_WIDGET_CONTROL, bits); | ||
9937 | } | ||
9938 | |||
9939 | |||
9940 | 10395 | ||
9941 | /* unsolicited event for HP jack sensing */ | 10396 | /* unsolicited event for HP jack sensing */ |
9942 | static void alc262_toshiba_s06_unsol_event(struct hda_codec *codec, | 10397 | static void alc262_toshiba_s06_unsol_event(struct hda_codec *codec, |
9943 | unsigned int res) | 10398 | unsigned int res) |
9944 | { | 10399 | { |
9945 | if ((res >> 26) == ALC880_HP_EVENT) | ||
9946 | alc262_toshiba_s06_speaker_automute(codec); | ||
9947 | if ((res >> 26) == ALC880_MIC_EVENT) | 10400 | if ((res >> 26) == ALC880_MIC_EVENT) |
9948 | alc262_dmic_automute(codec); | 10401 | alc262_dmic_automute(codec); |
9949 | 10402 | else | |
10403 | alc_sku_unsol_event(codec, res); | ||
9950 | } | 10404 | } |
9951 | 10405 | ||
9952 | static void alc262_toshiba_s06_init_hook(struct hda_codec *codec) | 10406 | static void alc262_toshiba_s06_init_hook(struct hda_codec *codec) |
9953 | { | 10407 | { |
9954 | alc262_toshiba_s06_speaker_automute(codec); | ||
9955 | alc262_dmic_automute(codec); | ||
9956 | } | ||
9957 | |||
9958 | /* mute/unmute internal speaker according to the hp jack and mute state */ | ||
9959 | static void alc262_hippo_automute(struct hda_codec *codec) | ||
9960 | { | ||
9961 | struct alc_spec *spec = codec->spec; | 10408 | struct alc_spec *spec = codec->spec; |
9962 | unsigned int mute; | ||
9963 | unsigned int present; | ||
9964 | |||
9965 | /* need to execute and sync at first */ | ||
9966 | snd_hda_codec_read(codec, 0x15, 0, AC_VERB_SET_PIN_SENSE, 0); | ||
9967 | present = snd_hda_codec_read(codec, 0x15, 0, | ||
9968 | AC_VERB_GET_PIN_SENSE, 0); | ||
9969 | spec->jack_present = (present & 0x80000000) != 0; | ||
9970 | if (spec->jack_present) { | ||
9971 | /* mute internal speaker */ | ||
9972 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
9973 | HDA_AMP_MUTE, HDA_AMP_MUTE); | ||
9974 | } else { | ||
9975 | /* unmute internal speaker if necessary */ | ||
9976 | mute = snd_hda_codec_amp_read(codec, 0x15, 0, HDA_OUTPUT, 0); | ||
9977 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
9978 | HDA_AMP_MUTE, mute); | ||
9979 | } | ||
9980 | } | ||
9981 | |||
9982 | /* unsolicited event for HP jack sensing */ | ||
9983 | static void alc262_hippo_unsol_event(struct hda_codec *codec, | ||
9984 | unsigned int res) | ||
9985 | { | ||
9986 | if ((res >> 26) != ALC880_HP_EVENT) | ||
9987 | return; | ||
9988 | alc262_hippo_automute(codec); | ||
9989 | } | ||
9990 | |||
9991 | static void alc262_hippo1_automute(struct hda_codec *codec) | ||
9992 | { | ||
9993 | unsigned int mute; | ||
9994 | unsigned int present; | ||
9995 | |||
9996 | snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0); | ||
9997 | present = snd_hda_codec_read(codec, 0x1b, 0, | ||
9998 | AC_VERB_GET_PIN_SENSE, 0); | ||
9999 | present = (present & 0x80000000) != 0; | ||
10000 | if (present) { | ||
10001 | /* mute internal speaker */ | ||
10002 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
10003 | HDA_AMP_MUTE, HDA_AMP_MUTE); | ||
10004 | } else { | ||
10005 | /* unmute internal speaker if necessary */ | ||
10006 | mute = snd_hda_codec_amp_read(codec, 0x1b, 0, HDA_OUTPUT, 0); | ||
10007 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
10008 | HDA_AMP_MUTE, mute); | ||
10009 | } | ||
10010 | } | ||
10011 | 10409 | ||
10012 | /* unsolicited event for HP jack sensing */ | 10410 | spec->autocfg.hp_pins[0] = 0x15; |
10013 | static void alc262_hippo1_unsol_event(struct hda_codec *codec, | 10411 | spec->autocfg.speaker_pins[0] = 0x14; |
10014 | unsigned int res) | 10412 | alc_automute_pin(codec); |
10015 | { | 10413 | alc262_dmic_automute(codec); |
10016 | if ((res >> 26) != ALC880_HP_EVENT) | ||
10017 | return; | ||
10018 | alc262_hippo1_automute(codec); | ||
10019 | } | 10414 | } |
10020 | 10415 | ||
10021 | /* | 10416 | /* |
@@ -10285,14 +10680,7 @@ static struct snd_kcontrol_new alc262_lenovo_3000_mixer[] = { | |||
10285 | 10680 | ||
10286 | static struct snd_kcontrol_new alc262_toshiba_rx1_mixer[] = { | 10681 | static struct snd_kcontrol_new alc262_toshiba_rx1_mixer[] = { |
10287 | HDA_BIND_VOL("Master Playback Volume", &alc262_fujitsu_bind_master_vol), | 10682 | HDA_BIND_VOL("Master Playback Volume", &alc262_fujitsu_bind_master_vol), |
10288 | { | 10683 | ALC262_HIPPO_MASTER_SWITCH, |
10289 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
10290 | .name = "Master Playback Switch", | ||
10291 | .info = snd_hda_mixer_amp_switch_info, | ||
10292 | .get = snd_hda_mixer_amp_switch_get, | ||
10293 | .put = alc262_sony_master_sw_put, | ||
10294 | .private_value = HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT), | ||
10295 | }, | ||
10296 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 10684 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
10297 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 10685 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
10298 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 10686 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
@@ -10513,9 +10901,27 @@ static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec, | |||
10513 | return 0; | 10901 | return 0; |
10514 | } | 10902 | } |
10515 | 10903 | ||
10516 | /* identical with ALC880 */ | 10904 | static int alc262_auto_create_analog_input_ctls(struct alc_spec *spec, |
10517 | #define alc262_auto_create_analog_input_ctls \ | 10905 | const struct auto_pin_cfg *cfg) |
10518 | alc880_auto_create_analog_input_ctls | 10906 | { |
10907 | int err; | ||
10908 | |||
10909 | err = alc880_auto_create_analog_input_ctls(spec, cfg); | ||
10910 | if (err < 0) | ||
10911 | return err; | ||
10912 | /* digital-mic input pin is excluded in alc880_auto_create..() | ||
10913 | * because it's under 0x18 | ||
10914 | */ | ||
10915 | if (cfg->input_pins[AUTO_PIN_MIC] == 0x12 || | ||
10916 | cfg->input_pins[AUTO_PIN_FRONT_MIC] == 0x12) { | ||
10917 | struct hda_input_mux *imux = &spec->private_imux[0]; | ||
10918 | imux->items[imux->num_items].label = "Int Mic"; | ||
10919 | imux->items[imux->num_items].index = 0x09; | ||
10920 | imux->num_items++; | ||
10921 | } | ||
10922 | return 0; | ||
10923 | } | ||
10924 | |||
10519 | 10925 | ||
10520 | /* | 10926 | /* |
10521 | * generic initialization of ADC, input mixers and output mixers | 10927 | * generic initialization of ADC, input mixers and output mixers |
@@ -10639,31 +11045,46 @@ static struct hda_verb alc262_HP_BPC_init_verbs[] = { | |||
10639 | {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20}, | 11045 | {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20}, |
10640 | {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20}, | 11046 | {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20}, |
10641 | 11047 | ||
10642 | {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7023 }, | 11048 | {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 }, |
10643 | {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 }, | 11049 | {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 }, |
10644 | {0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 }, | 11050 | {0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 }, |
10645 | {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x7023 }, | 11051 | {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 }, |
10646 | {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 }, | 11052 | {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 }, |
10647 | {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 }, | 11053 | {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 }, |
10648 | 11054 | ||
10649 | 11055 | ||
10650 | /* FIXME: use matrix-type input source selection */ | 11056 | /* FIXME: use matrix-type input source selection */ |
10651 | /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */ | 11057 | /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 0b, 12 */ |
10652 | /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */ | 11058 | /* Input mixer1: only unmute Mic */ |
10653 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))}, | 11059 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))}, |
10654 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))}, | 11060 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))}, |
10655 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))}, | 11061 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))}, |
10656 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))}, | 11062 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))}, |
11063 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))}, | ||
11064 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x05 << 8))}, | ||
11065 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x06 << 8))}, | ||
11066 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x07 << 8))}, | ||
11067 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x08 << 8))}, | ||
10657 | /* Input mixer2 */ | 11068 | /* Input mixer2 */ |
10658 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))}, | 11069 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))}, |
10659 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))}, | 11070 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))}, |
10660 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))}, | 11071 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))}, |
10661 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))}, | 11072 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))}, |
11073 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))}, | ||
11074 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x05 << 8))}, | ||
11075 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x06 << 8))}, | ||
11076 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x07 << 8))}, | ||
11077 | {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x08 << 8))}, | ||
10662 | /* Input mixer3 */ | 11078 | /* Input mixer3 */ |
10663 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))}, | 11079 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))}, |
10664 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))}, | 11080 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))}, |
10665 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))}, | 11081 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))}, |
10666 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))}, | 11082 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))}, |
11083 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))}, | ||
11084 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x05 << 8))}, | ||
11085 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x06 << 8))}, | ||
11086 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x07 << 8))}, | ||
11087 | {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x08 << 8))}, | ||
10667 | 11088 | ||
10668 | {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | 11089 | {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, |
10669 | 11090 | ||
@@ -10788,7 +11209,7 @@ static struct hda_verb alc262_toshiba_rx1_unsol_verbs[] = { | |||
10788 | #define alc262_loopbacks alc880_loopbacks | 11209 | #define alc262_loopbacks alc880_loopbacks |
10789 | #endif | 11210 | #endif |
10790 | 11211 | ||
10791 | /* pcm configuration: identiacal with ALC880 */ | 11212 | /* pcm configuration: identical with ALC880 */ |
10792 | #define alc262_pcm_analog_playback alc880_pcm_analog_playback | 11213 | #define alc262_pcm_analog_playback alc880_pcm_analog_playback |
10793 | #define alc262_pcm_analog_capture alc880_pcm_analog_capture | 11214 | #define alc262_pcm_analog_capture alc880_pcm_analog_capture |
10794 | #define alc262_pcm_digital_playback alc880_pcm_digital_playback | 11215 | #define alc262_pcm_digital_playback alc880_pcm_digital_playback |
@@ -10843,6 +11264,8 @@ static int alc262_parse_auto_config(struct hda_codec *codec) | |||
10843 | if (err < 0) | 11264 | if (err < 0) |
10844 | return err; | 11265 | return err; |
10845 | 11266 | ||
11267 | alc_ssid_check(codec, 0x15, 0x14, 0x1b); | ||
11268 | |||
10846 | return 1; | 11269 | return 1; |
10847 | } | 11270 | } |
10848 | 11271 | ||
@@ -10915,6 +11338,7 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = { | |||
10915 | SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO), | 11338 | SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO), |
10916 | SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD), | 11339 | SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD), |
10917 | SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */ | 11340 | SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */ |
11341 | SND_PCI_QUIRK(0x104d, 0x9025, "Sony VAIO Z21MN", ALC262_TOSHIBA_S06), | ||
10918 | SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO", | 11342 | SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO", |
10919 | ALC262_SONY_ASSAMD), | 11343 | ALC262_SONY_ASSAMD), |
10920 | SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1", | 11344 | SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1", |
@@ -10945,7 +11369,7 @@ static struct alc_config_preset alc262_presets[] = { | |||
10945 | .input_mux = &alc262_capture_source, | 11369 | .input_mux = &alc262_capture_source, |
10946 | }, | 11370 | }, |
10947 | [ALC262_HIPPO] = { | 11371 | [ALC262_HIPPO] = { |
10948 | .mixers = { alc262_base_mixer }, | 11372 | .mixers = { alc262_hippo_mixer }, |
10949 | .init_verbs = { alc262_init_verbs, alc262_hippo_unsol_verbs}, | 11373 | .init_verbs = { alc262_init_verbs, alc262_hippo_unsol_verbs}, |
10950 | .num_dacs = ARRAY_SIZE(alc262_dac_nids), | 11374 | .num_dacs = ARRAY_SIZE(alc262_dac_nids), |
10951 | .dac_nids = alc262_dac_nids, | 11375 | .dac_nids = alc262_dac_nids, |
@@ -10955,7 +11379,7 @@ static struct alc_config_preset alc262_presets[] = { | |||
10955 | .channel_mode = alc262_modes, | 11379 | .channel_mode = alc262_modes, |
10956 | .input_mux = &alc262_capture_source, | 11380 | .input_mux = &alc262_capture_source, |
10957 | .unsol_event = alc262_hippo_unsol_event, | 11381 | .unsol_event = alc262_hippo_unsol_event, |
10958 | .init_hook = alc262_hippo_automute, | 11382 | .init_hook = alc262_hippo_init_hook, |
10959 | }, | 11383 | }, |
10960 | [ALC262_HIPPO_1] = { | 11384 | [ALC262_HIPPO_1] = { |
10961 | .mixers = { alc262_hippo1_mixer }, | 11385 | .mixers = { alc262_hippo1_mixer }, |
@@ -10967,8 +11391,8 @@ static struct alc_config_preset alc262_presets[] = { | |||
10967 | .num_channel_mode = ARRAY_SIZE(alc262_modes), | 11391 | .num_channel_mode = ARRAY_SIZE(alc262_modes), |
10968 | .channel_mode = alc262_modes, | 11392 | .channel_mode = alc262_modes, |
10969 | .input_mux = &alc262_capture_source, | 11393 | .input_mux = &alc262_capture_source, |
10970 | .unsol_event = alc262_hippo1_unsol_event, | 11394 | .unsol_event = alc262_hippo_unsol_event, |
10971 | .init_hook = alc262_hippo1_automute, | 11395 | .init_hook = alc262_hippo1_init_hook, |
10972 | }, | 11396 | }, |
10973 | [ALC262_FUJITSU] = { | 11397 | [ALC262_FUJITSU] = { |
10974 | .mixers = { alc262_fujitsu_mixer }, | 11398 | .mixers = { alc262_fujitsu_mixer }, |
@@ -11030,7 +11454,7 @@ static struct alc_config_preset alc262_presets[] = { | |||
11030 | .num_channel_mode = ARRAY_SIZE(alc262_modes), | 11454 | .num_channel_mode = ARRAY_SIZE(alc262_modes), |
11031 | .channel_mode = alc262_modes, | 11455 | .channel_mode = alc262_modes, |
11032 | .input_mux = &alc262_capture_source, | 11456 | .input_mux = &alc262_capture_source, |
11033 | .unsol_event = alc262_hp_t5735_unsol_event, | 11457 | .unsol_event = alc_automute_amp_unsol_event, |
11034 | .init_hook = alc262_hp_t5735_init_hook, | 11458 | .init_hook = alc262_hp_t5735_init_hook, |
11035 | }, | 11459 | }, |
11036 | [ALC262_HP_RP5700] = { | 11460 | [ALC262_HP_RP5700] = { |
@@ -11062,7 +11486,7 @@ static struct alc_config_preset alc262_presets[] = { | |||
11062 | .channel_mode = alc262_modes, | 11486 | .channel_mode = alc262_modes, |
11063 | .input_mux = &alc262_capture_source, | 11487 | .input_mux = &alc262_capture_source, |
11064 | .unsol_event = alc262_hippo_unsol_event, | 11488 | .unsol_event = alc262_hippo_unsol_event, |
11065 | .init_hook = alc262_hippo_automute, | 11489 | .init_hook = alc262_hippo_init_hook, |
11066 | }, | 11490 | }, |
11067 | [ALC262_BENQ_T31] = { | 11491 | [ALC262_BENQ_T31] = { |
11068 | .mixers = { alc262_benq_t31_mixer }, | 11492 | .mixers = { alc262_benq_t31_mixer }, |
@@ -11074,7 +11498,7 @@ static struct alc_config_preset alc262_presets[] = { | |||
11074 | .channel_mode = alc262_modes, | 11498 | .channel_mode = alc262_modes, |
11075 | .input_mux = &alc262_capture_source, | 11499 | .input_mux = &alc262_capture_source, |
11076 | .unsol_event = alc262_hippo_unsol_event, | 11500 | .unsol_event = alc262_hippo_unsol_event, |
11077 | .init_hook = alc262_hippo_automute, | 11501 | .init_hook = alc262_hippo_init_hook, |
11078 | }, | 11502 | }, |
11079 | [ALC262_ULTRA] = { | 11503 | [ALC262_ULTRA] = { |
11080 | .mixers = { alc262_ultra_mixer }, | 11504 | .mixers = { alc262_ultra_mixer }, |
@@ -11122,6 +11546,7 @@ static struct alc_config_preset alc262_presets[] = { | |||
11122 | .capsrc_nids = alc262_dmic_capsrc_nids, | 11546 | .capsrc_nids = alc262_dmic_capsrc_nids, |
11123 | .dac_nids = alc262_dac_nids, | 11547 | .dac_nids = alc262_dac_nids, |
11124 | .adc_nids = alc262_dmic_adc_nids, /* ADC0 */ | 11548 | .adc_nids = alc262_dmic_adc_nids, /* ADC0 */ |
11549 | .num_adc_nids = 1, /* single ADC */ | ||
11125 | .dig_out_nid = ALC262_DIGOUT_NID, | 11550 | .dig_out_nid = ALC262_DIGOUT_NID, |
11126 | .num_channel_mode = ARRAY_SIZE(alc262_modes), | 11551 | .num_channel_mode = ARRAY_SIZE(alc262_modes), |
11127 | .channel_mode = alc262_modes, | 11552 | .channel_mode = alc262_modes, |
@@ -11139,7 +11564,7 @@ static struct alc_config_preset alc262_presets[] = { | |||
11139 | .channel_mode = alc262_modes, | 11564 | .channel_mode = alc262_modes, |
11140 | .input_mux = &alc262_capture_source, | 11565 | .input_mux = &alc262_capture_source, |
11141 | .unsol_event = alc262_hippo_unsol_event, | 11566 | .unsol_event = alc262_hippo_unsol_event, |
11142 | .init_hook = alc262_hippo_automute, | 11567 | .init_hook = alc262_hippo_init_hook, |
11143 | }, | 11568 | }, |
11144 | [ALC262_TYAN] = { | 11569 | [ALC262_TYAN] = { |
11145 | .mixers = { alc262_tyan_mixer }, | 11570 | .mixers = { alc262_tyan_mixer }, |
@@ -11151,8 +11576,8 @@ static struct alc_config_preset alc262_presets[] = { | |||
11151 | .num_channel_mode = ARRAY_SIZE(alc262_modes), | 11576 | .num_channel_mode = ARRAY_SIZE(alc262_modes), |
11152 | .channel_mode = alc262_modes, | 11577 | .channel_mode = alc262_modes, |
11153 | .input_mux = &alc262_capture_source, | 11578 | .input_mux = &alc262_capture_source, |
11154 | .unsol_event = alc262_tyan_unsol_event, | 11579 | .unsol_event = alc_automute_amp_unsol_event, |
11155 | .init_hook = alc262_tyan_automute, | 11580 | .init_hook = alc262_tyan_init_hook, |
11156 | }, | 11581 | }, |
11157 | }; | 11582 | }; |
11158 | 11583 | ||
@@ -11187,8 +11612,8 @@ static int patch_alc262(struct hda_codec *codec) | |||
11187 | alc262_cfg_tbl); | 11612 | alc262_cfg_tbl); |
11188 | 11613 | ||
11189 | if (board_config < 0) { | 11614 | if (board_config < 0) { |
11190 | printk(KERN_INFO "hda_codec: Unknown model for ALC262, " | 11615 | printk(KERN_INFO "hda_codec: Unknown model for %s, " |
11191 | "trying auto-probe from BIOS...\n"); | 11616 | "trying auto-probe from BIOS...\n", codec->chip_name); |
11192 | board_config = ALC262_AUTO; | 11617 | board_config = ALC262_AUTO; |
11193 | } | 11618 | } |
11194 | 11619 | ||
@@ -11217,29 +11642,42 @@ static int patch_alc262(struct hda_codec *codec) | |||
11217 | if (board_config != ALC262_AUTO) | 11642 | if (board_config != ALC262_AUTO) |
11218 | setup_preset(spec, &alc262_presets[board_config]); | 11643 | setup_preset(spec, &alc262_presets[board_config]); |
11219 | 11644 | ||
11220 | spec->stream_name_analog = "ALC262 Analog"; | ||
11221 | spec->stream_analog_playback = &alc262_pcm_analog_playback; | 11645 | spec->stream_analog_playback = &alc262_pcm_analog_playback; |
11222 | spec->stream_analog_capture = &alc262_pcm_analog_capture; | 11646 | spec->stream_analog_capture = &alc262_pcm_analog_capture; |
11223 | 11647 | ||
11224 | spec->stream_name_digital = "ALC262 Digital"; | ||
11225 | spec->stream_digital_playback = &alc262_pcm_digital_playback; | 11648 | spec->stream_digital_playback = &alc262_pcm_digital_playback; |
11226 | spec->stream_digital_capture = &alc262_pcm_digital_capture; | 11649 | spec->stream_digital_capture = &alc262_pcm_digital_capture; |
11227 | 11650 | ||
11228 | spec->capture_style = CAPT_MIX; | ||
11229 | if (!spec->adc_nids && spec->input_mux) { | 11651 | if (!spec->adc_nids && spec->input_mux) { |
11230 | /* check whether NID 0x07 is valid */ | 11652 | int i; |
11231 | unsigned int wcap = get_wcaps(codec, 0x07); | 11653 | /* check whether the digital-mic has to be supported */ |
11232 | 11654 | for (i = 0; i < spec->input_mux->num_items; i++) { | |
11233 | /* get type */ | 11655 | if (spec->input_mux->items[i].index >= 9) |
11234 | wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; | 11656 | break; |
11235 | if (wcap != AC_WID_AUD_IN) { | 11657 | } |
11236 | spec->adc_nids = alc262_adc_nids_alt; | 11658 | if (i < spec->input_mux->num_items) { |
11237 | spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids_alt); | 11659 | /* use only ADC0 */ |
11238 | spec->capsrc_nids = alc262_capsrc_nids_alt; | 11660 | spec->adc_nids = alc262_dmic_adc_nids; |
11661 | spec->num_adc_nids = 1; | ||
11662 | spec->capsrc_nids = alc262_dmic_capsrc_nids; | ||
11239 | } else { | 11663 | } else { |
11240 | spec->adc_nids = alc262_adc_nids; | 11664 | /* all analog inputs */ |
11241 | spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids); | 11665 | /* check whether NID 0x07 is valid */ |
11242 | spec->capsrc_nids = alc262_capsrc_nids; | 11666 | unsigned int wcap = get_wcaps(codec, 0x07); |
11667 | |||
11668 | /* get type */ | ||
11669 | wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; | ||
11670 | if (wcap != AC_WID_AUD_IN) { | ||
11671 | spec->adc_nids = alc262_adc_nids_alt; | ||
11672 | spec->num_adc_nids = | ||
11673 | ARRAY_SIZE(alc262_adc_nids_alt); | ||
11674 | spec->capsrc_nids = alc262_capsrc_nids_alt; | ||
11675 | } else { | ||
11676 | spec->adc_nids = alc262_adc_nids; | ||
11677 | spec->num_adc_nids = | ||
11678 | ARRAY_SIZE(alc262_adc_nids); | ||
11679 | spec->capsrc_nids = alc262_capsrc_nids; | ||
11680 | } | ||
11243 | } | 11681 | } |
11244 | } | 11682 | } |
11245 | if (!spec->cap_mixer && !spec->no_analog) | 11683 | if (!spec->cap_mixer && !spec->no_analog) |
@@ -11296,6 +11734,17 @@ static struct snd_kcontrol_new alc268_base_mixer[] = { | |||
11296 | { } | 11734 | { } |
11297 | }; | 11735 | }; |
11298 | 11736 | ||
11737 | static struct snd_kcontrol_new alc268_toshiba_mixer[] = { | ||
11738 | /* output mixer control */ | ||
11739 | HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT), | ||
11740 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, HDA_OUTPUT), | ||
11741 | ALC262_HIPPO_MASTER_SWITCH, | ||
11742 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | ||
11743 | HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), | ||
11744 | HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT), | ||
11745 | { } | ||
11746 | }; | ||
11747 | |||
11299 | /* bind Beep switches of both NID 0x0f and 0x10 */ | 11748 | /* bind Beep switches of both NID 0x0f and 0x10 */ |
11300 | static struct hda_bind_ctls alc268_bind_beep_sw = { | 11749 | static struct hda_bind_ctls alc268_bind_beep_sw = { |
11301 | .ops = &snd_hda_bind_sw, | 11750 | .ops = &snd_hda_bind_sw, |
@@ -11319,8 +11768,6 @@ static struct hda_verb alc268_eapd_verbs[] = { | |||
11319 | }; | 11768 | }; |
11320 | 11769 | ||
11321 | /* Toshiba specific */ | 11770 | /* Toshiba specific */ |
11322 | #define alc268_toshiba_automute alc262_hippo_automute | ||
11323 | |||
11324 | static struct hda_verb alc268_toshiba_verbs[] = { | 11771 | static struct hda_verb alc268_toshiba_verbs[] = { |
11325 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | 11772 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, |
11326 | { } /* end */ | 11773 | { } /* end */ |
@@ -11456,13 +11903,8 @@ static struct hda_verb alc268_acer_verbs[] = { | |||
11456 | }; | 11903 | }; |
11457 | 11904 | ||
11458 | /* unsolicited event for HP jack sensing */ | 11905 | /* unsolicited event for HP jack sensing */ |
11459 | static void alc268_toshiba_unsol_event(struct hda_codec *codec, | 11906 | #define alc268_toshiba_unsol_event alc262_hippo_unsol_event |
11460 | unsigned int res) | 11907 | #define alc268_toshiba_init_hook alc262_hippo_init_hook |
11461 | { | ||
11462 | if ((res >> 26) != ALC880_HP_EVENT) | ||
11463 | return; | ||
11464 | alc268_toshiba_automute(codec); | ||
11465 | } | ||
11466 | 11908 | ||
11467 | static void alc268_acer_unsol_event(struct hda_codec *codec, | 11909 | static void alc268_acer_unsol_event(struct hda_codec *codec, |
11468 | unsigned int res) | 11910 | unsigned int res) |
@@ -11537,30 +11979,15 @@ static struct hda_verb alc268_dell_verbs[] = { | |||
11537 | }; | 11979 | }; |
11538 | 11980 | ||
11539 | /* mute/unmute internal speaker according to the hp jack and mute state */ | 11981 | /* mute/unmute internal speaker according to the hp jack and mute state */ |
11540 | static void alc268_dell_automute(struct hda_codec *codec) | 11982 | static void alc268_dell_init_hook(struct hda_codec *codec) |
11541 | { | 11983 | { |
11542 | unsigned int present; | 11984 | struct alc_spec *spec = codec->spec; |
11543 | unsigned int mute; | ||
11544 | |||
11545 | present = snd_hda_codec_read(codec, 0x15, 0, AC_VERB_GET_PIN_SENSE, 0); | ||
11546 | if (present & 0x80000000) | ||
11547 | mute = HDA_AMP_MUTE; | ||
11548 | else | ||
11549 | mute = snd_hda_codec_amp_read(codec, 0x15, 0, HDA_OUTPUT, 0); | ||
11550 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
11551 | HDA_AMP_MUTE, mute); | ||
11552 | } | ||
11553 | 11985 | ||
11554 | static void alc268_dell_unsol_event(struct hda_codec *codec, | 11986 | spec->autocfg.hp_pins[0] = 0x15; |
11555 | unsigned int res) | 11987 | spec->autocfg.speaker_pins[0] = 0x14; |
11556 | { | 11988 | alc_automute_pin(codec); |
11557 | if ((res >> 26) != ALC880_HP_EVENT) | ||
11558 | return; | ||
11559 | alc268_dell_automute(codec); | ||
11560 | } | 11989 | } |
11561 | 11990 | ||
11562 | #define alc268_dell_init_hook alc268_dell_automute | ||
11563 | |||
11564 | static struct snd_kcontrol_new alc267_quanta_il1_mixer[] = { | 11991 | static struct snd_kcontrol_new alc267_quanta_il1_mixer[] = { |
11565 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x2, 0x0, HDA_OUTPUT), | 11992 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x2, 0x0, HDA_OUTPUT), |
11566 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT), | 11993 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT), |
@@ -11579,16 +12006,6 @@ static struct hda_verb alc267_quanta_il1_verbs[] = { | |||
11579 | { } | 12006 | { } |
11580 | }; | 12007 | }; |
11581 | 12008 | ||
11582 | static void alc267_quanta_il1_hp_automute(struct hda_codec *codec) | ||
11583 | { | ||
11584 | unsigned int present; | ||
11585 | |||
11586 | present = snd_hda_codec_read(codec, 0x15, 0, AC_VERB_GET_PIN_SENSE, 0) | ||
11587 | & AC_PINSENSE_PRESENCE; | ||
11588 | snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, | ||
11589 | present ? 0 : PIN_OUT); | ||
11590 | } | ||
11591 | |||
11592 | static void alc267_quanta_il1_mic_automute(struct hda_codec *codec) | 12009 | static void alc267_quanta_il1_mic_automute(struct hda_codec *codec) |
11593 | { | 12010 | { |
11594 | unsigned int present; | 12011 | unsigned int present; |
@@ -11600,9 +12017,13 @@ static void alc267_quanta_il1_mic_automute(struct hda_codec *codec) | |||
11600 | present ? 0x00 : 0x01); | 12017 | present ? 0x00 : 0x01); |
11601 | } | 12018 | } |
11602 | 12019 | ||
11603 | static void alc267_quanta_il1_automute(struct hda_codec *codec) | 12020 | static void alc267_quanta_il1_init_hook(struct hda_codec *codec) |
11604 | { | 12021 | { |
11605 | alc267_quanta_il1_hp_automute(codec); | 12022 | struct alc_spec *spec = codec->spec; |
12023 | |||
12024 | spec->autocfg.hp_pins[0] = 0x15; | ||
12025 | spec->autocfg.speaker_pins[0] = 0x14; | ||
12026 | alc_automute_pin(codec); | ||
11606 | alc267_quanta_il1_mic_automute(codec); | 12027 | alc267_quanta_il1_mic_automute(codec); |
11607 | } | 12028 | } |
11608 | 12029 | ||
@@ -11610,12 +12031,12 @@ static void alc267_quanta_il1_unsol_event(struct hda_codec *codec, | |||
11610 | unsigned int res) | 12031 | unsigned int res) |
11611 | { | 12032 | { |
11612 | switch (res >> 26) { | 12033 | switch (res >> 26) { |
11613 | case ALC880_HP_EVENT: | ||
11614 | alc267_quanta_il1_hp_automute(codec); | ||
11615 | break; | ||
11616 | case ALC880_MIC_EVENT: | 12034 | case ALC880_MIC_EVENT: |
11617 | alc267_quanta_il1_mic_automute(codec); | 12035 | alc267_quanta_il1_mic_automute(codec); |
11618 | break; | 12036 | break; |
12037 | default: | ||
12038 | alc_sku_unsol_event(codec, res); | ||
12039 | break; | ||
11619 | } | 12040 | } |
11620 | } | 12041 | } |
11621 | 12042 | ||
@@ -11960,7 +12381,7 @@ static void alc268_auto_init_mono_speaker_out(struct hda_codec *codec) | |||
11960 | AC_VERB_SET_AMP_GAIN_MUTE, dac_vol2); | 12381 | AC_VERB_SET_AMP_GAIN_MUTE, dac_vol2); |
11961 | } | 12382 | } |
11962 | 12383 | ||
11963 | /* pcm configuration: identiacal with ALC880 */ | 12384 | /* pcm configuration: identical with ALC880 */ |
11964 | #define alc268_pcm_analog_playback alc880_pcm_analog_playback | 12385 | #define alc268_pcm_analog_playback alc880_pcm_analog_playback |
11965 | #define alc268_pcm_analog_capture alc880_pcm_analog_capture | 12386 | #define alc268_pcm_analog_capture alc880_pcm_analog_capture |
11966 | #define alc268_pcm_analog_alt_capture alc880_pcm_analog_alt_capture | 12387 | #define alc268_pcm_analog_alt_capture alc880_pcm_analog_alt_capture |
@@ -12063,16 +12484,16 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = { | |||
12063 | ALC268_ACER_ASPIRE_ONE), | 12484 | ALC268_ACER_ASPIRE_ONE), |
12064 | SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL), | 12485 | SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL), |
12065 | SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL), | 12486 | SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL), |
12066 | SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA), | 12487 | SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP TX25xx series", |
12067 | SND_PCI_QUIRK(0x103c, 0x30f1, "HP TX25xx series", ALC268_TOSHIBA), | 12488 | ALC268_TOSHIBA), |
12068 | SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST), | 12489 | SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST), |
12069 | SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA), | 12490 | SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO), |
12070 | SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA), | 12491 | SND_PCI_QUIRK_MASK(0x1179, 0xff00, 0xff00, "TOSHIBA A/Lx05", |
12071 | SND_PCI_QUIRK(0x1179, 0xff64, "TOSHIBA L305", ALC268_TOSHIBA), | 12492 | ALC268_TOSHIBA), |
12072 | SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA), | 12493 | SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA), |
12073 | SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER), | 12494 | SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER), |
12074 | SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1), | 12495 | SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1), |
12075 | SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO), | 12496 | SND_PCI_QUIRK(0x1854, 0x1775, "LG R510", ALC268_DELL), |
12076 | {} | 12497 | {} |
12077 | }; | 12498 | }; |
12078 | 12499 | ||
@@ -12090,7 +12511,7 @@ static struct alc_config_preset alc268_presets[] = { | |||
12090 | .channel_mode = alc268_modes, | 12511 | .channel_mode = alc268_modes, |
12091 | .input_mux = &alc268_capture_source, | 12512 | .input_mux = &alc268_capture_source, |
12092 | .unsol_event = alc267_quanta_il1_unsol_event, | 12513 | .unsol_event = alc267_quanta_il1_unsol_event, |
12093 | .init_hook = alc267_quanta_il1_automute, | 12514 | .init_hook = alc267_quanta_il1_init_hook, |
12094 | }, | 12515 | }, |
12095 | [ALC268_3ST] = { | 12516 | [ALC268_3ST] = { |
12096 | .mixers = { alc268_base_mixer, alc268_capture_alt_mixer, | 12517 | .mixers = { alc268_base_mixer, alc268_capture_alt_mixer, |
@@ -12108,7 +12529,7 @@ static struct alc_config_preset alc268_presets[] = { | |||
12108 | .input_mux = &alc268_capture_source, | 12529 | .input_mux = &alc268_capture_source, |
12109 | }, | 12530 | }, |
12110 | [ALC268_TOSHIBA] = { | 12531 | [ALC268_TOSHIBA] = { |
12111 | .mixers = { alc268_base_mixer, alc268_capture_alt_mixer, | 12532 | .mixers = { alc268_toshiba_mixer, alc268_capture_alt_mixer, |
12112 | alc268_beep_mixer }, | 12533 | alc268_beep_mixer }, |
12113 | .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, | 12534 | .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, |
12114 | alc268_toshiba_verbs }, | 12535 | alc268_toshiba_verbs }, |
@@ -12122,7 +12543,7 @@ static struct alc_config_preset alc268_presets[] = { | |||
12122 | .channel_mode = alc268_modes, | 12543 | .channel_mode = alc268_modes, |
12123 | .input_mux = &alc268_capture_source, | 12544 | .input_mux = &alc268_capture_source, |
12124 | .unsol_event = alc268_toshiba_unsol_event, | 12545 | .unsol_event = alc268_toshiba_unsol_event, |
12125 | .init_hook = alc268_toshiba_automute, | 12546 | .init_hook = alc268_toshiba_init_hook, |
12126 | }, | 12547 | }, |
12127 | [ALC268_ACER] = { | 12548 | [ALC268_ACER] = { |
12128 | .mixers = { alc268_acer_mixer, alc268_capture_alt_mixer, | 12549 | .mixers = { alc268_acer_mixer, alc268_capture_alt_mixer, |
@@ -12185,7 +12606,7 @@ static struct alc_config_preset alc268_presets[] = { | |||
12185 | .hp_nid = 0x02, | 12606 | .hp_nid = 0x02, |
12186 | .num_channel_mode = ARRAY_SIZE(alc268_modes), | 12607 | .num_channel_mode = ARRAY_SIZE(alc268_modes), |
12187 | .channel_mode = alc268_modes, | 12608 | .channel_mode = alc268_modes, |
12188 | .unsol_event = alc268_dell_unsol_event, | 12609 | .unsol_event = alc_sku_unsol_event, |
12189 | .init_hook = alc268_dell_init_hook, | 12610 | .init_hook = alc268_dell_init_hook, |
12190 | .input_mux = &alc268_capture_source, | 12611 | .input_mux = &alc268_capture_source, |
12191 | }, | 12612 | }, |
@@ -12205,7 +12626,7 @@ static struct alc_config_preset alc268_presets[] = { | |||
12205 | .channel_mode = alc268_modes, | 12626 | .channel_mode = alc268_modes, |
12206 | .input_mux = &alc268_capture_source, | 12627 | .input_mux = &alc268_capture_source, |
12207 | .unsol_event = alc268_toshiba_unsol_event, | 12628 | .unsol_event = alc268_toshiba_unsol_event, |
12208 | .init_hook = alc268_toshiba_automute | 12629 | .init_hook = alc268_toshiba_init_hook |
12209 | }, | 12630 | }, |
12210 | #ifdef CONFIG_SND_DEBUG | 12631 | #ifdef CONFIG_SND_DEBUG |
12211 | [ALC268_TEST] = { | 12632 | [ALC268_TEST] = { |
@@ -12243,8 +12664,8 @@ static int patch_alc268(struct hda_codec *codec) | |||
12243 | alc268_cfg_tbl); | 12664 | alc268_cfg_tbl); |
12244 | 12665 | ||
12245 | if (board_config < 0 || board_config >= ALC268_MODEL_LAST) { | 12666 | if (board_config < 0 || board_config >= ALC268_MODEL_LAST) { |
12246 | printk(KERN_INFO "hda_codec: Unknown model for ALC268, " | 12667 | printk(KERN_INFO "hda_codec: Unknown model for %s, " |
12247 | "trying auto-probe from BIOS...\n"); | 12668 | "trying auto-probe from BIOS...\n", codec->chip_name); |
12248 | board_config = ALC268_AUTO; | 12669 | board_config = ALC268_AUTO; |
12249 | } | 12670 | } |
12250 | 12671 | ||
@@ -12265,14 +12686,6 @@ static int patch_alc268(struct hda_codec *codec) | |||
12265 | if (board_config != ALC268_AUTO) | 12686 | if (board_config != ALC268_AUTO) |
12266 | setup_preset(spec, &alc268_presets[board_config]); | 12687 | setup_preset(spec, &alc268_presets[board_config]); |
12267 | 12688 | ||
12268 | if (codec->vendor_id == 0x10ec0267) { | ||
12269 | spec->stream_name_analog = "ALC267 Analog"; | ||
12270 | spec->stream_name_digital = "ALC267 Digital"; | ||
12271 | } else { | ||
12272 | spec->stream_name_analog = "ALC268 Analog"; | ||
12273 | spec->stream_name_digital = "ALC268 Digital"; | ||
12274 | } | ||
12275 | |||
12276 | spec->stream_analog_playback = &alc268_pcm_analog_playback; | 12689 | spec->stream_analog_playback = &alc268_pcm_analog_playback; |
12277 | spec->stream_analog_capture = &alc268_pcm_analog_capture; | 12690 | spec->stream_analog_capture = &alc268_pcm_analog_capture; |
12278 | spec->stream_analog_alt_capture = &alc268_pcm_analog_alt_capture; | 12691 | spec->stream_analog_alt_capture = &alc268_pcm_analog_alt_capture; |
@@ -12854,32 +13267,14 @@ static int alc269_auto_create_multi_out_ctls(struct alc_spec *spec, | |||
12854 | return 0; | 13267 | return 0; |
12855 | } | 13268 | } |
12856 | 13269 | ||
12857 | static int alc269_auto_create_analog_input_ctls(struct alc_spec *spec, | 13270 | #define alc269_auto_create_analog_input_ctls \ |
12858 | const struct auto_pin_cfg *cfg) | 13271 | alc262_auto_create_analog_input_ctls |
12859 | { | ||
12860 | int err; | ||
12861 | |||
12862 | err = alc880_auto_create_analog_input_ctls(spec, cfg); | ||
12863 | if (err < 0) | ||
12864 | return err; | ||
12865 | /* digital-mic input pin is excluded in alc880_auto_create..() | ||
12866 | * because it's under 0x18 | ||
12867 | */ | ||
12868 | if (cfg->input_pins[AUTO_PIN_MIC] == 0x12 || | ||
12869 | cfg->input_pins[AUTO_PIN_FRONT_MIC] == 0x12) { | ||
12870 | struct hda_input_mux *imux = &spec->private_imux[0]; | ||
12871 | imux->items[imux->num_items].label = "Int Mic"; | ||
12872 | imux->items[imux->num_items].index = 0x05; | ||
12873 | imux->num_items++; | ||
12874 | } | ||
12875 | return 0; | ||
12876 | } | ||
12877 | 13272 | ||
12878 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 13273 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
12879 | #define alc269_loopbacks alc880_loopbacks | 13274 | #define alc269_loopbacks alc880_loopbacks |
12880 | #endif | 13275 | #endif |
12881 | 13276 | ||
12882 | /* pcm configuration: identiacal with ALC880 */ | 13277 | /* pcm configuration: identical with ALC880 */ |
12883 | #define alc269_pcm_analog_playback alc880_pcm_analog_playback | 13278 | #define alc269_pcm_analog_playback alc880_pcm_analog_playback |
12884 | #define alc269_pcm_analog_capture alc880_pcm_analog_capture | 13279 | #define alc269_pcm_analog_capture alc880_pcm_analog_capture |
12885 | #define alc269_pcm_digital_playback alc880_pcm_digital_playback | 13280 | #define alc269_pcm_digital_playback alc880_pcm_digital_playback |
@@ -13099,8 +13494,8 @@ static int patch_alc269(struct hda_codec *codec) | |||
13099 | alc269_cfg_tbl); | 13494 | alc269_cfg_tbl); |
13100 | 13495 | ||
13101 | if (board_config < 0) { | 13496 | if (board_config < 0) { |
13102 | printk(KERN_INFO "hda_codec: Unknown model for ALC269, " | 13497 | printk(KERN_INFO "hda_codec: Unknown model for %s, " |
13103 | "trying auto-probe from BIOS...\n"); | 13498 | "trying auto-probe from BIOS...\n", codec->chip_name); |
13104 | board_config = ALC269_AUTO; | 13499 | board_config = ALC269_AUTO; |
13105 | } | 13500 | } |
13106 | 13501 | ||
@@ -13127,7 +13522,6 @@ static int patch_alc269(struct hda_codec *codec) | |||
13127 | if (board_config != ALC269_AUTO) | 13522 | if (board_config != ALC269_AUTO) |
13128 | setup_preset(spec, &alc269_presets[board_config]); | 13523 | setup_preset(spec, &alc269_presets[board_config]); |
13129 | 13524 | ||
13130 | spec->stream_name_analog = "ALC269 Analog"; | ||
13131 | if (codec->subsystem_id == 0x17aa3bf8) { | 13525 | if (codec->subsystem_id == 0x17aa3bf8) { |
13132 | /* Due to a hardware problem on Lenovo Ideadpad, we need to | 13526 | /* Due to a hardware problem on Lenovo Ideadpad, we need to |
13133 | * fix the sample rate of analog I/O to 44.1kHz | 13527 | * fix the sample rate of analog I/O to 44.1kHz |
@@ -13138,7 +13532,6 @@ static int patch_alc269(struct hda_codec *codec) | |||
13138 | spec->stream_analog_playback = &alc269_pcm_analog_playback; | 13532 | spec->stream_analog_playback = &alc269_pcm_analog_playback; |
13139 | spec->stream_analog_capture = &alc269_pcm_analog_capture; | 13533 | spec->stream_analog_capture = &alc269_pcm_analog_capture; |
13140 | } | 13534 | } |
13141 | spec->stream_name_digital = "ALC269 Digital"; | ||
13142 | spec->stream_digital_playback = &alc269_pcm_digital_playback; | 13535 | spec->stream_digital_playback = &alc269_pcm_digital_playback; |
13143 | spec->stream_digital_capture = &alc269_pcm_digital_capture; | 13536 | spec->stream_digital_capture = &alc269_pcm_digital_capture; |
13144 | 13537 | ||
@@ -13743,7 +14136,7 @@ static void alc861_toshiba_unsol_event(struct hda_codec *codec, | |||
13743 | alc861_toshiba_automute(codec); | 14136 | alc861_toshiba_automute(codec); |
13744 | } | 14137 | } |
13745 | 14138 | ||
13746 | /* pcm configuration: identiacal with ALC880 */ | 14139 | /* pcm configuration: identical with ALC880 */ |
13747 | #define alc861_pcm_analog_playback alc880_pcm_analog_playback | 14140 | #define alc861_pcm_analog_playback alc880_pcm_analog_playback |
13748 | #define alc861_pcm_analog_capture alc880_pcm_analog_capture | 14141 | #define alc861_pcm_analog_capture alc880_pcm_analog_capture |
13749 | #define alc861_pcm_digital_playback alc880_pcm_digital_playback | 14142 | #define alc861_pcm_digital_playback alc880_pcm_digital_playback |
@@ -13927,7 +14320,6 @@ static void alc861_auto_init_multi_out(struct hda_codec *codec) | |||
13927 | struct alc_spec *spec = codec->spec; | 14320 | struct alc_spec *spec = codec->spec; |
13928 | int i; | 14321 | int i; |
13929 | 14322 | ||
13930 | alc_subsystem_id(codec, 0x0e, 0x0f, 0x0b); | ||
13931 | for (i = 0; i < spec->autocfg.line_outs; i++) { | 14323 | for (i = 0; i < spec->autocfg.line_outs; i++) { |
13932 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; | 14324 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; |
13933 | int pin_type = get_pin_type(spec->autocfg.line_out_type); | 14325 | int pin_type = get_pin_type(spec->autocfg.line_out_type); |
@@ -14010,6 +14402,8 @@ static int alc861_parse_auto_config(struct hda_codec *codec) | |||
14010 | spec->num_adc_nids = ARRAY_SIZE(alc861_adc_nids); | 14402 | spec->num_adc_nids = ARRAY_SIZE(alc861_adc_nids); |
14011 | set_capture_mixer(spec); | 14403 | set_capture_mixer(spec); |
14012 | 14404 | ||
14405 | alc_ssid_check(codec, 0x0e, 0x0f, 0x0b); | ||
14406 | |||
14013 | return 1; | 14407 | return 1; |
14014 | } | 14408 | } |
14015 | 14409 | ||
@@ -14199,8 +14593,8 @@ static int patch_alc861(struct hda_codec *codec) | |||
14199 | alc861_cfg_tbl); | 14593 | alc861_cfg_tbl); |
14200 | 14594 | ||
14201 | if (board_config < 0) { | 14595 | if (board_config < 0) { |
14202 | printk(KERN_INFO "hda_codec: Unknown model for ALC861, " | 14596 | printk(KERN_INFO "hda_codec: Unknown model for %s, " |
14203 | "trying auto-probe from BIOS...\n"); | 14597 | "trying auto-probe from BIOS...\n", codec->chip_name); |
14204 | board_config = ALC861_AUTO; | 14598 | board_config = ALC861_AUTO; |
14205 | } | 14599 | } |
14206 | 14600 | ||
@@ -14227,11 +14621,9 @@ static int patch_alc861(struct hda_codec *codec) | |||
14227 | if (board_config != ALC861_AUTO) | 14621 | if (board_config != ALC861_AUTO) |
14228 | setup_preset(spec, &alc861_presets[board_config]); | 14622 | setup_preset(spec, &alc861_presets[board_config]); |
14229 | 14623 | ||
14230 | spec->stream_name_analog = "ALC861 Analog"; | ||
14231 | spec->stream_analog_playback = &alc861_pcm_analog_playback; | 14624 | spec->stream_analog_playback = &alc861_pcm_analog_playback; |
14232 | spec->stream_analog_capture = &alc861_pcm_analog_capture; | 14625 | spec->stream_analog_capture = &alc861_pcm_analog_capture; |
14233 | 14626 | ||
14234 | spec->stream_name_digital = "ALC861 Digital"; | ||
14235 | spec->stream_digital_playback = &alc861_pcm_digital_playback; | 14627 | spec->stream_digital_playback = &alc861_pcm_digital_playback; |
14236 | spec->stream_digital_capture = &alc861_pcm_digital_capture; | 14628 | spec->stream_digital_capture = &alc861_pcm_digital_capture; |
14237 | 14629 | ||
@@ -14267,7 +14659,7 @@ static hda_nid_t alc861vd_dac_nids[4] = { | |||
14267 | 14659 | ||
14268 | /* dac_nids for ALC660vd are in a different order - according to | 14660 | /* dac_nids for ALC660vd are in a different order - according to |
14269 | * Realtek's driver. | 14661 | * Realtek's driver. |
14270 | * This should probably tesult in a different mixer for 6stack models | 14662 | * This should probably result in a different mixer for 6stack models |
14271 | * of ALC660vd codecs, but for now there is only 3stack mixer | 14663 | * of ALC660vd codecs, but for now there is only 3stack mixer |
14272 | * - and it is the same as in 861vd. | 14664 | * - and it is the same as in 861vd. |
14273 | * adc_nids in ALC660vd are (is) the same as in 861vd | 14665 | * adc_nids in ALC660vd are (is) the same as in 861vd |
@@ -14618,19 +15010,6 @@ static struct hda_verb alc861vd_lenovo_unsol_verbs[] = { | |||
14618 | {} | 15010 | {} |
14619 | }; | 15011 | }; |
14620 | 15012 | ||
14621 | /* toggle speaker-output according to the hp-jack state */ | ||
14622 | static void alc861vd_lenovo_hp_automute(struct hda_codec *codec) | ||
14623 | { | ||
14624 | unsigned int present; | ||
14625 | unsigned char bits; | ||
14626 | |||
14627 | present = snd_hda_codec_read(codec, 0x1b, 0, | ||
14628 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
14629 | bits = present ? HDA_AMP_MUTE : 0; | ||
14630 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | ||
14631 | HDA_AMP_MUTE, bits); | ||
14632 | } | ||
14633 | |||
14634 | static void alc861vd_lenovo_mic_automute(struct hda_codec *codec) | 15013 | static void alc861vd_lenovo_mic_automute(struct hda_codec *codec) |
14635 | { | 15014 | { |
14636 | unsigned int present; | 15015 | unsigned int present; |
@@ -14643,9 +15022,13 @@ static void alc861vd_lenovo_mic_automute(struct hda_codec *codec) | |||
14643 | HDA_AMP_MUTE, bits); | 15022 | HDA_AMP_MUTE, bits); |
14644 | } | 15023 | } |
14645 | 15024 | ||
14646 | static void alc861vd_lenovo_automute(struct hda_codec *codec) | 15025 | static void alc861vd_lenovo_init_hook(struct hda_codec *codec) |
14647 | { | 15026 | { |
14648 | alc861vd_lenovo_hp_automute(codec); | 15027 | struct alc_spec *spec = codec->spec; |
15028 | |||
15029 | spec->autocfg.hp_pins[0] = 0x1b; | ||
15030 | spec->autocfg.speaker_pins[0] = 0x14; | ||
15031 | alc_automute_amp(codec); | ||
14649 | alc861vd_lenovo_mic_automute(codec); | 15032 | alc861vd_lenovo_mic_automute(codec); |
14650 | } | 15033 | } |
14651 | 15034 | ||
@@ -14653,12 +15036,12 @@ static void alc861vd_lenovo_unsol_event(struct hda_codec *codec, | |||
14653 | unsigned int res) | 15036 | unsigned int res) |
14654 | { | 15037 | { |
14655 | switch (res >> 26) { | 15038 | switch (res >> 26) { |
14656 | case ALC880_HP_EVENT: | ||
14657 | alc861vd_lenovo_hp_automute(codec); | ||
14658 | break; | ||
14659 | case ALC880_MIC_EVENT: | 15039 | case ALC880_MIC_EVENT: |
14660 | alc861vd_lenovo_mic_automute(codec); | 15040 | alc861vd_lenovo_mic_automute(codec); |
14661 | break; | 15041 | break; |
15042 | default: | ||
15043 | alc_automute_amp_unsol_event(codec, res); | ||
15044 | break; | ||
14662 | } | 15045 | } |
14663 | } | 15046 | } |
14664 | 15047 | ||
@@ -14708,27 +15091,20 @@ static struct hda_verb alc861vd_dallas_verbs[] = { | |||
14708 | }; | 15091 | }; |
14709 | 15092 | ||
14710 | /* toggle speaker-output according to the hp-jack state */ | 15093 | /* toggle speaker-output according to the hp-jack state */ |
14711 | static void alc861vd_dallas_automute(struct hda_codec *codec) | 15094 | static void alc861vd_dallas_init_hook(struct hda_codec *codec) |
14712 | { | 15095 | { |
14713 | unsigned int present; | 15096 | struct alc_spec *spec = codec->spec; |
14714 | 15097 | ||
14715 | present = snd_hda_codec_read(codec, 0x15, 0, | 15098 | spec->autocfg.hp_pins[0] = 0x15; |
14716 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 15099 | spec->autocfg.speaker_pins[0] = 0x14; |
14717 | snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, | 15100 | alc_automute_amp(codec); |
14718 | HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); | ||
14719 | } | ||
14720 | |||
14721 | static void alc861vd_dallas_unsol_event(struct hda_codec *codec, unsigned int res) | ||
14722 | { | ||
14723 | if ((res >> 26) == ALC880_HP_EVENT) | ||
14724 | alc861vd_dallas_automute(codec); | ||
14725 | } | 15101 | } |
14726 | 15102 | ||
14727 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 15103 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
14728 | #define alc861vd_loopbacks alc880_loopbacks | 15104 | #define alc861vd_loopbacks alc880_loopbacks |
14729 | #endif | 15105 | #endif |
14730 | 15106 | ||
14731 | /* pcm configuration: identiacal with ALC880 */ | 15107 | /* pcm configuration: identical with ALC880 */ |
14732 | #define alc861vd_pcm_analog_playback alc880_pcm_analog_playback | 15108 | #define alc861vd_pcm_analog_playback alc880_pcm_analog_playback |
14733 | #define alc861vd_pcm_analog_capture alc880_pcm_analog_capture | 15109 | #define alc861vd_pcm_analog_capture alc880_pcm_analog_capture |
14734 | #define alc861vd_pcm_digital_playback alc880_pcm_digital_playback | 15110 | #define alc861vd_pcm_digital_playback alc880_pcm_digital_playback |
@@ -14835,7 +15211,7 @@ static struct alc_config_preset alc861vd_presets[] = { | |||
14835 | .channel_mode = alc861vd_3stack_2ch_modes, | 15211 | .channel_mode = alc861vd_3stack_2ch_modes, |
14836 | .input_mux = &alc861vd_capture_source, | 15212 | .input_mux = &alc861vd_capture_source, |
14837 | .unsol_event = alc861vd_lenovo_unsol_event, | 15213 | .unsol_event = alc861vd_lenovo_unsol_event, |
14838 | .init_hook = alc861vd_lenovo_automute, | 15214 | .init_hook = alc861vd_lenovo_init_hook, |
14839 | }, | 15215 | }, |
14840 | [ALC861VD_DALLAS] = { | 15216 | [ALC861VD_DALLAS] = { |
14841 | .mixers = { alc861vd_dallas_mixer }, | 15217 | .mixers = { alc861vd_dallas_mixer }, |
@@ -14845,8 +15221,8 @@ static struct alc_config_preset alc861vd_presets[] = { | |||
14845 | .num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes), | 15221 | .num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes), |
14846 | .channel_mode = alc861vd_3stack_2ch_modes, | 15222 | .channel_mode = alc861vd_3stack_2ch_modes, |
14847 | .input_mux = &alc861vd_dallas_capture_source, | 15223 | .input_mux = &alc861vd_dallas_capture_source, |
14848 | .unsol_event = alc861vd_dallas_unsol_event, | 15224 | .unsol_event = alc_automute_amp_unsol_event, |
14849 | .init_hook = alc861vd_dallas_automute, | 15225 | .init_hook = alc861vd_dallas_init_hook, |
14850 | }, | 15226 | }, |
14851 | [ALC861VD_HP] = { | 15227 | [ALC861VD_HP] = { |
14852 | .mixers = { alc861vd_hp_mixer }, | 15228 | .mixers = { alc861vd_hp_mixer }, |
@@ -14857,8 +15233,8 @@ static struct alc_config_preset alc861vd_presets[] = { | |||
14857 | .num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes), | 15233 | .num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes), |
14858 | .channel_mode = alc861vd_3stack_2ch_modes, | 15234 | .channel_mode = alc861vd_3stack_2ch_modes, |
14859 | .input_mux = &alc861vd_hp_capture_source, | 15235 | .input_mux = &alc861vd_hp_capture_source, |
14860 | .unsol_event = alc861vd_dallas_unsol_event, | 15236 | .unsol_event = alc_automute_amp_unsol_event, |
14861 | .init_hook = alc861vd_dallas_automute, | 15237 | .init_hook = alc861vd_dallas_init_hook, |
14862 | }, | 15238 | }, |
14863 | [ALC660VD_ASUS_V1S] = { | 15239 | [ALC660VD_ASUS_V1S] = { |
14864 | .mixers = { alc861vd_lenovo_mixer }, | 15240 | .mixers = { alc861vd_lenovo_mixer }, |
@@ -14873,7 +15249,7 @@ static struct alc_config_preset alc861vd_presets[] = { | |||
14873 | .channel_mode = alc861vd_3stack_2ch_modes, | 15249 | .channel_mode = alc861vd_3stack_2ch_modes, |
14874 | .input_mux = &alc861vd_capture_source, | 15250 | .input_mux = &alc861vd_capture_source, |
14875 | .unsol_event = alc861vd_lenovo_unsol_event, | 15251 | .unsol_event = alc861vd_lenovo_unsol_event, |
14876 | .init_hook = alc861vd_lenovo_automute, | 15252 | .init_hook = alc861vd_lenovo_init_hook, |
14877 | }, | 15253 | }, |
14878 | }; | 15254 | }; |
14879 | 15255 | ||
@@ -14891,7 +15267,6 @@ static void alc861vd_auto_init_multi_out(struct hda_codec *codec) | |||
14891 | struct alc_spec *spec = codec->spec; | 15267 | struct alc_spec *spec = codec->spec; |
14892 | int i; | 15268 | int i; |
14893 | 15269 | ||
14894 | alc_subsystem_id(codec, 0x15, 0x1b, 0x14); | ||
14895 | for (i = 0; i <= HDA_SIDE; i++) { | 15270 | for (i = 0; i <= HDA_SIDE; i++) { |
14896 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; | 15271 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; |
14897 | int pin_type = get_pin_type(spec->autocfg.line_out_type); | 15272 | int pin_type = get_pin_type(spec->autocfg.line_out_type); |
@@ -14908,7 +15283,7 @@ static void alc861vd_auto_init_hp_out(struct hda_codec *codec) | |||
14908 | hda_nid_t pin; | 15283 | hda_nid_t pin; |
14909 | 15284 | ||
14910 | pin = spec->autocfg.hp_pins[0]; | 15285 | pin = spec->autocfg.hp_pins[0]; |
14911 | if (pin) /* connect to front and use dac 0 */ | 15286 | if (pin) /* connect to front and use dac 0 */ |
14912 | alc861vd_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); | 15287 | alc861vd_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); |
14913 | pin = spec->autocfg.speaker_pins[0]; | 15288 | pin = spec->autocfg.speaker_pins[0]; |
14914 | if (pin) | 15289 | if (pin) |
@@ -15109,6 +15484,8 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec) | |||
15109 | if (err < 0) | 15484 | if (err < 0) |
15110 | return err; | 15485 | return err; |
15111 | 15486 | ||
15487 | alc_ssid_check(codec, 0x15, 0x1b, 0x14); | ||
15488 | |||
15112 | return 1; | 15489 | return 1; |
15113 | } | 15490 | } |
15114 | 15491 | ||
@@ -15140,8 +15517,8 @@ static int patch_alc861vd(struct hda_codec *codec) | |||
15140 | alc861vd_cfg_tbl); | 15517 | alc861vd_cfg_tbl); |
15141 | 15518 | ||
15142 | if (board_config < 0 || board_config >= ALC861VD_MODEL_LAST) { | 15519 | if (board_config < 0 || board_config >= ALC861VD_MODEL_LAST) { |
15143 | printk(KERN_INFO "hda_codec: Unknown model for ALC660VD/" | 15520 | printk(KERN_INFO "hda_codec: Unknown model for %s, " |
15144 | "ALC861VD, trying auto-probe from BIOS...\n"); | 15521 | "trying auto-probe from BIOS...\n", codec->chip_name); |
15145 | board_config = ALC861VD_AUTO; | 15522 | board_config = ALC861VD_AUTO; |
15146 | } | 15523 | } |
15147 | 15524 | ||
@@ -15169,13 +15546,8 @@ static int patch_alc861vd(struct hda_codec *codec) | |||
15169 | setup_preset(spec, &alc861vd_presets[board_config]); | 15546 | setup_preset(spec, &alc861vd_presets[board_config]); |
15170 | 15547 | ||
15171 | if (codec->vendor_id == 0x10ec0660) { | 15548 | if (codec->vendor_id == 0x10ec0660) { |
15172 | spec->stream_name_analog = "ALC660-VD Analog"; | ||
15173 | spec->stream_name_digital = "ALC660-VD Digital"; | ||
15174 | /* always turn on EAPD */ | 15549 | /* always turn on EAPD */ |
15175 | add_verb(spec, alc660vd_eapd_verbs); | 15550 | add_verb(spec, alc660vd_eapd_verbs); |
15176 | } else { | ||
15177 | spec->stream_name_analog = "ALC861VD Analog"; | ||
15178 | spec->stream_name_digital = "ALC861VD Digital"; | ||
15179 | } | 15551 | } |
15180 | 15552 | ||
15181 | spec->stream_analog_playback = &alc861vd_pcm_analog_playback; | 15553 | spec->stream_analog_playback = &alc861vd_pcm_analog_playback; |
@@ -15187,7 +15559,6 @@ static int patch_alc861vd(struct hda_codec *codec) | |||
15187 | spec->adc_nids = alc861vd_adc_nids; | 15559 | spec->adc_nids = alc861vd_adc_nids; |
15188 | spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids); | 15560 | spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids); |
15189 | spec->capsrc_nids = alc861vd_capsrc_nids; | 15561 | spec->capsrc_nids = alc861vd_capsrc_nids; |
15190 | spec->capture_style = CAPT_MIX; | ||
15191 | 15562 | ||
15192 | set_capture_mixer(spec); | 15563 | set_capture_mixer(spec); |
15193 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); | 15564 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); |
@@ -15289,6 +15660,38 @@ static struct hda_input_mux alc663_m51va_capture_source = { | |||
15289 | }, | 15660 | }, |
15290 | }; | 15661 | }; |
15291 | 15662 | ||
15663 | #if 1 /* set to 0 for testing other input sources below */ | ||
15664 | static struct hda_input_mux alc272_nc10_capture_source = { | ||
15665 | .num_items = 2, | ||
15666 | .items = { | ||
15667 | { "Autoselect Mic", 0x0 }, | ||
15668 | { "Internal Mic", 0x1 }, | ||
15669 | }, | ||
15670 | }; | ||
15671 | #else | ||
15672 | static struct hda_input_mux alc272_nc10_capture_source = { | ||
15673 | .num_items = 16, | ||
15674 | .items = { | ||
15675 | { "Autoselect Mic", 0x0 }, | ||
15676 | { "Internal Mic", 0x1 }, | ||
15677 | { "In-0x02", 0x2 }, | ||
15678 | { "In-0x03", 0x3 }, | ||
15679 | { "In-0x04", 0x4 }, | ||
15680 | { "In-0x05", 0x5 }, | ||
15681 | { "In-0x06", 0x6 }, | ||
15682 | { "In-0x07", 0x7 }, | ||
15683 | { "In-0x08", 0x8 }, | ||
15684 | { "In-0x09", 0x9 }, | ||
15685 | { "In-0x0a", 0x0a }, | ||
15686 | { "In-0x0b", 0x0b }, | ||
15687 | { "In-0x0c", 0x0c }, | ||
15688 | { "In-0x0d", 0x0d }, | ||
15689 | { "In-0x0e", 0x0e }, | ||
15690 | { "In-0x0f", 0x0f }, | ||
15691 | }, | ||
15692 | }; | ||
15693 | #endif | ||
15694 | |||
15292 | /* | 15695 | /* |
15293 | * 2ch mode | 15696 | * 2ch mode |
15294 | */ | 15697 | */ |
@@ -15428,10 +15831,8 @@ static struct snd_kcontrol_new alc662_lenovo_101e_mixer[] = { | |||
15428 | }; | 15831 | }; |
15429 | 15832 | ||
15430 | static struct snd_kcontrol_new alc662_eeepc_p701_mixer[] = { | 15833 | static struct snd_kcontrol_new alc662_eeepc_p701_mixer[] = { |
15431 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT), | 15834 | HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT), |
15432 | 15835 | ALC262_HIPPO_MASTER_SWITCH, | |
15433 | HDA_CODEC_VOLUME("Line-Out Playback Volume", 0x02, 0x0, HDA_OUTPUT), | ||
15434 | HDA_CODEC_MUTE("Line-Out Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | ||
15435 | 15836 | ||
15436 | HDA_CODEC_VOLUME("e-Mic Boost", 0x18, 0, HDA_INPUT), | 15837 | HDA_CODEC_VOLUME("e-Mic Boost", 0x18, 0, HDA_INPUT), |
15437 | HDA_CODEC_VOLUME("e-Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 15838 | HDA_CODEC_VOLUME("e-Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
@@ -15444,15 +15845,11 @@ static struct snd_kcontrol_new alc662_eeepc_p701_mixer[] = { | |||
15444 | }; | 15845 | }; |
15445 | 15846 | ||
15446 | static struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = { | 15847 | static struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = { |
15447 | HDA_CODEC_VOLUME("Line-Out Playback Volume", 0x02, 0x0, HDA_OUTPUT), | 15848 | ALC262_HIPPO_MASTER_SWITCH, |
15448 | HDA_CODEC_MUTE("Line-Out Playback Switch", 0x14, 0x0, HDA_OUTPUT), | 15849 | HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT), |
15449 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT), | 15850 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT), |
15450 | HDA_BIND_MUTE("Surround Playback Switch", 0x03, 2, HDA_INPUT), | ||
15451 | HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0, HDA_OUTPUT), | 15851 | HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0, HDA_OUTPUT), |
15452 | HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0, HDA_OUTPUT), | 15852 | HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0, HDA_OUTPUT), |
15453 | HDA_BIND_MUTE_MONO("Center Playback Switch", 0x04, 1, 2, HDA_INPUT), | ||
15454 | HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x04, 2, 2, HDA_INPUT), | ||
15455 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | ||
15456 | HDA_BIND_MUTE("MuteCtrl Playback Switch", 0x0c, 2, HDA_INPUT), | 15853 | HDA_BIND_MUTE("MuteCtrl Playback Switch", 0x0c, 2, HDA_INPUT), |
15457 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | 15854 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), |
15458 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | 15855 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), |
@@ -15960,51 +16357,25 @@ static void alc662_eeepc_mic_automute(struct hda_codec *codec) | |||
15960 | static void alc662_eeepc_unsol_event(struct hda_codec *codec, | 16357 | static void alc662_eeepc_unsol_event(struct hda_codec *codec, |
15961 | unsigned int res) | 16358 | unsigned int res) |
15962 | { | 16359 | { |
15963 | if ((res >> 26) == ALC880_HP_EVENT) | ||
15964 | alc262_hippo1_automute( codec ); | ||
15965 | |||
15966 | if ((res >> 26) == ALC880_MIC_EVENT) | 16360 | if ((res >> 26) == ALC880_MIC_EVENT) |
15967 | alc662_eeepc_mic_automute(codec); | 16361 | alc662_eeepc_mic_automute(codec); |
16362 | else | ||
16363 | alc262_hippo_unsol_event(codec, res); | ||
15968 | } | 16364 | } |
15969 | 16365 | ||
15970 | static void alc662_eeepc_inithook(struct hda_codec *codec) | 16366 | static void alc662_eeepc_inithook(struct hda_codec *codec) |
15971 | { | 16367 | { |
15972 | alc262_hippo1_automute( codec ); | 16368 | alc262_hippo1_init_hook(codec); |
15973 | alc662_eeepc_mic_automute(codec); | 16369 | alc662_eeepc_mic_automute(codec); |
15974 | } | 16370 | } |
15975 | 16371 | ||
15976 | static void alc662_eeepc_ep20_automute(struct hda_codec *codec) | ||
15977 | { | ||
15978 | unsigned int mute; | ||
15979 | unsigned int present; | ||
15980 | |||
15981 | snd_hda_codec_read(codec, 0x14, 0, AC_VERB_SET_PIN_SENSE, 0); | ||
15982 | present = snd_hda_codec_read(codec, 0x14, 0, | ||
15983 | AC_VERB_GET_PIN_SENSE, 0); | ||
15984 | present = (present & 0x80000000) != 0; | ||
15985 | if (present) { | ||
15986 | /* mute internal speaker */ | ||
15987 | snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0, | ||
15988 | HDA_AMP_MUTE, HDA_AMP_MUTE); | ||
15989 | } else { | ||
15990 | /* unmute internal speaker if necessary */ | ||
15991 | mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0); | ||
15992 | snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0, | ||
15993 | HDA_AMP_MUTE, mute); | ||
15994 | } | ||
15995 | } | ||
15996 | |||
15997 | /* unsolicited event for HP jack sensing */ | ||
15998 | static void alc662_eeepc_ep20_unsol_event(struct hda_codec *codec, | ||
15999 | unsigned int res) | ||
16000 | { | ||
16001 | if ((res >> 26) == ALC880_HP_EVENT) | ||
16002 | alc662_eeepc_ep20_automute(codec); | ||
16003 | } | ||
16004 | |||
16005 | static void alc662_eeepc_ep20_inithook(struct hda_codec *codec) | 16372 | static void alc662_eeepc_ep20_inithook(struct hda_codec *codec) |
16006 | { | 16373 | { |
16007 | alc662_eeepc_ep20_automute(codec); | 16374 | struct alc_spec *spec = codec->spec; |
16375 | |||
16376 | spec->autocfg.hp_pins[0] = 0x14; | ||
16377 | spec->autocfg.speaker_pins[0] = 0x1b; | ||
16378 | alc262_hippo_master_update(codec); | ||
16008 | } | 16379 | } |
16009 | 16380 | ||
16010 | static void alc663_m51va_speaker_automute(struct hda_codec *codec) | 16381 | static void alc663_m51va_speaker_automute(struct hda_codec *codec) |
@@ -16338,35 +16709,9 @@ static void alc663_g50v_inithook(struct hda_codec *codec) | |||
16338 | alc662_eeepc_mic_automute(codec); | 16709 | alc662_eeepc_mic_automute(codec); |
16339 | } | 16710 | } |
16340 | 16711 | ||
16341 | /* bind hp and internal speaker mute (with plug check) */ | ||
16342 | static int alc662_ecs_master_sw_put(struct snd_kcontrol *kcontrol, | ||
16343 | struct snd_ctl_elem_value *ucontrol) | ||
16344 | { | ||
16345 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | ||
16346 | long *valp = ucontrol->value.integer.value; | ||
16347 | int change; | ||
16348 | |||
16349 | change = snd_hda_codec_amp_update(codec, 0x1b, 0, HDA_OUTPUT, 0, | ||
16350 | HDA_AMP_MUTE, | ||
16351 | valp[0] ? 0 : HDA_AMP_MUTE); | ||
16352 | change |= snd_hda_codec_amp_update(codec, 0x1b, 1, HDA_OUTPUT, 0, | ||
16353 | HDA_AMP_MUTE, | ||
16354 | valp[1] ? 0 : HDA_AMP_MUTE); | ||
16355 | if (change) | ||
16356 | alc262_hippo1_automute(codec); | ||
16357 | return change; | ||
16358 | } | ||
16359 | |||
16360 | static struct snd_kcontrol_new alc662_ecs_mixer[] = { | 16712 | static struct snd_kcontrol_new alc662_ecs_mixer[] = { |
16361 | HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT), | 16713 | HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT), |
16362 | { | 16714 | ALC262_HIPPO_MASTER_SWITCH, |
16363 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
16364 | .name = "Master Playback Switch", | ||
16365 | .info = snd_hda_mixer_amp_switch_info, | ||
16366 | .get = snd_hda_mixer_amp_switch_get, | ||
16367 | .put = alc662_ecs_master_sw_put, | ||
16368 | .private_value = HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT), | ||
16369 | }, | ||
16370 | 16715 | ||
16371 | HDA_CODEC_VOLUME("e-Mic/LineIn Boost", 0x18, 0, HDA_INPUT), | 16716 | HDA_CODEC_VOLUME("e-Mic/LineIn Boost", 0x18, 0, HDA_INPUT), |
16372 | HDA_CODEC_VOLUME("e-Mic/LineIn Playback Volume", 0x0b, 0x0, HDA_INPUT), | 16717 | HDA_CODEC_VOLUME("e-Mic/LineIn Playback Volume", 0x0b, 0x0, HDA_INPUT), |
@@ -16378,12 +16723,29 @@ static struct snd_kcontrol_new alc662_ecs_mixer[] = { | |||
16378 | { } /* end */ | 16723 | { } /* end */ |
16379 | }; | 16724 | }; |
16380 | 16725 | ||
16726 | static struct snd_kcontrol_new alc272_nc10_mixer[] = { | ||
16727 | /* Master Playback automatically created from Speaker and Headphone */ | ||
16728 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT), | ||
16729 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT), | ||
16730 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT), | ||
16731 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT), | ||
16732 | |||
16733 | HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
16734 | HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
16735 | HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT), | ||
16736 | |||
16737 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | ||
16738 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | ||
16739 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | ||
16740 | { } /* end */ | ||
16741 | }; | ||
16742 | |||
16381 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 16743 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
16382 | #define alc662_loopbacks alc880_loopbacks | 16744 | #define alc662_loopbacks alc880_loopbacks |
16383 | #endif | 16745 | #endif |
16384 | 16746 | ||
16385 | 16747 | ||
16386 | /* pcm configuration: identiacal with ALC880 */ | 16748 | /* pcm configuration: identical with ALC880 */ |
16387 | #define alc662_pcm_analog_playback alc880_pcm_analog_playback | 16749 | #define alc662_pcm_analog_playback alc880_pcm_analog_playback |
16388 | #define alc662_pcm_analog_capture alc880_pcm_analog_capture | 16750 | #define alc662_pcm_analog_capture alc880_pcm_analog_capture |
16389 | #define alc662_pcm_digital_playback alc880_pcm_digital_playback | 16751 | #define alc662_pcm_digital_playback alc880_pcm_digital_playback |
@@ -16411,6 +16773,9 @@ static const char *alc662_models[ALC662_MODEL_LAST] = { | |||
16411 | [ALC663_ASUS_MODE4] = "asus-mode4", | 16773 | [ALC663_ASUS_MODE4] = "asus-mode4", |
16412 | [ALC663_ASUS_MODE5] = "asus-mode5", | 16774 | [ALC663_ASUS_MODE5] = "asus-mode5", |
16413 | [ALC663_ASUS_MODE6] = "asus-mode6", | 16775 | [ALC663_ASUS_MODE6] = "asus-mode6", |
16776 | [ALC272_DELL] = "dell", | ||
16777 | [ALC272_DELL_ZM1] = "dell-zm1", | ||
16778 | [ALC272_SAMSUNG_NC10] = "samsung-nc10", | ||
16414 | [ALC662_AUTO] = "auto", | 16779 | [ALC662_AUTO] = "auto", |
16415 | }; | 16780 | }; |
16416 | 16781 | ||
@@ -16468,6 +16833,7 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = { | |||
16468 | SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_ECS), | 16833 | SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_ECS), |
16469 | SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K", | 16834 | SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K", |
16470 | ALC662_3ST_6ch_DIG), | 16835 | ALC662_3ST_6ch_DIG), |
16836 | SND_PCI_QUIRK(0x144d, 0xca00, "Samsung NC10", ALC272_SAMSUNG_NC10), | ||
16471 | SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L", | 16837 | SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L", |
16472 | ALC662_3ST_6ch_DIG), | 16838 | ALC662_3ST_6ch_DIG), |
16473 | SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG), | 16839 | SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG), |
@@ -16558,7 +16924,7 @@ static struct alc_config_preset alc662_presets[] = { | |||
16558 | .num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes), | 16924 | .num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes), |
16559 | .channel_mode = alc662_3ST_6ch_modes, | 16925 | .channel_mode = alc662_3ST_6ch_modes, |
16560 | .input_mux = &alc662_lenovo_101e_capture_source, | 16926 | .input_mux = &alc662_lenovo_101e_capture_source, |
16561 | .unsol_event = alc662_eeepc_ep20_unsol_event, | 16927 | .unsol_event = alc662_eeepc_unsol_event, |
16562 | .init_hook = alc662_eeepc_ep20_inithook, | 16928 | .init_hook = alc662_eeepc_ep20_inithook, |
16563 | }, | 16929 | }, |
16564 | [ALC662_ECS] = { | 16930 | [ALC662_ECS] = { |
@@ -16739,6 +17105,18 @@ static struct alc_config_preset alc662_presets[] = { | |||
16739 | .unsol_event = alc663_m51va_unsol_event, | 17105 | .unsol_event = alc663_m51va_unsol_event, |
16740 | .init_hook = alc663_m51va_inithook, | 17106 | .init_hook = alc663_m51va_inithook, |
16741 | }, | 17107 | }, |
17108 | [ALC272_SAMSUNG_NC10] = { | ||
17109 | .mixers = { alc272_nc10_mixer }, | ||
17110 | .init_verbs = { alc662_init_verbs, | ||
17111 | alc663_21jd_amic_init_verbs }, | ||
17112 | .num_dacs = ARRAY_SIZE(alc272_dac_nids), | ||
17113 | .dac_nids = alc272_dac_nids, | ||
17114 | .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes), | ||
17115 | .channel_mode = alc662_3ST_2ch_modes, | ||
17116 | .input_mux = &alc272_nc10_capture_source, | ||
17117 | .unsol_event = alc663_mode4_unsol_event, | ||
17118 | .init_hook = alc663_mode4_inithook, | ||
17119 | }, | ||
16742 | }; | 17120 | }; |
16743 | 17121 | ||
16744 | 17122 | ||
@@ -16933,7 +17311,6 @@ static void alc662_auto_init_multi_out(struct hda_codec *codec) | |||
16933 | struct alc_spec *spec = codec->spec; | 17311 | struct alc_spec *spec = codec->spec; |
16934 | int i; | 17312 | int i; |
16935 | 17313 | ||
16936 | alc_subsystem_id(codec, 0x15, 0x1b, 0x14); | ||
16937 | for (i = 0; i <= HDA_SIDE; i++) { | 17314 | for (i = 0; i <= HDA_SIDE; i++) { |
16938 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; | 17315 | hda_nid_t nid = spec->autocfg.line_out_pins[i]; |
16939 | int pin_type = get_pin_type(spec->autocfg.line_out_type); | 17316 | int pin_type = get_pin_type(spec->autocfg.line_out_type); |
@@ -17030,6 +17407,8 @@ static int alc662_parse_auto_config(struct hda_codec *codec) | |||
17030 | if (err < 0) | 17407 | if (err < 0) |
17031 | return err; | 17408 | return err; |
17032 | 17409 | ||
17410 | alc_ssid_check(codec, 0x15, 0x1b, 0x14); | ||
17411 | |||
17033 | return 1; | 17412 | return 1; |
17034 | } | 17413 | } |
17035 | 17414 | ||
@@ -17062,8 +17441,8 @@ static int patch_alc662(struct hda_codec *codec) | |||
17062 | alc662_models, | 17441 | alc662_models, |
17063 | alc662_cfg_tbl); | 17442 | alc662_cfg_tbl); |
17064 | if (board_config < 0) { | 17443 | if (board_config < 0) { |
17065 | printk(KERN_INFO "hda_codec: Unknown model for ALC662, " | 17444 | printk(KERN_INFO "hda_codec: Unknown model for %s, " |
17066 | "trying auto-probe from BIOS...\n"); | 17445 | "trying auto-probe from BIOS...\n", codec->chip_name); |
17067 | board_config = ALC662_AUTO; | 17446 | board_config = ALC662_AUTO; |
17068 | } | 17447 | } |
17069 | 17448 | ||
@@ -17090,17 +17469,6 @@ static int patch_alc662(struct hda_codec *codec) | |||
17090 | if (board_config != ALC662_AUTO) | 17469 | if (board_config != ALC662_AUTO) |
17091 | setup_preset(spec, &alc662_presets[board_config]); | 17470 | setup_preset(spec, &alc662_presets[board_config]); |
17092 | 17471 | ||
17093 | if (codec->vendor_id == 0x10ec0663) { | ||
17094 | spec->stream_name_analog = "ALC663 Analog"; | ||
17095 | spec->stream_name_digital = "ALC663 Digital"; | ||
17096 | } else if (codec->vendor_id == 0x10ec0272) { | ||
17097 | spec->stream_name_analog = "ALC272 Analog"; | ||
17098 | spec->stream_name_digital = "ALC272 Digital"; | ||
17099 | } else { | ||
17100 | spec->stream_name_analog = "ALC662 Analog"; | ||
17101 | spec->stream_name_digital = "ALC662 Digital"; | ||
17102 | } | ||
17103 | |||
17104 | spec->stream_analog_playback = &alc662_pcm_analog_playback; | 17472 | spec->stream_analog_playback = &alc662_pcm_analog_playback; |
17105 | spec->stream_analog_capture = &alc662_pcm_analog_capture; | 17473 | spec->stream_analog_capture = &alc662_pcm_analog_capture; |
17106 | 17474 | ||
@@ -17110,7 +17478,6 @@ static int patch_alc662(struct hda_codec *codec) | |||
17110 | spec->adc_nids = alc662_adc_nids; | 17478 | spec->adc_nids = alc662_adc_nids; |
17111 | spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids); | 17479 | spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids); |
17112 | spec->capsrc_nids = alc662_capsrc_nids; | 17480 | spec->capsrc_nids = alc662_capsrc_nids; |
17113 | spec->capture_style = CAPT_MIX; | ||
17114 | 17481 | ||
17115 | if (!spec->cap_mixer) | 17482 | if (!spec->cap_mixer) |
17116 | set_capture_mixer(spec); | 17483 | set_capture_mixer(spec); |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index d2fd8ef6aef8..14f3c3e0f62d 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -100,6 +100,7 @@ enum { | |||
100 | STAC_HP_M4, | 100 | STAC_HP_M4, |
101 | STAC_HP_DV5, | 101 | STAC_HP_DV5, |
102 | STAC_HP_HDX, | 102 | STAC_HP_HDX, |
103 | STAC_HP_DV4_1222NR, | ||
103 | STAC_92HD71BXX_MODELS | 104 | STAC_92HD71BXX_MODELS |
104 | }; | 105 | }; |
105 | 106 | ||
@@ -193,6 +194,7 @@ struct sigmatel_spec { | |||
193 | unsigned int gpio_dir; | 194 | unsigned int gpio_dir; |
194 | unsigned int gpio_data; | 195 | unsigned int gpio_data; |
195 | unsigned int gpio_mute; | 196 | unsigned int gpio_mute; |
197 | unsigned int gpio_led; | ||
196 | 198 | ||
197 | /* stream */ | 199 | /* stream */ |
198 | unsigned int stream_delay; | 200 | unsigned int stream_delay; |
@@ -634,6 +636,40 @@ static int stac92xx_smux_enum_put(struct snd_kcontrol *kcontrol, | |||
634 | return 0; | 636 | return 0; |
635 | } | 637 | } |
636 | 638 | ||
639 | static unsigned int stac92xx_vref_set(struct hda_codec *codec, | ||
640 | hda_nid_t nid, unsigned int new_vref) | ||
641 | { | ||
642 | int error; | ||
643 | unsigned int pincfg; | ||
644 | pincfg = snd_hda_codec_read(codec, nid, 0, | ||
645 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); | ||
646 | |||
647 | pincfg &= 0xff; | ||
648 | pincfg &= ~(AC_PINCTL_VREFEN | AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN); | ||
649 | pincfg |= new_vref; | ||
650 | |||
651 | if (new_vref == AC_PINCTL_VREF_HIZ) | ||
652 | pincfg |= AC_PINCTL_OUT_EN; | ||
653 | else | ||
654 | pincfg |= AC_PINCTL_IN_EN; | ||
655 | |||
656 | error = snd_hda_codec_write_cache(codec, nid, 0, | ||
657 | AC_VERB_SET_PIN_WIDGET_CONTROL, pincfg); | ||
658 | if (error < 0) | ||
659 | return error; | ||
660 | else | ||
661 | return 1; | ||
662 | } | ||
663 | |||
664 | static unsigned int stac92xx_vref_get(struct hda_codec *codec, hda_nid_t nid) | ||
665 | { | ||
666 | unsigned int vref; | ||
667 | vref = snd_hda_codec_read(codec, nid, 0, | ||
668 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); | ||
669 | vref &= AC_PINCTL_VREFEN; | ||
670 | return vref; | ||
671 | } | ||
672 | |||
637 | static int stac92xx_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) | 673 | static int stac92xx_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
638 | { | 674 | { |
639 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 675 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
@@ -995,6 +1031,17 @@ static struct hda_verb stac9205_core_init[] = { | |||
995 | .private_value = verb_read | (verb_write << 16), \ | 1031 | .private_value = verb_read | (verb_write << 16), \ |
996 | } | 1032 | } |
997 | 1033 | ||
1034 | #define DC_BIAS(xname, idx, nid) \ | ||
1035 | { \ | ||
1036 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ | ||
1037 | .name = xname, \ | ||
1038 | .index = idx, \ | ||
1039 | .info = stac92xx_dc_bias_info, \ | ||
1040 | .get = stac92xx_dc_bias_get, \ | ||
1041 | .put = stac92xx_dc_bias_put, \ | ||
1042 | .private_value = nid, \ | ||
1043 | } | ||
1044 | |||
998 | static struct snd_kcontrol_new stac9200_mixer[] = { | 1045 | static struct snd_kcontrol_new stac9200_mixer[] = { |
999 | HDA_CODEC_VOLUME("Master Playback Volume", 0xb, 0, HDA_OUTPUT), | 1046 | HDA_CODEC_VOLUME("Master Playback Volume", 0xb, 0, HDA_OUTPUT), |
1000 | HDA_CODEC_MUTE("Master Playback Switch", 0xb, 0, HDA_OUTPUT), | 1047 | HDA_CODEC_MUTE("Master Playback Switch", 0xb, 0, HDA_OUTPUT), |
@@ -1543,6 +1590,8 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = { | |||
1543 | /* SigmaTel reference board */ | 1590 | /* SigmaTel reference board */ |
1544 | SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, | 1591 | SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, |
1545 | "DFI LanParty", STAC_REF), | 1592 | "DFI LanParty", STAC_REF), |
1593 | SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xfb30, | ||
1594 | "SigmaTel",STAC_9205_REF), | ||
1546 | SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101, | 1595 | SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101, |
1547 | "DFI LanParty", STAC_REF), | 1596 | "DFI LanParty", STAC_REF), |
1548 | /* Dell laptops have BIOS problem */ | 1597 | /* Dell laptops have BIOS problem */ |
@@ -1837,6 +1886,7 @@ static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { | |||
1837 | [STAC_HP_M4] = NULL, | 1886 | [STAC_HP_M4] = NULL, |
1838 | [STAC_HP_DV5] = NULL, | 1887 | [STAC_HP_DV5] = NULL, |
1839 | [STAC_HP_HDX] = NULL, | 1888 | [STAC_HP_HDX] = NULL, |
1889 | [STAC_HP_DV4_1222NR] = NULL, | ||
1840 | }; | 1890 | }; |
1841 | 1891 | ||
1842 | static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = { | 1892 | static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = { |
@@ -1848,6 +1898,7 @@ static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = { | |||
1848 | [STAC_HP_M4] = "hp-m4", | 1898 | [STAC_HP_M4] = "hp-m4", |
1849 | [STAC_HP_DV5] = "hp-dv5", | 1899 | [STAC_HP_DV5] = "hp-dv5", |
1850 | [STAC_HP_HDX] = "hp-hdx", | 1900 | [STAC_HP_HDX] = "hp-hdx", |
1901 | [STAC_HP_DV4_1222NR] = "hp-dv4-1222nr", | ||
1851 | }; | 1902 | }; |
1852 | 1903 | ||
1853 | static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { | 1904 | static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { |
@@ -1856,6 +1907,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { | |||
1856 | "DFI LanParty", STAC_92HD71BXX_REF), | 1907 | "DFI LanParty", STAC_92HD71BXX_REF), |
1857 | SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101, | 1908 | SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101, |
1858 | "DFI LanParty", STAC_92HD71BXX_REF), | 1909 | "DFI LanParty", STAC_92HD71BXX_REF), |
1910 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fb, | ||
1911 | "HP dv4-1222nr", STAC_HP_DV4_1222NR), | ||
1859 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080, | 1912 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080, |
1860 | "HP", STAC_HP_DV5), | 1913 | "HP", STAC_HP_DV5), |
1861 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0, | 1914 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0, |
@@ -2545,7 +2598,8 @@ static int stac92xx_build_pcms(struct hda_codec *codec) | |||
2545 | return 0; | 2598 | return 0; |
2546 | } | 2599 | } |
2547 | 2600 | ||
2548 | static unsigned int stac92xx_get_vref(struct hda_codec *codec, hda_nid_t nid) | 2601 | static unsigned int stac92xx_get_default_vref(struct hda_codec *codec, |
2602 | hda_nid_t nid) | ||
2549 | { | 2603 | { |
2550 | unsigned int pincap = snd_hda_query_pin_caps(codec, nid); | 2604 | unsigned int pincap = snd_hda_query_pin_caps(codec, nid); |
2551 | pincap = (pincap & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT; | 2605 | pincap = (pincap & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT; |
@@ -2599,15 +2653,108 @@ static int stac92xx_hp_switch_put(struct snd_kcontrol *kcontrol, | |||
2599 | return 1; | 2653 | return 1; |
2600 | } | 2654 | } |
2601 | 2655 | ||
2602 | #define stac92xx_io_switch_info snd_ctl_boolean_mono_info | 2656 | static int stac92xx_dc_bias_info(struct snd_kcontrol *kcontrol, |
2657 | struct snd_ctl_elem_info *uinfo) | ||
2658 | { | ||
2659 | int i; | ||
2660 | static char *texts[] = { | ||
2661 | "Mic In", "Line In", "Line Out" | ||
2662 | }; | ||
2663 | |||
2664 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | ||
2665 | struct sigmatel_spec *spec = codec->spec; | ||
2666 | hda_nid_t nid = kcontrol->private_value; | ||
2667 | |||
2668 | if (nid == spec->mic_switch || nid == spec->line_switch) | ||
2669 | i = 3; | ||
2670 | else | ||
2671 | i = 2; | ||
2672 | |||
2673 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | ||
2674 | uinfo->value.enumerated.items = i; | ||
2675 | uinfo->count = 1; | ||
2676 | if (uinfo->value.enumerated.item >= i) | ||
2677 | uinfo->value.enumerated.item = i-1; | ||
2678 | strcpy(uinfo->value.enumerated.name, | ||
2679 | texts[uinfo->value.enumerated.item]); | ||
2680 | |||
2681 | return 0; | ||
2682 | } | ||
2683 | |||
2684 | static int stac92xx_dc_bias_get(struct snd_kcontrol *kcontrol, | ||
2685 | struct snd_ctl_elem_value *ucontrol) | ||
2686 | { | ||
2687 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | ||
2688 | hda_nid_t nid = kcontrol->private_value; | ||
2689 | unsigned int vref = stac92xx_vref_get(codec, nid); | ||
2690 | |||
2691 | if (vref == stac92xx_get_default_vref(codec, nid)) | ||
2692 | ucontrol->value.enumerated.item[0] = 0; | ||
2693 | else if (vref == AC_PINCTL_VREF_GRD) | ||
2694 | ucontrol->value.enumerated.item[0] = 1; | ||
2695 | else if (vref == AC_PINCTL_VREF_HIZ) | ||
2696 | ucontrol->value.enumerated.item[0] = 2; | ||
2697 | |||
2698 | return 0; | ||
2699 | } | ||
2700 | |||
2701 | static int stac92xx_dc_bias_put(struct snd_kcontrol *kcontrol, | ||
2702 | struct snd_ctl_elem_value *ucontrol) | ||
2703 | { | ||
2704 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | ||
2705 | unsigned int new_vref = 0; | ||
2706 | int error; | ||
2707 | hda_nid_t nid = kcontrol->private_value; | ||
2708 | |||
2709 | if (ucontrol->value.enumerated.item[0] == 0) | ||
2710 | new_vref = stac92xx_get_default_vref(codec, nid); | ||
2711 | else if (ucontrol->value.enumerated.item[0] == 1) | ||
2712 | new_vref = AC_PINCTL_VREF_GRD; | ||
2713 | else if (ucontrol->value.enumerated.item[0] == 2) | ||
2714 | new_vref = AC_PINCTL_VREF_HIZ; | ||
2715 | else | ||
2716 | return 0; | ||
2717 | |||
2718 | if (new_vref != stac92xx_vref_get(codec, nid)) { | ||
2719 | error = stac92xx_vref_set(codec, nid, new_vref); | ||
2720 | return error; | ||
2721 | } | ||
2722 | |||
2723 | return 0; | ||
2724 | } | ||
2725 | |||
2726 | static int stac92xx_io_switch_info(struct snd_kcontrol *kcontrol, | ||
2727 | struct snd_ctl_elem_info *uinfo) | ||
2728 | { | ||
2729 | static char *texts[2]; | ||
2730 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | ||
2731 | struct sigmatel_spec *spec = codec->spec; | ||
2732 | |||
2733 | if (kcontrol->private_value == spec->line_switch) | ||
2734 | texts[0] = "Line In"; | ||
2735 | else | ||
2736 | texts[0] = "Mic In"; | ||
2737 | texts[1] = "Line Out"; | ||
2738 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | ||
2739 | uinfo->value.enumerated.items = 2; | ||
2740 | uinfo->count = 1; | ||
2741 | |||
2742 | if (uinfo->value.enumerated.item >= 2) | ||
2743 | uinfo->value.enumerated.item = 1; | ||
2744 | strcpy(uinfo->value.enumerated.name, | ||
2745 | texts[uinfo->value.enumerated.item]); | ||
2746 | |||
2747 | return 0; | ||
2748 | } | ||
2603 | 2749 | ||
2604 | static int stac92xx_io_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) | 2750 | static int stac92xx_io_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
2605 | { | 2751 | { |
2606 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 2752 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
2607 | struct sigmatel_spec *spec = codec->spec; | 2753 | struct sigmatel_spec *spec = codec->spec; |
2608 | int io_idx = kcontrol-> private_value & 0xff; | 2754 | hda_nid_t nid = kcontrol->private_value; |
2755 | int io_idx = (nid == spec->mic_switch) ? 1 : 0; | ||
2609 | 2756 | ||
2610 | ucontrol->value.integer.value[0] = spec->io_switch[io_idx]; | 2757 | ucontrol->value.enumerated.item[0] = spec->io_switch[io_idx]; |
2611 | return 0; | 2758 | return 0; |
2612 | } | 2759 | } |
2613 | 2760 | ||
@@ -2615,9 +2762,9 @@ static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ | |||
2615 | { | 2762 | { |
2616 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 2763 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
2617 | struct sigmatel_spec *spec = codec->spec; | 2764 | struct sigmatel_spec *spec = codec->spec; |
2618 | hda_nid_t nid = kcontrol->private_value >> 8; | 2765 | hda_nid_t nid = kcontrol->private_value; |
2619 | int io_idx = kcontrol-> private_value & 0xff; | 2766 | int io_idx = (nid == spec->mic_switch) ? 1 : 0; |
2620 | unsigned short val = !!ucontrol->value.integer.value[0]; | 2767 | unsigned short val = !!ucontrol->value.enumerated.item[0]; |
2621 | 2768 | ||
2622 | spec->io_switch[io_idx] = val; | 2769 | spec->io_switch[io_idx] = val; |
2623 | 2770 | ||
@@ -2626,7 +2773,7 @@ static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ | |||
2626 | else { | 2773 | else { |
2627 | unsigned int pinctl = AC_PINCTL_IN_EN; | 2774 | unsigned int pinctl = AC_PINCTL_IN_EN; |
2628 | if (io_idx) /* set VREF for mic */ | 2775 | if (io_idx) /* set VREF for mic */ |
2629 | pinctl |= stac92xx_get_vref(codec, nid); | 2776 | pinctl |= stac92xx_get_default_vref(codec, nid); |
2630 | stac92xx_auto_set_pinctl(codec, nid, pinctl); | 2777 | stac92xx_auto_set_pinctl(codec, nid, pinctl); |
2631 | } | 2778 | } |
2632 | 2779 | ||
@@ -2707,7 +2854,8 @@ enum { | |||
2707 | STAC_CTL_WIDGET_AMP_VOL, | 2854 | STAC_CTL_WIDGET_AMP_VOL, |
2708 | STAC_CTL_WIDGET_HP_SWITCH, | 2855 | STAC_CTL_WIDGET_HP_SWITCH, |
2709 | STAC_CTL_WIDGET_IO_SWITCH, | 2856 | STAC_CTL_WIDGET_IO_SWITCH, |
2710 | STAC_CTL_WIDGET_CLFE_SWITCH | 2857 | STAC_CTL_WIDGET_CLFE_SWITCH, |
2858 | STAC_CTL_WIDGET_DC_BIAS | ||
2711 | }; | 2859 | }; |
2712 | 2860 | ||
2713 | static struct snd_kcontrol_new stac92xx_control_templates[] = { | 2861 | static struct snd_kcontrol_new stac92xx_control_templates[] = { |
@@ -2719,6 +2867,7 @@ static struct snd_kcontrol_new stac92xx_control_templates[] = { | |||
2719 | STAC_CODEC_HP_SWITCH(NULL), | 2867 | STAC_CODEC_HP_SWITCH(NULL), |
2720 | STAC_CODEC_IO_SWITCH(NULL, 0), | 2868 | STAC_CODEC_IO_SWITCH(NULL, 0), |
2721 | STAC_CODEC_CLFE_SWITCH(NULL, 0), | 2869 | STAC_CODEC_CLFE_SWITCH(NULL, 0), |
2870 | DC_BIAS(NULL, 0, 0), | ||
2722 | }; | 2871 | }; |
2723 | 2872 | ||
2724 | /* add dynamic controls */ | 2873 | /* add dynamic controls */ |
@@ -2782,6 +2931,34 @@ static struct snd_kcontrol_new stac_input_src_temp = { | |||
2782 | .put = stac92xx_mux_enum_put, | 2931 | .put = stac92xx_mux_enum_put, |
2783 | }; | 2932 | }; |
2784 | 2933 | ||
2934 | static inline int stac92xx_add_jack_mode_control(struct hda_codec *codec, | ||
2935 | hda_nid_t nid, int idx) | ||
2936 | { | ||
2937 | int def_conf = snd_hda_codec_get_pincfg(codec, nid); | ||
2938 | int control = 0; | ||
2939 | struct sigmatel_spec *spec = codec->spec; | ||
2940 | char name[22]; | ||
2941 | |||
2942 | if (!((get_defcfg_connect(def_conf)) & AC_JACK_PORT_FIXED)) { | ||
2943 | if (stac92xx_get_default_vref(codec, nid) == AC_PINCTL_VREF_GRD | ||
2944 | && nid == spec->line_switch) | ||
2945 | control = STAC_CTL_WIDGET_IO_SWITCH; | ||
2946 | else if (snd_hda_query_pin_caps(codec, nid) | ||
2947 | & (AC_PINCAP_VREF_GRD << AC_PINCAP_VREF_SHIFT)) | ||
2948 | control = STAC_CTL_WIDGET_DC_BIAS; | ||
2949 | else if (nid == spec->mic_switch) | ||
2950 | control = STAC_CTL_WIDGET_IO_SWITCH; | ||
2951 | } | ||
2952 | |||
2953 | if (control) { | ||
2954 | strcpy(name, auto_pin_cfg_labels[idx]); | ||
2955 | return stac92xx_add_control(codec->spec, control, | ||
2956 | strcat(name, " Jack Mode"), nid); | ||
2957 | } | ||
2958 | |||
2959 | return 0; | ||
2960 | } | ||
2961 | |||
2785 | static int stac92xx_add_input_source(struct sigmatel_spec *spec) | 2962 | static int stac92xx_add_input_source(struct sigmatel_spec *spec) |
2786 | { | 2963 | { |
2787 | struct snd_kcontrol_new *knew; | 2964 | struct snd_kcontrol_new *knew; |
@@ -3144,7 +3321,9 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec, | |||
3144 | const struct auto_pin_cfg *cfg) | 3321 | const struct auto_pin_cfg *cfg) |
3145 | { | 3322 | { |
3146 | struct sigmatel_spec *spec = codec->spec; | 3323 | struct sigmatel_spec *spec = codec->spec; |
3324 | hda_nid_t nid; | ||
3147 | int err; | 3325 | int err; |
3326 | int idx; | ||
3148 | 3327 | ||
3149 | err = create_multi_out_ctls(codec, cfg->line_outs, cfg->line_out_pins, | 3328 | err = create_multi_out_ctls(codec, cfg->line_outs, cfg->line_out_pins, |
3150 | spec->multiout.dac_nids, | 3329 | spec->multiout.dac_nids, |
@@ -3161,20 +3340,13 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec, | |||
3161 | return err; | 3340 | return err; |
3162 | } | 3341 | } |
3163 | 3342 | ||
3164 | if (spec->line_switch) { | 3343 | for (idx = AUTO_PIN_MIC; idx <= AUTO_PIN_FRONT_LINE; idx++) { |
3165 | err = stac92xx_add_control(spec, STAC_CTL_WIDGET_IO_SWITCH, | 3344 | nid = cfg->input_pins[idx]; |
3166 | "Line In as Output Switch", | 3345 | if (nid) { |
3167 | spec->line_switch << 8); | 3346 | err = stac92xx_add_jack_mode_control(codec, nid, idx); |
3168 | if (err < 0) | 3347 | if (err < 0) |
3169 | return err; | 3348 | return err; |
3170 | } | 3349 | } |
3171 | |||
3172 | if (spec->mic_switch) { | ||
3173 | err = stac92xx_add_control(spec, STAC_CTL_WIDGET_IO_SWITCH, | ||
3174 | "Mic as Output Switch", | ||
3175 | (spec->mic_switch << 8) | 1); | ||
3176 | if (err < 0) | ||
3177 | return err; | ||
3178 | } | 3350 | } |
3179 | 3351 | ||
3180 | return 0; | 3352 | return 0; |
@@ -3639,6 +3811,8 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out | |||
3639 | err = snd_hda_attach_beep_device(codec, nid); | 3811 | err = snd_hda_attach_beep_device(codec, nid); |
3640 | if (err < 0) | 3812 | if (err < 0) |
3641 | return err; | 3813 | return err; |
3814 | /* IDT/STAC codecs have linear beep tone parameter */ | ||
3815 | codec->beep->linear_tone = 1; | ||
3642 | /* if no beep switch is available, make its own one */ | 3816 | /* if no beep switch is available, make its own one */ |
3643 | caps = query_amp_caps(codec, nid, HDA_OUTPUT); | 3817 | caps = query_amp_caps(codec, nid, HDA_OUTPUT); |
3644 | if (codec->beep && | 3818 | if (codec->beep && |
@@ -3861,7 +4035,7 @@ static void stac_gpio_set(struct hda_codec *codec, unsigned int mask, | |||
3861 | AC_VERB_SET_GPIO_DATA, gpiostate); /* sync */ | 4035 | AC_VERB_SET_GPIO_DATA, gpiostate); /* sync */ |
3862 | } | 4036 | } |
3863 | 4037 | ||
3864 | #ifdef CONFIG_SND_JACK | 4038 | #ifdef CONFIG_SND_HDA_INPUT_JACK |
3865 | static void stac92xx_free_jack_priv(struct snd_jack *jack) | 4039 | static void stac92xx_free_jack_priv(struct snd_jack *jack) |
3866 | { | 4040 | { |
3867 | struct sigmatel_jack *jacks = jack->private_data; | 4041 | struct sigmatel_jack *jacks = jack->private_data; |
@@ -3873,7 +4047,7 @@ static void stac92xx_free_jack_priv(struct snd_jack *jack) | |||
3873 | static int stac92xx_add_jack(struct hda_codec *codec, | 4047 | static int stac92xx_add_jack(struct hda_codec *codec, |
3874 | hda_nid_t nid, int type) | 4048 | hda_nid_t nid, int type) |
3875 | { | 4049 | { |
3876 | #ifdef CONFIG_SND_JACK | 4050 | #ifdef CONFIG_SND_HDA_INPUT_JACK |
3877 | struct sigmatel_spec *spec = codec->spec; | 4051 | struct sigmatel_spec *spec = codec->spec; |
3878 | struct sigmatel_jack *jack; | 4052 | struct sigmatel_jack *jack; |
3879 | int def_conf = snd_hda_codec_get_pincfg(codec, nid); | 4053 | int def_conf = snd_hda_codec_get_pincfg(codec, nid); |
@@ -4082,7 +4256,7 @@ static int stac92xx_init(struct hda_codec *codec) | |||
4082 | unsigned int pinctl, conf; | 4256 | unsigned int pinctl, conf; |
4083 | if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC) { | 4257 | if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC) { |
4084 | /* for mic pins, force to initialize */ | 4258 | /* for mic pins, force to initialize */ |
4085 | pinctl = stac92xx_get_vref(codec, nid); | 4259 | pinctl = stac92xx_get_default_vref(codec, nid); |
4086 | pinctl |= AC_PINCTL_IN_EN; | 4260 | pinctl |= AC_PINCTL_IN_EN; |
4087 | stac92xx_auto_set_pinctl(codec, nid, pinctl); | 4261 | stac92xx_auto_set_pinctl(codec, nid, pinctl); |
4088 | } else { | 4262 | } else { |
@@ -4162,7 +4336,7 @@ static int stac92xx_init(struct hda_codec *codec) | |||
4162 | 4336 | ||
4163 | static void stac92xx_free_jacks(struct hda_codec *codec) | 4337 | static void stac92xx_free_jacks(struct hda_codec *codec) |
4164 | { | 4338 | { |
4165 | #ifdef CONFIG_SND_JACK | 4339 | #ifdef CONFIG_SND_HDA_INPUT_JACK |
4166 | /* free jack instances manually when clearing/reconfiguring */ | 4340 | /* free jack instances manually when clearing/reconfiguring */ |
4167 | struct sigmatel_spec *spec = codec->spec; | 4341 | struct sigmatel_spec *spec = codec->spec; |
4168 | if (!codec->bus->shutdown && spec->jacks.list) { | 4342 | if (!codec->bus->shutdown && spec->jacks.list) { |
@@ -4535,17 +4709,19 @@ static int stac92xx_resume(struct hda_codec *codec) | |||
4535 | return 0; | 4709 | return 0; |
4536 | } | 4710 | } |
4537 | 4711 | ||
4538 | |||
4539 | /* | 4712 | /* |
4540 | * using power check for controlling mute led of HP HDX notebooks | 4713 | * using power check for controlling mute led of HP notebooks |
4541 | * check for mute state only on Speakers (nid = 0x10) | 4714 | * check for mute state only on Speakers (nid = 0x10) |
4542 | * | 4715 | * |
4543 | * For this feature CONFIG_SND_HDA_POWER_SAVE is needed, otherwise | 4716 | * For this feature CONFIG_SND_HDA_POWER_SAVE is needed, otherwise |
4544 | * the LED is NOT working properly ! | 4717 | * the LED is NOT working properly ! |
4718 | * | ||
4719 | * Changed name to reflect that it now works for any designated | ||
4720 | * model, not just HP HDX. | ||
4545 | */ | 4721 | */ |
4546 | 4722 | ||
4547 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 4723 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
4548 | static int stac92xx_hp_hdx_check_power_status(struct hda_codec *codec, | 4724 | static int stac92xx_hp_check_power_status(struct hda_codec *codec, |
4549 | hda_nid_t nid) | 4725 | hda_nid_t nid) |
4550 | { | 4726 | { |
4551 | struct sigmatel_spec *spec = codec->spec; | 4727 | struct sigmatel_spec *spec = codec->spec; |
@@ -4553,9 +4729,9 @@ static int stac92xx_hp_hdx_check_power_status(struct hda_codec *codec, | |||
4553 | if (nid == 0x10) { | 4729 | if (nid == 0x10) { |
4554 | if (snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) & | 4730 | if (snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) & |
4555 | HDA_AMP_MUTE) | 4731 | HDA_AMP_MUTE) |
4556 | spec->gpio_data &= ~0x08; /* orange */ | 4732 | spec->gpio_data &= ~spec->gpio_led; /* orange */ |
4557 | else | 4733 | else |
4558 | spec->gpio_data |= 0x08; /* white */ | 4734 | spec->gpio_data |= spec->gpio_led; /* white */ |
4559 | 4735 | ||
4560 | stac_gpio_set(codec, spec->gpio_mask, | 4736 | stac_gpio_set(codec, spec->gpio_mask, |
4561 | spec->gpio_dir, | 4737 | spec->gpio_dir, |
@@ -5201,6 +5377,15 @@ again: | |||
5201 | if (get_wcaps(codec, 0xa) & AC_WCAP_IN_AMP) | 5377 | if (get_wcaps(codec, 0xa) & AC_WCAP_IN_AMP) |
5202 | snd_hda_sequence_write_cache(codec, unmute_init); | 5378 | snd_hda_sequence_write_cache(codec, unmute_init); |
5203 | 5379 | ||
5380 | /* Some HP machines seem to have unstable codec communications | ||
5381 | * especially with ATI fglrx driver. For recovering from the | ||
5382 | * CORB/RIRB stall, allow the BUS reset and keep always sync | ||
5383 | */ | ||
5384 | if (spec->board_config == STAC_HP_DV5) { | ||
5385 | codec->bus->sync_write = 1; | ||
5386 | codec->bus->allow_bus_reset = 1; | ||
5387 | } | ||
5388 | |||
5204 | spec->aloopback_ctl = stac92hd71bxx_loopback; | 5389 | spec->aloopback_ctl = stac92hd71bxx_loopback; |
5205 | spec->aloopback_mask = 0x50; | 5390 | spec->aloopback_mask = 0x50; |
5206 | spec->aloopback_shift = 0; | 5391 | spec->aloopback_shift = 0; |
@@ -5234,6 +5419,15 @@ again: | |||
5234 | spec->num_smuxes = 0; | 5419 | spec->num_smuxes = 0; |
5235 | spec->num_dmuxes = 1; | 5420 | spec->num_dmuxes = 1; |
5236 | break; | 5421 | break; |
5422 | case STAC_HP_DV4_1222NR: | ||
5423 | spec->num_dmics = 1; | ||
5424 | /* I don't know if it needs 1 or 2 smuxes - will wait for | ||
5425 | * bug reports to fix if needed | ||
5426 | */ | ||
5427 | spec->num_smuxes = 1; | ||
5428 | spec->num_dmuxes = 1; | ||
5429 | spec->gpio_led = 0x01; | ||
5430 | /* fallthrough */ | ||
5237 | case STAC_HP_DV5: | 5431 | case STAC_HP_DV5: |
5238 | snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010); | 5432 | snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010); |
5239 | stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN); | 5433 | stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN); |
@@ -5242,22 +5436,21 @@ again: | |||
5242 | spec->num_dmics = 1; | 5436 | spec->num_dmics = 1; |
5243 | spec->num_dmuxes = 1; | 5437 | spec->num_dmuxes = 1; |
5244 | spec->num_smuxes = 1; | 5438 | spec->num_smuxes = 1; |
5245 | /* | ||
5246 | * For controlling MUTE LED on HP HDX16/HDX18 notebooks, | ||
5247 | * the CONFIG_SND_HDA_POWER_SAVE is needed to be set. | ||
5248 | */ | ||
5249 | #ifdef CONFIG_SND_HDA_POWER_SAVE | ||
5250 | /* orange/white mute led on GPIO3, orange=0, white=1 */ | 5439 | /* orange/white mute led on GPIO3, orange=0, white=1 */ |
5251 | spec->gpio_mask |= 0x08; | 5440 | spec->gpio_led = 0x08; |
5252 | spec->gpio_dir |= 0x08; | 5441 | break; |
5253 | spec->gpio_data |= 0x08; /* set to white */ | 5442 | } |
5254 | 5443 | ||
5444 | #ifdef CONFIG_SND_HDA_POWER_SAVE | ||
5445 | if (spec->gpio_led) { | ||
5446 | spec->gpio_mask |= spec->gpio_led; | ||
5447 | spec->gpio_dir |= spec->gpio_led; | ||
5448 | spec->gpio_data |= spec->gpio_led; | ||
5255 | /* register check_power_status callback. */ | 5449 | /* register check_power_status callback. */ |
5256 | codec->patch_ops.check_power_status = | 5450 | codec->patch_ops.check_power_status = |
5257 | stac92xx_hp_hdx_check_power_status; | 5451 | stac92xx_hp_check_power_status; |
5452 | } | ||
5258 | #endif | 5453 | #endif |
5259 | break; | ||
5260 | }; | ||
5261 | 5454 | ||
5262 | spec->multiout.dac_nids = spec->dac_nids; | 5455 | spec->multiout.dac_nids = spec->dac_nids; |
5263 | if (spec->dinput_mux) | 5456 | if (spec->dinput_mux) |
@@ -5282,7 +5475,7 @@ again: | |||
5282 | codec->proc_widget_hook = stac92hd7x_proc_hook; | 5475 | codec->proc_widget_hook = stac92hd7x_proc_hook; |
5283 | 5476 | ||
5284 | return 0; | 5477 | return 0; |
5285 | }; | 5478 | } |
5286 | 5479 | ||
5287 | static int patch_stac922x(struct hda_codec *codec) | 5480 | static int patch_stac922x(struct hda_codec *codec) |
5288 | { | 5481 | { |
@@ -5437,7 +5630,7 @@ static int patch_stac927x(struct hda_codec *codec) | |||
5437 | /* correct the device field to SPDIF out */ | 5630 | /* correct the device field to SPDIF out */ |
5438 | snd_hda_codec_set_pincfg(codec, 0x21, 0x01442070); | 5631 | snd_hda_codec_set_pincfg(codec, 0x21, 0x01442070); |
5439 | break; | 5632 | break; |
5440 | }; | 5633 | } |
5441 | /* configure the analog microphone on some laptops */ | 5634 | /* configure the analog microphone on some laptops */ |
5442 | snd_hda_codec_set_pincfg(codec, 0x0c, 0x90a79130); | 5635 | snd_hda_codec_set_pincfg(codec, 0x0c, 0x90a79130); |
5443 | /* correct the front output jack as a hp out */ | 5636 | /* correct the front output jack as a hp out */ |
@@ -5747,6 +5940,7 @@ static struct hda_codec_preset snd_hda_preset_sigmatel[] = { | |||
5747 | { .id = 0x83847661, .name = "CXD9872RD/K", .patch = patch_stac9872 }, | 5940 | { .id = 0x83847661, .name = "CXD9872RD/K", .patch = patch_stac9872 }, |
5748 | { .id = 0x83847662, .name = "STAC9872AK", .patch = patch_stac9872 }, | 5941 | { .id = 0x83847662, .name = "STAC9872AK", .patch = patch_stac9872 }, |
5749 | { .id = 0x83847664, .name = "CXD9872AKD", .patch = patch_stac9872 }, | 5942 | { .id = 0x83847664, .name = "CXD9872AKD", .patch = patch_stac9872 }, |
5943 | { .id = 0x83847698, .name = "STAC9205", .patch = patch_stac9205 }, | ||
5750 | { .id = 0x838476a0, .name = "STAC9205", .patch = patch_stac9205 }, | 5944 | { .id = 0x838476a0, .name = "STAC9205", .patch = patch_stac9205 }, |
5751 | { .id = 0x838476a1, .name = "STAC9205D", .patch = patch_stac9205 }, | 5945 | { .id = 0x838476a1, .name = "STAC9205D", .patch = patch_stac9205 }, |
5752 | { .id = 0x838476a2, .name = "STAC9204", .patch = patch_stac9205 }, | 5946 | { .id = 0x838476a2, .name = "STAC9204", .patch = patch_stac9205 }, |
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index b25a5cc637d6..8e004fb6961a 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
@@ -205,7 +205,7 @@ struct via_spec { | |||
205 | 205 | ||
206 | /* playback */ | 206 | /* playback */ |
207 | struct hda_multi_out multiout; | 207 | struct hda_multi_out multiout; |
208 | hda_nid_t extra_dig_out_nid; | 208 | hda_nid_t slave_dig_outs[2]; |
209 | 209 | ||
210 | /* capture */ | 210 | /* capture */ |
211 | unsigned int num_adc_nids; | 211 | unsigned int num_adc_nids; |
@@ -731,21 +731,6 @@ static int via_dig_playback_pcm_close(struct hda_pcm_stream *hinfo, | |||
731 | return snd_hda_multi_out_dig_close(codec, &spec->multiout); | 731 | return snd_hda_multi_out_dig_close(codec, &spec->multiout); |
732 | } | 732 | } |
733 | 733 | ||
734 | /* setup SPDIF output stream */ | ||
735 | static void setup_dig_playback_stream(struct hda_codec *codec, hda_nid_t nid, | ||
736 | unsigned int stream_tag, unsigned int format) | ||
737 | { | ||
738 | /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */ | ||
739 | if (codec->spdif_ctls & AC_DIG1_ENABLE) | ||
740 | snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, | ||
741 | codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff); | ||
742 | snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format); | ||
743 | /* turn on again (if needed) */ | ||
744 | if (codec->spdif_ctls & AC_DIG1_ENABLE) | ||
745 | snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, | ||
746 | codec->spdif_ctls & 0xff); | ||
747 | } | ||
748 | |||
749 | static int via_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo, | 734 | static int via_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo, |
750 | struct hda_codec *codec, | 735 | struct hda_codec *codec, |
751 | unsigned int stream_tag, | 736 | unsigned int stream_tag, |
@@ -753,19 +738,16 @@ static int via_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo, | |||
753 | struct snd_pcm_substream *substream) | 738 | struct snd_pcm_substream *substream) |
754 | { | 739 | { |
755 | struct via_spec *spec = codec->spec; | 740 | struct via_spec *spec = codec->spec; |
756 | hda_nid_t nid; | 741 | return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, |
757 | 742 | stream_tag, format, substream); | |
758 | /* 1st or 2nd S/PDIF */ | 743 | } |
759 | if (substream->number == 0) | ||
760 | nid = spec->multiout.dig_out_nid; | ||
761 | else if (substream->number == 1) | ||
762 | nid = spec->extra_dig_out_nid; | ||
763 | else | ||
764 | return -1; | ||
765 | 744 | ||
766 | mutex_lock(&codec->spdif_mutex); | 745 | static int via_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, |
767 | setup_dig_playback_stream(codec, nid, stream_tag, format); | 746 | struct hda_codec *codec, |
768 | mutex_unlock(&codec->spdif_mutex); | 747 | struct snd_pcm_substream *substream) |
748 | { | ||
749 | struct via_spec *spec = codec->spec; | ||
750 | snd_hda_multi_out_dig_cleanup(codec, &spec->multiout); | ||
769 | return 0; | 751 | return 0; |
770 | } | 752 | } |
771 | 753 | ||
@@ -842,7 +824,8 @@ static struct hda_pcm_stream vt1708_pcm_digital_playback = { | |||
842 | .ops = { | 824 | .ops = { |
843 | .open = via_dig_playback_pcm_open, | 825 | .open = via_dig_playback_pcm_open, |
844 | .close = via_dig_playback_pcm_close, | 826 | .close = via_dig_playback_pcm_close, |
845 | .prepare = via_dig_playback_pcm_prepare | 827 | .prepare = via_dig_playback_pcm_prepare, |
828 | .cleanup = via_dig_playback_pcm_cleanup | ||
846 | }, | 829 | }, |
847 | }; | 830 | }; |
848 | 831 | ||
@@ -874,13 +857,6 @@ static int via_build_controls(struct hda_codec *codec) | |||
874 | if (err < 0) | 857 | if (err < 0) |
875 | return err; | 858 | return err; |
876 | spec->multiout.share_spdif = 1; | 859 | spec->multiout.share_spdif = 1; |
877 | |||
878 | if (spec->extra_dig_out_nid) { | ||
879 | err = snd_hda_create_spdif_out_ctls(codec, | ||
880 | spec->extra_dig_out_nid); | ||
881 | if (err < 0) | ||
882 | return err; | ||
883 | } | ||
884 | } | 860 | } |
885 | if (spec->dig_in_nid) { | 861 | if (spec->dig_in_nid) { |
886 | err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid); | 862 | err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid); |
@@ -1013,10 +989,6 @@ static void via_unsol_event(struct hda_codec *codec, | |||
1013 | via_gpio_control(codec); | 989 | via_gpio_control(codec); |
1014 | } | 990 | } |
1015 | 991 | ||
1016 | static hda_nid_t slave_dig_outs[] = { | ||
1017 | 0, | ||
1018 | }; | ||
1019 | |||
1020 | static int via_init(struct hda_codec *codec) | 992 | static int via_init(struct hda_codec *codec) |
1021 | { | 993 | { |
1022 | struct via_spec *spec = codec->spec; | 994 | struct via_spec *spec = codec->spec; |
@@ -1051,8 +1023,9 @@ static int via_init(struct hda_codec *codec) | |||
1051 | snd_hda_codec_write(codec, spec->autocfg.dig_in_pin, 0, | 1023 | snd_hda_codec_write(codec, spec->autocfg.dig_in_pin, 0, |
1052 | AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN); | 1024 | AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN); |
1053 | 1025 | ||
1054 | /* no slave outs */ | 1026 | /* assign slave outs */ |
1055 | codec->slave_dig_outs = slave_dig_outs; | 1027 | if (spec->slave_dig_outs[0]) |
1028 | codec->slave_dig_outs = spec->slave_dig_outs; | ||
1056 | 1029 | ||
1057 | return 0; | 1030 | return 0; |
1058 | } | 1031 | } |
@@ -2134,7 +2107,8 @@ static struct hda_pcm_stream vt1708B_pcm_digital_playback = { | |||
2134 | .ops = { | 2107 | .ops = { |
2135 | .open = via_dig_playback_pcm_open, | 2108 | .open = via_dig_playback_pcm_open, |
2136 | .close = via_dig_playback_pcm_close, | 2109 | .close = via_dig_playback_pcm_close, |
2137 | .prepare = via_dig_playback_pcm_prepare | 2110 | .prepare = via_dig_playback_pcm_prepare, |
2111 | .cleanup = via_dig_playback_pcm_cleanup | ||
2138 | }, | 2112 | }, |
2139 | }; | 2113 | }; |
2140 | 2114 | ||
@@ -2589,14 +2563,15 @@ static struct hda_pcm_stream vt1708S_pcm_analog_capture = { | |||
2589 | }; | 2563 | }; |
2590 | 2564 | ||
2591 | static struct hda_pcm_stream vt1708S_pcm_digital_playback = { | 2565 | static struct hda_pcm_stream vt1708S_pcm_digital_playback = { |
2592 | .substreams = 2, | 2566 | .substreams = 1, |
2593 | .channels_min = 2, | 2567 | .channels_min = 2, |
2594 | .channels_max = 2, | 2568 | .channels_max = 2, |
2595 | /* NID is set in via_build_pcms */ | 2569 | /* NID is set in via_build_pcms */ |
2596 | .ops = { | 2570 | .ops = { |
2597 | .open = via_dig_playback_pcm_open, | 2571 | .open = via_dig_playback_pcm_open, |
2598 | .close = via_dig_playback_pcm_close, | 2572 | .close = via_dig_playback_pcm_close, |
2599 | .prepare = via_dig_playback_pcm_prepare | 2573 | .prepare = via_dig_playback_pcm_prepare, |
2574 | .cleanup = via_dig_playback_pcm_cleanup | ||
2600 | }, | 2575 | }, |
2601 | }; | 2576 | }; |
2602 | 2577 | ||
@@ -2805,14 +2780,37 @@ static int vt1708S_auto_create_analog_input_ctls(struct via_spec *spec, | |||
2805 | return 0; | 2780 | return 0; |
2806 | } | 2781 | } |
2807 | 2782 | ||
2783 | /* fill out digital output widgets; one for master and one for slave outputs */ | ||
2784 | static void fill_dig_outs(struct hda_codec *codec) | ||
2785 | { | ||
2786 | struct via_spec *spec = codec->spec; | ||
2787 | int i; | ||
2788 | |||
2789 | for (i = 0; i < spec->autocfg.dig_outs; i++) { | ||
2790 | hda_nid_t nid; | ||
2791 | int conn; | ||
2792 | |||
2793 | nid = spec->autocfg.dig_out_pins[i]; | ||
2794 | if (!nid) | ||
2795 | continue; | ||
2796 | conn = snd_hda_get_connections(codec, nid, &nid, 1); | ||
2797 | if (conn < 1) | ||
2798 | continue; | ||
2799 | if (!spec->multiout.dig_out_nid) | ||
2800 | spec->multiout.dig_out_nid = nid; | ||
2801 | else { | ||
2802 | spec->slave_dig_outs[0] = nid; | ||
2803 | break; /* at most two dig outs */ | ||
2804 | } | ||
2805 | } | ||
2806 | } | ||
2807 | |||
2808 | static int vt1708S_parse_auto_config(struct hda_codec *codec) | 2808 | static int vt1708S_parse_auto_config(struct hda_codec *codec) |
2809 | { | 2809 | { |
2810 | struct via_spec *spec = codec->spec; | 2810 | struct via_spec *spec = codec->spec; |
2811 | int err; | 2811 | int err; |
2812 | static hda_nid_t vt1708s_ignore[] = {0x21, 0}; | ||
2813 | 2812 | ||
2814 | err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, | 2813 | err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL); |
2815 | vt1708s_ignore); | ||
2816 | if (err < 0) | 2814 | if (err < 0) |
2817 | return err; | 2815 | return err; |
2818 | err = vt1708S_auto_fill_dac_nids(spec, &spec->autocfg); | 2816 | err = vt1708S_auto_fill_dac_nids(spec, &spec->autocfg); |
@@ -2833,10 +2831,7 @@ static int vt1708S_parse_auto_config(struct hda_codec *codec) | |||
2833 | 2831 | ||
2834 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; | 2832 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; |
2835 | 2833 | ||
2836 | if (spec->autocfg.dig_outs) | 2834 | fill_dig_outs(codec); |
2837 | spec->multiout.dig_out_nid = VT1708S_DIGOUT_NID; | ||
2838 | |||
2839 | spec->extra_dig_out_nid = 0x15; | ||
2840 | 2835 | ||
2841 | if (spec->kctls.list) | 2836 | if (spec->kctls.list) |
2842 | spec->mixers[spec->num_mixers++] = spec->kctls.list; | 2837 | spec->mixers[spec->num_mixers++] = spec->kctls.list; |
@@ -3000,7 +2995,8 @@ static struct hda_pcm_stream vt1702_pcm_digital_playback = { | |||
3000 | .ops = { | 2995 | .ops = { |
3001 | .open = via_dig_playback_pcm_open, | 2996 | .open = via_dig_playback_pcm_open, |
3002 | .close = via_dig_playback_pcm_close, | 2997 | .close = via_dig_playback_pcm_close, |
3003 | .prepare = via_dig_playback_pcm_prepare | 2998 | .prepare = via_dig_playback_pcm_prepare, |
2999 | .cleanup = via_dig_playback_pcm_cleanup | ||
3004 | }, | 3000 | }, |
3005 | }; | 3001 | }; |
3006 | 3002 | ||
@@ -3128,10 +3124,8 @@ static int vt1702_parse_auto_config(struct hda_codec *codec) | |||
3128 | { | 3124 | { |
3129 | struct via_spec *spec = codec->spec; | 3125 | struct via_spec *spec = codec->spec; |
3130 | int err; | 3126 | int err; |
3131 | static hda_nid_t vt1702_ignore[] = {0x1C, 0}; | ||
3132 | 3127 | ||
3133 | err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, | 3128 | err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL); |
3134 | vt1702_ignore); | ||
3135 | if (err < 0) | 3129 | if (err < 0) |
3136 | return err; | 3130 | return err; |
3137 | err = vt1702_auto_fill_dac_nids(spec, &spec->autocfg); | 3131 | err = vt1702_auto_fill_dac_nids(spec, &spec->autocfg); |
@@ -3152,10 +3146,7 @@ static int vt1702_parse_auto_config(struct hda_codec *codec) | |||
3152 | 3146 | ||
3153 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; | 3147 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; |
3154 | 3148 | ||
3155 | if (spec->autocfg.dig_outs) | 3149 | fill_dig_outs(codec); |
3156 | spec->multiout.dig_out_nid = VT1702_DIGOUT_NID; | ||
3157 | |||
3158 | spec->extra_dig_out_nid = 0x1B; | ||
3159 | 3150 | ||
3160 | if (spec->kctls.list) | 3151 | if (spec->kctls.list) |
3161 | spec->mixers[spec->num_mixers++] = spec->kctls.list; | 3152 | spec->mixers[spec->num_mixers++] = spec->kctls.list; |
diff --git a/sound/pci/ice1712/Makefile b/sound/pci/ice1712/Makefile index f99fe089495d..536eae2ccf94 100644 --- a/sound/pci/ice1712/Makefile +++ b/sound/pci/ice1712/Makefile | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | snd-ice17xx-ak4xxx-objs := ak4xxx.o | 6 | snd-ice17xx-ak4xxx-objs := ak4xxx.o |
7 | snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o | 7 | snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o |
8 | snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o | 8 | snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o |
9 | 9 | ||
10 | # Toplevel Module Dependency | 10 | # Toplevel Module Dependency |
11 | obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o | 11 | obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o |
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h index fdae6deba16b..adc909ec125c 100644 --- a/sound/pci/ice1712/ice1712.h +++ b/sound/pci/ice1712/ice1712.h | |||
@@ -335,6 +335,7 @@ struct snd_ice1712 { | |||
335 | unsigned int force_rdma1:1; /* VT1720/4 - RDMA1 as non-spdif */ | 335 | unsigned int force_rdma1:1; /* VT1720/4 - RDMA1 as non-spdif */ |
336 | unsigned int midi_output:1; /* VT1720/4: MIDI output triggered */ | 336 | unsigned int midi_output:1; /* VT1720/4: MIDI output triggered */ |
337 | unsigned int midi_input:1; /* VT1720/4: MIDI input triggered */ | 337 | unsigned int midi_input:1; /* VT1720/4: MIDI input triggered */ |
338 | unsigned int own_routing:1; /* VT1720/4: use own routing ctls */ | ||
338 | unsigned int num_total_dacs; /* total DACs */ | 339 | unsigned int num_total_dacs; /* total DACs */ |
339 | unsigned int num_total_adcs; /* total ADCs */ | 340 | unsigned int num_total_adcs; /* total ADCs */ |
340 | unsigned int cur_rate; /* current rate */ | 341 | unsigned int cur_rate; /* current rate */ |
@@ -458,10 +459,17 @@ static inline int snd_ice1712_gpio_read_bits(struct snd_ice1712 *ice, | |||
458 | return snd_ice1712_gpio_read(ice) & mask; | 459 | return snd_ice1712_gpio_read(ice) & mask; |
459 | } | 460 | } |
460 | 461 | ||
462 | /* route access functions */ | ||
463 | int snd_ice1724_get_route_val(struct snd_ice1712 *ice, int shift); | ||
464 | int snd_ice1724_put_route_val(struct snd_ice1712 *ice, unsigned int val, | ||
465 | int shift); | ||
466 | |||
461 | int snd_ice1712_spdif_build_controls(struct snd_ice1712 *ice); | 467 | int snd_ice1712_spdif_build_controls(struct snd_ice1712 *ice); |
462 | 468 | ||
463 | int snd_ice1712_akm4xxx_init(struct snd_akm4xxx *ak, const struct snd_akm4xxx *template, | 469 | int snd_ice1712_akm4xxx_init(struct snd_akm4xxx *ak, |
464 | const struct snd_ak4xxx_private *priv, struct snd_ice1712 *ice); | 470 | const struct snd_akm4xxx *template, |
471 | const struct snd_ak4xxx_private *priv, | ||
472 | struct snd_ice1712 *ice); | ||
465 | void snd_ice1712_akm4xxx_free(struct snd_ice1712 *ice); | 473 | void snd_ice1712_akm4xxx_free(struct snd_ice1712 *ice); |
466 | int snd_ice1712_akm4xxx_build_controls(struct snd_ice1712 *ice); | 474 | int snd_ice1712_akm4xxx_build_controls(struct snd_ice1712 *ice); |
467 | 475 | ||
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 128510e77a78..36ade77cf371 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include "prodigy192.h" | 49 | #include "prodigy192.h" |
50 | #include "prodigy_hifi.h" | 50 | #include "prodigy_hifi.h" |
51 | #include "juli.h" | 51 | #include "juli.h" |
52 | #include "maya44.h" | ||
52 | #include "phase.h" | 53 | #include "phase.h" |
53 | #include "wtm.h" | 54 | #include "wtm.h" |
54 | #include "se.h" | 55 | #include "se.h" |
@@ -65,6 +66,7 @@ MODULE_SUPPORTED_DEVICE("{" | |||
65 | PRODIGY192_DEVICE_DESC | 66 | PRODIGY192_DEVICE_DESC |
66 | PRODIGY_HIFI_DEVICE_DESC | 67 | PRODIGY_HIFI_DEVICE_DESC |
67 | JULI_DEVICE_DESC | 68 | JULI_DEVICE_DESC |
69 | MAYA44_DEVICE_DESC | ||
68 | PHASE_DEVICE_DESC | 70 | PHASE_DEVICE_DESC |
69 | WTM_DEVICE_DESC | 71 | WTM_DEVICE_DESC |
70 | SE_DEVICE_DESC | 72 | SE_DEVICE_DESC |
@@ -626,7 +628,7 @@ static unsigned char stdclock_set_mclk(struct snd_ice1712 *ice, | |||
626 | return 0; | 628 | return 0; |
627 | } | 629 | } |
628 | 630 | ||
629 | static void snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, | 631 | static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, |
630 | int force) | 632 | int force) |
631 | { | 633 | { |
632 | unsigned long flags; | 634 | unsigned long flags; |
@@ -634,17 +636,18 @@ static void snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, | |||
634 | unsigned int i, old_rate; | 636 | unsigned int i, old_rate; |
635 | 637 | ||
636 | if (rate > ice->hw_rates->list[ice->hw_rates->count - 1]) | 638 | if (rate > ice->hw_rates->list[ice->hw_rates->count - 1]) |
637 | return; | 639 | return -EINVAL; |
640 | |||
638 | spin_lock_irqsave(&ice->reg_lock, flags); | 641 | spin_lock_irqsave(&ice->reg_lock, flags); |
639 | if ((inb(ICEMT1724(ice, DMA_CONTROL)) & DMA_STARTS) || | 642 | if ((inb(ICEMT1724(ice, DMA_CONTROL)) & DMA_STARTS) || |
640 | (inb(ICEMT1724(ice, DMA_PAUSE)) & DMA_PAUSES)) { | 643 | (inb(ICEMT1724(ice, DMA_PAUSE)) & DMA_PAUSES)) { |
641 | /* running? we cannot change the rate now... */ | 644 | /* running? we cannot change the rate now... */ |
642 | spin_unlock_irqrestore(&ice->reg_lock, flags); | 645 | spin_unlock_irqrestore(&ice->reg_lock, flags); |
643 | return; | 646 | return -EBUSY; |
644 | } | 647 | } |
645 | if (!force && is_pro_rate_locked(ice)) { | 648 | if (!force && is_pro_rate_locked(ice)) { |
646 | spin_unlock_irqrestore(&ice->reg_lock, flags); | 649 | spin_unlock_irqrestore(&ice->reg_lock, flags); |
647 | return; | 650 | return (rate == ice->cur_rate) ? 0 : -EBUSY; |
648 | } | 651 | } |
649 | 652 | ||
650 | old_rate = ice->get_rate(ice); | 653 | old_rate = ice->get_rate(ice); |
@@ -652,7 +655,7 @@ static void snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, | |||
652 | ice->set_rate(ice, rate); | 655 | ice->set_rate(ice, rate); |
653 | else if (rate == ice->cur_rate) { | 656 | else if (rate == ice->cur_rate) { |
654 | spin_unlock_irqrestore(&ice->reg_lock, flags); | 657 | spin_unlock_irqrestore(&ice->reg_lock, flags); |
655 | return; | 658 | return 0; |
656 | } | 659 | } |
657 | 660 | ||
658 | ice->cur_rate = rate; | 661 | ice->cur_rate = rate; |
@@ -674,13 +677,15 @@ static void snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, | |||
674 | } | 677 | } |
675 | if (ice->spdif.ops.setup_rate) | 678 | if (ice->spdif.ops.setup_rate) |
676 | ice->spdif.ops.setup_rate(ice, rate); | 679 | ice->spdif.ops.setup_rate(ice, rate); |
680 | |||
681 | return 0; | ||
677 | } | 682 | } |
678 | 683 | ||
679 | static int snd_vt1724_pcm_hw_params(struct snd_pcm_substream *substream, | 684 | static int snd_vt1724_pcm_hw_params(struct snd_pcm_substream *substream, |
680 | struct snd_pcm_hw_params *hw_params) | 685 | struct snd_pcm_hw_params *hw_params) |
681 | { | 686 | { |
682 | struct snd_ice1712 *ice = snd_pcm_substream_chip(substream); | 687 | struct snd_ice1712 *ice = snd_pcm_substream_chip(substream); |
683 | int i, chs; | 688 | int i, chs, err; |
684 | 689 | ||
685 | chs = params_channels(hw_params); | 690 | chs = params_channels(hw_params); |
686 | mutex_lock(&ice->open_mutex); | 691 | mutex_lock(&ice->open_mutex); |
@@ -715,7 +720,11 @@ static int snd_vt1724_pcm_hw_params(struct snd_pcm_substream *substream, | |||
715 | } | 720 | } |
716 | } | 721 | } |
717 | mutex_unlock(&ice->open_mutex); | 722 | mutex_unlock(&ice->open_mutex); |
718 | snd_vt1724_set_pro_rate(ice, params_rate(hw_params), 0); | 723 | |
724 | err = snd_vt1724_set_pro_rate(ice, params_rate(hw_params), 0); | ||
725 | if (err < 0) | ||
726 | return err; | ||
727 | |||
719 | return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)); | 728 | return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)); |
720 | } | 729 | } |
721 | 730 | ||
@@ -848,20 +857,39 @@ static snd_pcm_uframes_t snd_vt1724_pcm_pointer(struct snd_pcm_substream *substr | |||
848 | #endif | 857 | #endif |
849 | } | 858 | } |
850 | 859 | ||
851 | static const struct vt1724_pcm_reg vt1724_playback_pro_reg = { | 860 | static const struct vt1724_pcm_reg vt1724_pdma0_reg = { |
852 | .addr = VT1724_MT_PLAYBACK_ADDR, | 861 | .addr = VT1724_MT_PLAYBACK_ADDR, |
853 | .size = VT1724_MT_PLAYBACK_SIZE, | 862 | .size = VT1724_MT_PLAYBACK_SIZE, |
854 | .count = VT1724_MT_PLAYBACK_COUNT, | 863 | .count = VT1724_MT_PLAYBACK_COUNT, |
855 | .start = VT1724_PDMA0_START, | 864 | .start = VT1724_PDMA0_START, |
856 | }; | 865 | }; |
857 | 866 | ||
858 | static const struct vt1724_pcm_reg vt1724_capture_pro_reg = { | 867 | static const struct vt1724_pcm_reg vt1724_pdma4_reg = { |
868 | .addr = VT1724_MT_PDMA4_ADDR, | ||
869 | .size = VT1724_MT_PDMA4_SIZE, | ||
870 | .count = VT1724_MT_PDMA4_COUNT, | ||
871 | .start = VT1724_PDMA4_START, | ||
872 | }; | ||
873 | |||
874 | static const struct vt1724_pcm_reg vt1724_rdma0_reg = { | ||
859 | .addr = VT1724_MT_CAPTURE_ADDR, | 875 | .addr = VT1724_MT_CAPTURE_ADDR, |
860 | .size = VT1724_MT_CAPTURE_SIZE, | 876 | .size = VT1724_MT_CAPTURE_SIZE, |
861 | .count = VT1724_MT_CAPTURE_COUNT, | 877 | .count = VT1724_MT_CAPTURE_COUNT, |
862 | .start = VT1724_RDMA0_START, | 878 | .start = VT1724_RDMA0_START, |
863 | }; | 879 | }; |
864 | 880 | ||
881 | static const struct vt1724_pcm_reg vt1724_rdma1_reg = { | ||
882 | .addr = VT1724_MT_RDMA1_ADDR, | ||
883 | .size = VT1724_MT_RDMA1_SIZE, | ||
884 | .count = VT1724_MT_RDMA1_COUNT, | ||
885 | .start = VT1724_RDMA1_START, | ||
886 | }; | ||
887 | |||
888 | #define vt1724_playback_pro_reg vt1724_pdma0_reg | ||
889 | #define vt1724_playback_spdif_reg vt1724_pdma4_reg | ||
890 | #define vt1724_capture_pro_reg vt1724_rdma0_reg | ||
891 | #define vt1724_capture_spdif_reg vt1724_rdma1_reg | ||
892 | |||
865 | static const struct snd_pcm_hardware snd_vt1724_playback_pro = { | 893 | static const struct snd_pcm_hardware snd_vt1724_playback_pro = { |
866 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | 894 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | |
867 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 895 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
@@ -1077,20 +1105,6 @@ static int __devinit snd_vt1724_pcm_profi(struct snd_ice1712 *ice, int device) | |||
1077 | * SPDIF PCM | 1105 | * SPDIF PCM |
1078 | */ | 1106 | */ |
1079 | 1107 | ||
1080 | static const struct vt1724_pcm_reg vt1724_playback_spdif_reg = { | ||
1081 | .addr = VT1724_MT_PDMA4_ADDR, | ||
1082 | .size = VT1724_MT_PDMA4_SIZE, | ||
1083 | .count = VT1724_MT_PDMA4_COUNT, | ||
1084 | .start = VT1724_PDMA4_START, | ||
1085 | }; | ||
1086 | |||
1087 | static const struct vt1724_pcm_reg vt1724_capture_spdif_reg = { | ||
1088 | .addr = VT1724_MT_RDMA1_ADDR, | ||
1089 | .size = VT1724_MT_RDMA1_SIZE, | ||
1090 | .count = VT1724_MT_RDMA1_COUNT, | ||
1091 | .start = VT1724_RDMA1_START, | ||
1092 | }; | ||
1093 | |||
1094 | /* update spdif control bits; call with reg_lock */ | 1108 | /* update spdif control bits; call with reg_lock */ |
1095 | static void update_spdif_bits(struct snd_ice1712 *ice, unsigned int val) | 1109 | static void update_spdif_bits(struct snd_ice1712 *ice, unsigned int val) |
1096 | { | 1110 | { |
@@ -1963,7 +1977,7 @@ static inline int digital_route_shift(int idx) | |||
1963 | return idx * 3; | 1977 | return idx * 3; |
1964 | } | 1978 | } |
1965 | 1979 | ||
1966 | static int get_route_val(struct snd_ice1712 *ice, int shift) | 1980 | int snd_ice1724_get_route_val(struct snd_ice1712 *ice, int shift) |
1967 | { | 1981 | { |
1968 | unsigned long val; | 1982 | unsigned long val; |
1969 | unsigned char eitem; | 1983 | unsigned char eitem; |
@@ -1982,7 +1996,8 @@ static int get_route_val(struct snd_ice1712 *ice, int shift) | |||
1982 | return eitem; | 1996 | return eitem; |
1983 | } | 1997 | } |
1984 | 1998 | ||
1985 | static int put_route_val(struct snd_ice1712 *ice, unsigned int val, int shift) | 1999 | int snd_ice1724_put_route_val(struct snd_ice1712 *ice, unsigned int val, |
2000 | int shift) | ||
1986 | { | 2001 | { |
1987 | unsigned int old_val, nval; | 2002 | unsigned int old_val, nval; |
1988 | int change; | 2003 | int change; |
@@ -2010,7 +2025,7 @@ static int snd_vt1724_pro_route_analog_get(struct snd_kcontrol *kcontrol, | |||
2010 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); | 2025 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
2011 | int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); | 2026 | int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); |
2012 | ucontrol->value.enumerated.item[0] = | 2027 | ucontrol->value.enumerated.item[0] = |
2013 | get_route_val(ice, analog_route_shift(idx)); | 2028 | snd_ice1724_get_route_val(ice, analog_route_shift(idx)); |
2014 | return 0; | 2029 | return 0; |
2015 | } | 2030 | } |
2016 | 2031 | ||
@@ -2019,8 +2034,9 @@ static int snd_vt1724_pro_route_analog_put(struct snd_kcontrol *kcontrol, | |||
2019 | { | 2034 | { |
2020 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); | 2035 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
2021 | int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); | 2036 | int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); |
2022 | return put_route_val(ice, ucontrol->value.enumerated.item[0], | 2037 | return snd_ice1724_put_route_val(ice, |
2023 | analog_route_shift(idx)); | 2038 | ucontrol->value.enumerated.item[0], |
2039 | analog_route_shift(idx)); | ||
2024 | } | 2040 | } |
2025 | 2041 | ||
2026 | static int snd_vt1724_pro_route_spdif_get(struct snd_kcontrol *kcontrol, | 2042 | static int snd_vt1724_pro_route_spdif_get(struct snd_kcontrol *kcontrol, |
@@ -2029,7 +2045,7 @@ static int snd_vt1724_pro_route_spdif_get(struct snd_kcontrol *kcontrol, | |||
2029 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); | 2045 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
2030 | int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); | 2046 | int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); |
2031 | ucontrol->value.enumerated.item[0] = | 2047 | ucontrol->value.enumerated.item[0] = |
2032 | get_route_val(ice, digital_route_shift(idx)); | 2048 | snd_ice1724_get_route_val(ice, digital_route_shift(idx)); |
2033 | return 0; | 2049 | return 0; |
2034 | } | 2050 | } |
2035 | 2051 | ||
@@ -2038,11 +2054,13 @@ static int snd_vt1724_pro_route_spdif_put(struct snd_kcontrol *kcontrol, | |||
2038 | { | 2054 | { |
2039 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); | 2055 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); |
2040 | int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); | 2056 | int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); |
2041 | return put_route_val(ice, ucontrol->value.enumerated.item[0], | 2057 | return snd_ice1724_put_route_val(ice, |
2042 | digital_route_shift(idx)); | 2058 | ucontrol->value.enumerated.item[0], |
2059 | digital_route_shift(idx)); | ||
2043 | } | 2060 | } |
2044 | 2061 | ||
2045 | static struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route __devinitdata = { | 2062 | static struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route __devinitdata = |
2063 | { | ||
2046 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 2064 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
2047 | .name = "H/W Playback Route", | 2065 | .name = "H/W Playback Route", |
2048 | .info = snd_vt1724_pro_route_info, | 2066 | .info = snd_vt1724_pro_route_info, |
@@ -2109,6 +2127,7 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = { | |||
2109 | snd_vt1724_prodigy_hifi_cards, | 2127 | snd_vt1724_prodigy_hifi_cards, |
2110 | snd_vt1724_prodigy192_cards, | 2128 | snd_vt1724_prodigy192_cards, |
2111 | snd_vt1724_juli_cards, | 2129 | snd_vt1724_juli_cards, |
2130 | snd_vt1724_maya44_cards, | ||
2112 | snd_vt1724_phase_cards, | 2131 | snd_vt1724_phase_cards, |
2113 | snd_vt1724_wtm_cards, | 2132 | snd_vt1724_wtm_cards, |
2114 | snd_vt1724_se_cards, | 2133 | snd_vt1724_se_cards, |
@@ -2246,8 +2265,10 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice, | |||
2246 | static void __devinit snd_vt1724_chip_reset(struct snd_ice1712 *ice) | 2265 | static void __devinit snd_vt1724_chip_reset(struct snd_ice1712 *ice) |
2247 | { | 2266 | { |
2248 | outb(VT1724_RESET , ICEREG1724(ice, CONTROL)); | 2267 | outb(VT1724_RESET , ICEREG1724(ice, CONTROL)); |
2268 | inb(ICEREG1724(ice, CONTROL)); /* pci posting flush */ | ||
2249 | msleep(10); | 2269 | msleep(10); |
2250 | outb(0, ICEREG1724(ice, CONTROL)); | 2270 | outb(0, ICEREG1724(ice, CONTROL)); |
2271 | inb(ICEREG1724(ice, CONTROL)); /* pci posting flush */ | ||
2251 | msleep(10); | 2272 | msleep(10); |
2252 | } | 2273 | } |
2253 | 2274 | ||
@@ -2277,9 +2298,12 @@ static int __devinit snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice) | |||
2277 | if (snd_BUG_ON(!ice->pcm)) | 2298 | if (snd_BUG_ON(!ice->pcm)) |
2278 | return -EIO; | 2299 | return -EIO; |
2279 | 2300 | ||
2280 | err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_vt1724_mixer_pro_spdif_route, ice)); | 2301 | if (!ice->own_routing) { |
2281 | if (err < 0) | 2302 | err = snd_ctl_add(ice->card, |
2282 | return err; | 2303 | snd_ctl_new1(&snd_vt1724_mixer_pro_spdif_route, ice)); |
2304 | if (err < 0) | ||
2305 | return err; | ||
2306 | } | ||
2283 | 2307 | ||
2284 | err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_vt1724_spdif_switch, ice)); | 2308 | err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_vt1724_spdif_switch, ice)); |
2285 | if (err < 0) | 2309 | if (err < 0) |
@@ -2326,7 +2350,7 @@ static int __devinit snd_vt1724_build_controls(struct snd_ice1712 *ice) | |||
2326 | if (err < 0) | 2350 | if (err < 0) |
2327 | return err; | 2351 | return err; |
2328 | 2352 | ||
2329 | if (ice->num_total_dacs > 0) { | 2353 | if (!ice->own_routing && ice->num_total_dacs > 0) { |
2330 | struct snd_kcontrol_new tmp = snd_vt1724_mixer_pro_analog_route; | 2354 | struct snd_kcontrol_new tmp = snd_vt1724_mixer_pro_analog_route; |
2331 | tmp.count = ice->num_total_dacs; | 2355 | tmp.count = ice->num_total_dacs; |
2332 | if (ice->vt1720 && tmp.count > 2) | 2356 | if (ice->vt1720 && tmp.count > 2) |
diff --git a/sound/pci/ice1712/maya44.c b/sound/pci/ice1712/maya44.c new file mode 100644 index 000000000000..3e1c20ae2f1c --- /dev/null +++ b/sound/pci/ice1712/maya44.c | |||
@@ -0,0 +1,779 @@ | |||
1 | /* | ||
2 | * ALSA driver for ICEnsemble VT1724 (Envy24HT) | ||
3 | * | ||
4 | * Lowlevel functions for ESI Maya44 cards | ||
5 | * | ||
6 | * Copyright (c) 2009 Takashi Iwai <tiwai@suse.de> | ||
7 | * Based on the patches by Rainer Zimmermann <mail@lightshed.de> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License as published by | ||
11 | * the Free Software Foundation; either version 2 of the License, or | ||
12 | * (at your option) any later version. | ||
13 | * | ||
14 | * This program is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | * You should have received a copy of the GNU General Public License | ||
20 | * along with this program; if not, write to the Free Software | ||
21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #include <linux/init.h> | ||
26 | #include <linux/slab.h> | ||
27 | #include <linux/io.h> | ||
28 | #include <sound/core.h> | ||
29 | #include <sound/control.h> | ||
30 | #include <sound/pcm.h> | ||
31 | #include <sound/tlv.h> | ||
32 | |||
33 | #include "ice1712.h" | ||
34 | #include "envy24ht.h" | ||
35 | #include "maya44.h" | ||
36 | |||
37 | /* WM8776 register indexes */ | ||
38 | #define WM8776_REG_HEADPHONE_L 0x00 | ||
39 | #define WM8776_REG_HEADPHONE_R 0x01 | ||
40 | #define WM8776_REG_HEADPHONE_MASTER 0x02 | ||
41 | #define WM8776_REG_DAC_ATTEN_L 0x03 | ||
42 | #define WM8776_REG_DAC_ATTEN_R 0x04 | ||
43 | #define WM8776_REG_DAC_ATTEN_MASTER 0x05 | ||
44 | #define WM8776_REG_DAC_PHASE 0x06 | ||
45 | #define WM8776_REG_DAC_CONTROL 0x07 | ||
46 | #define WM8776_REG_DAC_MUTE 0x08 | ||
47 | #define WM8776_REG_DAC_DEEMPH 0x09 | ||
48 | #define WM8776_REG_DAC_IF_CONTROL 0x0a | ||
49 | #define WM8776_REG_ADC_IF_CONTROL 0x0b | ||
50 | #define WM8776_REG_MASTER_MODE_CONTROL 0x0c | ||
51 | #define WM8776_REG_POWERDOWN 0x0d | ||
52 | #define WM8776_REG_ADC_ATTEN_L 0x0e | ||
53 | #define WM8776_REG_ADC_ATTEN_R 0x0f | ||
54 | #define WM8776_REG_ADC_ALC1 0x10 | ||
55 | #define WM8776_REG_ADC_ALC2 0x11 | ||
56 | #define WM8776_REG_ADC_ALC3 0x12 | ||
57 | #define WM8776_REG_ADC_NOISE_GATE 0x13 | ||
58 | #define WM8776_REG_ADC_LIMITER 0x14 | ||
59 | #define WM8776_REG_ADC_MUX 0x15 | ||
60 | #define WM8776_REG_OUTPUT_MUX 0x16 | ||
61 | #define WM8776_REG_RESET 0x17 | ||
62 | |||
63 | #define WM8776_NUM_REGS 0x18 | ||
64 | |||
65 | /* clock ratio identifiers for snd_wm8776_set_rate() */ | ||
66 | #define WM8776_CLOCK_RATIO_128FS 0 | ||
67 | #define WM8776_CLOCK_RATIO_192FS 1 | ||
68 | #define WM8776_CLOCK_RATIO_256FS 2 | ||
69 | #define WM8776_CLOCK_RATIO_384FS 3 | ||
70 | #define WM8776_CLOCK_RATIO_512FS 4 | ||
71 | #define WM8776_CLOCK_RATIO_768FS 5 | ||
72 | |||
73 | enum { WM_VOL_HP, WM_VOL_DAC, WM_VOL_ADC, WM_NUM_VOLS }; | ||
74 | enum { WM_SW_DAC, WM_SW_BYPASS, WM_NUM_SWITCHES }; | ||
75 | |||
76 | struct snd_wm8776 { | ||
77 | unsigned char addr; | ||
78 | unsigned short regs[WM8776_NUM_REGS]; | ||
79 | unsigned char volumes[WM_NUM_VOLS][2]; | ||
80 | unsigned int switch_bits; | ||
81 | }; | ||
82 | |||
83 | struct snd_maya44 { | ||
84 | struct snd_ice1712 *ice; | ||
85 | struct snd_wm8776 wm[2]; | ||
86 | struct mutex mutex; | ||
87 | }; | ||
88 | |||
89 | |||
90 | /* write the given register and save the data to the cache */ | ||
91 | static void wm8776_write(struct snd_ice1712 *ice, struct snd_wm8776 *wm, | ||
92 | unsigned char reg, unsigned short val) | ||
93 | { | ||
94 | /* | ||
95 | * WM8776 registers are up to 9 bits wide, bit 8 is placed in the LSB | ||
96 | * of the address field | ||
97 | */ | ||
98 | snd_vt1724_write_i2c(ice, wm->addr, | ||
99 | (reg << 1) | ((val >> 8) & 1), | ||
100 | val & 0xff); | ||
101 | wm->regs[reg] = val; | ||
102 | } | ||
103 | |||
104 | /* | ||
105 | * update the given register with and/or mask and save the data to the cache | ||
106 | */ | ||
107 | static int wm8776_write_bits(struct snd_ice1712 *ice, struct snd_wm8776 *wm, | ||
108 | unsigned char reg, | ||
109 | unsigned short mask, unsigned short val) | ||
110 | { | ||
111 | val |= wm->regs[reg] & ~mask; | ||
112 | if (val != wm->regs[reg]) { | ||
113 | wm8776_write(ice, wm, reg, val); | ||
114 | return 1; | ||
115 | } | ||
116 | return 0; | ||
117 | } | ||
118 | |||
119 | |||
120 | /* | ||
121 | * WM8776 volume controls | ||
122 | */ | ||
123 | |||
124 | struct maya_vol_info { | ||
125 | unsigned int maxval; /* volume range: 0..maxval */ | ||
126 | unsigned char regs[2]; /* left and right registers */ | ||
127 | unsigned short mask; /* value mask */ | ||
128 | unsigned short offset; /* zero-value offset */ | ||
129 | unsigned short mute; /* mute bit */ | ||
130 | unsigned short update; /* update bits */ | ||
131 | unsigned char mux_bits[2]; /* extra bits for ADC mute */ | ||
132 | }; | ||
133 | |||
134 | static struct maya_vol_info vol_info[WM_NUM_VOLS] = { | ||
135 | [WM_VOL_HP] = { | ||
136 | .maxval = 80, | ||
137 | .regs = { WM8776_REG_HEADPHONE_L, WM8776_REG_HEADPHONE_R }, | ||
138 | .mask = 0x7f, | ||
139 | .offset = 0x30, | ||
140 | .mute = 0x00, | ||
141 | .update = 0x180, /* update and zero-cross enable */ | ||
142 | }, | ||
143 | [WM_VOL_DAC] = { | ||
144 | .maxval = 255, | ||
145 | .regs = { WM8776_REG_DAC_ATTEN_L, WM8776_REG_DAC_ATTEN_R }, | ||
146 | .mask = 0xff, | ||
147 | .offset = 0x01, | ||
148 | .mute = 0x00, | ||
149 | .update = 0x100, /* zero-cross enable */ | ||
150 | }, | ||
151 | [WM_VOL_ADC] = { | ||
152 | .maxval = 91, | ||
153 | .regs = { WM8776_REG_ADC_ATTEN_L, WM8776_REG_ADC_ATTEN_R }, | ||
154 | .mask = 0xff, | ||
155 | .offset = 0xa5, | ||
156 | .mute = 0xa5, | ||
157 | .update = 0x100, /* update */ | ||
158 | .mux_bits = { 0x80, 0x40 }, /* ADCMUX bits */ | ||
159 | }, | ||
160 | }; | ||
161 | |||
162 | /* | ||
163 | * dB tables | ||
164 | */ | ||
165 | /* headphone output: mute, -73..+6db (1db step) */ | ||
166 | static const DECLARE_TLV_DB_SCALE(db_scale_hp, -7400, 100, 1); | ||
167 | /* DAC output: mute, -127..0db (0.5db step) */ | ||
168 | static const DECLARE_TLV_DB_SCALE(db_scale_dac, -12750, 50, 1); | ||
169 | /* ADC gain: mute, -21..+24db (0.5db step) */ | ||
170 | static const DECLARE_TLV_DB_SCALE(db_scale_adc, -2100, 50, 1); | ||
171 | |||
172 | static int maya_vol_info(struct snd_kcontrol *kcontrol, | ||
173 | struct snd_ctl_elem_info *uinfo) | ||
174 | { | ||
175 | unsigned int idx = kcontrol->private_value; | ||
176 | struct maya_vol_info *vol = &vol_info[idx]; | ||
177 | |||
178 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | ||
179 | uinfo->count = 2; | ||
180 | uinfo->value.integer.min = 0; | ||
181 | uinfo->value.integer.max = vol->maxval; | ||
182 | return 0; | ||
183 | } | ||
184 | |||
185 | static int maya_vol_get(struct snd_kcontrol *kcontrol, | ||
186 | struct snd_ctl_elem_value *ucontrol) | ||
187 | { | ||
188 | struct snd_maya44 *chip = snd_kcontrol_chip(kcontrol); | ||
189 | struct snd_wm8776 *wm = | ||
190 | &chip->wm[snd_ctl_get_ioff(kcontrol, &ucontrol->id)]; | ||
191 | unsigned int idx = kcontrol->private_value; | ||
192 | |||
193 | mutex_lock(&chip->mutex); | ||
194 | ucontrol->value.integer.value[0] = wm->volumes[idx][0]; | ||
195 | ucontrol->value.integer.value[1] = wm->volumes[idx][1]; | ||
196 | mutex_unlock(&chip->mutex); | ||
197 | return 0; | ||
198 | } | ||
199 | |||
200 | static int maya_vol_put(struct snd_kcontrol *kcontrol, | ||
201 | struct snd_ctl_elem_value *ucontrol) | ||
202 | { | ||
203 | struct snd_maya44 *chip = snd_kcontrol_chip(kcontrol); | ||
204 | struct snd_wm8776 *wm = | ||
205 | &chip->wm[snd_ctl_get_ioff(kcontrol, &ucontrol->id)]; | ||
206 | unsigned int idx = kcontrol->private_value; | ||
207 | struct maya_vol_info *vol = &vol_info[idx]; | ||
208 | unsigned int val, data; | ||
209 | int ch, changed = 0; | ||
210 | |||
211 | mutex_lock(&chip->mutex); | ||
212 | for (ch = 0; ch < 2; ch++) { | ||
213 | val = ucontrol->value.integer.value[ch]; | ||
214 | if (val > vol->maxval) | ||
215 | val = vol->maxval; | ||
216 | if (val == wm->volumes[idx][ch]) | ||
217 | continue; | ||
218 | if (!val) | ||
219 | data = vol->mute; | ||
220 | else | ||
221 | data = (val - 1) + vol->offset; | ||
222 | data |= vol->update; | ||
223 | changed |= wm8776_write_bits(chip->ice, wm, vol->regs[ch], | ||
224 | vol->mask | vol->update, data); | ||
225 | if (vol->mux_bits[ch]) | ||
226 | wm8776_write_bits(chip->ice, wm, WM8776_REG_ADC_MUX, | ||
227 | vol->mux_bits[ch], | ||
228 | val ? 0 : vol->mux_bits[ch]); | ||
229 | wm->volumes[idx][ch] = val; | ||
230 | } | ||
231 | mutex_unlock(&chip->mutex); | ||
232 | return changed; | ||
233 | } | ||
234 | |||
235 | /* | ||
236 | * WM8776 switch controls | ||
237 | */ | ||
238 | |||
239 | #define COMPOSE_SW_VAL(idx, reg, mask) ((idx) | ((reg) << 8) | ((mask) << 16)) | ||
240 | #define GET_SW_VAL_IDX(val) ((val) & 0xff) | ||
241 | #define GET_SW_VAL_REG(val) (((val) >> 8) & 0xff) | ||
242 | #define GET_SW_VAL_MASK(val) (((val) >> 16) & 0xff) | ||
243 | |||
244 | #define maya_sw_info snd_ctl_boolean_mono_info | ||
245 | |||
246 | static int maya_sw_get(struct snd_kcontrol *kcontrol, | ||
247 | struct snd_ctl_elem_value *ucontrol) | ||
248 | { | ||
249 | struct snd_maya44 *chip = snd_kcontrol_chip(kcontrol); | ||
250 | struct snd_wm8776 *wm = | ||
251 | &chip->wm[snd_ctl_get_ioff(kcontrol, &ucontrol->id)]; | ||
252 | unsigned int idx = GET_SW_VAL_IDX(kcontrol->private_value); | ||
253 | |||
254 | ucontrol->value.integer.value[0] = (wm->switch_bits >> idx) & 1; | ||
255 | return 0; | ||
256 | } | ||
257 | |||
258 | static int maya_sw_put(struct snd_kcontrol *kcontrol, | ||
259 | struct snd_ctl_elem_value *ucontrol) | ||
260 | { | ||
261 | struct snd_maya44 *chip = snd_kcontrol_chip(kcontrol); | ||
262 | struct snd_wm8776 *wm = | ||
263 | &chip->wm[snd_ctl_get_ioff(kcontrol, &ucontrol->id)]; | ||
264 | unsigned int idx = GET_SW_VAL_IDX(kcontrol->private_value); | ||
265 | unsigned int mask, val; | ||
266 | int changed; | ||
267 | |||
268 | mutex_lock(&chip->mutex); | ||
269 | mask = 1 << idx; | ||
270 | wm->switch_bits &= ~mask; | ||
271 | val = ucontrol->value.integer.value[0]; | ||
272 | if (val) | ||
273 | wm->switch_bits |= mask; | ||
274 | mask = GET_SW_VAL_MASK(kcontrol->private_value); | ||
275 | changed = wm8776_write_bits(chip->ice, wm, | ||
276 | GET_SW_VAL_REG(kcontrol->private_value), | ||
277 | mask, val ? mask : 0); | ||
278 | mutex_unlock(&chip->mutex); | ||
279 | return changed; | ||
280 | } | ||
281 | |||
282 | /* | ||
283 | * GPIO pins (known ones for maya44) | ||
284 | */ | ||
285 | #define GPIO_PHANTOM_OFF 2 | ||
286 | #define GPIO_MIC_RELAY 4 | ||
287 | #define GPIO_SPDIF_IN_INV 5 | ||
288 | #define GPIO_MUST_BE_0 7 | ||
289 | |||
290 | /* | ||
291 | * GPIO switch controls | ||
292 | */ | ||
293 | |||
294 | #define COMPOSE_GPIO_VAL(shift, inv) ((shift) | ((inv) << 8)) | ||
295 | #define GET_GPIO_VAL_SHIFT(val) ((val) & 0xff) | ||
296 | #define GET_GPIO_VAL_INV(val) (((val) >> 8) & 1) | ||
297 | |||
298 | static int maya_set_gpio_bits(struct snd_ice1712 *ice, unsigned int mask, | ||
299 | unsigned int bits) | ||
300 | { | ||
301 | unsigned int data; | ||
302 | data = snd_ice1712_gpio_read(ice); | ||
303 | if ((data & mask) == bits) | ||
304 | return 0; | ||
305 | snd_ice1712_gpio_write(ice, (data & ~mask) | bits); | ||
306 | return 1; | ||
307 | } | ||
308 | |||
309 | #define maya_gpio_sw_info snd_ctl_boolean_mono_info | ||
310 | |||
311 | static int maya_gpio_sw_get(struct snd_kcontrol *kcontrol, | ||
312 | struct snd_ctl_elem_value *ucontrol) | ||
313 | { | ||
314 | struct snd_maya44 *chip = snd_kcontrol_chip(kcontrol); | ||
315 | unsigned int shift = GET_GPIO_VAL_SHIFT(kcontrol->private_value); | ||
316 | unsigned int val; | ||
317 | |||
318 | val = (snd_ice1712_gpio_read(chip->ice) >> shift) & 1; | ||
319 | if (GET_GPIO_VAL_INV(kcontrol->private_value)) | ||
320 | val = !val; | ||
321 | ucontrol->value.integer.value[0] = val; | ||
322 | return 0; | ||
323 | } | ||
324 | |||
325 | static int maya_gpio_sw_put(struct snd_kcontrol *kcontrol, | ||
326 | struct snd_ctl_elem_value *ucontrol) | ||
327 | { | ||
328 | struct snd_maya44 *chip = snd_kcontrol_chip(kcontrol); | ||
329 | unsigned int shift = GET_GPIO_VAL_SHIFT(kcontrol->private_value); | ||
330 | unsigned int val, mask; | ||
331 | int changed; | ||
332 | |||
333 | mutex_lock(&chip->mutex); | ||
334 | mask = 1 << shift; | ||
335 | val = ucontrol->value.integer.value[0]; | ||
336 | if (GET_GPIO_VAL_INV(kcontrol->private_value)) | ||
337 | val = !val; | ||
338 | val = val ? mask : 0; | ||
339 | changed = maya_set_gpio_bits(chip->ice, mask, val); | ||
340 | mutex_unlock(&chip->mutex); | ||
341 | return changed; | ||
342 | } | ||
343 | |||
344 | /* | ||
345 | * capture source selection | ||
346 | */ | ||
347 | |||
348 | /* known working input slots (0-4) */ | ||
349 | #define MAYA_LINE_IN 1 /* in-2 */ | ||
350 | #define MAYA_MIC_IN 4 /* in-5 */ | ||
351 | |||
352 | static void wm8776_select_input(struct snd_maya44 *chip, int idx, int line) | ||
353 | { | ||
354 | wm8776_write_bits(chip->ice, &chip->wm[idx], WM8776_REG_ADC_MUX, | ||
355 | 0x1f, 1 << line); | ||
356 | } | ||
357 | |||
358 | static int maya_rec_src_info(struct snd_kcontrol *kcontrol, | ||
359 | struct snd_ctl_elem_info *uinfo) | ||
360 | { | ||
361 | static char *texts[] = { "Line", "Mic" }; | ||
362 | |||
363 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | ||
364 | uinfo->count = 1; | ||
365 | uinfo->value.enumerated.items = ARRAY_SIZE(texts); | ||
366 | if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) | ||
367 | uinfo->value.enumerated.item = | ||
368 | uinfo->value.enumerated.items - 1; | ||
369 | strcpy(uinfo->value.enumerated.name, | ||
370 | texts[uinfo->value.enumerated.item]); | ||
371 | return 0; | ||
372 | } | ||
373 | |||
374 | static int maya_rec_src_get(struct snd_kcontrol *kcontrol, | ||
375 | struct snd_ctl_elem_value *ucontrol) | ||
376 | { | ||
377 | struct snd_maya44 *chip = snd_kcontrol_chip(kcontrol); | ||
378 | int sel; | ||
379 | |||
380 | if (snd_ice1712_gpio_read(chip->ice) & (1 << GPIO_MIC_RELAY)) | ||
381 | sel = 1; | ||
382 | else | ||
383 | sel = 0; | ||
384 | ucontrol->value.enumerated.item[0] = sel; | ||
385 | return 0; | ||
386 | } | ||
387 | |||
388 | static int maya_rec_src_put(struct snd_kcontrol *kcontrol, | ||
389 | struct snd_ctl_elem_value *ucontrol) | ||
390 | { | ||
391 | struct snd_maya44 *chip = snd_kcontrol_chip(kcontrol); | ||
392 | int sel = ucontrol->value.enumerated.item[0]; | ||
393 | int changed; | ||
394 | |||
395 | mutex_lock(&chip->mutex); | ||
396 | changed = maya_set_gpio_bits(chip->ice, GPIO_MIC_RELAY, | ||
397 | sel ? GPIO_MIC_RELAY : 0); | ||
398 | wm8776_select_input(chip, 0, sel ? MAYA_MIC_IN : MAYA_LINE_IN); | ||
399 | mutex_unlock(&chip->mutex); | ||
400 | return changed; | ||
401 | } | ||
402 | |||
403 | /* | ||
404 | * Maya44 routing switch settings have different meanings than the standard | ||
405 | * ice1724 switches as defined in snd_vt1724_pro_route_info (ice1724.c). | ||
406 | */ | ||
407 | static int maya_pb_route_info(struct snd_kcontrol *kcontrol, | ||
408 | struct snd_ctl_elem_info *uinfo) | ||
409 | { | ||
410 | static char *texts[] = { | ||
411 | "PCM Out", /* 0 */ | ||
412 | "Input 1", "Input 2", "Input 3", "Input 4" | ||
413 | }; | ||
414 | |||
415 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | ||
416 | uinfo->count = 1; | ||
417 | uinfo->value.enumerated.items = ARRAY_SIZE(texts); | ||
418 | if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) | ||
419 | uinfo->value.enumerated.item = | ||
420 | uinfo->value.enumerated.items - 1; | ||
421 | strcpy(uinfo->value.enumerated.name, | ||
422 | texts[uinfo->value.enumerated.item]); | ||
423 | return 0; | ||
424 | } | ||
425 | |||
426 | static int maya_pb_route_shift(int idx) | ||
427 | { | ||
428 | static const unsigned char shift[10] = | ||
429 | { 8, 20, 0, 3, 11, 23, 14, 26, 17, 29 }; | ||
430 | return shift[idx % 10]; | ||
431 | } | ||
432 | |||
433 | static int maya_pb_route_get(struct snd_kcontrol *kcontrol, | ||
434 | struct snd_ctl_elem_value *ucontrol) | ||
435 | { | ||
436 | struct snd_maya44 *chip = snd_kcontrol_chip(kcontrol); | ||
437 | int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); | ||
438 | ucontrol->value.enumerated.item[0] = | ||
439 | snd_ice1724_get_route_val(chip->ice, maya_pb_route_shift(idx)); | ||
440 | return 0; | ||
441 | } | ||
442 | |||
443 | static int maya_pb_route_put(struct snd_kcontrol *kcontrol, | ||
444 | struct snd_ctl_elem_value *ucontrol) | ||
445 | { | ||
446 | struct snd_maya44 *chip = snd_kcontrol_chip(kcontrol); | ||
447 | int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); | ||
448 | return snd_ice1724_put_route_val(chip->ice, | ||
449 | ucontrol->value.enumerated.item[0], | ||
450 | maya_pb_route_shift(idx)); | ||
451 | } | ||
452 | |||
453 | |||
454 | /* | ||
455 | * controls to be added | ||
456 | */ | ||
457 | |||
458 | static struct snd_kcontrol_new maya_controls[] __devinitdata = { | ||
459 | { | ||
460 | .name = "Crossmix Playback Volume", | ||
461 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
462 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | ||
463 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, | ||
464 | .info = maya_vol_info, | ||
465 | .get = maya_vol_get, | ||
466 | .put = maya_vol_put, | ||
467 | .tlv = { .p = db_scale_hp }, | ||
468 | .private_value = WM_VOL_HP, | ||
469 | .count = 2, | ||
470 | }, | ||
471 | { | ||
472 | .name = "PCM Playback Volume", | ||
473 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
474 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | ||
475 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, | ||
476 | .info = maya_vol_info, | ||
477 | .get = maya_vol_get, | ||
478 | .put = maya_vol_put, | ||
479 | .tlv = { .p = db_scale_dac }, | ||
480 | .private_value = WM_VOL_DAC, | ||
481 | .count = 2, | ||
482 | }, | ||
483 | { | ||
484 | .name = "Line Capture Volume", | ||
485 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
486 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | ||
487 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, | ||
488 | .info = maya_vol_info, | ||
489 | .get = maya_vol_get, | ||
490 | .put = maya_vol_put, | ||
491 | .tlv = { .p = db_scale_adc }, | ||
492 | .private_value = WM_VOL_ADC, | ||
493 | .count = 2, | ||
494 | }, | ||
495 | { | ||
496 | .name = "PCM Playback Switch", | ||
497 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
498 | .info = maya_sw_info, | ||
499 | .get = maya_sw_get, | ||
500 | .put = maya_sw_put, | ||
501 | .private_value = COMPOSE_SW_VAL(WM_SW_DAC, | ||
502 | WM8776_REG_OUTPUT_MUX, 0x01), | ||
503 | .count = 2, | ||
504 | }, | ||
505 | { | ||
506 | .name = "Bypass Playback Switch", | ||
507 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
508 | .info = maya_sw_info, | ||
509 | .get = maya_sw_get, | ||
510 | .put = maya_sw_put, | ||
511 | .private_value = COMPOSE_SW_VAL(WM_SW_BYPASS, | ||
512 | WM8776_REG_OUTPUT_MUX, 0x04), | ||
513 | .count = 2, | ||
514 | }, | ||
515 | { | ||
516 | .name = "Capture Source", | ||
517 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
518 | .info = maya_rec_src_info, | ||
519 | .get = maya_rec_src_get, | ||
520 | .put = maya_rec_src_put, | ||
521 | }, | ||
522 | { | ||
523 | .name = "Mic Phantom Power Switch", | ||
524 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
525 | .info = maya_gpio_sw_info, | ||
526 | .get = maya_gpio_sw_get, | ||
527 | .put = maya_gpio_sw_put, | ||
528 | .private_value = COMPOSE_GPIO_VAL(GPIO_PHANTOM_OFF, 1), | ||
529 | }, | ||
530 | { | ||
531 | .name = "SPDIF Capture Switch", | ||
532 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
533 | .info = maya_gpio_sw_info, | ||
534 | .get = maya_gpio_sw_get, | ||
535 | .put = maya_gpio_sw_put, | ||
536 | .private_value = COMPOSE_GPIO_VAL(GPIO_SPDIF_IN_INV, 1), | ||
537 | }, | ||
538 | { | ||
539 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
540 | .name = "H/W Playback Route", | ||
541 | .info = maya_pb_route_info, | ||
542 | .get = maya_pb_route_get, | ||
543 | .put = maya_pb_route_put, | ||
544 | .count = 4, /* FIXME: do controls 5-9 have any meaning? */ | ||
545 | }, | ||
546 | }; | ||
547 | |||
548 | static int __devinit maya44_add_controls(struct snd_ice1712 *ice) | ||
549 | { | ||
550 | int err, i; | ||
551 | |||
552 | for (i = 0; i < ARRAY_SIZE(maya_controls); i++) { | ||
553 | err = snd_ctl_add(ice->card, snd_ctl_new1(&maya_controls[i], | ||
554 | ice->spec)); | ||
555 | if (err < 0) | ||
556 | return err; | ||
557 | } | ||
558 | return 0; | ||
559 | } | ||
560 | |||
561 | |||
562 | /* | ||
563 | * initialize a wm8776 chip | ||
564 | */ | ||
565 | static void __devinit wm8776_init(struct snd_ice1712 *ice, | ||
566 | struct snd_wm8776 *wm, unsigned int addr) | ||
567 | { | ||
568 | static const unsigned short inits_wm8776[] = { | ||
569 | 0x02, 0x100, /* R2: headphone L+R muted + update */ | ||
570 | 0x05, 0x100, /* R5: DAC output L+R muted + update */ | ||
571 | 0x06, 0x000, /* R6: DAC output phase normal */ | ||
572 | 0x07, 0x091, /* R7: DAC enable zero cross detection, | ||
573 | normal output */ | ||
574 | 0x08, 0x000, /* R8: DAC soft mute off */ | ||
575 | 0x09, 0x000, /* R9: no deemph, DAC zero detect disabled */ | ||
576 | 0x0a, 0x022, /* R10: DAC I2C mode, std polarities, 24bit */ | ||
577 | 0x0b, 0x022, /* R11: ADC I2C mode, std polarities, 24bit, | ||
578 | highpass filter enabled */ | ||
579 | 0x0c, 0x042, /* R12: ADC+DAC slave, ADC+DAC 44,1kHz */ | ||
580 | 0x0d, 0x000, /* R13: all power up */ | ||
581 | 0x0e, 0x100, /* R14: ADC left muted, | ||
582 | enable zero cross detection */ | ||
583 | 0x0f, 0x100, /* R15: ADC right muted, | ||
584 | enable zero cross detection */ | ||
585 | /* R16: ALC...*/ | ||
586 | 0x11, 0x000, /* R17: disable ALC */ | ||
587 | /* R18: ALC...*/ | ||
588 | /* R19: noise gate...*/ | ||
589 | 0x15, 0x000, /* R21: ADC input mux init, mute all inputs */ | ||
590 | 0x16, 0x001, /* R22: output mux, select DAC */ | ||
591 | 0xff, 0xff | ||
592 | }; | ||
593 | |||
594 | const unsigned short *ptr; | ||
595 | unsigned char reg; | ||
596 | unsigned short data; | ||
597 | |||
598 | wm->addr = addr; | ||
599 | /* enable DAC output; mute bypass, aux & all inputs */ | ||
600 | wm->switch_bits = (1 << WM_SW_DAC); | ||
601 | |||
602 | ptr = inits_wm8776; | ||
603 | while (*ptr != 0xff) { | ||
604 | reg = *ptr++; | ||
605 | data = *ptr++; | ||
606 | wm8776_write(ice, wm, reg, data); | ||
607 | } | ||
608 | } | ||
609 | |||
610 | |||
611 | /* | ||
612 | * change the rate on the WM8776 codecs. | ||
613 | * this assumes that the VT17xx's rate is changed by the calling function. | ||
614 | * NOTE: even though the WM8776's are running in slave mode and rate | ||
615 | * selection is automatic, we need to call snd_wm8776_set_rate() here | ||
616 | * to make sure some flags are set correctly. | ||
617 | */ | ||
618 | static void set_rate(struct snd_ice1712 *ice, unsigned int rate) | ||
619 | { | ||
620 | struct snd_maya44 *chip = ice->spec; | ||
621 | unsigned int ratio, adc_ratio, val; | ||
622 | int i; | ||
623 | |||
624 | switch (rate) { | ||
625 | case 192000: | ||
626 | ratio = WM8776_CLOCK_RATIO_128FS; | ||
627 | break; | ||
628 | case 176400: | ||
629 | ratio = WM8776_CLOCK_RATIO_128FS; | ||
630 | break; | ||
631 | case 96000: | ||
632 | ratio = WM8776_CLOCK_RATIO_256FS; | ||
633 | break; | ||
634 | case 88200: | ||
635 | ratio = WM8776_CLOCK_RATIO_384FS; | ||
636 | break; | ||
637 | case 48000: | ||
638 | ratio = WM8776_CLOCK_RATIO_512FS; | ||
639 | break; | ||
640 | case 44100: | ||
641 | ratio = WM8776_CLOCK_RATIO_512FS; | ||
642 | break; | ||
643 | case 32000: | ||
644 | ratio = WM8776_CLOCK_RATIO_768FS; | ||
645 | break; | ||
646 | case 0: | ||
647 | /* no hint - S/PDIF input is master, simply return */ | ||
648 | return; | ||
649 | default: | ||
650 | snd_BUG(); | ||
651 | return; | ||
652 | } | ||
653 | |||
654 | /* | ||
655 | * this currently sets the same rate for ADC and DAC, but limits | ||
656 | * ADC rate to 256X (96kHz). For 256X mode (96kHz), this sets ADC | ||
657 | * oversampling to 64x, as recommended by WM8776 datasheet. | ||
658 | * Setting the rate is not really necessary in slave mode. | ||
659 | */ | ||
660 | adc_ratio = ratio; | ||
661 | if (adc_ratio < WM8776_CLOCK_RATIO_256FS) | ||
662 | adc_ratio = WM8776_CLOCK_RATIO_256FS; | ||
663 | |||
664 | val = adc_ratio; | ||
665 | if (adc_ratio == WM8776_CLOCK_RATIO_256FS) | ||
666 | val |= 8; | ||
667 | val |= ratio << 4; | ||
668 | |||
669 | mutex_lock(&chip->mutex); | ||
670 | for (i = 0; i < 2; i++) | ||
671 | wm8776_write_bits(ice, &chip->wm[i], | ||
672 | WM8776_REG_MASTER_MODE_CONTROL, | ||
673 | 0x180, val); | ||
674 | mutex_unlock(&chip->mutex); | ||
675 | } | ||
676 | |||
677 | /* | ||
678 | * supported sample rates (to override the default one) | ||
679 | */ | ||
680 | |||
681 | static unsigned int rates[] = { | ||
682 | 32000, 44100, 48000, 64000, 88200, 96000, 176400, 192000 | ||
683 | }; | ||
684 | |||
685 | /* playback rates: 32..192 kHz */ | ||
686 | static struct snd_pcm_hw_constraint_list dac_rates = { | ||
687 | .count = ARRAY_SIZE(rates), | ||
688 | .list = rates, | ||
689 | .mask = 0 | ||
690 | }; | ||
691 | |||
692 | |||
693 | /* | ||
694 | * chip addresses on I2C bus | ||
695 | */ | ||
696 | static unsigned char wm8776_addr[2] __devinitdata = { | ||
697 | 0x34, 0x36, /* codec 0 & 1 */ | ||
698 | }; | ||
699 | |||
700 | /* | ||
701 | * initialize the chip | ||
702 | */ | ||
703 | static int __devinit maya44_init(struct snd_ice1712 *ice) | ||
704 | { | ||
705 | int i; | ||
706 | struct snd_maya44 *chip; | ||
707 | |||
708 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); | ||
709 | if (!chip) | ||
710 | return -ENOMEM; | ||
711 | mutex_init(&chip->mutex); | ||
712 | chip->ice = ice; | ||
713 | ice->spec = chip; | ||
714 | |||
715 | /* initialise codecs */ | ||
716 | ice->num_total_dacs = 4; | ||
717 | ice->num_total_adcs = 4; | ||
718 | ice->akm_codecs = 0; | ||
719 | |||
720 | for (i = 0; i < 2; i++) { | ||
721 | wm8776_init(ice, &chip->wm[i], wm8776_addr[i]); | ||
722 | wm8776_select_input(chip, i, MAYA_LINE_IN); | ||
723 | } | ||
724 | |||
725 | /* set card specific rates */ | ||
726 | ice->hw_rates = &dac_rates; | ||
727 | |||
728 | /* register change rate notifier */ | ||
729 | ice->gpio.set_pro_rate = set_rate; | ||
730 | |||
731 | /* RDMA1 (2nd input channel) is used for ADC by default */ | ||
732 | ice->force_rdma1 = 1; | ||
733 | |||
734 | /* have an own routing control */ | ||
735 | ice->own_routing = 1; | ||
736 | |||
737 | return 0; | ||
738 | } | ||
739 | |||
740 | |||
741 | /* | ||
742 | * Maya44 boards don't provide the EEPROM data except for the vendor IDs. | ||
743 | * hence the driver needs to sets up it properly. | ||
744 | */ | ||
745 | |||
746 | static unsigned char maya44_eeprom[] __devinitdata = { | ||
747 | [ICE_EEP2_SYSCONF] = 0x45, | ||
748 | /* clock xin1=49.152MHz, mpu401, 2 stereo ADCs+DACs */ | ||
749 | [ICE_EEP2_ACLINK] = 0x80, | ||
750 | /* I2S */ | ||
751 | [ICE_EEP2_I2S] = 0xf8, | ||
752 | /* vol, 96k, 24bit, 192k */ | ||
753 | [ICE_EEP2_SPDIF] = 0xc3, | ||
754 | /* enable spdif out, spdif out supp, spdif-in, ext spdif out */ | ||
755 | [ICE_EEP2_GPIO_DIR] = 0xff, | ||
756 | [ICE_EEP2_GPIO_DIR1] = 0xff, | ||
757 | [ICE_EEP2_GPIO_DIR2] = 0xff, | ||
758 | [ICE_EEP2_GPIO_MASK] = 0/*0x9f*/, | ||
759 | [ICE_EEP2_GPIO_MASK1] = 0/*0xff*/, | ||
760 | [ICE_EEP2_GPIO_MASK2] = 0/*0x7f*/, | ||
761 | [ICE_EEP2_GPIO_STATE] = (1 << GPIO_PHANTOM_OFF) | | ||
762 | (1 << GPIO_SPDIF_IN_INV), | ||
763 | [ICE_EEP2_GPIO_STATE1] = 0x00, | ||
764 | [ICE_EEP2_GPIO_STATE2] = 0x00, | ||
765 | }; | ||
766 | |||
767 | /* entry point */ | ||
768 | struct snd_ice1712_card_info snd_vt1724_maya44_cards[] __devinitdata = { | ||
769 | { | ||
770 | .subvendor = VT1724_SUBDEVICE_MAYA44, | ||
771 | .name = "ESI Maya44", | ||
772 | .model = "maya44", | ||
773 | .chip_init = maya44_init, | ||
774 | .build_controls = maya44_add_controls, | ||
775 | .eeprom_size = sizeof(maya44_eeprom), | ||
776 | .eeprom_data = maya44_eeprom, | ||
777 | }, | ||
778 | { } /* terminator */ | ||
779 | }; | ||
diff --git a/sound/pci/ice1712/maya44.h b/sound/pci/ice1712/maya44.h new file mode 100644 index 000000000000..eafd03a8f4b5 --- /dev/null +++ b/sound/pci/ice1712/maya44.h | |||
@@ -0,0 +1,10 @@ | |||
1 | #ifndef __SOUND_MAYA44_H | ||
2 | #define __SOUND_MAYA44_H | ||
3 | |||
4 | #define MAYA44_DEVICE_DESC "{ESI,Maya44}," | ||
5 | |||
6 | #define VT1724_SUBDEVICE_MAYA44 0x34315441 /* Maya44 */ | ||
7 | |||
8 | extern struct snd_ice1712_card_info snd_vt1724_maya44_cards[]; | ||
9 | |||
10 | #endif /* __SOUND_MAYA44_H */ | ||
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 173bebf9f51d..8aa5687f392a 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
@@ -356,8 +356,6 @@ struct ichdev { | |||
356 | unsigned int position; | 356 | unsigned int position; |
357 | unsigned int pos_shift; | 357 | unsigned int pos_shift; |
358 | unsigned int last_pos; | 358 | unsigned int last_pos; |
359 | unsigned long last_pos_jiffies; | ||
360 | unsigned int jiffy_to_bytes; | ||
361 | int frags; | 359 | int frags; |
362 | int lvi; | 360 | int lvi; |
363 | int lvi_frag; | 361 | int lvi_frag; |
@@ -844,7 +842,6 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd | |||
844 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | 842 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: |
845 | val = ICH_IOCE | ICH_STARTBM; | 843 | val = ICH_IOCE | ICH_STARTBM; |
846 | ichdev->last_pos = ichdev->position; | 844 | ichdev->last_pos = ichdev->position; |
847 | ichdev->last_pos_jiffies = jiffies; | ||
848 | break; | 845 | break; |
849 | case SNDRV_PCM_TRIGGER_SUSPEND: | 846 | case SNDRV_PCM_TRIGGER_SUSPEND: |
850 | ichdev->suspended = 1; | 847 | ichdev->suspended = 1; |
@@ -1048,7 +1045,6 @@ static int snd_intel8x0_pcm_prepare(struct snd_pcm_substream *substream) | |||
1048 | ichdev->pos_shift = (runtime->sample_bits > 16) ? 2 : 1; | 1045 | ichdev->pos_shift = (runtime->sample_bits > 16) ? 2 : 1; |
1049 | } | 1046 | } |
1050 | snd_intel8x0_setup_periods(chip, ichdev); | 1047 | snd_intel8x0_setup_periods(chip, ichdev); |
1051 | ichdev->jiffy_to_bytes = (runtime->rate * 4 * ichdev->pos_shift) / HZ; | ||
1052 | return 0; | 1048 | return 0; |
1053 | } | 1049 | } |
1054 | 1050 | ||
@@ -1073,19 +1069,23 @@ static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(struct snd_pcm_substream *subs | |||
1073 | ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb)) | 1069 | ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb)) |
1074 | break; | 1070 | break; |
1075 | } while (timeout--); | 1071 | } while (timeout--); |
1072 | ptr = ichdev->last_pos; | ||
1076 | if (ptr1 != 0) { | 1073 | if (ptr1 != 0) { |
1077 | ptr1 <<= ichdev->pos_shift; | 1074 | ptr1 <<= ichdev->pos_shift; |
1078 | ptr = ichdev->fragsize1 - ptr1; | 1075 | ptr = ichdev->fragsize1 - ptr1; |
1079 | ptr += position; | 1076 | ptr += position; |
1080 | ichdev->last_pos = ptr; | 1077 | if (ptr < ichdev->last_pos) { |
1081 | ichdev->last_pos_jiffies = jiffies; | 1078 | unsigned int pos_base, last_base; |
1082 | } else { | 1079 | pos_base = position / ichdev->fragsize1; |
1083 | ptr1 = jiffies - ichdev->last_pos_jiffies; | 1080 | last_base = ichdev->last_pos / ichdev->fragsize1; |
1084 | if (ptr1) | 1081 | /* another sanity check; ptr1 can go back to full |
1085 | ptr1 -= 1; | 1082 | * before the base position is updated |
1086 | ptr = ichdev->last_pos + ptr1 * ichdev->jiffy_to_bytes; | 1083 | */ |
1087 | ptr %= ichdev->size; | 1084 | if (pos_base == last_base) |
1085 | ptr = ichdev->last_pos; | ||
1086 | } | ||
1088 | } | 1087 | } |
1088 | ichdev->last_pos = ptr; | ||
1089 | spin_unlock(&chip->reg_lock); | 1089 | spin_unlock(&chip->reg_lock); |
1090 | if (ptr >= ichdev->size) | 1090 | if (ptr >= ichdev->size) |
1091 | return 0; | 1091 | return 0; |
diff --git a/sound/pci/lx6464es/Makefile b/sound/pci/lx6464es/Makefile new file mode 100644 index 000000000000..eb04a6c73d8b --- /dev/null +++ b/sound/pci/lx6464es/Makefile | |||
@@ -0,0 +1,2 @@ | |||
1 | snd-lx6464es-objs := lx6464es.o lx_core.o | ||
2 | obj-$(CONFIG_SND_LX6464ES) += snd-lx6464es.o | ||
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c new file mode 100644 index 000000000000..ccf1b38c88ea --- /dev/null +++ b/sound/pci/lx6464es/lx6464es.c | |||
@@ -0,0 +1,1159 @@ | |||
1 | /* -*- linux-c -*- * | ||
2 | * | ||
3 | * ALSA driver for the digigram lx6464es interface | ||
4 | * | ||
5 | * Copyright (c) 2008, 2009 Tim Blechmann <tim@klingt.org> | ||
6 | * | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; see the file COPYING. If not, write to | ||
20 | * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
21 | * Boston, MA 02111-1307, USA. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #include <linux/module.h> | ||
26 | #include <linux/init.h> | ||
27 | #include <linux/pci.h> | ||
28 | #include <linux/delay.h> | ||
29 | |||
30 | #include <sound/initval.h> | ||
31 | #include <sound/control.h> | ||
32 | #include <sound/info.h> | ||
33 | |||
34 | #include "lx6464es.h" | ||
35 | |||
36 | MODULE_AUTHOR("Tim Blechmann"); | ||
37 | MODULE_LICENSE("GPL"); | ||
38 | MODULE_DESCRIPTION("digigram lx6464es"); | ||
39 | MODULE_SUPPORTED_DEVICE("{digigram lx6464es{}}"); | ||
40 | |||
41 | |||
42 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; | ||
43 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; | ||
44 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; | ||
45 | |||
46 | module_param_array(index, int, NULL, 0444); | ||
47 | MODULE_PARM_DESC(index, "Index value for Digigram LX6464ES interface."); | ||
48 | module_param_array(id, charp, NULL, 0444); | ||
49 | MODULE_PARM_DESC(id, "ID string for Digigram LX6464ES interface."); | ||
50 | module_param_array(enable, bool, NULL, 0444); | ||
51 | MODULE_PARM_DESC(enable, "Enable/disable specific Digigram LX6464ES soundcards."); | ||
52 | |||
53 | static const char card_name[] = "LX6464ES"; | ||
54 | |||
55 | |||
56 | #define PCI_DEVICE_ID_PLX_LX6464ES PCI_DEVICE_ID_PLX_9056 | ||
57 | |||
58 | static struct pci_device_id snd_lx6464es_ids[] = { | ||
59 | { PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES), | ||
60 | .subvendor = PCI_VENDOR_ID_DIGIGRAM, | ||
61 | .subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM | ||
62 | }, /* LX6464ES */ | ||
63 | { PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES), | ||
64 | .subvendor = PCI_VENDOR_ID_DIGIGRAM, | ||
65 | .subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_CAE_SERIAL_SUBSYSTEM | ||
66 | }, /* LX6464ES-CAE */ | ||
67 | { 0, }, | ||
68 | }; | ||
69 | |||
70 | MODULE_DEVICE_TABLE(pci, snd_lx6464es_ids); | ||
71 | |||
72 | |||
73 | |||
74 | /* PGO pour USERo dans le registre pci_0x06/loc_0xEC */ | ||
75 | #define CHIPSC_RESET_XILINX (1L<<16) | ||
76 | |||
77 | |||
78 | /* alsa callbacks */ | ||
79 | static struct snd_pcm_hardware lx_caps = { | ||
80 | .info = (SNDRV_PCM_INFO_MMAP | | ||
81 | SNDRV_PCM_INFO_INTERLEAVED | | ||
82 | SNDRV_PCM_INFO_MMAP_VALID | | ||
83 | SNDRV_PCM_INFO_SYNC_START), | ||
84 | .formats = (SNDRV_PCM_FMTBIT_S16_LE | | ||
85 | SNDRV_PCM_FMTBIT_S16_BE | | ||
86 | SNDRV_PCM_FMTBIT_S24_3LE | | ||
87 | SNDRV_PCM_FMTBIT_S24_3BE), | ||
88 | .rates = (SNDRV_PCM_RATE_CONTINUOUS | | ||
89 | SNDRV_PCM_RATE_8000_192000), | ||
90 | .rate_min = 8000, | ||
91 | .rate_max = 192000, | ||
92 | .channels_min = 2, | ||
93 | .channels_max = 64, | ||
94 | .buffer_bytes_max = 64*2*3*MICROBLAZE_IBL_MAX*MAX_STREAM_BUFFER, | ||
95 | .period_bytes_min = (2*2*MICROBLAZE_IBL_MIN*2), | ||
96 | .period_bytes_max = (4*64*MICROBLAZE_IBL_MAX*MAX_STREAM_BUFFER), | ||
97 | .periods_min = 2, | ||
98 | .periods_max = MAX_STREAM_BUFFER, | ||
99 | }; | ||
100 | |||
101 | static int lx_set_granularity(struct lx6464es *chip, u32 gran); | ||
102 | |||
103 | |||
104 | static int lx_hardware_open(struct lx6464es *chip, | ||
105 | struct snd_pcm_substream *substream) | ||
106 | { | ||
107 | int err = 0; | ||
108 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
109 | int channels = runtime->channels; | ||
110 | int is_capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); | ||
111 | |||
112 | snd_pcm_uframes_t period_size = runtime->period_size; | ||
113 | |||
114 | snd_printd(LXP "allocating pipe for %d channels\n", channels); | ||
115 | err = lx_pipe_allocate(chip, 0, is_capture, channels); | ||
116 | if (err < 0) { | ||
117 | snd_printk(KERN_ERR LXP "allocating pipe failed\n"); | ||
118 | return err; | ||
119 | } | ||
120 | |||
121 | err = lx_set_granularity(chip, period_size); | ||
122 | if (err < 0) { | ||
123 | snd_printk(KERN_ERR LXP "setting granularity to %ld failed\n", | ||
124 | period_size); | ||
125 | return err; | ||
126 | } | ||
127 | |||
128 | return 0; | ||
129 | } | ||
130 | |||
131 | static int lx_hardware_start(struct lx6464es *chip, | ||
132 | struct snd_pcm_substream *substream) | ||
133 | { | ||
134 | int err = 0; | ||
135 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
136 | int is_capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); | ||
137 | |||
138 | snd_printd(LXP "setting stream format\n"); | ||
139 | err = lx_stream_set_format(chip, runtime, 0, is_capture); | ||
140 | if (err < 0) { | ||
141 | snd_printk(KERN_ERR LXP "setting stream format failed\n"); | ||
142 | return err; | ||
143 | } | ||
144 | |||
145 | snd_printd(LXP "starting pipe\n"); | ||
146 | err = lx_pipe_start(chip, 0, is_capture); | ||
147 | if (err < 0) { | ||
148 | snd_printk(KERN_ERR LXP "starting pipe failed\n"); | ||
149 | return err; | ||
150 | } | ||
151 | |||
152 | snd_printd(LXP "waiting for pipe to start\n"); | ||
153 | err = lx_pipe_wait_for_start(chip, 0, is_capture); | ||
154 | if (err < 0) { | ||
155 | snd_printk(KERN_ERR LXP "waiting for pipe failed\n"); | ||
156 | return err; | ||
157 | } | ||
158 | |||
159 | return err; | ||
160 | } | ||
161 | |||
162 | |||
163 | static int lx_hardware_stop(struct lx6464es *chip, | ||
164 | struct snd_pcm_substream *substream) | ||
165 | { | ||
166 | int err = 0; | ||
167 | int is_capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); | ||
168 | |||
169 | snd_printd(LXP "pausing pipe\n"); | ||
170 | err = lx_pipe_pause(chip, 0, is_capture); | ||
171 | if (err < 0) { | ||
172 | snd_printk(KERN_ERR LXP "pausing pipe failed\n"); | ||
173 | return err; | ||
174 | } | ||
175 | |||
176 | snd_printd(LXP "waiting for pipe to become idle\n"); | ||
177 | err = lx_pipe_wait_for_idle(chip, 0, is_capture); | ||
178 | if (err < 0) { | ||
179 | snd_printk(KERN_ERR LXP "waiting for pipe failed\n"); | ||
180 | return err; | ||
181 | } | ||
182 | |||
183 | snd_printd(LXP "stopping pipe\n"); | ||
184 | err = lx_pipe_stop(chip, 0, is_capture); | ||
185 | if (err < 0) { | ||
186 | snd_printk(LXP "stopping pipe failed\n"); | ||
187 | return err; | ||
188 | } | ||
189 | |||
190 | return err; | ||
191 | } | ||
192 | |||
193 | |||
194 | static int lx_hardware_close(struct lx6464es *chip, | ||
195 | struct snd_pcm_substream *substream) | ||
196 | { | ||
197 | int err = 0; | ||
198 | int is_capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); | ||
199 | |||
200 | snd_printd(LXP "releasing pipe\n"); | ||
201 | err = lx_pipe_release(chip, 0, is_capture); | ||
202 | if (err < 0) { | ||
203 | snd_printk(LXP "releasing pipe failed\n"); | ||
204 | return err; | ||
205 | } | ||
206 | |||
207 | return err; | ||
208 | } | ||
209 | |||
210 | |||
211 | static int lx_pcm_open(struct snd_pcm_substream *substream) | ||
212 | { | ||
213 | struct lx6464es *chip = snd_pcm_substream_chip(substream); | ||
214 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
215 | int err = 0; | ||
216 | int board_rate; | ||
217 | |||
218 | snd_printdd("->lx_pcm_open\n"); | ||
219 | mutex_lock(&chip->setup_mutex); | ||
220 | |||
221 | /* copy the struct snd_pcm_hardware struct */ | ||
222 | runtime->hw = lx_caps; | ||
223 | |||
224 | #if 0 | ||
225 | /* buffer-size should better be multiple of period-size */ | ||
226 | err = snd_pcm_hw_constraint_integer(runtime, | ||
227 | SNDRV_PCM_HW_PARAM_PERIODS); | ||
228 | if (err < 0) { | ||
229 | snd_printk(KERN_WARNING LXP "could not constrain periods\n"); | ||
230 | goto exit; | ||
231 | } | ||
232 | #endif | ||
233 | |||
234 | /* the clock rate cannot be changed */ | ||
235 | board_rate = chip->board_sample_rate; | ||
236 | err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_RATE, | ||
237 | board_rate, board_rate); | ||
238 | |||
239 | if (err < 0) { | ||
240 | snd_printk(KERN_WARNING LXP "could not constrain periods\n"); | ||
241 | goto exit; | ||
242 | } | ||
243 | |||
244 | /* constrain period size */ | ||
245 | err = snd_pcm_hw_constraint_minmax(runtime, | ||
246 | SNDRV_PCM_HW_PARAM_PERIOD_SIZE, | ||
247 | MICROBLAZE_IBL_MIN, | ||
248 | MICROBLAZE_IBL_MAX); | ||
249 | if (err < 0) { | ||
250 | snd_printk(KERN_WARNING LXP | ||
251 | "could not constrain period size\n"); | ||
252 | goto exit; | ||
253 | } | ||
254 | |||
255 | snd_pcm_hw_constraint_step(runtime, 0, | ||
256 | SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 32); | ||
257 | |||
258 | snd_pcm_set_sync(substream); | ||
259 | err = 0; | ||
260 | |||
261 | exit: | ||
262 | runtime->private_data = chip; | ||
263 | |||
264 | mutex_unlock(&chip->setup_mutex); | ||
265 | snd_printdd("<-lx_pcm_open, %d\n", err); | ||
266 | return err; | ||
267 | } | ||
268 | |||
269 | static int lx_pcm_close(struct snd_pcm_substream *substream) | ||
270 | { | ||
271 | int err = 0; | ||
272 | snd_printdd("->lx_pcm_close\n"); | ||
273 | return err; | ||
274 | } | ||
275 | |||
276 | static snd_pcm_uframes_t lx_pcm_stream_pointer(struct snd_pcm_substream | ||
277 | *substream) | ||
278 | { | ||
279 | struct lx6464es *chip = snd_pcm_substream_chip(substream); | ||
280 | snd_pcm_uframes_t pos; | ||
281 | unsigned long flags; | ||
282 | int is_capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); | ||
283 | |||
284 | struct lx_stream *lx_stream = is_capture ? &chip->capture_stream : | ||
285 | &chip->playback_stream; | ||
286 | |||
287 | snd_printdd("->lx_pcm_stream_pointer\n"); | ||
288 | |||
289 | spin_lock_irqsave(&chip->lock, flags); | ||
290 | pos = lx_stream->frame_pos * substream->runtime->period_size; | ||
291 | spin_unlock_irqrestore(&chip->lock, flags); | ||
292 | |||
293 | snd_printdd(LXP "stream_pointer at %ld\n", pos); | ||
294 | return pos; | ||
295 | } | ||
296 | |||
297 | static int lx_pcm_prepare(struct snd_pcm_substream *substream) | ||
298 | { | ||
299 | struct lx6464es *chip = snd_pcm_substream_chip(substream); | ||
300 | int err = 0; | ||
301 | const int is_capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); | ||
302 | |||
303 | snd_printdd("->lx_pcm_prepare\n"); | ||
304 | |||
305 | mutex_lock(&chip->setup_mutex); | ||
306 | |||
307 | if (chip->hardware_running[is_capture]) { | ||
308 | err = lx_hardware_stop(chip, substream); | ||
309 | if (err < 0) { | ||
310 | snd_printk(KERN_ERR LXP "failed to stop hardware. " | ||
311 | "Error code %d\n", err); | ||
312 | goto exit; | ||
313 | } | ||
314 | |||
315 | err = lx_hardware_close(chip, substream); | ||
316 | if (err < 0) { | ||
317 | snd_printk(KERN_ERR LXP "failed to close hardware. " | ||
318 | "Error code %d\n", err); | ||
319 | goto exit; | ||
320 | } | ||
321 | } | ||
322 | |||
323 | snd_printd(LXP "opening hardware\n"); | ||
324 | err = lx_hardware_open(chip, substream); | ||
325 | if (err < 0) { | ||
326 | snd_printk(KERN_ERR LXP "failed to open hardware. " | ||
327 | "Error code %d\n", err); | ||
328 | goto exit; | ||
329 | } | ||
330 | |||
331 | err = lx_hardware_start(chip, substream); | ||
332 | if (err < 0) { | ||
333 | snd_printk(KERN_ERR LXP "failed to start hardware. " | ||
334 | "Error code %d\n", err); | ||
335 | goto exit; | ||
336 | } | ||
337 | |||
338 | chip->hardware_running[is_capture] = 1; | ||
339 | |||
340 | if (chip->board_sample_rate != substream->runtime->rate) { | ||
341 | if (!err) | ||
342 | chip->board_sample_rate = substream->runtime->rate; | ||
343 | } | ||
344 | |||
345 | exit: | ||
346 | mutex_unlock(&chip->setup_mutex); | ||
347 | return err; | ||
348 | } | ||
349 | |||
350 | static int lx_pcm_hw_params(struct snd_pcm_substream *substream, | ||
351 | struct snd_pcm_hw_params *hw_params, int is_capture) | ||
352 | { | ||
353 | struct lx6464es *chip = snd_pcm_substream_chip(substream); | ||
354 | int err = 0; | ||
355 | |||
356 | snd_printdd("->lx_pcm_hw_params\n"); | ||
357 | |||
358 | mutex_lock(&chip->setup_mutex); | ||
359 | |||
360 | /* set dma buffer */ | ||
361 | err = snd_pcm_lib_malloc_pages(substream, | ||
362 | params_buffer_bytes(hw_params)); | ||
363 | |||
364 | if (is_capture) | ||
365 | chip->capture_stream.stream = substream; | ||
366 | else | ||
367 | chip->playback_stream.stream = substream; | ||
368 | |||
369 | mutex_unlock(&chip->setup_mutex); | ||
370 | return err; | ||
371 | } | ||
372 | |||
373 | static int lx_pcm_hw_params_playback(struct snd_pcm_substream *substream, | ||
374 | struct snd_pcm_hw_params *hw_params) | ||
375 | { | ||
376 | return lx_pcm_hw_params(substream, hw_params, 0); | ||
377 | } | ||
378 | |||
379 | static int lx_pcm_hw_params_capture(struct snd_pcm_substream *substream, | ||
380 | struct snd_pcm_hw_params *hw_params) | ||
381 | { | ||
382 | return lx_pcm_hw_params(substream, hw_params, 1); | ||
383 | } | ||
384 | |||
385 | static int lx_pcm_hw_free(struct snd_pcm_substream *substream) | ||
386 | { | ||
387 | struct lx6464es *chip = snd_pcm_substream_chip(substream); | ||
388 | int err = 0; | ||
389 | int is_capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); | ||
390 | |||
391 | snd_printdd("->lx_pcm_hw_free\n"); | ||
392 | mutex_lock(&chip->setup_mutex); | ||
393 | |||
394 | if (chip->hardware_running[is_capture]) { | ||
395 | err = lx_hardware_stop(chip, substream); | ||
396 | if (err < 0) { | ||
397 | snd_printk(KERN_ERR LXP "failed to stop hardware. " | ||
398 | "Error code %d\n", err); | ||
399 | goto exit; | ||
400 | } | ||
401 | |||
402 | err = lx_hardware_close(chip, substream); | ||
403 | if (err < 0) { | ||
404 | snd_printk(KERN_ERR LXP "failed to close hardware. " | ||
405 | "Error code %d\n", err); | ||
406 | goto exit; | ||
407 | } | ||
408 | |||
409 | chip->hardware_running[is_capture] = 0; | ||
410 | } | ||
411 | |||
412 | err = snd_pcm_lib_free_pages(substream); | ||
413 | |||
414 | if (is_capture) | ||
415 | chip->capture_stream.stream = 0; | ||
416 | else | ||
417 | chip->playback_stream.stream = 0; | ||
418 | |||
419 | exit: | ||
420 | mutex_unlock(&chip->setup_mutex); | ||
421 | return err; | ||
422 | } | ||
423 | |||
424 | static void lx_trigger_start(struct lx6464es *chip, struct lx_stream *lx_stream) | ||
425 | { | ||
426 | struct snd_pcm_substream *substream = lx_stream->stream; | ||
427 | const int is_capture = lx_stream->is_capture; | ||
428 | |||
429 | int err; | ||
430 | |||
431 | const u32 channels = substream->runtime->channels; | ||
432 | const u32 bytes_per_frame = channels * 3; | ||
433 | const u32 period_size = substream->runtime->period_size; | ||
434 | const u32 periods = substream->runtime->periods; | ||
435 | const u32 period_bytes = period_size * bytes_per_frame; | ||
436 | |||
437 | dma_addr_t buf = substream->dma_buffer.addr; | ||
438 | int i; | ||
439 | |||
440 | u32 needed, freed; | ||
441 | u32 size_array[5]; | ||
442 | |||
443 | for (i = 0; i != periods; ++i) { | ||
444 | u32 buffer_index = 0; | ||
445 | |||
446 | err = lx_buffer_ask(chip, 0, is_capture, &needed, &freed, | ||
447 | size_array); | ||
448 | snd_printdd(LXP "starting: needed %d, freed %d\n", | ||
449 | needed, freed); | ||
450 | |||
451 | err = lx_buffer_give(chip, 0, is_capture, period_bytes, | ||
452 | lower_32_bits(buf), upper_32_bits(buf), | ||
453 | &buffer_index); | ||
454 | |||
455 | snd_printdd(LXP "starting: buffer index %x on %p (%d bytes)\n", | ||
456 | buffer_index, (void *)buf, period_bytes); | ||
457 | buf += period_bytes; | ||
458 | } | ||
459 | |||
460 | err = lx_buffer_ask(chip, 0, is_capture, &needed, &freed, size_array); | ||
461 | snd_printdd(LXP "starting: needed %d, freed %d\n", needed, freed); | ||
462 | |||
463 | snd_printd(LXP "starting: starting stream\n"); | ||
464 | err = lx_stream_start(chip, 0, is_capture); | ||
465 | if (err < 0) | ||
466 | snd_printk(KERN_ERR LXP "couldn't start stream\n"); | ||
467 | else | ||
468 | lx_stream->status = LX_STREAM_STATUS_RUNNING; | ||
469 | |||
470 | lx_stream->frame_pos = 0; | ||
471 | } | ||
472 | |||
473 | static void lx_trigger_stop(struct lx6464es *chip, struct lx_stream *lx_stream) | ||
474 | { | ||
475 | const int is_capture = lx_stream->is_capture; | ||
476 | int err; | ||
477 | |||
478 | snd_printd(LXP "stopping: stopping stream\n"); | ||
479 | err = lx_stream_stop(chip, 0, is_capture); | ||
480 | if (err < 0) | ||
481 | snd_printk(KERN_ERR LXP "couldn't stop stream\n"); | ||
482 | else | ||
483 | lx_stream->status = LX_STREAM_STATUS_FREE; | ||
484 | |||
485 | } | ||
486 | |||
487 | static void lx_trigger_tasklet_dispatch_stream(struct lx6464es *chip, | ||
488 | struct lx_stream *lx_stream) | ||
489 | { | ||
490 | switch (lx_stream->status) { | ||
491 | case LX_STREAM_STATUS_SCHEDULE_RUN: | ||
492 | lx_trigger_start(chip, lx_stream); | ||
493 | break; | ||
494 | |||
495 | case LX_STREAM_STATUS_SCHEDULE_STOP: | ||
496 | lx_trigger_stop(chip, lx_stream); | ||
497 | break; | ||
498 | |||
499 | default: | ||
500 | break; | ||
501 | } | ||
502 | } | ||
503 | |||
504 | static void lx_trigger_tasklet(unsigned long data) | ||
505 | { | ||
506 | struct lx6464es *chip = (struct lx6464es *)data; | ||
507 | unsigned long flags; | ||
508 | |||
509 | snd_printdd("->lx_trigger_tasklet\n"); | ||
510 | |||
511 | spin_lock_irqsave(&chip->lock, flags); | ||
512 | lx_trigger_tasklet_dispatch_stream(chip, &chip->capture_stream); | ||
513 | lx_trigger_tasklet_dispatch_stream(chip, &chip->playback_stream); | ||
514 | spin_unlock_irqrestore(&chip->lock, flags); | ||
515 | } | ||
516 | |||
517 | static int lx_pcm_trigger_dispatch(struct lx6464es *chip, | ||
518 | struct lx_stream *lx_stream, int cmd) | ||
519 | { | ||
520 | int err = 0; | ||
521 | |||
522 | switch (cmd) { | ||
523 | case SNDRV_PCM_TRIGGER_START: | ||
524 | lx_stream->status = LX_STREAM_STATUS_SCHEDULE_RUN; | ||
525 | break; | ||
526 | |||
527 | case SNDRV_PCM_TRIGGER_STOP: | ||
528 | lx_stream->status = LX_STREAM_STATUS_SCHEDULE_STOP; | ||
529 | break; | ||
530 | |||
531 | default: | ||
532 | err = -EINVAL; | ||
533 | goto exit; | ||
534 | } | ||
535 | tasklet_schedule(&chip->trigger_tasklet); | ||
536 | |||
537 | exit: | ||
538 | return err; | ||
539 | } | ||
540 | |||
541 | |||
542 | static int lx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) | ||
543 | { | ||
544 | struct lx6464es *chip = snd_pcm_substream_chip(substream); | ||
545 | const int is_capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); | ||
546 | struct lx_stream *stream = is_capture ? &chip->capture_stream : | ||
547 | &chip->playback_stream; | ||
548 | |||
549 | snd_printdd("->lx_pcm_trigger\n"); | ||
550 | |||
551 | return lx_pcm_trigger_dispatch(chip, stream, cmd); | ||
552 | } | ||
553 | |||
554 | static int snd_lx6464es_free(struct lx6464es *chip) | ||
555 | { | ||
556 | snd_printdd("->snd_lx6464es_free\n"); | ||
557 | |||
558 | lx_irq_disable(chip); | ||
559 | |||
560 | if (chip->irq >= 0) | ||
561 | free_irq(chip->irq, chip); | ||
562 | |||
563 | iounmap(chip->port_dsp_bar); | ||
564 | ioport_unmap(chip->port_plx_remapped); | ||
565 | |||
566 | pci_release_regions(chip->pci); | ||
567 | pci_disable_device(chip->pci); | ||
568 | |||
569 | kfree(chip); | ||
570 | |||
571 | return 0; | ||
572 | } | ||
573 | |||
574 | static int snd_lx6464es_dev_free(struct snd_device *device) | ||
575 | { | ||
576 | return snd_lx6464es_free(device->device_data); | ||
577 | } | ||
578 | |||
579 | /* reset the dsp during initialization */ | ||
580 | static int __devinit lx_init_xilinx_reset(struct lx6464es *chip) | ||
581 | { | ||
582 | int i; | ||
583 | u32 plx_reg = lx_plx_reg_read(chip, ePLX_CHIPSC); | ||
584 | |||
585 | snd_printdd("->lx_init_xilinx_reset\n"); | ||
586 | |||
587 | /* activate reset of xilinx */ | ||
588 | plx_reg &= ~CHIPSC_RESET_XILINX; | ||
589 | |||
590 | lx_plx_reg_write(chip, ePLX_CHIPSC, plx_reg); | ||
591 | msleep(1); | ||
592 | |||
593 | lx_plx_reg_write(chip, ePLX_MBOX3, 0); | ||
594 | msleep(1); | ||
595 | |||
596 | plx_reg |= CHIPSC_RESET_XILINX; | ||
597 | lx_plx_reg_write(chip, ePLX_CHIPSC, plx_reg); | ||
598 | |||
599 | /* deactivate reset of xilinx */ | ||
600 | for (i = 0; i != 100; ++i) { | ||
601 | u32 reg_mbox3; | ||
602 | msleep(10); | ||
603 | reg_mbox3 = lx_plx_reg_read(chip, ePLX_MBOX3); | ||
604 | if (reg_mbox3) { | ||
605 | snd_printd(LXP "xilinx reset done\n"); | ||
606 | snd_printdd(LXP "xilinx took %d loops\n", i); | ||
607 | break; | ||
608 | } | ||
609 | } | ||
610 | |||
611 | /* todo: add some error handling? */ | ||
612 | |||
613 | /* clear mr */ | ||
614 | lx_dsp_reg_write(chip, eReg_CSM, 0); | ||
615 | |||
616 | /* le xilinx ES peut ne pas etre encore pret, on attend. */ | ||
617 | msleep(600); | ||
618 | |||
619 | return 0; | ||
620 | } | ||
621 | |||
622 | static int __devinit lx_init_xilinx_test(struct lx6464es *chip) | ||
623 | { | ||
624 | u32 reg; | ||
625 | |||
626 | snd_printdd("->lx_init_xilinx_test\n"); | ||
627 | |||
628 | /* TEST if we have access to Xilinx/MicroBlaze */ | ||
629 | lx_dsp_reg_write(chip, eReg_CSM, 0); | ||
630 | |||
631 | reg = lx_dsp_reg_read(chip, eReg_CSM); | ||
632 | |||
633 | if (reg) { | ||
634 | snd_printk(KERN_ERR LXP "Problem: Reg_CSM %x.\n", reg); | ||
635 | |||
636 | /* PCI9056_SPACE0_REMAP */ | ||
637 | lx_plx_reg_write(chip, ePLX_PCICR, 1); | ||
638 | |||
639 | reg = lx_dsp_reg_read(chip, eReg_CSM); | ||
640 | if (reg) { | ||
641 | snd_printk(KERN_ERR LXP "Error: Reg_CSM %x.\n", reg); | ||
642 | return -EAGAIN; /* seems to be appropriate */ | ||
643 | } | ||
644 | } | ||
645 | |||
646 | snd_printd(LXP "Xilinx/MicroBlaze access test successful\n"); | ||
647 | |||
648 | return 0; | ||
649 | } | ||
650 | |||
651 | /* initialize ethersound */ | ||
652 | static int __devinit lx_init_ethersound_config(struct lx6464es *chip) | ||
653 | { | ||
654 | int i; | ||
655 | u32 orig_conf_es = lx_dsp_reg_read(chip, eReg_CONFES); | ||
656 | |||
657 | u32 default_conf_es = (64 << IOCR_OUTPUTS_OFFSET) | | ||
658 | (64 << IOCR_INPUTS_OFFSET) | | ||
659 | (FREQ_RATIO_SINGLE_MODE << FREQ_RATIO_OFFSET); | ||
660 | |||
661 | u32 conf_es = (orig_conf_es & CONFES_READ_PART_MASK) | ||
662 | | (default_conf_es & CONFES_WRITE_PART_MASK); | ||
663 | |||
664 | snd_printdd("->lx_init_ethersound\n"); | ||
665 | |||
666 | chip->freq_ratio = FREQ_RATIO_SINGLE_MODE; | ||
667 | |||
668 | /* | ||
669 | * write it to the card ! | ||
670 | * this actually kicks the ES xilinx, the first time since poweron. | ||
671 | * the MAC address in the Reg_ADMACESMSB Reg_ADMACESLSB registers | ||
672 | * is not ready before this is done, and the bit 2 in Reg_CSES is set. | ||
673 | * */ | ||
674 | lx_dsp_reg_write(chip, eReg_CONFES, conf_es); | ||
675 | |||
676 | for (i = 0; i != 1000; ++i) { | ||
677 | if (lx_dsp_reg_read(chip, eReg_CSES) & 4) { | ||
678 | snd_printd(LXP "ethersound initialized after %dms\n", | ||
679 | i); | ||
680 | goto ethersound_initialized; | ||
681 | } | ||
682 | msleep(1); | ||
683 | } | ||
684 | snd_printk(KERN_WARNING LXP | ||
685 | "ethersound could not be initialized after %dms\n", i); | ||
686 | return -ETIMEDOUT; | ||
687 | |||
688 | ethersound_initialized: | ||
689 | snd_printd(LXP "ethersound initialized\n"); | ||
690 | return 0; | ||
691 | } | ||
692 | |||
693 | static int __devinit lx_init_get_version_features(struct lx6464es *chip) | ||
694 | { | ||
695 | u32 dsp_version; | ||
696 | |||
697 | int err; | ||
698 | |||
699 | snd_printdd("->lx_init_get_version_features\n"); | ||
700 | |||
701 | err = lx_dsp_get_version(chip, &dsp_version); | ||
702 | |||
703 | if (err == 0) { | ||
704 | u32 freq; | ||
705 | |||
706 | snd_printk(LXP "DSP version: V%02d.%02d #%d\n", | ||
707 | (dsp_version>>16) & 0xff, (dsp_version>>8) & 0xff, | ||
708 | dsp_version & 0xff); | ||
709 | |||
710 | /* later: what firmware version do we expect? */ | ||
711 | |||
712 | /* retrieve Play/Rec features */ | ||
713 | /* done here because we may have to handle alternate | ||
714 | * DSP files. */ | ||
715 | /* later */ | ||
716 | |||
717 | /* init the EtherSound sample rate */ | ||
718 | err = lx_dsp_get_clock_frequency(chip, &freq); | ||
719 | if (err == 0) | ||
720 | chip->board_sample_rate = freq; | ||
721 | snd_printd(LXP "actual clock frequency %d\n", freq); | ||
722 | } else { | ||
723 | snd_printk(KERN_ERR LXP "DSP corrupted \n"); | ||
724 | err = -EAGAIN; | ||
725 | } | ||
726 | |||
727 | return err; | ||
728 | } | ||
729 | |||
730 | static int lx_set_granularity(struct lx6464es *chip, u32 gran) | ||
731 | { | ||
732 | int err = 0; | ||
733 | u32 snapped_gran = MICROBLAZE_IBL_MIN; | ||
734 | |||
735 | snd_printdd("->lx_set_granularity\n"); | ||
736 | |||
737 | /* blocksize is a power of 2 */ | ||
738 | while ((snapped_gran < gran) && | ||
739 | (snapped_gran < MICROBLAZE_IBL_MAX)) { | ||
740 | snapped_gran *= 2; | ||
741 | } | ||
742 | |||
743 | if (snapped_gran == chip->pcm_granularity) | ||
744 | return 0; | ||
745 | |||
746 | err = lx_dsp_set_granularity(chip, snapped_gran); | ||
747 | if (err < 0) { | ||
748 | snd_printk(KERN_WARNING LXP "could not set granularity\n"); | ||
749 | err = -EAGAIN; | ||
750 | } | ||
751 | |||
752 | if (snapped_gran != gran) | ||
753 | snd_printk(LXP "snapped blocksize to %d\n", snapped_gran); | ||
754 | |||
755 | snd_printd(LXP "set blocksize on board %d\n", snapped_gran); | ||
756 | chip->pcm_granularity = snapped_gran; | ||
757 | |||
758 | return err; | ||
759 | } | ||
760 | |||
761 | /* initialize and test the xilinx dsp chip */ | ||
762 | static int __devinit lx_init_dsp(struct lx6464es *chip) | ||
763 | { | ||
764 | int err; | ||
765 | u8 mac_address[6]; | ||
766 | int i; | ||
767 | |||
768 | snd_printdd("->lx_init_dsp\n"); | ||
769 | |||
770 | snd_printd(LXP "initialize board\n"); | ||
771 | err = lx_init_xilinx_reset(chip); | ||
772 | if (err) | ||
773 | return err; | ||
774 | |||
775 | snd_printd(LXP "testing board\n"); | ||
776 | err = lx_init_xilinx_test(chip); | ||
777 | if (err) | ||
778 | return err; | ||
779 | |||
780 | snd_printd(LXP "initialize ethersound configuration\n"); | ||
781 | err = lx_init_ethersound_config(chip); | ||
782 | if (err) | ||
783 | return err; | ||
784 | |||
785 | lx_irq_enable(chip); | ||
786 | |||
787 | /** \todo the mac address should be ready by not, but it isn't, | ||
788 | * so we wait for it */ | ||
789 | for (i = 0; i != 1000; ++i) { | ||
790 | err = lx_dsp_get_mac(chip, mac_address); | ||
791 | if (err) | ||
792 | return err; | ||
793 | if (mac_address[0] || mac_address[1] || mac_address[2] || | ||
794 | mac_address[3] || mac_address[4] || mac_address[5]) | ||
795 | goto mac_ready; | ||
796 | msleep(1); | ||
797 | } | ||
798 | return -ETIMEDOUT; | ||
799 | |||
800 | mac_ready: | ||
801 | snd_printd(LXP "mac address ready read after: %dms\n", i); | ||
802 | snd_printk(LXP "mac address: %02X.%02X.%02X.%02X.%02X.%02X\n", | ||
803 | mac_address[0], mac_address[1], mac_address[2], | ||
804 | mac_address[3], mac_address[4], mac_address[5]); | ||
805 | |||
806 | err = lx_init_get_version_features(chip); | ||
807 | if (err) | ||
808 | return err; | ||
809 | |||
810 | lx_set_granularity(chip, MICROBLAZE_IBL_DEFAULT); | ||
811 | |||
812 | chip->playback_mute = 0; | ||
813 | |||
814 | return err; | ||
815 | } | ||
816 | |||
817 | static struct snd_pcm_ops lx_ops_playback = { | ||
818 | .open = lx_pcm_open, | ||
819 | .close = lx_pcm_close, | ||
820 | .ioctl = snd_pcm_lib_ioctl, | ||
821 | .prepare = lx_pcm_prepare, | ||
822 | .hw_params = lx_pcm_hw_params_playback, | ||
823 | .hw_free = lx_pcm_hw_free, | ||
824 | .trigger = lx_pcm_trigger, | ||
825 | .pointer = lx_pcm_stream_pointer, | ||
826 | }; | ||
827 | |||
828 | static struct snd_pcm_ops lx_ops_capture = { | ||
829 | .open = lx_pcm_open, | ||
830 | .close = lx_pcm_close, | ||
831 | .ioctl = snd_pcm_lib_ioctl, | ||
832 | .prepare = lx_pcm_prepare, | ||
833 | .hw_params = lx_pcm_hw_params_capture, | ||
834 | .hw_free = lx_pcm_hw_free, | ||
835 | .trigger = lx_pcm_trigger, | ||
836 | .pointer = lx_pcm_stream_pointer, | ||
837 | }; | ||
838 | |||
839 | static int __devinit lx_pcm_create(struct lx6464es *chip) | ||
840 | { | ||
841 | int err; | ||
842 | struct snd_pcm *pcm; | ||
843 | |||
844 | u32 size = 64 * /* channels */ | ||
845 | 3 * /* 24 bit samples */ | ||
846 | MAX_STREAM_BUFFER * /* periods */ | ||
847 | MICROBLAZE_IBL_MAX * /* frames per period */ | ||
848 | 2; /* duplex */ | ||
849 | |||
850 | size = PAGE_ALIGN(size); | ||
851 | |||
852 | /* hardcoded device name & channel count */ | ||
853 | err = snd_pcm_new(chip->card, (char *)card_name, 0, | ||
854 | 1, 1, &pcm); | ||
855 | |||
856 | pcm->private_data = chip; | ||
857 | |||
858 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &lx_ops_playback); | ||
859 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &lx_ops_capture); | ||
860 | |||
861 | pcm->info_flags = 0; | ||
862 | strcpy(pcm->name, card_name); | ||
863 | |||
864 | err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, | ||
865 | snd_dma_pci_data(chip->pci), | ||
866 | size, size); | ||
867 | if (err < 0) | ||
868 | return err; | ||
869 | |||
870 | chip->pcm = pcm; | ||
871 | chip->capture_stream.is_capture = 1; | ||
872 | |||
873 | return 0; | ||
874 | } | ||
875 | |||
876 | static int lx_control_playback_info(struct snd_kcontrol *kcontrol, | ||
877 | struct snd_ctl_elem_info *uinfo) | ||
878 | { | ||
879 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | ||
880 | uinfo->count = 1; | ||
881 | uinfo->value.integer.min = 0; | ||
882 | uinfo->value.integer.max = 1; | ||
883 | return 0; | ||
884 | } | ||
885 | |||
886 | static int lx_control_playback_get(struct snd_kcontrol *kcontrol, | ||
887 | struct snd_ctl_elem_value *ucontrol) | ||
888 | { | ||
889 | struct lx6464es *chip = snd_kcontrol_chip(kcontrol); | ||
890 | ucontrol->value.integer.value[0] = chip->playback_mute; | ||
891 | return 0; | ||
892 | } | ||
893 | |||
894 | static int lx_control_playback_put(struct snd_kcontrol *kcontrol, | ||
895 | struct snd_ctl_elem_value *ucontrol) | ||
896 | { | ||
897 | struct lx6464es *chip = snd_kcontrol_chip(kcontrol); | ||
898 | int changed = 0; | ||
899 | int current_value = chip->playback_mute; | ||
900 | |||
901 | if (current_value != ucontrol->value.integer.value[0]) { | ||
902 | lx_level_unmute(chip, 0, !current_value); | ||
903 | chip->playback_mute = !current_value; | ||
904 | changed = 1; | ||
905 | } | ||
906 | return changed; | ||
907 | } | ||
908 | |||
909 | static struct snd_kcontrol_new lx_control_playback_switch __devinitdata = { | ||
910 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
911 | .name = "PCM Playback Switch", | ||
912 | .index = 0, | ||
913 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | ||
914 | .private_value = 0, | ||
915 | .info = lx_control_playback_info, | ||
916 | .get = lx_control_playback_get, | ||
917 | .put = lx_control_playback_put | ||
918 | }; | ||
919 | |||
920 | |||
921 | |||
922 | static void lx_proc_levels_read(struct snd_info_entry *entry, | ||
923 | struct snd_info_buffer *buffer) | ||
924 | { | ||
925 | u32 levels[64]; | ||
926 | int err; | ||
927 | int i, j; | ||
928 | struct lx6464es *chip = entry->private_data; | ||
929 | |||
930 | snd_iprintf(buffer, "capture levels:\n"); | ||
931 | err = lx_level_peaks(chip, 1, 64, levels); | ||
932 | if (err < 0) | ||
933 | return; | ||
934 | |||
935 | for (i = 0; i != 8; ++i) { | ||
936 | for (j = 0; j != 8; ++j) | ||
937 | snd_iprintf(buffer, "%08x ", levels[i*8+j]); | ||
938 | snd_iprintf(buffer, "\n"); | ||
939 | } | ||
940 | |||
941 | snd_iprintf(buffer, "\nplayback levels:\n"); | ||
942 | |||
943 | err = lx_level_peaks(chip, 0, 64, levels); | ||
944 | if (err < 0) | ||
945 | return; | ||
946 | |||
947 | for (i = 0; i != 8; ++i) { | ||
948 | for (j = 0; j != 8; ++j) | ||
949 | snd_iprintf(buffer, "%08x ", levels[i*8+j]); | ||
950 | snd_iprintf(buffer, "\n"); | ||
951 | } | ||
952 | |||
953 | snd_iprintf(buffer, "\n"); | ||
954 | } | ||
955 | |||
956 | static int __devinit lx_proc_create(struct snd_card *card, struct lx6464es *chip) | ||
957 | { | ||
958 | struct snd_info_entry *entry; | ||
959 | int err = snd_card_proc_new(card, "levels", &entry); | ||
960 | if (err < 0) | ||
961 | return err; | ||
962 | |||
963 | snd_info_set_text_ops(entry, chip, lx_proc_levels_read); | ||
964 | return 0; | ||
965 | } | ||
966 | |||
967 | |||
968 | static int __devinit snd_lx6464es_create(struct snd_card *card, | ||
969 | struct pci_dev *pci, | ||
970 | struct lx6464es **rchip) | ||
971 | { | ||
972 | struct lx6464es *chip; | ||
973 | int err; | ||
974 | |||
975 | static struct snd_device_ops ops = { | ||
976 | .dev_free = snd_lx6464es_dev_free, | ||
977 | }; | ||
978 | |||
979 | snd_printdd("->snd_lx6464es_create\n"); | ||
980 | |||
981 | *rchip = NULL; | ||
982 | |||
983 | /* enable PCI device */ | ||
984 | err = pci_enable_device(pci); | ||
985 | if (err < 0) | ||
986 | return err; | ||
987 | |||
988 | pci_set_master(pci); | ||
989 | |||
990 | /* check if we can restrict PCI DMA transfers to 32 bits */ | ||
991 | err = pci_set_dma_mask(pci, DMA_32BIT_MASK); | ||
992 | if (err < 0) { | ||
993 | snd_printk(KERN_ERR "architecture does not support " | ||
994 | "32bit PCI busmaster DMA\n"); | ||
995 | pci_disable_device(pci); | ||
996 | return -ENXIO; | ||
997 | } | ||
998 | |||
999 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); | ||
1000 | if (chip == NULL) { | ||
1001 | err = -ENOMEM; | ||
1002 | goto alloc_failed; | ||
1003 | } | ||
1004 | |||
1005 | chip->card = card; | ||
1006 | chip->pci = pci; | ||
1007 | chip->irq = -1; | ||
1008 | |||
1009 | /* initialize synchronization structs */ | ||
1010 | spin_lock_init(&chip->lock); | ||
1011 | spin_lock_init(&chip->msg_lock); | ||
1012 | mutex_init(&chip->setup_mutex); | ||
1013 | tasklet_init(&chip->trigger_tasklet, lx_trigger_tasklet, | ||
1014 | (unsigned long)chip); | ||
1015 | tasklet_init(&chip->tasklet_capture, lx_tasklet_capture, | ||
1016 | (unsigned long)chip); | ||
1017 | tasklet_init(&chip->tasklet_playback, lx_tasklet_playback, | ||
1018 | (unsigned long)chip); | ||
1019 | |||
1020 | /* request resources */ | ||
1021 | err = pci_request_regions(pci, card_name); | ||
1022 | if (err < 0) | ||
1023 | goto request_regions_failed; | ||
1024 | |||
1025 | /* plx port */ | ||
1026 | chip->port_plx = pci_resource_start(pci, 1); | ||
1027 | chip->port_plx_remapped = ioport_map(chip->port_plx, | ||
1028 | pci_resource_len(pci, 1)); | ||
1029 | |||
1030 | /* dsp port */ | ||
1031 | chip->port_dsp_bar = pci_ioremap_bar(pci, 2); | ||
1032 | |||
1033 | err = request_irq(pci->irq, lx_interrupt, IRQF_SHARED, | ||
1034 | card_name, chip); | ||
1035 | if (err) { | ||
1036 | snd_printk(KERN_ERR LXP "unable to grab IRQ %d\n", pci->irq); | ||
1037 | goto request_irq_failed; | ||
1038 | } | ||
1039 | chip->irq = pci->irq; | ||
1040 | |||
1041 | err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); | ||
1042 | if (err < 0) | ||
1043 | goto device_new_failed; | ||
1044 | |||
1045 | err = lx_init_dsp(chip); | ||
1046 | if (err < 0) { | ||
1047 | snd_printk(KERN_ERR LXP "error during DSP initialization\n"); | ||
1048 | return err; | ||
1049 | } | ||
1050 | |||
1051 | err = lx_pcm_create(chip); | ||
1052 | if (err < 0) | ||
1053 | return err; | ||
1054 | |||
1055 | err = lx_proc_create(card, chip); | ||
1056 | if (err < 0) | ||
1057 | return err; | ||
1058 | |||
1059 | err = snd_ctl_add(card, snd_ctl_new1(&lx_control_playback_switch, | ||
1060 | chip)); | ||
1061 | if (err < 0) | ||
1062 | return err; | ||
1063 | |||
1064 | snd_card_set_dev(card, &pci->dev); | ||
1065 | |||
1066 | *rchip = chip; | ||
1067 | return 0; | ||
1068 | |||
1069 | device_new_failed: | ||
1070 | free_irq(pci->irq, chip); | ||
1071 | |||
1072 | request_irq_failed: | ||
1073 | pci_release_regions(pci); | ||
1074 | |||
1075 | request_regions_failed: | ||
1076 | kfree(chip); | ||
1077 | |||
1078 | alloc_failed: | ||
1079 | pci_disable_device(pci); | ||
1080 | |||
1081 | return err; | ||
1082 | } | ||
1083 | |||
1084 | static int __devinit snd_lx6464es_probe(struct pci_dev *pci, | ||
1085 | const struct pci_device_id *pci_id) | ||
1086 | { | ||
1087 | static int dev; | ||
1088 | struct snd_card *card; | ||
1089 | struct lx6464es *chip; | ||
1090 | int err; | ||
1091 | |||
1092 | snd_printdd("->snd_lx6464es_probe\n"); | ||
1093 | |||
1094 | if (dev >= SNDRV_CARDS) | ||
1095 | return -ENODEV; | ||
1096 | if (!enable[dev]) { | ||
1097 | dev++; | ||
1098 | return -ENOENT; | ||
1099 | } | ||
1100 | |||
1101 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | ||
1102 | if (err < 0) | ||
1103 | return err; | ||
1104 | |||
1105 | err = snd_lx6464es_create(card, pci, &chip); | ||
1106 | if (err < 0) { | ||
1107 | snd_printk(KERN_ERR LXP "error during snd_lx6464es_create\n"); | ||
1108 | goto out_free; | ||
1109 | } | ||
1110 | |||
1111 | strcpy(card->driver, "lx6464es"); | ||
1112 | strcpy(card->shortname, "Digigram LX6464ES"); | ||
1113 | sprintf(card->longname, "%s at 0x%lx, 0x%p, irq %i", | ||
1114 | card->shortname, chip->port_plx, | ||
1115 | chip->port_dsp_bar, chip->irq); | ||
1116 | |||
1117 | err = snd_card_register(card); | ||
1118 | if (err < 0) | ||
1119 | goto out_free; | ||
1120 | |||
1121 | snd_printdd(LXP "initialization successful\n"); | ||
1122 | pci_set_drvdata(pci, card); | ||
1123 | dev++; | ||
1124 | return 0; | ||
1125 | |||
1126 | out_free: | ||
1127 | snd_card_free(card); | ||
1128 | return err; | ||
1129 | |||
1130 | } | ||
1131 | |||
1132 | static void __devexit snd_lx6464es_remove(struct pci_dev *pci) | ||
1133 | { | ||
1134 | snd_card_free(pci_get_drvdata(pci)); | ||
1135 | pci_set_drvdata(pci, NULL); | ||
1136 | } | ||
1137 | |||
1138 | |||
1139 | static struct pci_driver driver = { | ||
1140 | .name = "Digigram LX6464ES", | ||
1141 | .id_table = snd_lx6464es_ids, | ||
1142 | .probe = snd_lx6464es_probe, | ||
1143 | .remove = __devexit_p(snd_lx6464es_remove), | ||
1144 | }; | ||
1145 | |||
1146 | |||
1147 | /* module initialization */ | ||
1148 | static int __init mod_init(void) | ||
1149 | { | ||
1150 | return pci_register_driver(&driver); | ||
1151 | } | ||
1152 | |||
1153 | static void __exit mod_exit(void) | ||
1154 | { | ||
1155 | pci_unregister_driver(&driver); | ||
1156 | } | ||
1157 | |||
1158 | module_init(mod_init); | ||
1159 | module_exit(mod_exit); | ||
diff --git a/sound/pci/lx6464es/lx6464es.h b/sound/pci/lx6464es/lx6464es.h new file mode 100644 index 000000000000..012c010c8c89 --- /dev/null +++ b/sound/pci/lx6464es/lx6464es.h | |||
@@ -0,0 +1,114 @@ | |||
1 | /* -*- linux-c -*- * | ||
2 | * | ||
3 | * ALSA driver for the digigram lx6464es interface | ||
4 | * | ||
5 | * Copyright (c) 2009 Tim Blechmann <tim@klingt.org> | ||
6 | * | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; see the file COPYING. If not, write to | ||
20 | * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
21 | * Boston, MA 02111-1307, USA. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #ifndef LX6464ES_H | ||
26 | #define LX6464ES_H | ||
27 | |||
28 | #include <linux/spinlock.h> | ||
29 | #include <asm/atomic.h> | ||
30 | |||
31 | #include <sound/core.h> | ||
32 | #include <sound/pcm.h> | ||
33 | |||
34 | #include "lx_core.h" | ||
35 | |||
36 | #define LXP "LX6464ES: " | ||
37 | |||
38 | enum { | ||
39 | ES_cmd_free = 0, /* no command executing */ | ||
40 | ES_cmd_processing = 1, /* execution of a read/write command */ | ||
41 | ES_read_pending = 2, /* a asynchron read command is pending */ | ||
42 | ES_read_finishing = 3, /* a read command has finished waiting (set by | ||
43 | * Interrupt or CancelIrp) */ | ||
44 | }; | ||
45 | |||
46 | enum lx_stream_status { | ||
47 | LX_STREAM_STATUS_FREE, | ||
48 | /* LX_STREAM_STATUS_OPEN, */ | ||
49 | LX_STREAM_STATUS_SCHEDULE_RUN, | ||
50 | /* LX_STREAM_STATUS_STARTED, */ | ||
51 | LX_STREAM_STATUS_RUNNING, | ||
52 | LX_STREAM_STATUS_SCHEDULE_STOP, | ||
53 | /* LX_STREAM_STATUS_STOPPED, */ | ||
54 | /* LX_STREAM_STATUS_PAUSED */ | ||
55 | }; | ||
56 | |||
57 | |||
58 | struct lx_stream { | ||
59 | struct snd_pcm_substream *stream; | ||
60 | snd_pcm_uframes_t frame_pos; | ||
61 | enum lx_stream_status status; /* free, open, running, draining | ||
62 | * pause */ | ||
63 | int is_capture:1; | ||
64 | }; | ||
65 | |||
66 | |||
67 | struct lx6464es { | ||
68 | struct snd_card *card; | ||
69 | struct pci_dev *pci; | ||
70 | int irq; | ||
71 | |||
72 | spinlock_t lock; /* interrupt spinlock */ | ||
73 | struct mutex setup_mutex; /* mutex used in hw_params, open | ||
74 | * and close */ | ||
75 | |||
76 | struct tasklet_struct trigger_tasklet; /* trigger tasklet */ | ||
77 | struct tasklet_struct tasklet_capture; | ||
78 | struct tasklet_struct tasklet_playback; | ||
79 | |||
80 | /* ports */ | ||
81 | unsigned long port_plx; /* io port (size=256) */ | ||
82 | void __iomem *port_plx_remapped; /* remapped plx port */ | ||
83 | void __iomem *port_dsp_bar; /* memory port (32-bit, | ||
84 | * non-prefetchable, | ||
85 | * size=8K) */ | ||
86 | |||
87 | /* messaging */ | ||
88 | spinlock_t msg_lock; /* message spinlock */ | ||
89 | atomic_t send_message_locked; | ||
90 | struct lx_rmh rmh; | ||
91 | |||
92 | /* configuration */ | ||
93 | uint freq_ratio : 2; | ||
94 | uint playback_mute : 1; | ||
95 | uint hardware_running[2]; | ||
96 | u32 board_sample_rate; /* sample rate read from | ||
97 | * board */ | ||
98 | u32 sample_rate; /* our sample rate */ | ||
99 | u16 pcm_granularity; /* board blocksize */ | ||
100 | |||
101 | /* dma */ | ||
102 | struct snd_dma_buffer capture_dma_buf; | ||
103 | struct snd_dma_buffer playback_dma_buf; | ||
104 | |||
105 | /* pcm */ | ||
106 | struct snd_pcm *pcm; | ||
107 | |||
108 | /* streams */ | ||
109 | struct lx_stream capture_stream; | ||
110 | struct lx_stream playback_stream; | ||
111 | }; | ||
112 | |||
113 | |||
114 | #endif /* LX6464ES_H */ | ||
diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c new file mode 100644 index 000000000000..5812780d6e89 --- /dev/null +++ b/sound/pci/lx6464es/lx_core.c | |||
@@ -0,0 +1,1444 @@ | |||
1 | /* -*- linux-c -*- * | ||
2 | * | ||
3 | * ALSA driver for the digigram lx6464es interface | ||
4 | * low-level interface | ||
5 | * | ||
6 | * Copyright (c) 2009 Tim Blechmann <tim@klingt.org> | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; see the file COPYING. If not, write to | ||
20 | * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
21 | * Boston, MA 02111-1307, USA. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | /* #define RMH_DEBUG 1 */ | ||
26 | |||
27 | #include <linux/module.h> | ||
28 | #include <linux/pci.h> | ||
29 | #include <linux/delay.h> | ||
30 | |||
31 | #include "lx6464es.h" | ||
32 | #include "lx_core.h" | ||
33 | |||
34 | /* low-level register access */ | ||
35 | |||
36 | static const unsigned long dsp_port_offsets[] = { | ||
37 | 0, | ||
38 | 0x400, | ||
39 | 0x401, | ||
40 | 0x402, | ||
41 | 0x403, | ||
42 | 0x404, | ||
43 | 0x405, | ||
44 | 0x406, | ||
45 | 0x407, | ||
46 | 0x408, | ||
47 | 0x409, | ||
48 | 0x40a, | ||
49 | 0x40b, | ||
50 | 0x40c, | ||
51 | |||
52 | 0x410, | ||
53 | 0x411, | ||
54 | 0x412, | ||
55 | 0x413, | ||
56 | 0x414, | ||
57 | 0x415, | ||
58 | 0x416, | ||
59 | |||
60 | 0x420, | ||
61 | 0x430, | ||
62 | 0x431, | ||
63 | 0x432, | ||
64 | 0x433, | ||
65 | 0x434, | ||
66 | 0x440 | ||
67 | }; | ||
68 | |||
69 | static void __iomem *lx_dsp_register(struct lx6464es *chip, int port) | ||
70 | { | ||
71 | void __iomem *base_address = chip->port_dsp_bar; | ||
72 | return base_address + dsp_port_offsets[port]*4; | ||
73 | } | ||
74 | |||
75 | unsigned long lx_dsp_reg_read(struct lx6464es *chip, int port) | ||
76 | { | ||
77 | void __iomem *address = lx_dsp_register(chip, port); | ||
78 | return ioread32(address); | ||
79 | } | ||
80 | |||
81 | void lx_dsp_reg_readbuf(struct lx6464es *chip, int port, u32 *data, u32 len) | ||
82 | { | ||
83 | void __iomem *address = lx_dsp_register(chip, port); | ||
84 | memcpy_fromio(data, address, len*sizeof(u32)); | ||
85 | } | ||
86 | |||
87 | |||
88 | void lx_dsp_reg_write(struct lx6464es *chip, int port, unsigned data) | ||
89 | { | ||
90 | void __iomem *address = lx_dsp_register(chip, port); | ||
91 | iowrite32(data, address); | ||
92 | } | ||
93 | |||
94 | void lx_dsp_reg_writebuf(struct lx6464es *chip, int port, const u32 *data, | ||
95 | u32 len) | ||
96 | { | ||
97 | void __iomem *address = lx_dsp_register(chip, port); | ||
98 | memcpy_toio(address, data, len*sizeof(u32)); | ||
99 | } | ||
100 | |||
101 | |||
102 | static const unsigned long plx_port_offsets[] = { | ||
103 | 0x04, | ||
104 | 0x40, | ||
105 | 0x44, | ||
106 | 0x48, | ||
107 | 0x4c, | ||
108 | 0x50, | ||
109 | 0x54, | ||
110 | 0x58, | ||
111 | 0x5c, | ||
112 | 0x64, | ||
113 | 0x68, | ||
114 | 0x6C | ||
115 | }; | ||
116 | |||
117 | static void __iomem *lx_plx_register(struct lx6464es *chip, int port) | ||
118 | { | ||
119 | void __iomem *base_address = chip->port_plx_remapped; | ||
120 | return base_address + plx_port_offsets[port]; | ||
121 | } | ||
122 | |||
123 | unsigned long lx_plx_reg_read(struct lx6464es *chip, int port) | ||
124 | { | ||
125 | void __iomem *address = lx_plx_register(chip, port); | ||
126 | return ioread32(address); | ||
127 | } | ||
128 | |||
129 | void lx_plx_reg_write(struct lx6464es *chip, int port, u32 data) | ||
130 | { | ||
131 | void __iomem *address = lx_plx_register(chip, port); | ||
132 | iowrite32(data, address); | ||
133 | } | ||
134 | |||
135 | u32 lx_plx_mbox_read(struct lx6464es *chip, int mbox_nr) | ||
136 | { | ||
137 | int index; | ||
138 | |||
139 | switch (mbox_nr) { | ||
140 | case 1: | ||
141 | index = ePLX_MBOX1; break; | ||
142 | case 2: | ||
143 | index = ePLX_MBOX2; break; | ||
144 | case 3: | ||
145 | index = ePLX_MBOX3; break; | ||
146 | case 4: | ||
147 | index = ePLX_MBOX4; break; | ||
148 | case 5: | ||
149 | index = ePLX_MBOX5; break; | ||
150 | case 6: | ||
151 | index = ePLX_MBOX6; break; | ||
152 | case 7: | ||
153 | index = ePLX_MBOX7; break; | ||
154 | case 0: /* reserved for HF flags */ | ||
155 | snd_BUG(); | ||
156 | default: | ||
157 | return 0xdeadbeef; | ||
158 | } | ||
159 | |||
160 | return lx_plx_reg_read(chip, index); | ||
161 | } | ||
162 | |||
163 | int lx_plx_mbox_write(struct lx6464es *chip, int mbox_nr, u32 value) | ||
164 | { | ||
165 | int index = -1; | ||
166 | |||
167 | switch (mbox_nr) { | ||
168 | case 1: | ||
169 | index = ePLX_MBOX1; break; | ||
170 | case 3: | ||
171 | index = ePLX_MBOX3; break; | ||
172 | case 4: | ||
173 | index = ePLX_MBOX4; break; | ||
174 | case 5: | ||
175 | index = ePLX_MBOX5; break; | ||
176 | case 6: | ||
177 | index = ePLX_MBOX6; break; | ||
178 | case 7: | ||
179 | index = ePLX_MBOX7; break; | ||
180 | case 0: /* reserved for HF flags */ | ||
181 | case 2: /* reserved for Pipe States | ||
182 | * the DSP keeps an image of it */ | ||
183 | snd_BUG(); | ||
184 | return -EBADRQC; | ||
185 | } | ||
186 | |||
187 | lx_plx_reg_write(chip, index, value); | ||
188 | return 0; | ||
189 | } | ||
190 | |||
191 | |||
192 | /* rmh */ | ||
193 | |||
194 | #ifdef CONFIG_SND_DEBUG | ||
195 | #define CMD_NAME(a) a | ||
196 | #else | ||
197 | #define CMD_NAME(a) NULL | ||
198 | #endif | ||
199 | |||
200 | #define Reg_CSM_MR 0x00000002 | ||
201 | #define Reg_CSM_MC 0x00000001 | ||
202 | |||
203 | struct dsp_cmd_info { | ||
204 | u32 dcCodeOp; /* Op Code of the command (usually 1st 24-bits | ||
205 | * word).*/ | ||
206 | u16 dcCmdLength; /* Command length in words of 24 bits.*/ | ||
207 | u16 dcStatusType; /* Status type: 0 for fixed length, 1 for | ||
208 | * random. */ | ||
209 | u16 dcStatusLength; /* Status length (if fixed).*/ | ||
210 | char *dcOpName; | ||
211 | }; | ||
212 | |||
213 | /* | ||
214 | Initialization and control data for the Microblaze interface | ||
215 | - OpCode: | ||
216 | the opcode field of the command set at the proper offset | ||
217 | - CmdLength | ||
218 | the number of command words | ||
219 | - StatusType | ||
220 | offset in the status registers: 0 means that the return value may be | ||
221 | different from 0, and must be read | ||
222 | - StatusLength | ||
223 | the number of status words (in addition to the return value) | ||
224 | */ | ||
225 | |||
226 | static struct dsp_cmd_info dsp_commands[] = | ||
227 | { | ||
228 | { (CMD_00_INFO_DEBUG << OPCODE_OFFSET) , 1 /*custom*/ | ||
229 | , 1 , 0 /**/ , CMD_NAME("INFO_DEBUG") }, | ||
230 | { (CMD_01_GET_SYS_CFG << OPCODE_OFFSET) , 1 /**/ | ||
231 | , 1 , 2 /**/ , CMD_NAME("GET_SYS_CFG") }, | ||
232 | { (CMD_02_SET_GRANULARITY << OPCODE_OFFSET) , 1 /**/ | ||
233 | , 1 , 0 /**/ , CMD_NAME("SET_GRANULARITY") }, | ||
234 | { (CMD_03_SET_TIMER_IRQ << OPCODE_OFFSET) , 1 /**/ | ||
235 | , 1 , 0 /**/ , CMD_NAME("SET_TIMER_IRQ") }, | ||
236 | { (CMD_04_GET_EVENT << OPCODE_OFFSET) , 1 /**/ | ||
237 | , 1 , 0 /*up to 10*/ , CMD_NAME("GET_EVENT") }, | ||
238 | { (CMD_05_GET_PIPES << OPCODE_OFFSET) , 1 /**/ | ||
239 | , 1 , 2 /*up to 4*/ , CMD_NAME("GET_PIPES") }, | ||
240 | { (CMD_06_ALLOCATE_PIPE << OPCODE_OFFSET) , 1 /**/ | ||
241 | , 0 , 0 /**/ , CMD_NAME("ALLOCATE_PIPE") }, | ||
242 | { (CMD_07_RELEASE_PIPE << OPCODE_OFFSET) , 1 /**/ | ||
243 | , 0 , 0 /**/ , CMD_NAME("RELEASE_PIPE") }, | ||
244 | { (CMD_08_ASK_BUFFERS << OPCODE_OFFSET) , 1 /**/ | ||
245 | , 1 , MAX_STREAM_BUFFER , CMD_NAME("ASK_BUFFERS") }, | ||
246 | { (CMD_09_STOP_PIPE << OPCODE_OFFSET) , 1 /**/ | ||
247 | , 0 , 0 /*up to 2*/ , CMD_NAME("STOP_PIPE") }, | ||
248 | { (CMD_0A_GET_PIPE_SPL_COUNT << OPCODE_OFFSET) , 1 /**/ | ||
249 | , 1 , 1 /*up to 2*/ , CMD_NAME("GET_PIPE_SPL_COUNT") }, | ||
250 | { (CMD_0B_TOGGLE_PIPE_STATE << OPCODE_OFFSET) , 1 /*up to 5*/ | ||
251 | , 1 , 0 /**/ , CMD_NAME("TOGGLE_PIPE_STATE") }, | ||
252 | { (CMD_0C_DEF_STREAM << OPCODE_OFFSET) , 1 /*up to 4*/ | ||
253 | , 1 , 0 /**/ , CMD_NAME("DEF_STREAM") }, | ||
254 | { (CMD_0D_SET_MUTE << OPCODE_OFFSET) , 3 /**/ | ||
255 | , 1 , 0 /**/ , CMD_NAME("SET_MUTE") }, | ||
256 | { (CMD_0E_GET_STREAM_SPL_COUNT << OPCODE_OFFSET) , 1/**/ | ||
257 | , 1 , 2 /**/ , CMD_NAME("GET_STREAM_SPL_COUNT") }, | ||
258 | { (CMD_0F_UPDATE_BUFFER << OPCODE_OFFSET) , 3 /*up to 4*/ | ||
259 | , 0 , 1 /**/ , CMD_NAME("UPDATE_BUFFER") }, | ||
260 | { (CMD_10_GET_BUFFER << OPCODE_OFFSET) , 1 /**/ | ||
261 | , 1 , 4 /**/ , CMD_NAME("GET_BUFFER") }, | ||
262 | { (CMD_11_CANCEL_BUFFER << OPCODE_OFFSET) , 1 /**/ | ||
263 | , 1 , 1 /*up to 4*/ , CMD_NAME("CANCEL_BUFFER") }, | ||
264 | { (CMD_12_GET_PEAK << OPCODE_OFFSET) , 1 /**/ | ||
265 | , 1 , 1 /**/ , CMD_NAME("GET_PEAK") }, | ||
266 | { (CMD_13_SET_STREAM_STATE << OPCODE_OFFSET) , 1 /**/ | ||
267 | , 1 , 0 /**/ , CMD_NAME("SET_STREAM_STATE") }, | ||
268 | }; | ||
269 | |||
270 | static void lx_message_init(struct lx_rmh *rmh, enum cmd_mb_opcodes cmd) | ||
271 | { | ||
272 | snd_BUG_ON(cmd >= CMD_14_INVALID); | ||
273 | |||
274 | rmh->cmd[0] = dsp_commands[cmd].dcCodeOp; | ||
275 | rmh->cmd_len = dsp_commands[cmd].dcCmdLength; | ||
276 | rmh->stat_len = dsp_commands[cmd].dcStatusLength; | ||
277 | rmh->dsp_stat = dsp_commands[cmd].dcStatusType; | ||
278 | rmh->cmd_idx = cmd; | ||
279 | memset(&rmh->cmd[1], 0, (REG_CRM_NUMBER - 1) * sizeof(u32)); | ||
280 | |||
281 | #ifdef CONFIG_SND_DEBUG | ||
282 | memset(rmh->stat, 0, REG_CRM_NUMBER * sizeof(u32)); | ||
283 | #endif | ||
284 | #ifdef RMH_DEBUG | ||
285 | rmh->cmd_idx = cmd; | ||
286 | #endif | ||
287 | } | ||
288 | |||
289 | #ifdef RMH_DEBUG | ||
290 | #define LXRMH "lx6464es rmh: " | ||
291 | static void lx_message_dump(struct lx_rmh *rmh) | ||
292 | { | ||
293 | u8 idx = rmh->cmd_idx; | ||
294 | int i; | ||
295 | |||
296 | snd_printk(LXRMH "command %s\n", dsp_commands[idx].dcOpName); | ||
297 | |||
298 | for (i = 0; i != rmh->cmd_len; ++i) | ||
299 | snd_printk(LXRMH "\tcmd[%d] %08x\n", i, rmh->cmd[i]); | ||
300 | |||
301 | for (i = 0; i != rmh->stat_len; ++i) | ||
302 | snd_printk(LXRMH "\tstat[%d]: %08x\n", i, rmh->stat[i]); | ||
303 | snd_printk("\n"); | ||
304 | } | ||
305 | #else | ||
306 | static inline void lx_message_dump(struct lx_rmh *rmh) | ||
307 | {} | ||
308 | #endif | ||
309 | |||
310 | |||
311 | |||
312 | /* sleep 500 - 100 = 400 times 100us -> the timeout is >= 40 ms */ | ||
313 | #define XILINX_TIMEOUT_MS 40 | ||
314 | #define XILINX_POLL_NO_SLEEP 100 | ||
315 | #define XILINX_POLL_ITERATIONS 150 | ||
316 | |||
317 | #if 0 /* not used now */ | ||
318 | static int lx_message_send(struct lx6464es *chip, struct lx_rmh *rmh) | ||
319 | { | ||
320 | u32 reg = ED_DSP_TIMED_OUT; | ||
321 | int dwloop; | ||
322 | int answer_received; | ||
323 | |||
324 | if (lx_dsp_reg_read(chip, eReg_CSM) & (Reg_CSM_MC | Reg_CSM_MR)) { | ||
325 | snd_printk(KERN_ERR LXP "PIOSendMessage eReg_CSM %x\n", reg); | ||
326 | return -EBUSY; | ||
327 | } | ||
328 | |||
329 | /* write command */ | ||
330 | lx_dsp_reg_writebuf(chip, eReg_CRM1, rmh->cmd, rmh->cmd_len); | ||
331 | |||
332 | snd_BUG_ON(atomic_read(&chip->send_message_locked) != 0); | ||
333 | atomic_set(&chip->send_message_locked, 1); | ||
334 | |||
335 | /* MicoBlaze gogogo */ | ||
336 | lx_dsp_reg_write(chip, eReg_CSM, Reg_CSM_MC); | ||
337 | |||
338 | /* wait for interrupt to answer */ | ||
339 | for (dwloop = 0; dwloop != XILINX_TIMEOUT_MS; ++dwloop) { | ||
340 | answer_received = atomic_read(&chip->send_message_locked); | ||
341 | if (answer_received == 0) | ||
342 | break; | ||
343 | msleep(1); | ||
344 | } | ||
345 | |||
346 | if (answer_received == 0) { | ||
347 | /* in Debug mode verify Reg_CSM_MR */ | ||
348 | snd_BUG_ON(!(lx_dsp_reg_read(chip, eReg_CSM) & Reg_CSM_MR)); | ||
349 | |||
350 | /* command finished, read status */ | ||
351 | if (rmh->dsp_stat == 0) | ||
352 | reg = lx_dsp_reg_read(chip, eReg_CRM1); | ||
353 | else | ||
354 | reg = 0; | ||
355 | } else { | ||
356 | int i; | ||
357 | snd_printk(KERN_WARNING LXP "TIMEOUT lx_message_send! " | ||
358 | "Interrupts disabled?\n"); | ||
359 | |||
360 | /* attente bit Reg_CSM_MR */ | ||
361 | for (i = 0; i != XILINX_POLL_ITERATIONS; i++) { | ||
362 | if ((lx_dsp_reg_read(chip, eReg_CSM) & Reg_CSM_MR)) { | ||
363 | if (rmh->dsp_stat == 0) | ||
364 | reg = lx_dsp_reg_read(chip, eReg_CRM1); | ||
365 | else | ||
366 | reg = 0; | ||
367 | goto polling_successful; | ||
368 | } | ||
369 | |||
370 | if (i > XILINX_POLL_NO_SLEEP) | ||
371 | msleep(1); | ||
372 | } | ||
373 | snd_printk(KERN_WARNING LXP "TIMEOUT lx_message_send! " | ||
374 | "polling failed\n"); | ||
375 | |||
376 | polling_successful: | ||
377 | atomic_set(&chip->send_message_locked, 0); | ||
378 | } | ||
379 | |||
380 | if ((reg & ERROR_VALUE) == 0) { | ||
381 | /* read response */ | ||
382 | if (rmh->stat_len) { | ||
383 | snd_BUG_ON(rmh->stat_len >= (REG_CRM_NUMBER-1)); | ||
384 | |||
385 | lx_dsp_reg_readbuf(chip, eReg_CRM2, rmh->stat, | ||
386 | rmh->stat_len); | ||
387 | } | ||
388 | } else | ||
389 | snd_printk(KERN_WARNING LXP "lx_message_send: error_value %x\n", | ||
390 | reg); | ||
391 | |||
392 | /* clear Reg_CSM_MR */ | ||
393 | lx_dsp_reg_write(chip, eReg_CSM, 0); | ||
394 | |||
395 | switch (reg) { | ||
396 | case ED_DSP_TIMED_OUT: | ||
397 | snd_printk(KERN_WARNING LXP "lx_message_send: dsp timeout\n"); | ||
398 | return -ETIMEDOUT; | ||
399 | |||
400 | case ED_DSP_CRASHED: | ||
401 | snd_printk(KERN_WARNING LXP "lx_message_send: dsp crashed\n"); | ||
402 | return -EAGAIN; | ||
403 | } | ||
404 | |||
405 | lx_message_dump(rmh); | ||
406 | return 0; | ||
407 | } | ||
408 | #endif /* not used now */ | ||
409 | |||
410 | static int lx_message_send_atomic(struct lx6464es *chip, struct lx_rmh *rmh) | ||
411 | { | ||
412 | u32 reg = ED_DSP_TIMED_OUT; | ||
413 | int dwloop; | ||
414 | |||
415 | if (lx_dsp_reg_read(chip, eReg_CSM) & (Reg_CSM_MC | Reg_CSM_MR)) { | ||
416 | snd_printk(KERN_ERR LXP "PIOSendMessage eReg_CSM %x\n", reg); | ||
417 | return -EBUSY; | ||
418 | } | ||
419 | |||
420 | /* write command */ | ||
421 | lx_dsp_reg_writebuf(chip, eReg_CRM1, rmh->cmd, rmh->cmd_len); | ||
422 | |||
423 | /* MicoBlaze gogogo */ | ||
424 | lx_dsp_reg_write(chip, eReg_CSM, Reg_CSM_MC); | ||
425 | |||
426 | /* wait for interrupt to answer */ | ||
427 | for (dwloop = 0; dwloop != XILINX_TIMEOUT_MS * 1000; ++dwloop) { | ||
428 | if (lx_dsp_reg_read(chip, eReg_CSM) & Reg_CSM_MR) { | ||
429 | if (rmh->dsp_stat == 0) | ||
430 | reg = lx_dsp_reg_read(chip, eReg_CRM1); | ||
431 | else | ||
432 | reg = 0; | ||
433 | goto polling_successful; | ||
434 | } else | ||
435 | udelay(1); | ||
436 | } | ||
437 | snd_printk(KERN_WARNING LXP "TIMEOUT lx_message_send_atomic! " | ||
438 | "polling failed\n"); | ||
439 | |||
440 | polling_successful: | ||
441 | if ((reg & ERROR_VALUE) == 0) { | ||
442 | /* read response */ | ||
443 | if (rmh->stat_len) { | ||
444 | snd_BUG_ON(rmh->stat_len >= (REG_CRM_NUMBER-1)); | ||
445 | lx_dsp_reg_readbuf(chip, eReg_CRM2, rmh->stat, | ||
446 | rmh->stat_len); | ||
447 | } | ||
448 | } else | ||
449 | snd_printk(LXP "rmh error: %08x\n", reg); | ||
450 | |||
451 | /* clear Reg_CSM_MR */ | ||
452 | lx_dsp_reg_write(chip, eReg_CSM, 0); | ||
453 | |||
454 | switch (reg) { | ||
455 | case ED_DSP_TIMED_OUT: | ||
456 | snd_printk(KERN_WARNING LXP "lx_message_send: dsp timeout\n"); | ||
457 | return -ETIMEDOUT; | ||
458 | |||
459 | case ED_DSP_CRASHED: | ||
460 | snd_printk(KERN_WARNING LXP "lx_message_send: dsp crashed\n"); | ||
461 | return -EAGAIN; | ||
462 | } | ||
463 | |||
464 | lx_message_dump(rmh); | ||
465 | |||
466 | return reg; | ||
467 | } | ||
468 | |||
469 | |||
470 | /* low-level dsp access */ | ||
471 | int __devinit lx_dsp_get_version(struct lx6464es *chip, u32 *rdsp_version) | ||
472 | { | ||
473 | u16 ret; | ||
474 | unsigned long flags; | ||
475 | |||
476 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
477 | |||
478 | lx_message_init(&chip->rmh, CMD_01_GET_SYS_CFG); | ||
479 | ret = lx_message_send_atomic(chip, &chip->rmh); | ||
480 | |||
481 | *rdsp_version = chip->rmh.stat[1]; | ||
482 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
483 | return ret; | ||
484 | } | ||
485 | |||
486 | int lx_dsp_get_clock_frequency(struct lx6464es *chip, u32 *rfreq) | ||
487 | { | ||
488 | u16 ret = 0; | ||
489 | unsigned long flags; | ||
490 | u32 freq_raw = 0; | ||
491 | u32 freq = 0; | ||
492 | u32 frequency = 0; | ||
493 | |||
494 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
495 | |||
496 | lx_message_init(&chip->rmh, CMD_01_GET_SYS_CFG); | ||
497 | ret = lx_message_send_atomic(chip, &chip->rmh); | ||
498 | |||
499 | if (ret == 0) { | ||
500 | freq_raw = chip->rmh.stat[0] >> FREQ_FIELD_OFFSET; | ||
501 | freq = freq_raw & XES_FREQ_COUNT8_MASK; | ||
502 | |||
503 | if ((freq < XES_FREQ_COUNT8_48_MAX) || | ||
504 | (freq > XES_FREQ_COUNT8_44_MIN)) | ||
505 | frequency = 0; /* unknown */ | ||
506 | else if (freq >= XES_FREQ_COUNT8_44_MAX) | ||
507 | frequency = 44100; | ||
508 | else | ||
509 | frequency = 48000; | ||
510 | } | ||
511 | |||
512 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
513 | |||
514 | *rfreq = frequency * chip->freq_ratio; | ||
515 | |||
516 | return ret; | ||
517 | } | ||
518 | |||
519 | int lx_dsp_get_mac(struct lx6464es *chip, u8 *mac_address) | ||
520 | { | ||
521 | u32 macmsb, maclsb; | ||
522 | |||
523 | macmsb = lx_dsp_reg_read(chip, eReg_ADMACESMSB) & 0x00FFFFFF; | ||
524 | maclsb = lx_dsp_reg_read(chip, eReg_ADMACESLSB) & 0x00FFFFFF; | ||
525 | |||
526 | /* todo: endianess handling */ | ||
527 | mac_address[5] = ((u8 *)(&maclsb))[0]; | ||
528 | mac_address[4] = ((u8 *)(&maclsb))[1]; | ||
529 | mac_address[3] = ((u8 *)(&maclsb))[2]; | ||
530 | mac_address[2] = ((u8 *)(&macmsb))[0]; | ||
531 | mac_address[1] = ((u8 *)(&macmsb))[1]; | ||
532 | mac_address[0] = ((u8 *)(&macmsb))[2]; | ||
533 | |||
534 | return 0; | ||
535 | } | ||
536 | |||
537 | |||
538 | int lx_dsp_set_granularity(struct lx6464es *chip, u32 gran) | ||
539 | { | ||
540 | unsigned long flags; | ||
541 | int ret; | ||
542 | |||
543 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
544 | |||
545 | lx_message_init(&chip->rmh, CMD_02_SET_GRANULARITY); | ||
546 | chip->rmh.cmd[0] |= gran; | ||
547 | |||
548 | ret = lx_message_send_atomic(chip, &chip->rmh); | ||
549 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
550 | return ret; | ||
551 | } | ||
552 | |||
553 | int lx_dsp_read_async_events(struct lx6464es *chip, u32 *data) | ||
554 | { | ||
555 | unsigned long flags; | ||
556 | int ret; | ||
557 | |||
558 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
559 | |||
560 | lx_message_init(&chip->rmh, CMD_04_GET_EVENT); | ||
561 | chip->rmh.stat_len = 9; /* we don't necessarily need the full length */ | ||
562 | |||
563 | ret = lx_message_send_atomic(chip, &chip->rmh); | ||
564 | |||
565 | if (!ret) | ||
566 | memcpy(data, chip->rmh.stat, chip->rmh.stat_len * sizeof(u32)); | ||
567 | |||
568 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
569 | return ret; | ||
570 | } | ||
571 | |||
572 | #define CSES_TIMEOUT 100 /* microseconds */ | ||
573 | #define CSES_CE 0x0001 | ||
574 | #define CSES_BROADCAST 0x0002 | ||
575 | #define CSES_UPDATE_LDSV 0x0004 | ||
576 | |||
577 | int lx_dsp_es_check_pipeline(struct lx6464es *chip) | ||
578 | { | ||
579 | int i; | ||
580 | |||
581 | for (i = 0; i != CSES_TIMEOUT; ++i) { | ||
582 | /* | ||
583 | * le bit CSES_UPDATE_LDSV est à1 dés que le macprog | ||
584 | * est pret. il re-passe à0 lorsque le premier read a | ||
585 | * été fait. pour l'instant on retire le test car ce bit | ||
586 | * passe a 1 environ 200 à400 ms aprés que le registre | ||
587 | * confES àété écrit (kick du xilinx ES). | ||
588 | * | ||
589 | * On ne teste que le bit CE. | ||
590 | * */ | ||
591 | |||
592 | u32 cses = lx_dsp_reg_read(chip, eReg_CSES); | ||
593 | |||
594 | if ((cses & CSES_CE) == 0) | ||
595 | return 0; | ||
596 | |||
597 | udelay(1); | ||
598 | } | ||
599 | |||
600 | return -ETIMEDOUT; | ||
601 | } | ||
602 | |||
603 | |||
604 | #define PIPE_INFO_TO_CMD(capture, pipe) \ | ||
605 | ((u32)((u32)(pipe) | ((capture) ? ID_IS_CAPTURE : 0L)) << ID_OFFSET) | ||
606 | |||
607 | |||
608 | |||
609 | /* low-level pipe handling */ | ||
610 | int lx_pipe_allocate(struct lx6464es *chip, u32 pipe, int is_capture, | ||
611 | int channels) | ||
612 | { | ||
613 | int err; | ||
614 | unsigned long flags; | ||
615 | |||
616 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
617 | |||
618 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
619 | lx_message_init(&chip->rmh, CMD_06_ALLOCATE_PIPE); | ||
620 | |||
621 | chip->rmh.cmd[0] |= pipe_cmd; | ||
622 | chip->rmh.cmd[0] |= channels; | ||
623 | |||
624 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
625 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
626 | |||
627 | if (err != 0) | ||
628 | snd_printk(KERN_ERR "lx6464es: could not allocate pipe\n"); | ||
629 | |||
630 | return err; | ||
631 | } | ||
632 | |||
633 | int lx_pipe_release(struct lx6464es *chip, u32 pipe, int is_capture) | ||
634 | { | ||
635 | int err; | ||
636 | unsigned long flags; | ||
637 | |||
638 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
639 | |||
640 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
641 | lx_message_init(&chip->rmh, CMD_07_RELEASE_PIPE); | ||
642 | |||
643 | chip->rmh.cmd[0] |= pipe_cmd; | ||
644 | |||
645 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
646 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
647 | |||
648 | return err; | ||
649 | } | ||
650 | |||
651 | int lx_buffer_ask(struct lx6464es *chip, u32 pipe, int is_capture, | ||
652 | u32 *r_needed, u32 *r_freed, u32 *size_array) | ||
653 | { | ||
654 | int err; | ||
655 | unsigned long flags; | ||
656 | |||
657 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
658 | |||
659 | #ifdef CONFIG_SND_DEBUG | ||
660 | if (size_array) | ||
661 | memset(size_array, 0, sizeof(u32)*MAX_STREAM_BUFFER); | ||
662 | #endif | ||
663 | |||
664 | *r_needed = 0; | ||
665 | *r_freed = 0; | ||
666 | |||
667 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
668 | lx_message_init(&chip->rmh, CMD_08_ASK_BUFFERS); | ||
669 | |||
670 | chip->rmh.cmd[0] |= pipe_cmd; | ||
671 | |||
672 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
673 | |||
674 | if (!err) { | ||
675 | int i; | ||
676 | for (i = 0; i < MAX_STREAM_BUFFER; ++i) { | ||
677 | u32 stat = chip->rmh.stat[i]; | ||
678 | if (stat & (BF_EOB << BUFF_FLAGS_OFFSET)) { | ||
679 | /* finished */ | ||
680 | *r_freed += 1; | ||
681 | if (size_array) | ||
682 | size_array[i] = stat & MASK_DATA_SIZE; | ||
683 | } else if ((stat & (BF_VALID << BUFF_FLAGS_OFFSET)) | ||
684 | == 0) | ||
685 | /* free */ | ||
686 | *r_needed += 1; | ||
687 | } | ||
688 | |||
689 | #if 0 | ||
690 | snd_printdd(LXP "CMD_08_ASK_BUFFERS: needed %d, freed %d\n", | ||
691 | *r_needed, *r_freed); | ||
692 | for (i = 0; i < MAX_STREAM_BUFFER; ++i) { | ||
693 | for (i = 0; i != chip->rmh.stat_len; ++i) | ||
694 | snd_printdd(" stat[%d]: %x, %x\n", i, | ||
695 | chip->rmh.stat[i], | ||
696 | chip->rmh.stat[i] & MASK_DATA_SIZE); | ||
697 | } | ||
698 | #endif | ||
699 | } | ||
700 | |||
701 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
702 | return err; | ||
703 | } | ||
704 | |||
705 | |||
706 | int lx_pipe_stop(struct lx6464es *chip, u32 pipe, int is_capture) | ||
707 | { | ||
708 | int err; | ||
709 | unsigned long flags; | ||
710 | |||
711 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
712 | |||
713 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
714 | lx_message_init(&chip->rmh, CMD_09_STOP_PIPE); | ||
715 | |||
716 | chip->rmh.cmd[0] |= pipe_cmd; | ||
717 | |||
718 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
719 | |||
720 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
721 | return err; | ||
722 | } | ||
723 | |||
724 | static int lx_pipe_toggle_state(struct lx6464es *chip, u32 pipe, int is_capture) | ||
725 | { | ||
726 | int err; | ||
727 | unsigned long flags; | ||
728 | |||
729 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
730 | |||
731 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
732 | lx_message_init(&chip->rmh, CMD_0B_TOGGLE_PIPE_STATE); | ||
733 | |||
734 | chip->rmh.cmd[0] |= pipe_cmd; | ||
735 | |||
736 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
737 | |||
738 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
739 | return err; | ||
740 | } | ||
741 | |||
742 | |||
743 | int lx_pipe_start(struct lx6464es *chip, u32 pipe, int is_capture) | ||
744 | { | ||
745 | int err; | ||
746 | |||
747 | err = lx_pipe_wait_for_idle(chip, pipe, is_capture); | ||
748 | if (err < 0) | ||
749 | return err; | ||
750 | |||
751 | err = lx_pipe_toggle_state(chip, pipe, is_capture); | ||
752 | |||
753 | return err; | ||
754 | } | ||
755 | |||
756 | int lx_pipe_pause(struct lx6464es *chip, u32 pipe, int is_capture) | ||
757 | { | ||
758 | int err = 0; | ||
759 | |||
760 | err = lx_pipe_wait_for_start(chip, pipe, is_capture); | ||
761 | if (err < 0) | ||
762 | return err; | ||
763 | |||
764 | err = lx_pipe_toggle_state(chip, pipe, is_capture); | ||
765 | |||
766 | return err; | ||
767 | } | ||
768 | |||
769 | |||
770 | int lx_pipe_sample_count(struct lx6464es *chip, u32 pipe, int is_capture, | ||
771 | u64 *rsample_count) | ||
772 | { | ||
773 | int err; | ||
774 | unsigned long flags; | ||
775 | |||
776 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
777 | |||
778 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
779 | lx_message_init(&chip->rmh, CMD_0A_GET_PIPE_SPL_COUNT); | ||
780 | |||
781 | chip->rmh.cmd[0] |= pipe_cmd; | ||
782 | chip->rmh.stat_len = 2; /* need all words here! */ | ||
783 | |||
784 | err = lx_message_send_atomic(chip, &chip->rmh); /* don't sleep! */ | ||
785 | |||
786 | if (err != 0) | ||
787 | snd_printk(KERN_ERR | ||
788 | "lx6464es: could not query pipe's sample count\n"); | ||
789 | else { | ||
790 | *rsample_count = ((u64)(chip->rmh.stat[0] & MASK_SPL_COUNT_HI) | ||
791 | << 24) /* hi part */ | ||
792 | + chip->rmh.stat[1]; /* lo part */ | ||
793 | } | ||
794 | |||
795 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
796 | return err; | ||
797 | } | ||
798 | |||
799 | int lx_pipe_state(struct lx6464es *chip, u32 pipe, int is_capture, u16 *rstate) | ||
800 | { | ||
801 | int err; | ||
802 | unsigned long flags; | ||
803 | |||
804 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
805 | |||
806 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
807 | lx_message_init(&chip->rmh, CMD_0A_GET_PIPE_SPL_COUNT); | ||
808 | |||
809 | chip->rmh.cmd[0] |= pipe_cmd; | ||
810 | |||
811 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
812 | |||
813 | if (err != 0) | ||
814 | snd_printk(KERN_ERR "lx6464es: could not query pipe's state\n"); | ||
815 | else | ||
816 | *rstate = (chip->rmh.stat[0] >> PSTATE_OFFSET) & 0x0F; | ||
817 | |||
818 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
819 | return err; | ||
820 | } | ||
821 | |||
822 | static int lx_pipe_wait_for_state(struct lx6464es *chip, u32 pipe, | ||
823 | int is_capture, u16 state) | ||
824 | { | ||
825 | int i; | ||
826 | |||
827 | /* max 2*PCMOnlyGranularity = 2*1024 at 44100 = < 50 ms: | ||
828 | * timeout 50 ms */ | ||
829 | for (i = 0; i != 50; ++i) { | ||
830 | u16 current_state; | ||
831 | int err = lx_pipe_state(chip, pipe, is_capture, ¤t_state); | ||
832 | |||
833 | if (err < 0) | ||
834 | return err; | ||
835 | |||
836 | if (current_state == state) | ||
837 | return 0; | ||
838 | |||
839 | mdelay(1); | ||
840 | } | ||
841 | |||
842 | return -ETIMEDOUT; | ||
843 | } | ||
844 | |||
845 | int lx_pipe_wait_for_start(struct lx6464es *chip, u32 pipe, int is_capture) | ||
846 | { | ||
847 | return lx_pipe_wait_for_state(chip, pipe, is_capture, PSTATE_RUN); | ||
848 | } | ||
849 | |||
850 | int lx_pipe_wait_for_idle(struct lx6464es *chip, u32 pipe, int is_capture) | ||
851 | { | ||
852 | return lx_pipe_wait_for_state(chip, pipe, is_capture, PSTATE_IDLE); | ||
853 | } | ||
854 | |||
855 | /* low-level stream handling */ | ||
856 | int lx_stream_set_state(struct lx6464es *chip, u32 pipe, | ||
857 | int is_capture, enum stream_state_t state) | ||
858 | { | ||
859 | int err; | ||
860 | unsigned long flags; | ||
861 | |||
862 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
863 | |||
864 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
865 | lx_message_init(&chip->rmh, CMD_13_SET_STREAM_STATE); | ||
866 | |||
867 | chip->rmh.cmd[0] |= pipe_cmd; | ||
868 | chip->rmh.cmd[0] |= state; | ||
869 | |||
870 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
871 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
872 | |||
873 | return err; | ||
874 | } | ||
875 | |||
876 | int lx_stream_set_format(struct lx6464es *chip, struct snd_pcm_runtime *runtime, | ||
877 | u32 pipe, int is_capture) | ||
878 | { | ||
879 | int err; | ||
880 | unsigned long flags; | ||
881 | |||
882 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
883 | |||
884 | u32 channels = runtime->channels; | ||
885 | |||
886 | if (runtime->channels != channels) | ||
887 | snd_printk(KERN_ERR LXP "channel count mismatch: %d vs %d", | ||
888 | runtime->channels, channels); | ||
889 | |||
890 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
891 | lx_message_init(&chip->rmh, CMD_0C_DEF_STREAM); | ||
892 | |||
893 | chip->rmh.cmd[0] |= pipe_cmd; | ||
894 | |||
895 | if (runtime->sample_bits == 16) | ||
896 | /* 16 bit format */ | ||
897 | chip->rmh.cmd[0] |= (STREAM_FMT_16b << STREAM_FMT_OFFSET); | ||
898 | |||
899 | if (snd_pcm_format_little_endian(runtime->format)) | ||
900 | /* little endian/intel format */ | ||
901 | chip->rmh.cmd[0] |= (STREAM_FMT_intel << STREAM_FMT_OFFSET); | ||
902 | |||
903 | chip->rmh.cmd[0] |= channels-1; | ||
904 | |||
905 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
906 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
907 | |||
908 | return err; | ||
909 | } | ||
910 | |||
911 | int lx_stream_state(struct lx6464es *chip, u32 pipe, int is_capture, | ||
912 | int *rstate) | ||
913 | { | ||
914 | int err; | ||
915 | unsigned long flags; | ||
916 | |||
917 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
918 | |||
919 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
920 | lx_message_init(&chip->rmh, CMD_0E_GET_STREAM_SPL_COUNT); | ||
921 | |||
922 | chip->rmh.cmd[0] |= pipe_cmd; | ||
923 | |||
924 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
925 | |||
926 | *rstate = (chip->rmh.stat[0] & SF_START) ? START_STATE : PAUSE_STATE; | ||
927 | |||
928 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
929 | return err; | ||
930 | } | ||
931 | |||
932 | int lx_stream_sample_position(struct lx6464es *chip, u32 pipe, int is_capture, | ||
933 | u64 *r_bytepos) | ||
934 | { | ||
935 | int err; | ||
936 | unsigned long flags; | ||
937 | |||
938 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
939 | |||
940 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
941 | lx_message_init(&chip->rmh, CMD_0E_GET_STREAM_SPL_COUNT); | ||
942 | |||
943 | chip->rmh.cmd[0] |= pipe_cmd; | ||
944 | |||
945 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
946 | |||
947 | *r_bytepos = ((u64) (chip->rmh.stat[0] & MASK_SPL_COUNT_HI) | ||
948 | << 32) /* hi part */ | ||
949 | + chip->rmh.stat[1]; /* lo part */ | ||
950 | |||
951 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
952 | return err; | ||
953 | } | ||
954 | |||
955 | /* low-level buffer handling */ | ||
956 | int lx_buffer_give(struct lx6464es *chip, u32 pipe, int is_capture, | ||
957 | u32 buffer_size, u32 buf_address_lo, u32 buf_address_hi, | ||
958 | u32 *r_buffer_index) | ||
959 | { | ||
960 | int err; | ||
961 | unsigned long flags; | ||
962 | |||
963 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
964 | |||
965 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
966 | lx_message_init(&chip->rmh, CMD_0F_UPDATE_BUFFER); | ||
967 | |||
968 | chip->rmh.cmd[0] |= pipe_cmd; | ||
969 | chip->rmh.cmd[0] |= BF_NOTIFY_EOB; /* request interrupt notification */ | ||
970 | |||
971 | /* todo: pause request, circular buffer */ | ||
972 | |||
973 | chip->rmh.cmd[1] = buffer_size & MASK_DATA_SIZE; | ||
974 | chip->rmh.cmd[2] = buf_address_lo; | ||
975 | |||
976 | if (buf_address_hi) { | ||
977 | chip->rmh.cmd_len = 4; | ||
978 | chip->rmh.cmd[3] = buf_address_hi; | ||
979 | chip->rmh.cmd[0] |= BF_64BITS_ADR; | ||
980 | } | ||
981 | |||
982 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
983 | |||
984 | if (err == 0) { | ||
985 | *r_buffer_index = chip->rmh.stat[0]; | ||
986 | goto done; | ||
987 | } | ||
988 | |||
989 | if (err == EB_RBUFFERS_TABLE_OVERFLOW) | ||
990 | snd_printk(LXP "lx_buffer_give EB_RBUFFERS_TABLE_OVERFLOW\n"); | ||
991 | |||
992 | if (err == EB_INVALID_STREAM) | ||
993 | snd_printk(LXP "lx_buffer_give EB_INVALID_STREAM\n"); | ||
994 | |||
995 | if (err == EB_CMD_REFUSED) | ||
996 | snd_printk(LXP "lx_buffer_give EB_CMD_REFUSED\n"); | ||
997 | |||
998 | done: | ||
999 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
1000 | return err; | ||
1001 | } | ||
1002 | |||
1003 | int lx_buffer_free(struct lx6464es *chip, u32 pipe, int is_capture, | ||
1004 | u32 *r_buffer_size) | ||
1005 | { | ||
1006 | int err; | ||
1007 | unsigned long flags; | ||
1008 | |||
1009 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
1010 | |||
1011 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
1012 | lx_message_init(&chip->rmh, CMD_11_CANCEL_BUFFER); | ||
1013 | |||
1014 | chip->rmh.cmd[0] |= pipe_cmd; | ||
1015 | chip->rmh.cmd[0] |= MASK_BUFFER_ID; /* ask for the current buffer: the | ||
1016 | * microblaze will seek for it */ | ||
1017 | |||
1018 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
1019 | |||
1020 | if (err == 0) | ||
1021 | *r_buffer_size = chip->rmh.stat[0] & MASK_DATA_SIZE; | ||
1022 | |||
1023 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
1024 | return err; | ||
1025 | } | ||
1026 | |||
1027 | int lx_buffer_cancel(struct lx6464es *chip, u32 pipe, int is_capture, | ||
1028 | u32 buffer_index) | ||
1029 | { | ||
1030 | int err; | ||
1031 | unsigned long flags; | ||
1032 | |||
1033 | u32 pipe_cmd = PIPE_INFO_TO_CMD(is_capture, pipe); | ||
1034 | |||
1035 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
1036 | lx_message_init(&chip->rmh, CMD_11_CANCEL_BUFFER); | ||
1037 | |||
1038 | chip->rmh.cmd[0] |= pipe_cmd; | ||
1039 | chip->rmh.cmd[0] |= buffer_index; | ||
1040 | |||
1041 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
1042 | |||
1043 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
1044 | return err; | ||
1045 | } | ||
1046 | |||
1047 | |||
1048 | /* low-level gain/peak handling | ||
1049 | * | ||
1050 | * \todo: can we unmute capture/playback channels independently? | ||
1051 | * | ||
1052 | * */ | ||
1053 | int lx_level_unmute(struct lx6464es *chip, int is_capture, int unmute) | ||
1054 | { | ||
1055 | int err; | ||
1056 | unsigned long flags; | ||
1057 | |||
1058 | /* bit set to 1: channel muted */ | ||
1059 | u64 mute_mask = unmute ? 0 : 0xFFFFFFFFFFFFFFFFLLU; | ||
1060 | |||
1061 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
1062 | lx_message_init(&chip->rmh, CMD_0D_SET_MUTE); | ||
1063 | |||
1064 | chip->rmh.cmd[0] |= PIPE_INFO_TO_CMD(is_capture, 0); | ||
1065 | |||
1066 | chip->rmh.cmd[1] = (u32)(mute_mask >> (u64)32); /* hi part */ | ||
1067 | chip->rmh.cmd[2] = (u32)(mute_mask & (u64)0xFFFFFFFF); /* lo part */ | ||
1068 | |||
1069 | snd_printk("mute %x %x %x\n", chip->rmh.cmd[0], chip->rmh.cmd[1], | ||
1070 | chip->rmh.cmd[2]); | ||
1071 | |||
1072 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
1073 | |||
1074 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
1075 | return err; | ||
1076 | } | ||
1077 | |||
1078 | static u32 peak_map[] = { | ||
1079 | 0x00000109, /* -90.308dB */ | ||
1080 | 0x0000083B, /* -72.247dB */ | ||
1081 | 0x000020C4, /* -60.205dB */ | ||
1082 | 0x00008273, /* -48.030dB */ | ||
1083 | 0x00020756, /* -36.005dB */ | ||
1084 | 0x00040C37, /* -30.001dB */ | ||
1085 | 0x00081385, /* -24.002dB */ | ||
1086 | 0x00101D3F, /* -18.000dB */ | ||
1087 | 0x0016C310, /* -15.000dB */ | ||
1088 | 0x002026F2, /* -12.001dB */ | ||
1089 | 0x002D6A86, /* -9.000dB */ | ||
1090 | 0x004026E6, /* -6.004dB */ | ||
1091 | 0x005A9DF6, /* -3.000dB */ | ||
1092 | 0x0065AC8B, /* -2.000dB */ | ||
1093 | 0x00721481, /* -1.000dB */ | ||
1094 | 0x007FFFFF, /* FS */ | ||
1095 | }; | ||
1096 | |||
1097 | int lx_level_peaks(struct lx6464es *chip, int is_capture, int channels, | ||
1098 | u32 *r_levels) | ||
1099 | { | ||
1100 | int err = 0; | ||
1101 | unsigned long flags; | ||
1102 | int i; | ||
1103 | spin_lock_irqsave(&chip->msg_lock, flags); | ||
1104 | |||
1105 | for (i = 0; i < channels; i += 4) { | ||
1106 | u32 s0, s1, s2, s3; | ||
1107 | |||
1108 | lx_message_init(&chip->rmh, CMD_12_GET_PEAK); | ||
1109 | chip->rmh.cmd[0] |= PIPE_INFO_TO_CMD(is_capture, i); | ||
1110 | |||
1111 | err = lx_message_send_atomic(chip, &chip->rmh); | ||
1112 | |||
1113 | if (err == 0) { | ||
1114 | s0 = peak_map[chip->rmh.stat[0] & 0x0F]; | ||
1115 | s1 = peak_map[(chip->rmh.stat[0] >> 4) & 0xf]; | ||
1116 | s2 = peak_map[(chip->rmh.stat[0] >> 8) & 0xf]; | ||
1117 | s3 = peak_map[(chip->rmh.stat[0] >> 12) & 0xf]; | ||
1118 | } else | ||
1119 | s0 = s1 = s2 = s3 = 0; | ||
1120 | |||
1121 | r_levels[0] = s0; | ||
1122 | r_levels[1] = s1; | ||
1123 | r_levels[2] = s2; | ||
1124 | r_levels[3] = s3; | ||
1125 | |||
1126 | r_levels += 4; | ||
1127 | } | ||
1128 | |||
1129 | spin_unlock_irqrestore(&chip->msg_lock, flags); | ||
1130 | return err; | ||
1131 | } | ||
1132 | |||
1133 | /* interrupt handling */ | ||
1134 | #define PCX_IRQ_NONE 0 | ||
1135 | #define IRQCS_ACTIVE_PCIDB 0x00002000L /* Bit nø 13 */ | ||
1136 | #define IRQCS_ENABLE_PCIIRQ 0x00000100L /* Bit nø 08 */ | ||
1137 | #define IRQCS_ENABLE_PCIDB 0x00000200L /* Bit nø 09 */ | ||
1138 | |||
1139 | static u32 lx_interrupt_test_ack(struct lx6464es *chip) | ||
1140 | { | ||
1141 | u32 irqcs = lx_plx_reg_read(chip, ePLX_IRQCS); | ||
1142 | |||
1143 | /* Test if PCI Doorbell interrupt is active */ | ||
1144 | if (irqcs & IRQCS_ACTIVE_PCIDB) { | ||
1145 | u32 temp; | ||
1146 | irqcs = PCX_IRQ_NONE; | ||
1147 | |||
1148 | while ((temp = lx_plx_reg_read(chip, ePLX_L2PCIDB))) { | ||
1149 | /* RAZ interrupt */ | ||
1150 | irqcs |= temp; | ||
1151 | lx_plx_reg_write(chip, ePLX_L2PCIDB, temp); | ||
1152 | } | ||
1153 | |||
1154 | return irqcs; | ||
1155 | } | ||
1156 | return PCX_IRQ_NONE; | ||
1157 | } | ||
1158 | |||
1159 | static int lx_interrupt_ack(struct lx6464es *chip, u32 *r_irqsrc, | ||
1160 | int *r_async_pending, int *r_async_escmd) | ||
1161 | { | ||
1162 | u32 irq_async; | ||
1163 | u32 irqsrc = lx_interrupt_test_ack(chip); | ||
1164 | |||
1165 | if (irqsrc == PCX_IRQ_NONE) | ||
1166 | return 0; | ||
1167 | |||
1168 | *r_irqsrc = irqsrc; | ||
1169 | |||
1170 | irq_async = irqsrc & MASK_SYS_ASYNC_EVENTS; /* + EtherSound response | ||
1171 | * (set by xilinx) + EOB */ | ||
1172 | |||
1173 | if (irq_async & MASK_SYS_STATUS_ESA) { | ||
1174 | irq_async &= ~MASK_SYS_STATUS_ESA; | ||
1175 | *r_async_escmd = 1; | ||
1176 | } | ||
1177 | |||
1178 | if (irqsrc & MASK_SYS_STATUS_CMD_DONE) | ||
1179 | /* xilinx command notification */ | ||
1180 | atomic_set(&chip->send_message_locked, 0); | ||
1181 | |||
1182 | if (irq_async) { | ||
1183 | /* snd_printd("interrupt: async event pending\n"); */ | ||
1184 | *r_async_pending = 1; | ||
1185 | } | ||
1186 | |||
1187 | return 1; | ||
1188 | } | ||
1189 | |||
1190 | static int lx_interrupt_handle_async_events(struct lx6464es *chip, u32 irqsrc, | ||
1191 | int *r_freq_changed, | ||
1192 | u64 *r_notified_in_pipe_mask, | ||
1193 | u64 *r_notified_out_pipe_mask) | ||
1194 | { | ||
1195 | int err; | ||
1196 | u32 stat[9]; /* answer from CMD_04_GET_EVENT */ | ||
1197 | |||
1198 | /* On peut optimiser pour ne pas lire les evenements vides | ||
1199 | * les mots de réponse sont dans l'ordre suivant : | ||
1200 | * Stat[0] mot de status général | ||
1201 | * Stat[1] fin de buffer OUT pF | ||
1202 | * Stat[2] fin de buffer OUT pf | ||
1203 | * Stat[3] fin de buffer IN pF | ||
1204 | * Stat[4] fin de buffer IN pf | ||
1205 | * Stat[5] underrun poid fort | ||
1206 | * Stat[6] underrun poid faible | ||
1207 | * Stat[7] overrun poid fort | ||
1208 | * Stat[8] overrun poid faible | ||
1209 | * */ | ||
1210 | |||
1211 | u64 orun_mask; | ||
1212 | u64 urun_mask; | ||
1213 | #if 0 | ||
1214 | int has_underrun = (irqsrc & MASK_SYS_STATUS_URUN) ? 1 : 0; | ||
1215 | int has_overrun = (irqsrc & MASK_SYS_STATUS_ORUN) ? 1 : 0; | ||
1216 | #endif | ||
1217 | int eb_pending_out = (irqsrc & MASK_SYS_STATUS_EOBO) ? 1 : 0; | ||
1218 | int eb_pending_in = (irqsrc & MASK_SYS_STATUS_EOBI) ? 1 : 0; | ||
1219 | |||
1220 | *r_freq_changed = (irqsrc & MASK_SYS_STATUS_FREQ) ? 1 : 0; | ||
1221 | |||
1222 | err = lx_dsp_read_async_events(chip, stat); | ||
1223 | if (err < 0) | ||
1224 | return err; | ||
1225 | |||
1226 | if (eb_pending_in) { | ||
1227 | *r_notified_in_pipe_mask = ((u64)stat[3] << 32) | ||
1228 | + stat[4]; | ||
1229 | snd_printdd(LXP "interrupt: EOBI pending %llx\n", | ||
1230 | *r_notified_in_pipe_mask); | ||
1231 | } | ||
1232 | if (eb_pending_out) { | ||
1233 | *r_notified_out_pipe_mask = ((u64)stat[1] << 32) | ||
1234 | + stat[2]; | ||
1235 | snd_printdd(LXP "interrupt: EOBO pending %llx\n", | ||
1236 | *r_notified_out_pipe_mask); | ||
1237 | } | ||
1238 | |||
1239 | orun_mask = ((u64)stat[7] << 32) + stat[8]; | ||
1240 | urun_mask = ((u64)stat[5] << 32) + stat[6]; | ||
1241 | |||
1242 | /* todo: handle xrun notification */ | ||
1243 | |||
1244 | return err; | ||
1245 | } | ||
1246 | |||
1247 | static int lx_interrupt_request_new_buffer(struct lx6464es *chip, | ||
1248 | struct lx_stream *lx_stream) | ||
1249 | { | ||
1250 | struct snd_pcm_substream *substream = lx_stream->stream; | ||
1251 | int is_capture = lx_stream->is_capture; | ||
1252 | int err; | ||
1253 | unsigned long flags; | ||
1254 | |||
1255 | const u32 channels = substream->runtime->channels; | ||
1256 | const u32 bytes_per_frame = channels * 3; | ||
1257 | const u32 period_size = substream->runtime->period_size; | ||
1258 | const u32 period_bytes = period_size * bytes_per_frame; | ||
1259 | const u32 pos = lx_stream->frame_pos; | ||
1260 | const u32 next_pos = ((pos+1) == substream->runtime->periods) ? | ||
1261 | 0 : pos + 1; | ||
1262 | |||
1263 | dma_addr_t buf = substream->dma_buffer.addr + pos * period_bytes; | ||
1264 | u32 buf_hi = 0; | ||
1265 | u32 buf_lo = 0; | ||
1266 | u32 buffer_index = 0; | ||
1267 | |||
1268 | u32 needed, freed; | ||
1269 | u32 size_array[MAX_STREAM_BUFFER]; | ||
1270 | |||
1271 | snd_printdd("->lx_interrupt_request_new_buffer\n"); | ||
1272 | |||
1273 | spin_lock_irqsave(&chip->lock, flags); | ||
1274 | |||
1275 | err = lx_buffer_ask(chip, 0, is_capture, &needed, &freed, size_array); | ||
1276 | snd_printdd(LXP "interrupt: needed %d, freed %d\n", needed, freed); | ||
1277 | |||
1278 | unpack_pointer(buf, &buf_lo, &buf_hi); | ||
1279 | err = lx_buffer_give(chip, 0, is_capture, period_bytes, buf_lo, buf_hi, | ||
1280 | &buffer_index); | ||
1281 | snd_printdd(LXP "interrupt: gave buffer index %x on %p (%d bytes)\n", | ||
1282 | buffer_index, (void *)buf, period_bytes); | ||
1283 | |||
1284 | lx_stream->frame_pos = next_pos; | ||
1285 | spin_unlock_irqrestore(&chip->lock, flags); | ||
1286 | |||
1287 | return err; | ||
1288 | } | ||
1289 | |||
1290 | void lx_tasklet_playback(unsigned long data) | ||
1291 | { | ||
1292 | struct lx6464es *chip = (struct lx6464es *)data; | ||
1293 | struct lx_stream *lx_stream = &chip->playback_stream; | ||
1294 | int err; | ||
1295 | |||
1296 | snd_printdd("->lx_tasklet_playback\n"); | ||
1297 | |||
1298 | err = lx_interrupt_request_new_buffer(chip, lx_stream); | ||
1299 | if (err < 0) | ||
1300 | snd_printk(KERN_ERR LXP | ||
1301 | "cannot request new buffer for playback\n"); | ||
1302 | |||
1303 | snd_pcm_period_elapsed(lx_stream->stream); | ||
1304 | } | ||
1305 | |||
1306 | void lx_tasklet_capture(unsigned long data) | ||
1307 | { | ||
1308 | struct lx6464es *chip = (struct lx6464es *)data; | ||
1309 | struct lx_stream *lx_stream = &chip->capture_stream; | ||
1310 | int err; | ||
1311 | |||
1312 | snd_printdd("->lx_tasklet_capture\n"); | ||
1313 | err = lx_interrupt_request_new_buffer(chip, lx_stream); | ||
1314 | if (err < 0) | ||
1315 | snd_printk(KERN_ERR LXP | ||
1316 | "cannot request new buffer for capture\n"); | ||
1317 | |||
1318 | snd_pcm_period_elapsed(lx_stream->stream); | ||
1319 | } | ||
1320 | |||
1321 | |||
1322 | |||
1323 | static int lx_interrupt_handle_audio_transfer(struct lx6464es *chip, | ||
1324 | u64 notified_in_pipe_mask, | ||
1325 | u64 notified_out_pipe_mask) | ||
1326 | { | ||
1327 | int err = 0; | ||
1328 | |||
1329 | if (notified_in_pipe_mask) { | ||
1330 | snd_printdd(LXP "requesting audio transfer for capture\n"); | ||
1331 | tasklet_hi_schedule(&chip->tasklet_capture); | ||
1332 | } | ||
1333 | |||
1334 | if (notified_out_pipe_mask) { | ||
1335 | snd_printdd(LXP "requesting audio transfer for playback\n"); | ||
1336 | tasklet_hi_schedule(&chip->tasklet_playback); | ||
1337 | } | ||
1338 | |||
1339 | return err; | ||
1340 | } | ||
1341 | |||
1342 | |||
1343 | irqreturn_t lx_interrupt(int irq, void *dev_id) | ||
1344 | { | ||
1345 | struct lx6464es *chip = dev_id; | ||
1346 | int async_pending, async_escmd; | ||
1347 | u32 irqsrc; | ||
1348 | |||
1349 | spin_lock(&chip->lock); | ||
1350 | |||
1351 | snd_printdd("**************************************************\n"); | ||
1352 | |||
1353 | if (!lx_interrupt_ack(chip, &irqsrc, &async_pending, &async_escmd)) { | ||
1354 | spin_unlock(&chip->lock); | ||
1355 | snd_printdd("IRQ_NONE\n"); | ||
1356 | return IRQ_NONE; /* this device did not cause the interrupt */ | ||
1357 | } | ||
1358 | |||
1359 | if (irqsrc & MASK_SYS_STATUS_CMD_DONE) | ||
1360 | goto exit; | ||
1361 | |||
1362 | #if 0 | ||
1363 | if (irqsrc & MASK_SYS_STATUS_EOBI) | ||
1364 | snd_printdd(LXP "interrupt: EOBI\n"); | ||
1365 | |||
1366 | if (irqsrc & MASK_SYS_STATUS_EOBO) | ||
1367 | snd_printdd(LXP "interrupt: EOBO\n"); | ||
1368 | |||
1369 | if (irqsrc & MASK_SYS_STATUS_URUN) | ||
1370 | snd_printdd(LXP "interrupt: URUN\n"); | ||
1371 | |||
1372 | if (irqsrc & MASK_SYS_STATUS_ORUN) | ||
1373 | snd_printdd(LXP "interrupt: ORUN\n"); | ||
1374 | #endif | ||
1375 | |||
1376 | if (async_pending) { | ||
1377 | u64 notified_in_pipe_mask = 0; | ||
1378 | u64 notified_out_pipe_mask = 0; | ||
1379 | int freq_changed; | ||
1380 | int err; | ||
1381 | |||
1382 | /* handle async events */ | ||
1383 | err = lx_interrupt_handle_async_events(chip, irqsrc, | ||
1384 | &freq_changed, | ||
1385 | ¬ified_in_pipe_mask, | ||
1386 | ¬ified_out_pipe_mask); | ||
1387 | if (err) | ||
1388 | snd_printk(KERN_ERR LXP | ||
1389 | "error handling async events\n"); | ||
1390 | |||
1391 | err = lx_interrupt_handle_audio_transfer(chip, | ||
1392 | notified_in_pipe_mask, | ||
1393 | notified_out_pipe_mask | ||
1394 | ); | ||
1395 | if (err) | ||
1396 | snd_printk(KERN_ERR LXP | ||
1397 | "error during audio transfer\n"); | ||
1398 | } | ||
1399 | |||
1400 | if (async_escmd) { | ||
1401 | #if 0 | ||
1402 | /* backdoor for ethersound commands | ||
1403 | * | ||
1404 | * for now, we do not need this | ||
1405 | * | ||
1406 | * */ | ||
1407 | |||
1408 | snd_printdd("lx6464es: interrupt requests escmd handling\n"); | ||
1409 | #endif | ||
1410 | } | ||
1411 | |||
1412 | exit: | ||
1413 | spin_unlock(&chip->lock); | ||
1414 | return IRQ_HANDLED; /* this device caused the interrupt */ | ||
1415 | } | ||
1416 | |||
1417 | |||
1418 | static void lx_irq_set(struct lx6464es *chip, int enable) | ||
1419 | { | ||
1420 | u32 reg = lx_plx_reg_read(chip, ePLX_IRQCS); | ||
1421 | |||
1422 | /* enable/disable interrupts | ||
1423 | * | ||
1424 | * Set the Doorbell and PCI interrupt enable bits | ||
1425 | * | ||
1426 | * */ | ||
1427 | if (enable) | ||
1428 | reg |= (IRQCS_ENABLE_PCIIRQ | IRQCS_ENABLE_PCIDB); | ||
1429 | else | ||
1430 | reg &= ~(IRQCS_ENABLE_PCIIRQ | IRQCS_ENABLE_PCIDB); | ||
1431 | lx_plx_reg_write(chip, ePLX_IRQCS, reg); | ||
1432 | } | ||
1433 | |||
1434 | void lx_irq_enable(struct lx6464es *chip) | ||
1435 | { | ||
1436 | snd_printdd("->lx_irq_enable\n"); | ||
1437 | lx_irq_set(chip, 1); | ||
1438 | } | ||
1439 | |||
1440 | void lx_irq_disable(struct lx6464es *chip) | ||
1441 | { | ||
1442 | snd_printdd("->lx_irq_disable\n"); | ||
1443 | lx_irq_set(chip, 0); | ||
1444 | } | ||
diff --git a/sound/pci/lx6464es/lx_core.h b/sound/pci/lx6464es/lx_core.h new file mode 100644 index 000000000000..6bd9cbbbc68d --- /dev/null +++ b/sound/pci/lx6464es/lx_core.h | |||
@@ -0,0 +1,242 @@ | |||
1 | /* -*- linux-c -*- * | ||
2 | * | ||
3 | * ALSA driver for the digigram lx6464es interface | ||
4 | * low-level interface | ||
5 | * | ||
6 | * Copyright (c) 2009 Tim Blechmann <tim@klingt.org> | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; see the file COPYING. If not, write to | ||
20 | * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
21 | * Boston, MA 02111-1307, USA. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #ifndef LX_CORE_H | ||
26 | #define LX_CORE_H | ||
27 | |||
28 | #include <linux/interrupt.h> | ||
29 | |||
30 | #include "lx_defs.h" | ||
31 | |||
32 | #define REG_CRM_NUMBER 12 | ||
33 | |||
34 | struct lx6464es; | ||
35 | |||
36 | /* low-level register access */ | ||
37 | |||
38 | /* dsp register access */ | ||
39 | enum { | ||
40 | eReg_BASE, | ||
41 | eReg_CSM, | ||
42 | eReg_CRM1, | ||
43 | eReg_CRM2, | ||
44 | eReg_CRM3, | ||
45 | eReg_CRM4, | ||
46 | eReg_CRM5, | ||
47 | eReg_CRM6, | ||
48 | eReg_CRM7, | ||
49 | eReg_CRM8, | ||
50 | eReg_CRM9, | ||
51 | eReg_CRM10, | ||
52 | eReg_CRM11, | ||
53 | eReg_CRM12, | ||
54 | |||
55 | eReg_ICR, | ||
56 | eReg_CVR, | ||
57 | eReg_ISR, | ||
58 | eReg_RXHTXH, | ||
59 | eReg_RXMTXM, | ||
60 | eReg_RHLTXL, | ||
61 | eReg_RESETDSP, | ||
62 | |||
63 | eReg_CSUF, | ||
64 | eReg_CSES, | ||
65 | eReg_CRESMSB, | ||
66 | eReg_CRESLSB, | ||
67 | eReg_ADMACESMSB, | ||
68 | eReg_ADMACESLSB, | ||
69 | eReg_CONFES, | ||
70 | |||
71 | eMaxPortLx | ||
72 | }; | ||
73 | |||
74 | unsigned long lx_dsp_reg_read(struct lx6464es *chip, int port); | ||
75 | void lx_dsp_reg_readbuf(struct lx6464es *chip, int port, u32 *data, u32 len); | ||
76 | void lx_dsp_reg_write(struct lx6464es *chip, int port, unsigned data); | ||
77 | void lx_dsp_reg_writebuf(struct lx6464es *chip, int port, const u32 *data, | ||
78 | u32 len); | ||
79 | |||
80 | /* plx register access */ | ||
81 | enum { | ||
82 | ePLX_PCICR, | ||
83 | |||
84 | ePLX_MBOX0, | ||
85 | ePLX_MBOX1, | ||
86 | ePLX_MBOX2, | ||
87 | ePLX_MBOX3, | ||
88 | ePLX_MBOX4, | ||
89 | ePLX_MBOX5, | ||
90 | ePLX_MBOX6, | ||
91 | ePLX_MBOX7, | ||
92 | |||
93 | ePLX_L2PCIDB, | ||
94 | ePLX_IRQCS, | ||
95 | ePLX_CHIPSC, | ||
96 | |||
97 | eMaxPort | ||
98 | }; | ||
99 | |||
100 | unsigned long lx_plx_reg_read(struct lx6464es *chip, int port); | ||
101 | void lx_plx_reg_write(struct lx6464es *chip, int port, u32 data); | ||
102 | |||
103 | /* rhm */ | ||
104 | struct lx_rmh { | ||
105 | u16 cmd_len; /* length of the command to send (WORDs) */ | ||
106 | u16 stat_len; /* length of the status received (WORDs) */ | ||
107 | u16 dsp_stat; /* status type, RMP_SSIZE_XXX */ | ||
108 | u16 cmd_idx; /* index of the command */ | ||
109 | u32 cmd[REG_CRM_NUMBER]; | ||
110 | u32 stat[REG_CRM_NUMBER]; | ||
111 | }; | ||
112 | |||
113 | |||
114 | /* low-level dsp access */ | ||
115 | int __devinit lx_dsp_get_version(struct lx6464es *chip, u32 *rdsp_version); | ||
116 | int lx_dsp_get_clock_frequency(struct lx6464es *chip, u32 *rfreq); | ||
117 | int lx_dsp_set_granularity(struct lx6464es *chip, u32 gran); | ||
118 | int lx_dsp_read_async_events(struct lx6464es *chip, u32 *data); | ||
119 | int lx_dsp_get_mac(struct lx6464es *chip, u8 *mac_address); | ||
120 | |||
121 | |||
122 | /* low-level pipe handling */ | ||
123 | int lx_pipe_allocate(struct lx6464es *chip, u32 pipe, int is_capture, | ||
124 | int channels); | ||
125 | int lx_pipe_release(struct lx6464es *chip, u32 pipe, int is_capture); | ||
126 | int lx_pipe_sample_count(struct lx6464es *chip, u32 pipe, int is_capture, | ||
127 | u64 *rsample_count); | ||
128 | int lx_pipe_state(struct lx6464es *chip, u32 pipe, int is_capture, u16 *rstate); | ||
129 | int lx_pipe_stop(struct lx6464es *chip, u32 pipe, int is_capture); | ||
130 | int lx_pipe_start(struct lx6464es *chip, u32 pipe, int is_capture); | ||
131 | int lx_pipe_pause(struct lx6464es *chip, u32 pipe, int is_capture); | ||
132 | |||
133 | int lx_pipe_wait_for_start(struct lx6464es *chip, u32 pipe, int is_capture); | ||
134 | int lx_pipe_wait_for_idle(struct lx6464es *chip, u32 pipe, int is_capture); | ||
135 | |||
136 | /* low-level stream handling */ | ||
137 | int lx_stream_set_format(struct lx6464es *chip, struct snd_pcm_runtime *runtime, | ||
138 | u32 pipe, int is_capture); | ||
139 | int lx_stream_state(struct lx6464es *chip, u32 pipe, int is_capture, | ||
140 | int *rstate); | ||
141 | int lx_stream_sample_position(struct lx6464es *chip, u32 pipe, int is_capture, | ||
142 | u64 *r_bytepos); | ||
143 | |||
144 | int lx_stream_set_state(struct lx6464es *chip, u32 pipe, | ||
145 | int is_capture, enum stream_state_t state); | ||
146 | |||
147 | static inline int lx_stream_start(struct lx6464es *chip, u32 pipe, | ||
148 | int is_capture) | ||
149 | { | ||
150 | snd_printdd("->lx_stream_start\n"); | ||
151 | return lx_stream_set_state(chip, pipe, is_capture, SSTATE_RUN); | ||
152 | } | ||
153 | |||
154 | static inline int lx_stream_pause(struct lx6464es *chip, u32 pipe, | ||
155 | int is_capture) | ||
156 | { | ||
157 | snd_printdd("->lx_stream_pause\n"); | ||
158 | return lx_stream_set_state(chip, pipe, is_capture, SSTATE_PAUSE); | ||
159 | } | ||
160 | |||
161 | static inline int lx_stream_stop(struct lx6464es *chip, u32 pipe, | ||
162 | int is_capture) | ||
163 | { | ||
164 | snd_printdd("->lx_stream_stop\n"); | ||
165 | return lx_stream_set_state(chip, pipe, is_capture, SSTATE_STOP); | ||
166 | } | ||
167 | |||
168 | /* low-level buffer handling */ | ||
169 | int lx_buffer_ask(struct lx6464es *chip, u32 pipe, int is_capture, | ||
170 | u32 *r_needed, u32 *r_freed, u32 *size_array); | ||
171 | int lx_buffer_give(struct lx6464es *chip, u32 pipe, int is_capture, | ||
172 | u32 buffer_size, u32 buf_address_lo, u32 buf_address_hi, | ||
173 | u32 *r_buffer_index); | ||
174 | int lx_buffer_free(struct lx6464es *chip, u32 pipe, int is_capture, | ||
175 | u32 *r_buffer_size); | ||
176 | int lx_buffer_cancel(struct lx6464es *chip, u32 pipe, int is_capture, | ||
177 | u32 buffer_index); | ||
178 | |||
179 | /* low-level gain/peak handling */ | ||
180 | int lx_level_unmute(struct lx6464es *chip, int is_capture, int unmute); | ||
181 | int lx_level_peaks(struct lx6464es *chip, int is_capture, int channels, | ||
182 | u32 *r_levels); | ||
183 | |||
184 | |||
185 | /* interrupt handling */ | ||
186 | irqreturn_t lx_interrupt(int irq, void *dev_id); | ||
187 | void lx_irq_enable(struct lx6464es *chip); | ||
188 | void lx_irq_disable(struct lx6464es *chip); | ||
189 | |||
190 | void lx_tasklet_capture(unsigned long data); | ||
191 | void lx_tasklet_playback(unsigned long data); | ||
192 | |||
193 | |||
194 | /* Stream Format Header Defines (for LIN and IEEE754) */ | ||
195 | #define HEADER_FMT_BASE HEADER_FMT_BASE_LIN | ||
196 | #define HEADER_FMT_BASE_LIN 0xFED00000 | ||
197 | #define HEADER_FMT_BASE_FLOAT 0xFAD00000 | ||
198 | #define HEADER_FMT_MONO 0x00000080 /* bit 23 in header_lo. WARNING: old | ||
199 | * bit 22 is ignored in float | ||
200 | * format */ | ||
201 | #define HEADER_FMT_INTEL 0x00008000 | ||
202 | #define HEADER_FMT_16BITS 0x00002000 | ||
203 | #define HEADER_FMT_24BITS 0x00004000 | ||
204 | #define HEADER_FMT_UPTO11 0x00000200 /* frequency is less or equ. to 11k. | ||
205 | * */ | ||
206 | #define HEADER_FMT_UPTO32 0x00000100 /* frequency is over 11k and less | ||
207 | * then 32k.*/ | ||
208 | |||
209 | |||
210 | #define BIT_FMP_HEADER 23 | ||
211 | #define BIT_FMP_SD 22 | ||
212 | #define BIT_FMP_MULTICHANNEL 19 | ||
213 | |||
214 | #define START_STATE 1 | ||
215 | #define PAUSE_STATE 0 | ||
216 | |||
217 | |||
218 | |||
219 | |||
220 | |||
221 | /* from PcxAll_e.h */ | ||
222 | /* Start/Pause condition for pipes (PCXStartPipe, PCXPausePipe) */ | ||
223 | #define START_PAUSE_IMMEDIATE 0 | ||
224 | #define START_PAUSE_ON_SYNCHRO 1 | ||
225 | #define START_PAUSE_ON_TIME_CODE 2 | ||
226 | |||
227 | |||
228 | /* Pipe / Stream state */ | ||
229 | #define START_STATE 1 | ||
230 | #define PAUSE_STATE 0 | ||
231 | |||
232 | static inline void unpack_pointer(dma_addr_t ptr, u32 *r_low, u32 *r_high) | ||
233 | { | ||
234 | *r_low = (u32)(ptr & 0xffffffff); | ||
235 | #if BITS_PER_LONG == 32 | ||
236 | *r_high = 0; | ||
237 | #else | ||
238 | *r_high = (u32)((u64)ptr>>32); | ||
239 | #endif | ||
240 | } | ||
241 | |||
242 | #endif /* LX_CORE_H */ | ||
diff --git a/sound/pci/lx6464es/lx_defs.h b/sound/pci/lx6464es/lx_defs.h new file mode 100644 index 000000000000..49d36bdd512c --- /dev/null +++ b/sound/pci/lx6464es/lx_defs.h | |||
@@ -0,0 +1,376 @@ | |||
1 | /* -*- linux-c -*- * | ||
2 | * | ||
3 | * ALSA driver for the digigram lx6464es interface | ||
4 | * adapted upstream headers | ||
5 | * | ||
6 | * Copyright (c) 2009 Tim Blechmann <tim@klingt.org> | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; see the file COPYING. If not, write to | ||
20 | * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
21 | * Boston, MA 02111-1307, USA. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #ifndef LX_DEFS_H | ||
26 | #define LX_DEFS_H | ||
27 | |||
28 | /* code adapted from ethersound.h */ | ||
29 | #define XES_FREQ_COUNT8_MASK 0x00001FFF /* compteur 25MHz entre 8 ech. */ | ||
30 | #define XES_FREQ_COUNT8_44_MIN 0x00001288 /* 25M / | ||
31 | * [ 44k - ( 44.1k + 48k ) / 2 ] | ||
32 | * * 8 */ | ||
33 | #define XES_FREQ_COUNT8_44_MAX 0x000010F0 /* 25M / [ ( 44.1k + 48k ) / 2 ] | ||
34 | * * 8 */ | ||
35 | #define XES_FREQ_COUNT8_48_MAX 0x00000F08 /* 25M / | ||
36 | * [ 48k + ( 44.1k + 48k ) / 2 ] | ||
37 | * * 8 */ | ||
38 | |||
39 | /* code adapted from LXES_registers.h */ | ||
40 | |||
41 | #define IOCR_OUTPUTS_OFFSET 0 /* (rw) offset for the number of OUTs in the | ||
42 | * ConfES register. */ | ||
43 | #define IOCR_INPUTS_OFFSET 8 /* (rw) offset for the number of INs in the | ||
44 | * ConfES register. */ | ||
45 | #define FREQ_RATIO_OFFSET 19 /* (rw) offset for frequency ratio in the | ||
46 | * ConfES register. */ | ||
47 | #define FREQ_RATIO_SINGLE_MODE 0x01 /* value for single mode frequency ratio: | ||
48 | * sample rate = frequency rate. */ | ||
49 | |||
50 | #define CONFES_READ_PART_MASK 0x00070000 | ||
51 | #define CONFES_WRITE_PART_MASK 0x00F80000 | ||
52 | |||
53 | /* code adapted from if_drv_mb.h */ | ||
54 | |||
55 | #define MASK_SYS_STATUS_ERROR (1L << 31) /* events that lead to a PCI irq if | ||
56 | * not yet pending */ | ||
57 | #define MASK_SYS_STATUS_URUN (1L << 30) | ||
58 | #define MASK_SYS_STATUS_ORUN (1L << 29) | ||
59 | #define MASK_SYS_STATUS_EOBO (1L << 28) | ||
60 | #define MASK_SYS_STATUS_EOBI (1L << 27) | ||
61 | #define MASK_SYS_STATUS_FREQ (1L << 26) | ||
62 | #define MASK_SYS_STATUS_ESA (1L << 25) /* reserved, this is set by the | ||
63 | * XES */ | ||
64 | #define MASK_SYS_STATUS_TIMER (1L << 24) | ||
65 | |||
66 | #define MASK_SYS_ASYNC_EVENTS (MASK_SYS_STATUS_ERROR | \ | ||
67 | MASK_SYS_STATUS_URUN | \ | ||
68 | MASK_SYS_STATUS_ORUN | \ | ||
69 | MASK_SYS_STATUS_EOBO | \ | ||
70 | MASK_SYS_STATUS_EOBI | \ | ||
71 | MASK_SYS_STATUS_FREQ | \ | ||
72 | MASK_SYS_STATUS_ESA) | ||
73 | |||
74 | #define MASK_SYS_PCI_EVENTS (MASK_SYS_ASYNC_EVENTS | \ | ||
75 | MASK_SYS_STATUS_TIMER) | ||
76 | |||
77 | #define MASK_SYS_TIMER_COUNT 0x0000FFFF | ||
78 | |||
79 | #define MASK_SYS_STATUS_EOT_PLX (1L << 22) /* event that remains | ||
80 | * internal: reserved fo end | ||
81 | * of plx dma */ | ||
82 | #define MASK_SYS_STATUS_XES (1L << 21) /* event that remains | ||
83 | * internal: pending XES | ||
84 | * IRQ */ | ||
85 | #define MASK_SYS_STATUS_CMD_DONE (1L << 20) /* alternate command | ||
86 | * management: notify driver | ||
87 | * instead of polling */ | ||
88 | |||
89 | |||
90 | #define MAX_STREAM_BUFFER 5 /* max amount of stream buffers. */ | ||
91 | |||
92 | #define MICROBLAZE_IBL_MIN 32 | ||
93 | #define MICROBLAZE_IBL_DEFAULT 128 | ||
94 | #define MICROBLAZE_IBL_MAX 512 | ||
95 | /* #define MASK_GRANULARITY (2*MICROBLAZE_IBL_MAX-1) */ | ||
96 | |||
97 | |||
98 | |||
99 | /* command opcodes, see reference for details */ | ||
100 | |||
101 | /* | ||
102 | the capture bit position in the object_id field in driver commands | ||
103 | depends upon the number of managed channels. For now, 64 IN + 64 OUT are | ||
104 | supported. HOwever, the communication protocol forsees 1024 channels, hence | ||
105 | bit 10 indicates a capture (input) object). | ||
106 | */ | ||
107 | #define ID_IS_CAPTURE (1L << 10) | ||
108 | #define ID_OFFSET 13 /* object ID is at the 13th bit in the | ||
109 | * 1st command word.*/ | ||
110 | #define ID_CH_MASK 0x3F | ||
111 | #define OPCODE_OFFSET 24 /* offset of the command opcode in the first | ||
112 | * command word.*/ | ||
113 | |||
114 | enum cmd_mb_opcodes { | ||
115 | CMD_00_INFO_DEBUG = 0x00, | ||
116 | CMD_01_GET_SYS_CFG = 0x01, | ||
117 | CMD_02_SET_GRANULARITY = 0x02, | ||
118 | CMD_03_SET_TIMER_IRQ = 0x03, | ||
119 | CMD_04_GET_EVENT = 0x04, | ||
120 | CMD_05_GET_PIPES = 0x05, | ||
121 | |||
122 | CMD_06_ALLOCATE_PIPE = 0x06, | ||
123 | CMD_07_RELEASE_PIPE = 0x07, | ||
124 | CMD_08_ASK_BUFFERS = 0x08, | ||
125 | CMD_09_STOP_PIPE = 0x09, | ||
126 | CMD_0A_GET_PIPE_SPL_COUNT = 0x0a, | ||
127 | CMD_0B_TOGGLE_PIPE_STATE = 0x0b, | ||
128 | |||
129 | CMD_0C_DEF_STREAM = 0x0c, | ||
130 | CMD_0D_SET_MUTE = 0x0d, | ||
131 | CMD_0E_GET_STREAM_SPL_COUNT = 0x0e, | ||
132 | CMD_0F_UPDATE_BUFFER = 0x0f, | ||
133 | CMD_10_GET_BUFFER = 0x10, | ||
134 | CMD_11_CANCEL_BUFFER = 0x11, | ||
135 | CMD_12_GET_PEAK = 0x12, | ||
136 | CMD_13_SET_STREAM_STATE = 0x13, | ||
137 | CMD_14_INVALID = 0x14, | ||
138 | }; | ||
139 | |||
140 | /* pipe states */ | ||
141 | enum pipe_state_t { | ||
142 | PSTATE_IDLE = 0, /* the pipe is not processed in the XES_IRQ | ||
143 | * (free or stopped, or paused). */ | ||
144 | PSTATE_RUN = 1, /* sustained play/record state. */ | ||
145 | PSTATE_PURGE = 2, /* the ES channels are now off, render pipes do | ||
146 | * not DMA, record pipe do a last DMA. */ | ||
147 | PSTATE_ACQUIRE = 3, /* the ES channels are now on, render pipes do | ||
148 | * not yet increase their sample count, record | ||
149 | * pipes do not DMA. */ | ||
150 | PSTATE_CLOSING = 4, /* the pipe is releasing, and may not yet | ||
151 | * receive an "alloc" command. */ | ||
152 | }; | ||
153 | |||
154 | /* stream states */ | ||
155 | enum stream_state_t { | ||
156 | SSTATE_STOP = 0x00, /* setting to stop resets the stream spl | ||
157 | * count.*/ | ||
158 | SSTATE_RUN = (0x01 << 0), /* start DMA and spl count handling. */ | ||
159 | SSTATE_PAUSE = (0x01 << 1), /* pause DMA and spl count handling. */ | ||
160 | }; | ||
161 | |||
162 | /* buffer flags */ | ||
163 | enum buffer_flags { | ||
164 | BF_VALID = 0x80, /* set if the buffer is valid, clear if free.*/ | ||
165 | BF_CURRENT = 0x40, /* set if this is the current buffer (there is | ||
166 | * always a current buffer).*/ | ||
167 | BF_NOTIFY_EOB = 0x20, /* set if this buffer must cause a PCI event | ||
168 | * when finished.*/ | ||
169 | BF_CIRCULAR = 0x10, /* set if buffer[1] must be copied to buffer[0] | ||
170 | * by the end of this buffer.*/ | ||
171 | BF_64BITS_ADR = 0x08, /* set if the hi part of the address is valid.*/ | ||
172 | BF_xx = 0x04, /* future extension.*/ | ||
173 | BF_EOB = 0x02, /* set if finished, but not yet free.*/ | ||
174 | BF_PAUSE = 0x01, /* pause stream at buffer end.*/ | ||
175 | BF_ZERO = 0x00, /* no flags (init).*/ | ||
176 | }; | ||
177 | |||
178 | /** | ||
179 | * Stream Flags definitions | ||
180 | */ | ||
181 | enum stream_flags { | ||
182 | SF_ZERO = 0x00000000, /* no flags (stream invalid). */ | ||
183 | SF_VALID = 0x10000000, /* the stream has a valid DMA_conf | ||
184 | * info (setstreamformat). */ | ||
185 | SF_XRUN = 0x20000000, /* the stream is un x-run state. */ | ||
186 | SF_START = 0x40000000, /* the DMA is running.*/ | ||
187 | SF_ASIO = 0x80000000, /* ASIO.*/ | ||
188 | }; | ||
189 | |||
190 | |||
191 | #define MASK_SPL_COUNT_HI 0x00FFFFFF /* 4 MSBits are status bits */ | ||
192 | #define PSTATE_OFFSET 28 /* 4 MSBits are status bits */ | ||
193 | |||
194 | |||
195 | #define MASK_STREAM_HAS_MAPPING (1L << 12) | ||
196 | #define MASK_STREAM_IS_ASIO (1L << 9) | ||
197 | #define STREAM_FMT_OFFSET 10 /* the stream fmt bits start at the 10th | ||
198 | * bit in the command word. */ | ||
199 | |||
200 | #define STREAM_FMT_16b 0x02 | ||
201 | #define STREAM_FMT_intel 0x01 | ||
202 | |||
203 | #define FREQ_FIELD_OFFSET 15 /* offset of the freq field in the response | ||
204 | * word */ | ||
205 | |||
206 | #define BUFF_FLAGS_OFFSET 24 /* offset of the buffer flags in the | ||
207 | * response word. */ | ||
208 | #define MASK_DATA_SIZE 0x00FFFFFF /* this must match the field size of | ||
209 | * datasize in the buffer_t structure. */ | ||
210 | |||
211 | #define MASK_BUFFER_ID 0xFF /* the cancel command awaits a buffer ID, | ||
212 | * may be 0xFF for "current". */ | ||
213 | |||
214 | |||
215 | /* code adapted from PcxErr_e.h */ | ||
216 | |||
217 | /* Bits masks */ | ||
218 | |||
219 | #define ERROR_MASK 0x8000 | ||
220 | |||
221 | #define SOURCE_MASK 0x7800 | ||
222 | |||
223 | #define E_SOURCE_BOARD 0x4000 /* 8 >> 1 */ | ||
224 | #define E_SOURCE_DRV 0x2000 /* 4 >> 1 */ | ||
225 | #define E_SOURCE_API 0x1000 /* 2 >> 1 */ | ||
226 | /* Error tools */ | ||
227 | #define E_SOURCE_TOOLS 0x0800 /* 1 >> 1 */ | ||
228 | /* Error pcxaudio */ | ||
229 | #define E_SOURCE_AUDIO 0x1800 /* 3 >> 1 */ | ||
230 | /* Error virtual pcx */ | ||
231 | #define E_SOURCE_VPCX 0x2800 /* 5 >> 1 */ | ||
232 | /* Error dispatcher */ | ||
233 | #define E_SOURCE_DISPATCHER 0x3000 /* 6 >> 1 */ | ||
234 | /* Error from CobraNet firmware */ | ||
235 | #define E_SOURCE_COBRANET 0x3800 /* 7 >> 1 */ | ||
236 | |||
237 | #define E_SOURCE_USER 0x7800 | ||
238 | |||
239 | #define CLASS_MASK 0x0700 | ||
240 | |||
241 | #define CODE_MASK 0x00FF | ||
242 | |||
243 | /* Bits values */ | ||
244 | |||
245 | /* Values for the error/warning bit */ | ||
246 | #define ERROR_VALUE 0x8000 | ||
247 | #define WARNING_VALUE 0x0000 | ||
248 | |||
249 | /* Class values */ | ||
250 | #define E_CLASS_GENERAL 0x0000 | ||
251 | #define E_CLASS_INVALID_CMD 0x0100 | ||
252 | #define E_CLASS_INVALID_STD_OBJECT 0x0200 | ||
253 | #define E_CLASS_RSRC_IMPOSSIBLE 0x0300 | ||
254 | #define E_CLASS_WRONG_CONTEXT 0x0400 | ||
255 | #define E_CLASS_BAD_SPECIFIC_PARAMETER 0x0500 | ||
256 | #define E_CLASS_REAL_TIME_ERROR 0x0600 | ||
257 | #define E_CLASS_DIRECTSHOW 0x0700 | ||
258 | #define E_CLASS_FREE 0x0700 | ||
259 | |||
260 | |||
261 | /* Complete DRV error code for the general class */ | ||
262 | #define ED_GN (ERROR_VALUE | E_SOURCE_DRV | E_CLASS_GENERAL) | ||
263 | #define ED_CONCURRENCY (ED_GN | 0x01) | ||
264 | #define ED_DSP_CRASHED (ED_GN | 0x02) | ||
265 | #define ED_UNKNOWN_BOARD (ED_GN | 0x03) | ||
266 | #define ED_NOT_INSTALLED (ED_GN | 0x04) | ||
267 | #define ED_CANNOT_OPEN_SVC_MANAGER (ED_GN | 0x05) | ||
268 | #define ED_CANNOT_READ_REGISTRY (ED_GN | 0x06) | ||
269 | #define ED_DSP_VERSION_MISMATCH (ED_GN | 0x07) | ||
270 | #define ED_UNAVAILABLE_FEATURE (ED_GN | 0x08) | ||
271 | #define ED_CANCELLED (ED_GN | 0x09) | ||
272 | #define ED_NO_RESPONSE_AT_IRQA (ED_GN | 0x10) | ||
273 | #define ED_INVALID_ADDRESS (ED_GN | 0x11) | ||
274 | #define ED_DSP_CORRUPTED (ED_GN | 0x12) | ||
275 | #define ED_PENDING_OPERATION (ED_GN | 0x13) | ||
276 | #define ED_NET_ALLOCATE_MEMORY_IMPOSSIBLE (ED_GN | 0x14) | ||
277 | #define ED_NET_REGISTER_ERROR (ED_GN | 0x15) | ||
278 | #define ED_NET_THREAD_ERROR (ED_GN | 0x16) | ||
279 | #define ED_NET_OPEN_ERROR (ED_GN | 0x17) | ||
280 | #define ED_NET_CLOSE_ERROR (ED_GN | 0x18) | ||
281 | #define ED_NET_NO_MORE_PACKET (ED_GN | 0x19) | ||
282 | #define ED_NET_NO_MORE_BUFFER (ED_GN | 0x1A) | ||
283 | #define ED_NET_SEND_ERROR (ED_GN | 0x1B) | ||
284 | #define ED_NET_RECEIVE_ERROR (ED_GN | 0x1C) | ||
285 | #define ED_NET_WRONG_MSG_SIZE (ED_GN | 0x1D) | ||
286 | #define ED_NET_WAIT_ERROR (ED_GN | 0x1E) | ||
287 | #define ED_NET_EEPROM_ERROR (ED_GN | 0x1F) | ||
288 | #define ED_INVALID_RS232_COM_NUMBER (ED_GN | 0x20) | ||
289 | #define ED_INVALID_RS232_INIT (ED_GN | 0x21) | ||
290 | #define ED_FILE_ERROR (ED_GN | 0x22) | ||
291 | #define ED_INVALID_GPIO_CMD (ED_GN | 0x23) | ||
292 | #define ED_RS232_ALREADY_OPENED (ED_GN | 0x24) | ||
293 | #define ED_RS232_NOT_OPENED (ED_GN | 0x25) | ||
294 | #define ED_GPIO_ALREADY_OPENED (ED_GN | 0x26) | ||
295 | #define ED_GPIO_NOT_OPENED (ED_GN | 0x27) | ||
296 | #define ED_REGISTRY_ERROR (ED_GN | 0x28) /* <- NCX */ | ||
297 | #define ED_INVALID_SERVICE (ED_GN | 0x29) /* <- NCX */ | ||
298 | |||
299 | #define ED_READ_FILE_ALREADY_OPENED (ED_GN | 0x2a) /* <- Decalage | ||
300 | * pour RCX | ||
301 | * (old 0x28) | ||
302 | * */ | ||
303 | #define ED_READ_FILE_INVALID_COMMAND (ED_GN | 0x2b) /* ~ */ | ||
304 | #define ED_READ_FILE_INVALID_PARAMETER (ED_GN | 0x2c) /* ~ */ | ||
305 | #define ED_READ_FILE_ALREADY_CLOSED (ED_GN | 0x2d) /* ~ */ | ||
306 | #define ED_READ_FILE_NO_INFORMATION (ED_GN | 0x2e) /* ~ */ | ||
307 | #define ED_READ_FILE_INVALID_HANDLE (ED_GN | 0x2f) /* ~ */ | ||
308 | #define ED_READ_FILE_END_OF_FILE (ED_GN | 0x30) /* ~ */ | ||
309 | #define ED_READ_FILE_ERROR (ED_GN | 0x31) /* ~ */ | ||
310 | |||
311 | #define ED_DSP_CRASHED_EXC_DSPSTACK_OVERFLOW (ED_GN | 0x32) /* <- Decalage pour | ||
312 | * PCX (old 0x14) */ | ||
313 | #define ED_DSP_CRASHED_EXC_SYSSTACK_OVERFLOW (ED_GN | 0x33) /* ~ */ | ||
314 | #define ED_DSP_CRASHED_EXC_ILLEGAL (ED_GN | 0x34) /* ~ */ | ||
315 | #define ED_DSP_CRASHED_EXC_TIMER_REENTRY (ED_GN | 0x35) /* ~ */ | ||
316 | #define ED_DSP_CRASHED_EXC_FATAL_ERROR (ED_GN | 0x36) /* ~ */ | ||
317 | |||
318 | #define ED_FLASH_PCCARD_NOT_PRESENT (ED_GN | 0x37) | ||
319 | |||
320 | #define ED_NO_CURRENT_CLOCK (ED_GN | 0x38) | ||
321 | |||
322 | /* Complete DRV error code for real time class */ | ||
323 | #define ED_RT (ERROR_VALUE | E_SOURCE_DRV | E_CLASS_REAL_TIME_ERROR) | ||
324 | #define ED_DSP_TIMED_OUT (ED_RT | 0x01) | ||
325 | #define ED_DSP_CHK_TIMED_OUT (ED_RT | 0x02) | ||
326 | #define ED_STREAM_OVERRUN (ED_RT | 0x03) | ||
327 | #define ED_DSP_BUSY (ED_RT | 0x04) | ||
328 | #define ED_DSP_SEMAPHORE_TIME_OUT (ED_RT | 0x05) | ||
329 | #define ED_BOARD_TIME_OUT (ED_RT | 0x06) | ||
330 | #define ED_XILINX_ERROR (ED_RT | 0x07) | ||
331 | #define ED_COBRANET_ITF_NOT_RESPONDING (ED_RT | 0x08) | ||
332 | |||
333 | /* Complete BOARD error code for the invaid standard object class */ | ||
334 | #define EB_ISO (ERROR_VALUE | E_SOURCE_BOARD | \ | ||
335 | E_CLASS_INVALID_STD_OBJECT) | ||
336 | #define EB_INVALID_EFFECT (EB_ISO | 0x00) | ||
337 | #define EB_INVALID_PIPE (EB_ISO | 0x40) | ||
338 | #define EB_INVALID_STREAM (EB_ISO | 0x80) | ||
339 | #define EB_INVALID_AUDIO (EB_ISO | 0xC0) | ||
340 | |||
341 | /* Complete BOARD error code for impossible resource allocation class */ | ||
342 | #define EB_RI (ERROR_VALUE | E_SOURCE_BOARD | E_CLASS_RSRC_IMPOSSIBLE) | ||
343 | #define EB_ALLOCATE_ALL_STREAM_TRANSFERT_BUFFERS_IMPOSSIBLE (EB_RI | 0x01) | ||
344 | #define EB_ALLOCATE_PIPE_SAMPLE_BUFFER_IMPOSSIBLE (EB_RI | 0x02) | ||
345 | |||
346 | #define EB_ALLOCATE_MEM_STREAM_IMPOSSIBLE \ | ||
347 | EB_ALLOCATE_ALL_STREAM_TRANSFERT_BUFFERS_IMPOSSIBLE | ||
348 | #define EB_ALLOCATE_MEM_PIPE_IMPOSSIBLE \ | ||
349 | EB_ALLOCATE_PIPE_SAMPLE_BUFFER_IMPOSSIBLE | ||
350 | |||
351 | #define EB_ALLOCATE_DIFFERED_CMD_IMPOSSIBLE (EB_RI | 0x03) | ||
352 | #define EB_TOO_MANY_DIFFERED_CMD (EB_RI | 0x04) | ||
353 | #define EB_RBUFFERS_TABLE_OVERFLOW (EB_RI | 0x05) | ||
354 | #define EB_ALLOCATE_EFFECTS_IMPOSSIBLE (EB_RI | 0x08) | ||
355 | #define EB_ALLOCATE_EFFECT_POS_IMPOSSIBLE (EB_RI | 0x09) | ||
356 | #define EB_RBUFFER_NOT_AVAILABLE (EB_RI | 0x0A) | ||
357 | #define EB_ALLOCATE_CONTEXT_LIII_IMPOSSIBLE (EB_RI | 0x0B) | ||
358 | #define EB_STATUS_DIALOG_IMPOSSIBLE (EB_RI | 0x1D) | ||
359 | #define EB_CONTROL_CMD_IMPOSSIBLE (EB_RI | 0x1E) | ||
360 | #define EB_STATUS_SEND_IMPOSSIBLE (EB_RI | 0x1F) | ||
361 | #define EB_ALLOCATE_PIPE_IMPOSSIBLE (EB_RI | 0x40) | ||
362 | #define EB_ALLOCATE_STREAM_IMPOSSIBLE (EB_RI | 0x80) | ||
363 | #define EB_ALLOCATE_AUDIO_IMPOSSIBLE (EB_RI | 0xC0) | ||
364 | |||
365 | /* Complete BOARD error code for wrong call context class */ | ||
366 | #define EB_WCC (ERROR_VALUE | E_SOURCE_BOARD | E_CLASS_WRONG_CONTEXT) | ||
367 | #define EB_CMD_REFUSED (EB_WCC | 0x00) | ||
368 | #define EB_START_STREAM_REFUSED (EB_WCC | 0xFC) | ||
369 | #define EB_SPC_REFUSED (EB_WCC | 0xFD) | ||
370 | #define EB_CSN_REFUSED (EB_WCC | 0xFE) | ||
371 | #define EB_CSE_REFUSED (EB_WCC | 0xFF) | ||
372 | |||
373 | |||
374 | |||
375 | |||
376 | #endif /* LX_DEFS_H */ | ||
diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c index c262049961e1..3b5ca70c9d4d 100644 --- a/sound/pci/oxygen/oxygen_pcm.c +++ b/sound/pci/oxygen/oxygen_pcm.c | |||
@@ -487,10 +487,14 @@ static int oxygen_hw_free(struct snd_pcm_substream *substream) | |||
487 | { | 487 | { |
488 | struct oxygen *chip = snd_pcm_substream_chip(substream); | 488 | struct oxygen *chip = snd_pcm_substream_chip(substream); |
489 | unsigned int channel = oxygen_substream_channel(substream); | 489 | unsigned int channel = oxygen_substream_channel(substream); |
490 | unsigned int channel_mask = 1 << channel; | ||
490 | 491 | ||
491 | spin_lock_irq(&chip->reg_lock); | 492 | spin_lock_irq(&chip->reg_lock); |
492 | chip->interrupt_mask &= ~(1 << channel); | 493 | chip->interrupt_mask &= ~channel_mask; |
493 | oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, chip->interrupt_mask); | 494 | oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, chip->interrupt_mask); |
495 | |||
496 | oxygen_set_bits8(chip, OXYGEN_DMA_FLUSH, channel_mask); | ||
497 | oxygen_clear_bits8(chip, OXYGEN_DMA_FLUSH, channel_mask); | ||
494 | spin_unlock_irq(&chip->reg_lock); | 498 | spin_unlock_irq(&chip->reg_lock); |
495 | 499 | ||
496 | return snd_pcm_lib_free_pages(substream); | 500 | return snd_pcm_lib_free_pages(substream); |
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index bc5ce11c8b14..bf971f7cfdc6 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c | |||
@@ -113,8 +113,8 @@ | |||
113 | */ | 113 | */ |
114 | 114 | ||
115 | /* | 115 | /* |
116 | * Xonar Essence STX | 116 | * Xonar Essence ST (Deluxe)/STX |
117 | * ----------------- | 117 | * ----------------------------- |
118 | * | 118 | * |
119 | * CMI8788: | 119 | * CMI8788: |
120 | * | 120 | * |
@@ -180,6 +180,8 @@ enum { | |||
180 | MODEL_DX, | 180 | MODEL_DX, |
181 | MODEL_HDAV, /* without daughterboard */ | 181 | MODEL_HDAV, /* without daughterboard */ |
182 | MODEL_HDAV_H6, /* with H6 daughterboard */ | 182 | MODEL_HDAV_H6, /* with H6 daughterboard */ |
183 | MODEL_ST, | ||
184 | MODEL_ST_H6, | ||
183 | MODEL_STX, | 185 | MODEL_STX, |
184 | }; | 186 | }; |
185 | 187 | ||
@@ -188,8 +190,10 @@ static struct pci_device_id xonar_ids[] __devinitdata = { | |||
188 | { OXYGEN_PCI_SUBID(0x1043, 0x8275), .driver_data = MODEL_DX }, | 190 | { OXYGEN_PCI_SUBID(0x1043, 0x8275), .driver_data = MODEL_DX }, |
189 | { OXYGEN_PCI_SUBID(0x1043, 0x82b7), .driver_data = MODEL_D2X }, | 191 | { OXYGEN_PCI_SUBID(0x1043, 0x82b7), .driver_data = MODEL_D2X }, |
190 | { OXYGEN_PCI_SUBID(0x1043, 0x8314), .driver_data = MODEL_HDAV }, | 192 | { OXYGEN_PCI_SUBID(0x1043, 0x8314), .driver_data = MODEL_HDAV }, |
193 | { OXYGEN_PCI_SUBID(0x1043, 0x8327), .driver_data = MODEL_DX }, | ||
191 | { OXYGEN_PCI_SUBID(0x1043, 0x834f), .driver_data = MODEL_D1 }, | 194 | { OXYGEN_PCI_SUBID(0x1043, 0x834f), .driver_data = MODEL_D1 }, |
192 | { OXYGEN_PCI_SUBID(0x1043, 0x835c), .driver_data = MODEL_STX }, | 195 | { OXYGEN_PCI_SUBID(0x1043, 0x835c), .driver_data = MODEL_STX }, |
196 | { OXYGEN_PCI_SUBID(0x1043, 0x835d), .driver_data = MODEL_ST }, | ||
193 | { OXYGEN_PCI_SUBID_BROKEN_EEPROM }, | 197 | { OXYGEN_PCI_SUBID_BROKEN_EEPROM }, |
194 | { } | 198 | { } |
195 | }; | 199 | }; |
@@ -210,9 +214,9 @@ MODULE_DEVICE_TABLE(pci, xonar_ids); | |||
210 | #define GPIO_DX_FRONT_PANEL 0x0002 | 214 | #define GPIO_DX_FRONT_PANEL 0x0002 |
211 | #define GPIO_DX_INPUT_ROUTE 0x0100 | 215 | #define GPIO_DX_INPUT_ROUTE 0x0100 |
212 | 216 | ||
213 | #define GPIO_HDAV_DB_MASK 0x0030 | 217 | #define GPIO_DB_MASK 0x0030 |
214 | #define GPIO_HDAV_DB_H6 0x0000 | 218 | #define GPIO_DB_H6 0x0000 |
215 | #define GPIO_HDAV_DB_XX 0x0020 | 219 | #define GPIO_DB_XX 0x0020 |
216 | 220 | ||
217 | #define GPIO_ST_HP_REAR 0x0002 | 221 | #define GPIO_ST_HP_REAR 0x0002 |
218 | #define GPIO_ST_HP 0x0080 | 222 | #define GPIO_ST_HP 0x0080 |
@@ -530,7 +534,7 @@ static void xonar_hdav_init(struct oxygen *chip) | |||
530 | snd_component_add(chip->card, "CS5381"); | 534 | snd_component_add(chip->card, "CS5381"); |
531 | } | 535 | } |
532 | 536 | ||
533 | static void xonar_stx_init(struct oxygen *chip) | 537 | static void xonar_st_init(struct oxygen *chip) |
534 | { | 538 | { |
535 | struct xonar_data *data = chip->model_data; | 539 | struct xonar_data *data = chip->model_data; |
536 | 540 | ||
@@ -539,12 +543,11 @@ static void xonar_stx_init(struct oxygen *chip) | |||
539 | OXYGEN_2WIRE_INTERRUPT_MASK | | 543 | OXYGEN_2WIRE_INTERRUPT_MASK | |
540 | OXYGEN_2WIRE_SPEED_FAST); | 544 | OXYGEN_2WIRE_SPEED_FAST); |
541 | 545 | ||
546 | if (chip->model.private_data == MODEL_ST_H6) | ||
547 | chip->model.dac_channels = 8; | ||
542 | data->anti_pop_delay = 100; | 548 | data->anti_pop_delay = 100; |
543 | data->dacs = 1; | 549 | data->dacs = chip->model.private_data == MODEL_ST_H6 ? 4 : 1; |
544 | data->output_enable_bit = GPIO_DX_OUTPUT_ENABLE; | 550 | data->output_enable_bit = GPIO_DX_OUTPUT_ENABLE; |
545 | data->ext_power_reg = OXYGEN_GPI_DATA; | ||
546 | data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK; | ||
547 | data->ext_power_bit = GPI_DX_EXT_POWER; | ||
548 | data->pcm1796_oversampling = PCM1796_OS_64; | 551 | data->pcm1796_oversampling = PCM1796_OS_64; |
549 | 552 | ||
550 | pcm1796_init(chip); | 553 | pcm1796_init(chip); |
@@ -560,6 +563,17 @@ static void xonar_stx_init(struct oxygen *chip) | |||
560 | snd_component_add(chip->card, "CS5381"); | 563 | snd_component_add(chip->card, "CS5381"); |
561 | } | 564 | } |
562 | 565 | ||
566 | static void xonar_stx_init(struct oxygen *chip) | ||
567 | { | ||
568 | struct xonar_data *data = chip->model_data; | ||
569 | |||
570 | data->ext_power_reg = OXYGEN_GPI_DATA; | ||
571 | data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK; | ||
572 | data->ext_power_bit = GPI_DX_EXT_POWER; | ||
573 | |||
574 | xonar_st_init(chip); | ||
575 | } | ||
576 | |||
563 | static void xonar_disable_output(struct oxygen *chip) | 577 | static void xonar_disable_output(struct oxygen *chip) |
564 | { | 578 | { |
565 | struct xonar_data *data = chip->model_data; | 579 | struct xonar_data *data = chip->model_data; |
@@ -1021,7 +1035,8 @@ static const struct oxygen_model model_xonar_hdav = { | |||
1021 | .model_data_size = sizeof(struct xonar_data), | 1035 | .model_data_size = sizeof(struct xonar_data), |
1022 | .device_config = PLAYBACK_0_TO_I2S | | 1036 | .device_config = PLAYBACK_0_TO_I2S | |
1023 | PLAYBACK_1_TO_SPDIF | | 1037 | PLAYBACK_1_TO_SPDIF | |
1024 | CAPTURE_0_FROM_I2S_2, | 1038 | CAPTURE_0_FROM_I2S_2 | |
1039 | CAPTURE_1_FROM_SPDIF, | ||
1025 | .dac_channels = 8, | 1040 | .dac_channels = 8, |
1026 | .dac_volume_min = 255 - 2*60, | 1041 | .dac_volume_min = 255 - 2*60, |
1027 | .dac_volume_max = 255, | 1042 | .dac_volume_max = 255, |
@@ -1034,7 +1049,7 @@ static const struct oxygen_model model_xonar_hdav = { | |||
1034 | static const struct oxygen_model model_xonar_st = { | 1049 | static const struct oxygen_model model_xonar_st = { |
1035 | .longname = "Asus Virtuoso 100", | 1050 | .longname = "Asus Virtuoso 100", |
1036 | .chip = "AV200", | 1051 | .chip = "AV200", |
1037 | .init = xonar_stx_init, | 1052 | .init = xonar_st_init, |
1038 | .control_filter = xonar_st_control_filter, | 1053 | .control_filter = xonar_st_control_filter, |
1039 | .mixer_init = xonar_st_mixer_init, | 1054 | .mixer_init = xonar_st_mixer_init, |
1040 | .cleanup = xonar_st_cleanup, | 1055 | .cleanup = xonar_st_cleanup, |
@@ -1067,6 +1082,7 @@ static int __devinit get_xonar_model(struct oxygen *chip, | |||
1067 | [MODEL_D2] = &model_xonar_d2, | 1082 | [MODEL_D2] = &model_xonar_d2, |
1068 | [MODEL_D2X] = &model_xonar_d2, | 1083 | [MODEL_D2X] = &model_xonar_d2, |
1069 | [MODEL_HDAV] = &model_xonar_hdav, | 1084 | [MODEL_HDAV] = &model_xonar_hdav, |
1085 | [MODEL_ST] = &model_xonar_st, | ||
1070 | [MODEL_STX] = &model_xonar_st, | 1086 | [MODEL_STX] = &model_xonar_st, |
1071 | }; | 1087 | }; |
1072 | static const char *const names[] = { | 1088 | static const char *const names[] = { |
@@ -1076,6 +1092,8 @@ static int __devinit get_xonar_model(struct oxygen *chip, | |||
1076 | [MODEL_D2X] = "Xonar D2X", | 1092 | [MODEL_D2X] = "Xonar D2X", |
1077 | [MODEL_HDAV] = "Xonar HDAV1.3", | 1093 | [MODEL_HDAV] = "Xonar HDAV1.3", |
1078 | [MODEL_HDAV_H6] = "Xonar HDAV1.3+H6", | 1094 | [MODEL_HDAV_H6] = "Xonar HDAV1.3+H6", |
1095 | [MODEL_ST] = "Xonar Essence ST", | ||
1096 | [MODEL_ST_H6] = "Xonar Essence ST+H6", | ||
1079 | [MODEL_STX] = "Xonar Essence STX", | 1097 | [MODEL_STX] = "Xonar Essence STX", |
1080 | }; | 1098 | }; |
1081 | unsigned int model = id->driver_data; | 1099 | unsigned int model = id->driver_data; |
@@ -1092,21 +1110,27 @@ static int __devinit get_xonar_model(struct oxygen *chip, | |||
1092 | chip->model.init = xonar_dx_init; | 1110 | chip->model.init = xonar_dx_init; |
1093 | break; | 1111 | break; |
1094 | case MODEL_HDAV: | 1112 | case MODEL_HDAV: |
1095 | oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, | 1113 | oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DB_MASK); |
1096 | GPIO_HDAV_DB_MASK); | 1114 | switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_DB_MASK) { |
1097 | switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) & | 1115 | case GPIO_DB_H6: |
1098 | GPIO_HDAV_DB_MASK) { | ||
1099 | case GPIO_HDAV_DB_H6: | ||
1100 | model = MODEL_HDAV_H6; | 1116 | model = MODEL_HDAV_H6; |
1101 | break; | 1117 | break; |
1102 | case GPIO_HDAV_DB_XX: | 1118 | case GPIO_DB_XX: |
1103 | snd_printk(KERN_ERR "unknown daughterboard\n"); | 1119 | snd_printk(KERN_ERR "unknown daughterboard\n"); |
1104 | return -ENODEV; | 1120 | return -ENODEV; |
1105 | } | 1121 | } |
1106 | break; | 1122 | break; |
1123 | case MODEL_ST: | ||
1124 | oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DB_MASK); | ||
1125 | switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_DB_MASK) { | ||
1126 | case GPIO_DB_H6: | ||
1127 | model = MODEL_ST_H6; | ||
1128 | break; | ||
1129 | } | ||
1130 | break; | ||
1107 | case MODEL_STX: | 1131 | case MODEL_STX: |
1108 | oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, | 1132 | chip->model.init = xonar_stx_init; |
1109 | GPIO_HDAV_DB_MASK); | 1133 | oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DB_MASK); |
1110 | break; | 1134 | break; |
1111 | } | 1135 | } |
1112 | 1136 | ||
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index e51a5ef1954d..235a71e5ac8d 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
@@ -507,41 +507,19 @@ static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip); | |||
507 | */ | 507 | */ |
508 | 508 | ||
509 | static struct pci_device_id snd_riptide_ids[] = { | 509 | static struct pci_device_id snd_riptide_ids[] = { |
510 | { | 510 | { PCI_DEVICE(0x127a, 0x4310) }, |
511 | .vendor = 0x127a,.device = 0x4310, | 511 | { PCI_DEVICE(0x127a, 0x4320) }, |
512 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | 512 | { PCI_DEVICE(0x127a, 0x4330) }, |
513 | }, | 513 | { PCI_DEVICE(0x127a, 0x4340) }, |
514 | { | ||
515 | .vendor = 0x127a,.device = 0x4320, | ||
516 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
517 | }, | ||
518 | { | ||
519 | .vendor = 0x127a,.device = 0x4330, | ||
520 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
521 | }, | ||
522 | { | ||
523 | .vendor = 0x127a,.device = 0x4340, | ||
524 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
525 | }, | ||
526 | {0,}, | 514 | {0,}, |
527 | }; | 515 | }; |
528 | 516 | ||
529 | #ifdef SUPPORT_JOYSTICK | 517 | #ifdef SUPPORT_JOYSTICK |
530 | static struct pci_device_id snd_riptide_joystick_ids[] __devinitdata = { | 518 | static struct pci_device_id snd_riptide_joystick_ids[] __devinitdata = { |
531 | { | 519 | { PCI_DEVICE(0x127a, 0x4312) }, |
532 | .vendor = 0x127a,.device = 0x4312, | 520 | { PCI_DEVICE(0x127a, 0x4322) }, |
533 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | 521 | { PCI_DEVICE(0x127a, 0x4332) }, |
534 | }, | 522 | { PCI_DEVICE(0x127a, 0x4342) }, |
535 | { | ||
536 | .vendor = 0x127a,.device = 0x4322, | ||
537 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
538 | }, | ||
539 | {.vendor = 0x127a,.device = 0x4332, | ||
540 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
541 | }, | ||
542 | {.vendor = 0x127a,.device = 0x4342, | ||
543 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
544 | }, | ||
545 | {0,}, | 523 | {0,}, |
546 | }; | 524 | }; |
547 | #endif | 525 | #endif |
@@ -1209,12 +1187,79 @@ static int riptide_resume(struct pci_dev *pci) | |||
1209 | } | 1187 | } |
1210 | #endif | 1188 | #endif |
1211 | 1189 | ||
1190 | static int try_to_load_firmware(struct cmdif *cif, struct snd_riptide *chip) | ||
1191 | { | ||
1192 | union firmware_version firmware = { .ret = CMDRET_ZERO }; | ||
1193 | int i, timeout, err; | ||
1194 | |||
1195 | for (i = 0; i < 2; i++) { | ||
1196 | WRITE_PORT_ULONG(cif->hwport->port[i].data1, 0); | ||
1197 | WRITE_PORT_ULONG(cif->hwport->port[i].data2, 0); | ||
1198 | } | ||
1199 | SET_GRESET(cif->hwport); | ||
1200 | udelay(100); | ||
1201 | UNSET_GRESET(cif->hwport); | ||
1202 | udelay(100); | ||
1203 | |||
1204 | for (timeout = 100000; --timeout; udelay(10)) { | ||
1205 | if (IS_READY(cif->hwport) && !IS_GERR(cif->hwport)) | ||
1206 | break; | ||
1207 | } | ||
1208 | if (!timeout) { | ||
1209 | snd_printk(KERN_ERR | ||
1210 | "Riptide: device not ready, audio status: 0x%x " | ||
1211 | "ready: %d gerr: %d\n", | ||
1212 | READ_AUDIO_STATUS(cif->hwport), | ||
1213 | IS_READY(cif->hwport), IS_GERR(cif->hwport)); | ||
1214 | return -EIO; | ||
1215 | } else { | ||
1216 | snd_printdd | ||
1217 | ("Riptide: audio status: 0x%x ready: %d gerr: %d\n", | ||
1218 | READ_AUDIO_STATUS(cif->hwport), | ||
1219 | IS_READY(cif->hwport), IS_GERR(cif->hwport)); | ||
1220 | } | ||
1221 | |||
1222 | SEND_GETV(cif, &firmware.ret); | ||
1223 | snd_printdd("Firmware version: ASIC: %d CODEC %d AUXDSP %d PROG %d\n", | ||
1224 | firmware.firmware.ASIC, firmware.firmware.CODEC, | ||
1225 | firmware.firmware.AUXDSP, firmware.firmware.PROG); | ||
1226 | |||
1227 | for (i = 0; i < FIRMWARE_VERSIONS; i++) { | ||
1228 | if (!memcmp(&firmware_versions[i], &firmware, sizeof(firmware))) | ||
1229 | break; | ||
1230 | } | ||
1231 | if (i >= FIRMWARE_VERSIONS) | ||
1232 | return 0; /* no match */ | ||
1233 | |||
1234 | if (!chip) | ||
1235 | return 1; /* OK */ | ||
1236 | |||
1237 | snd_printdd("Writing Firmware\n"); | ||
1238 | if (!chip->fw_entry) { | ||
1239 | err = request_firmware(&chip->fw_entry, "riptide.hex", | ||
1240 | &chip->pci->dev); | ||
1241 | if (err) { | ||
1242 | snd_printk(KERN_ERR | ||
1243 | "Riptide: Firmware not available %d\n", err); | ||
1244 | return -EIO; | ||
1245 | } | ||
1246 | } | ||
1247 | err = loadfirmware(cif, chip->fw_entry->data, chip->fw_entry->size); | ||
1248 | if (err) { | ||
1249 | snd_printk(KERN_ERR | ||
1250 | "Riptide: Could not load firmware %d\n", err); | ||
1251 | return err; | ||
1252 | } | ||
1253 | |||
1254 | chip->firmware = firmware; | ||
1255 | |||
1256 | return 1; /* OK */ | ||
1257 | } | ||
1258 | |||
1212 | static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip) | 1259 | static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip) |
1213 | { | 1260 | { |
1214 | int timeout, tries; | ||
1215 | union cmdret rptr = CMDRET_ZERO; | 1261 | union cmdret rptr = CMDRET_ZERO; |
1216 | union firmware_version firmware; | 1262 | int err, tries; |
1217 | int i, j, err, has_firmware; | ||
1218 | 1263 | ||
1219 | if (!cif) | 1264 | if (!cif) |
1220 | return -EINVAL; | 1265 | return -EINVAL; |
@@ -1227,75 +1272,11 @@ static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip) | |||
1227 | cif->is_reset = 0; | 1272 | cif->is_reset = 0; |
1228 | 1273 | ||
1229 | tries = RESET_TRIES; | 1274 | tries = RESET_TRIES; |
1230 | has_firmware = 0; | 1275 | do { |
1231 | while (has_firmware == 0 && tries-- > 0) { | 1276 | err = try_to_load_firmware(cif, chip); |
1232 | for (i = 0; i < 2; i++) { | 1277 | if (err < 0) |
1233 | WRITE_PORT_ULONG(cif->hwport->port[i].data1, 0); | 1278 | return err; |
1234 | WRITE_PORT_ULONG(cif->hwport->port[i].data2, 0); | 1279 | } while (!err && --tries); |
1235 | } | ||
1236 | SET_GRESET(cif->hwport); | ||
1237 | udelay(100); | ||
1238 | UNSET_GRESET(cif->hwport); | ||
1239 | udelay(100); | ||
1240 | |||
1241 | for (timeout = 100000; --timeout; udelay(10)) { | ||
1242 | if (IS_READY(cif->hwport) && !IS_GERR(cif->hwport)) | ||
1243 | break; | ||
1244 | } | ||
1245 | if (timeout == 0) { | ||
1246 | snd_printk(KERN_ERR | ||
1247 | "Riptide: device not ready, audio status: 0x%x ready: %d gerr: %d\n", | ||
1248 | READ_AUDIO_STATUS(cif->hwport), | ||
1249 | IS_READY(cif->hwport), IS_GERR(cif->hwport)); | ||
1250 | return -EIO; | ||
1251 | } else { | ||
1252 | snd_printdd | ||
1253 | ("Riptide: audio status: 0x%x ready: %d gerr: %d\n", | ||
1254 | READ_AUDIO_STATUS(cif->hwport), | ||
1255 | IS_READY(cif->hwport), IS_GERR(cif->hwport)); | ||
1256 | } | ||
1257 | |||
1258 | SEND_GETV(cif, &rptr); | ||
1259 | for (i = 0; i < 4; i++) | ||
1260 | firmware.ret.retwords[i] = rptr.retwords[i]; | ||
1261 | |||
1262 | snd_printdd | ||
1263 | ("Firmware version: ASIC: %d CODEC %d AUXDSP %d PROG %d\n", | ||
1264 | firmware.firmware.ASIC, firmware.firmware.CODEC, | ||
1265 | firmware.firmware.AUXDSP, firmware.firmware.PROG); | ||
1266 | |||
1267 | for (j = 0; j < FIRMWARE_VERSIONS; j++) { | ||
1268 | has_firmware = 1; | ||
1269 | for (i = 0; i < 4; i++) { | ||
1270 | if (firmware_versions[j].ret.retwords[i] != | ||
1271 | firmware.ret.retwords[i]) | ||
1272 | has_firmware = 0; | ||
1273 | } | ||
1274 | if (has_firmware) | ||
1275 | break; | ||
1276 | } | ||
1277 | |||
1278 | if (chip != NULL && has_firmware == 0) { | ||
1279 | snd_printdd("Writing Firmware\n"); | ||
1280 | if (!chip->fw_entry) { | ||
1281 | if ((err = | ||
1282 | request_firmware(&chip->fw_entry, | ||
1283 | "riptide.hex", | ||
1284 | &chip->pci->dev)) != 0) { | ||
1285 | snd_printk(KERN_ERR | ||
1286 | "Riptide: Firmware not available %d\n", | ||
1287 | err); | ||
1288 | return -EIO; | ||
1289 | } | ||
1290 | } | ||
1291 | err = loadfirmware(cif, chip->fw_entry->data, | ||
1292 | chip->fw_entry->size); | ||
1293 | if (err) | ||
1294 | snd_printk(KERN_ERR | ||
1295 | "Riptide: Could not load firmware %d\n", | ||
1296 | err); | ||
1297 | } | ||
1298 | } | ||
1299 | 1280 | ||
1300 | SEND_SACR(cif, 0, AC97_RESET); | 1281 | SEND_SACR(cif, 0, AC97_RESET); |
1301 | SEND_RACR(cif, AC97_RESET, &rptr); | 1282 | SEND_RACR(cif, AC97_RESET, &rptr); |
@@ -1337,11 +1318,6 @@ static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip) | |||
1337 | SET_AIE(cif->hwport); | 1318 | SET_AIE(cif->hwport); |
1338 | SET_AIACK(cif->hwport); | 1319 | SET_AIACK(cif->hwport); |
1339 | cif->is_reset = 1; | 1320 | cif->is_reset = 1; |
1340 | if (chip) { | ||
1341 | for (i = 0; i < 4; i++) | ||
1342 | chip->firmware.ret.retwords[i] = | ||
1343 | firmware.ret.retwords[i]; | ||
1344 | } | ||
1345 | 1321 | ||
1346 | return 0; | 1322 | return 0; |
1347 | } | 1323 | } |
@@ -2038,14 +2014,12 @@ static int __devinit snd_riptide_mixer(struct snd_riptide *chip) | |||
2038 | } | 2014 | } |
2039 | 2015 | ||
2040 | #ifdef SUPPORT_JOYSTICK | 2016 | #ifdef SUPPORT_JOYSTICK |
2041 | static int have_joystick; | ||
2042 | static struct pci_dev *riptide_gameport_pci; | ||
2043 | static struct gameport *riptide_gameport; | ||
2044 | 2017 | ||
2045 | static int __devinit | 2018 | static int __devinit |
2046 | snd_riptide_joystick_probe(struct pci_dev *pci, const struct pci_device_id *id) | 2019 | snd_riptide_joystick_probe(struct pci_dev *pci, const struct pci_device_id *id) |
2047 | { | 2020 | { |
2048 | static int dev; | 2021 | static int dev; |
2022 | struct gameport *gameport; | ||
2049 | 2023 | ||
2050 | if (dev >= SNDRV_CARDS) | 2024 | if (dev >= SNDRV_CARDS) |
2051 | return -ENODEV; | 2025 | return -ENODEV; |
@@ -2054,36 +2028,33 @@ snd_riptide_joystick_probe(struct pci_dev *pci, const struct pci_device_id *id) | |||
2054 | return -ENOENT; | 2028 | return -ENOENT; |
2055 | } | 2029 | } |
2056 | 2030 | ||
2057 | if (joystick_port[dev]) { | 2031 | if (!joystick_port[dev++]) |
2058 | riptide_gameport = gameport_allocate_port(); | 2032 | return 0; |
2059 | if (riptide_gameport) { | 2033 | |
2060 | if (!request_region | 2034 | gameport = gameport_allocate_port(); |
2061 | (joystick_port[dev], 8, "Riptide gameport")) { | 2035 | if (!gameport) |
2062 | snd_printk(KERN_WARNING | 2036 | return -ENOMEM; |
2063 | "Riptide: cannot grab gameport 0x%x\n", | 2037 | if (!request_region(joystick_port[dev], 8, "Riptide gameport")) { |
2064 | joystick_port[dev]); | 2038 | snd_printk(KERN_WARNING |
2065 | gameport_free_port(riptide_gameport); | 2039 | "Riptide: cannot grab gameport 0x%x\n", |
2066 | riptide_gameport = NULL; | 2040 | joystick_port[dev]); |
2067 | } else { | 2041 | gameport_free_port(gameport); |
2068 | riptide_gameport_pci = pci; | 2042 | return -EBUSY; |
2069 | riptide_gameport->io = joystick_port[dev]; | ||
2070 | gameport_register_port(riptide_gameport); | ||
2071 | } | ||
2072 | } | ||
2073 | } | 2043 | } |
2074 | dev++; | 2044 | |
2045 | gameport->io = joystick_port[dev]; | ||
2046 | gameport_register_port(gameport); | ||
2047 | pci_set_drvdata(pci, gameport); | ||
2075 | return 0; | 2048 | return 0; |
2076 | } | 2049 | } |
2077 | 2050 | ||
2078 | static void __devexit snd_riptide_joystick_remove(struct pci_dev *pci) | 2051 | static void __devexit snd_riptide_joystick_remove(struct pci_dev *pci) |
2079 | { | 2052 | { |
2080 | if (riptide_gameport) { | 2053 | struct gameport *gameport = pci_get_drvdata(pci); |
2081 | if (riptide_gameport_pci == pci) { | 2054 | if (gameport) { |
2082 | release_region(riptide_gameport->io, 8); | 2055 | release_region(gameport->io, 8); |
2083 | riptide_gameport_pci = NULL; | 2056 | gameport_unregister_port(gameport); |
2084 | gameport_unregister_port(riptide_gameport); | 2057 | pci_set_drvdata(pci, NULL); |
2085 | riptide_gameport = NULL; | ||
2086 | } | ||
2087 | } | 2058 | } |
2088 | } | 2059 | } |
2089 | #endif | 2060 | #endif |
@@ -2094,8 +2065,8 @@ snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | |||
2094 | static int dev; | 2065 | static int dev; |
2095 | struct snd_card *card; | 2066 | struct snd_card *card; |
2096 | struct snd_riptide *chip; | 2067 | struct snd_riptide *chip; |
2097 | unsigned short addr; | 2068 | unsigned short val; |
2098 | int err = 0; | 2069 | int err; |
2099 | 2070 | ||
2100 | if (dev >= SNDRV_CARDS) | 2071 | if (dev >= SNDRV_CARDS) |
2101 | return -ENODEV; | 2072 | return -ENODEV; |
@@ -2107,60 +2078,63 @@ snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | |||
2107 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | 2078 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
2108 | if (err < 0) | 2079 | if (err < 0) |
2109 | return err; | 2080 | return err; |
2110 | if ((err = snd_riptide_create(card, pci, &chip)) < 0) { | 2081 | err = snd_riptide_create(card, pci, &chip); |
2111 | snd_card_free(card); | 2082 | if (err < 0) |
2112 | return err; | 2083 | goto error; |
2113 | } | ||
2114 | card->private_data = chip; | 2084 | card->private_data = chip; |
2115 | if ((err = snd_riptide_pcm(chip, 0, NULL)) < 0) { | 2085 | err = snd_riptide_pcm(chip, 0, NULL); |
2116 | snd_card_free(card); | 2086 | if (err < 0) |
2117 | return err; | 2087 | goto error; |
2118 | } | 2088 | err = snd_riptide_mixer(chip); |
2119 | if ((err = snd_riptide_mixer(chip)) < 0) { | 2089 | if (err < 0) |
2120 | snd_card_free(card); | 2090 | goto error; |
2121 | return err; | 2091 | |
2122 | } | 2092 | val = LEGACY_ENABLE_ALL; |
2123 | pci_write_config_word(chip->pci, PCI_EXT_Legacy_Mask, LEGACY_ENABLE_ALL | 2093 | if (opl3_port[dev]) |
2124 | | (opl3_port[dev] ? LEGACY_ENABLE_FM : 0) | 2094 | val |= LEGACY_ENABLE_FM; |
2125 | #ifdef SUPPORT_JOYSTICK | 2095 | #ifdef SUPPORT_JOYSTICK |
2126 | | (joystick_port[dev] ? LEGACY_ENABLE_GAMEPORT : | 2096 | if (joystick_port[dev]) |
2127 | 0) | 2097 | val |= LEGACY_ENABLE_GAMEPORT; |
2128 | #endif | 2098 | #endif |
2129 | | (mpu_port[dev] | 2099 | if (mpu_port[dev]) |
2130 | ? (LEGACY_ENABLE_MPU_INT | LEGACY_ENABLE_MPU) : | 2100 | val |= LEGACY_ENABLE_MPU_INT | LEGACY_ENABLE_MPU; |
2131 | 0) | 2101 | val |= (chip->irq << 4) & 0xf0; |
2132 | | ((chip->irq << 4) & 0xF0)); | 2102 | pci_write_config_word(chip->pci, PCI_EXT_Legacy_Mask, val); |
2133 | if ((addr = mpu_port[dev]) != 0) { | 2103 | if (mpu_port[dev]) { |
2134 | pci_write_config_word(chip->pci, PCI_EXT_MPU_Base, addr); | 2104 | val = mpu_port[dev]; |
2135 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_RIPTIDE, | 2105 | pci_write_config_word(chip->pci, PCI_EXT_MPU_Base, val); |
2136 | addr, 0, chip->irq, 0, | 2106 | err = snd_mpu401_uart_new(card, 0, MPU401_HW_RIPTIDE, |
2137 | &chip->rmidi)) < 0) | 2107 | val, 0, chip->irq, 0, |
2108 | &chip->rmidi); | ||
2109 | if (err < 0) | ||
2138 | snd_printk(KERN_WARNING | 2110 | snd_printk(KERN_WARNING |
2139 | "Riptide: Can't Allocate MPU at 0x%x\n", | 2111 | "Riptide: Can't Allocate MPU at 0x%x\n", |
2140 | addr); | 2112 | val); |
2141 | else | 2113 | else |
2142 | chip->mpuaddr = addr; | 2114 | chip->mpuaddr = val; |
2143 | } | 2115 | } |
2144 | if ((addr = opl3_port[dev]) != 0) { | 2116 | if (opl3_port[dev]) { |
2145 | pci_write_config_word(chip->pci, PCI_EXT_FM_Base, addr); | 2117 | val = opl3_port[dev]; |
2146 | if ((err = snd_opl3_create(card, addr, addr + 2, | 2118 | pci_write_config_word(chip->pci, PCI_EXT_FM_Base, val); |
2147 | OPL3_HW_RIPTIDE, 0, | 2119 | err = snd_opl3_create(card, val, val + 2, |
2148 | &chip->opl3)) < 0) | 2120 | OPL3_HW_RIPTIDE, 0, &chip->opl3); |
2121 | if (err < 0) | ||
2149 | snd_printk(KERN_WARNING | 2122 | snd_printk(KERN_WARNING |
2150 | "Riptide: Can't Allocate OPL3 at 0x%x\n", | 2123 | "Riptide: Can't Allocate OPL3 at 0x%x\n", |
2151 | addr); | 2124 | val); |
2152 | else { | 2125 | else { |
2153 | chip->opladdr = addr; | 2126 | chip->opladdr = val; |
2154 | if ((err = | 2127 | err = snd_opl3_hwdep_new(chip->opl3, 0, 1, NULL); |
2155 | snd_opl3_hwdep_new(chip->opl3, 0, 1, NULL)) < 0) | 2128 | if (err < 0) |
2156 | snd_printk(KERN_WARNING | 2129 | snd_printk(KERN_WARNING |
2157 | "Riptide: Can't Allocate OPL3-HWDEP\n"); | 2130 | "Riptide: Can't Allocate OPL3-HWDEP\n"); |
2158 | } | 2131 | } |
2159 | } | 2132 | } |
2160 | #ifdef SUPPORT_JOYSTICK | 2133 | #ifdef SUPPORT_JOYSTICK |
2161 | if ((addr = joystick_port[dev]) != 0) { | 2134 | if (joystick_port[dev]) { |
2162 | pci_write_config_word(chip->pci, PCI_EXT_Game_Base, addr); | 2135 | val = joystick_port[dev]; |
2163 | chip->gameaddr = addr; | 2136 | pci_write_config_word(chip->pci, PCI_EXT_Game_Base, val); |
2137 | chip->gameaddr = val; | ||
2164 | } | 2138 | } |
2165 | #endif | 2139 | #endif |
2166 | 2140 | ||
@@ -2178,13 +2152,16 @@ snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | |||
2178 | chip->opladdr); | 2152 | chip->opladdr); |
2179 | #endif | 2153 | #endif |
2180 | snd_riptide_proc_init(chip); | 2154 | snd_riptide_proc_init(chip); |
2181 | if ((err = snd_card_register(card)) < 0) { | 2155 | err = snd_card_register(card); |
2182 | snd_card_free(card); | 2156 | if (err < 0) |
2183 | return err; | 2157 | goto error; |
2184 | } | ||
2185 | pci_set_drvdata(pci, card); | 2158 | pci_set_drvdata(pci, card); |
2186 | dev++; | 2159 | dev++; |
2187 | return 0; | 2160 | return 0; |
2161 | |||
2162 | error: | ||
2163 | snd_card_free(card); | ||
2164 | return err; | ||
2188 | } | 2165 | } |
2189 | 2166 | ||
2190 | static void __devexit snd_card_riptide_remove(struct pci_dev *pci) | 2167 | static void __devexit snd_card_riptide_remove(struct pci_dev *pci) |
@@ -2216,14 +2193,11 @@ static struct pci_driver joystick_driver = { | |||
2216 | static int __init alsa_card_riptide_init(void) | 2193 | static int __init alsa_card_riptide_init(void) |
2217 | { | 2194 | { |
2218 | int err; | 2195 | int err; |
2219 | if ((err = pci_register_driver(&driver)) < 0) | 2196 | err = pci_register_driver(&driver); |
2197 | if (err < 0) | ||
2220 | return err; | 2198 | return err; |
2221 | #if defined(SUPPORT_JOYSTICK) | 2199 | #if defined(SUPPORT_JOYSTICK) |
2222 | if (pci_register_driver(&joystick_driver) < 0) { | 2200 | pci_register_driver(&joystick_driver); |
2223 | have_joystick = 0; | ||
2224 | snd_printk(KERN_INFO "no joystick found\n"); | ||
2225 | } else | ||
2226 | have_joystick = 1; | ||
2227 | #endif | 2201 | #endif |
2228 | return 0; | 2202 | return 0; |
2229 | } | 2203 | } |
@@ -2232,8 +2206,7 @@ static void __exit alsa_card_riptide_exit(void) | |||
2232 | { | 2206 | { |
2233 | pci_unregister_driver(&driver); | 2207 | pci_unregister_driver(&driver); |
2234 | #if defined(SUPPORT_JOYSTICK) | 2208 | #if defined(SUPPORT_JOYSTICK) |
2235 | if (have_joystick) | 2209 | pci_unregister_driver(&joystick_driver); |
2236 | pci_unregister_driver(&joystick_driver); | ||
2237 | #endif | 2210 | #endif |
2238 | } | 2211 | } |
2239 | 2212 | ||
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 314e73531bd1..3da5c029f93b 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
29 | #include <linux/firmware.h> | 29 | #include <linux/firmware.h> |
30 | #include <linux/moduleparam.h> | 30 | #include <linux/moduleparam.h> |
31 | #include <linux/math64.h> | ||
31 | 32 | ||
32 | #include <sound/core.h> | 33 | #include <sound/core.h> |
33 | #include <sound/control.h> | 34 | #include <sound/control.h> |
@@ -402,9 +403,9 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin"); | |||
402 | #define HDSP_DMA_AREA_BYTES ((HDSP_MAX_CHANNELS+1) * HDSP_CHANNEL_BUFFER_BYTES) | 403 | #define HDSP_DMA_AREA_BYTES ((HDSP_MAX_CHANNELS+1) * HDSP_CHANNEL_BUFFER_BYTES) |
403 | #define HDSP_DMA_AREA_KILOBYTES (HDSP_DMA_AREA_BYTES/1024) | 404 | #define HDSP_DMA_AREA_KILOBYTES (HDSP_DMA_AREA_BYTES/1024) |
404 | 405 | ||
405 | /* use hotplug firmeare loader? */ | 406 | /* use hotplug firmware loader? */ |
406 | #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) | 407 | #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) |
407 | #if !defined(HDSP_USE_HWDEP_LOADER) && !defined(CONFIG_SND_HDSP) | 408 | #if !defined(HDSP_USE_HWDEP_LOADER) |
408 | #define HDSP_FW_LOADER | 409 | #define HDSP_FW_LOADER |
409 | #endif | 410 | #endif |
410 | #endif | 411 | #endif |
@@ -1047,7 +1048,6 @@ static int hdsp_set_interrupt_interval(struct hdsp *s, unsigned int frames) | |||
1047 | static void hdsp_set_dds_value(struct hdsp *hdsp, int rate) | 1048 | static void hdsp_set_dds_value(struct hdsp *hdsp, int rate) |
1048 | { | 1049 | { |
1049 | u64 n; | 1050 | u64 n; |
1050 | u32 r; | ||
1051 | 1051 | ||
1052 | if (rate >= 112000) | 1052 | if (rate >= 112000) |
1053 | rate /= 4; | 1053 | rate /= 4; |
@@ -1055,7 +1055,7 @@ static void hdsp_set_dds_value(struct hdsp *hdsp, int rate) | |||
1055 | rate /= 2; | 1055 | rate /= 2; |
1056 | 1056 | ||
1057 | n = DDS_NUMERATOR; | 1057 | n = DDS_NUMERATOR; |
1058 | div64_32(&n, rate, &r); | 1058 | n = div_u64(n, rate); |
1059 | /* n should be less than 2^32 for being written to FREQ register */ | 1059 | /* n should be less than 2^32 for being written to FREQ register */ |
1060 | snd_BUG_ON(n >> 32); | 1060 | snd_BUG_ON(n >> 32); |
1061 | /* HDSP_freqReg and HDSP_resetPointer are the same, so keep the DDS | 1061 | /* HDSP_freqReg and HDSP_resetPointer are the same, so keep the DDS |
@@ -3097,7 +3097,6 @@ static int snd_hdsp_get_adat_sync_check(struct snd_kcontrol *kcontrol, struct sn | |||
3097 | static int hdsp_dds_offset(struct hdsp *hdsp) | 3097 | static int hdsp_dds_offset(struct hdsp *hdsp) |
3098 | { | 3098 | { |
3099 | u64 n; | 3099 | u64 n; |
3100 | u32 r; | ||
3101 | unsigned int dds_value = hdsp->dds_value; | 3100 | unsigned int dds_value = hdsp->dds_value; |
3102 | int system_sample_rate = hdsp->system_sample_rate; | 3101 | int system_sample_rate = hdsp->system_sample_rate; |
3103 | 3102 | ||
@@ -3109,7 +3108,7 @@ static int hdsp_dds_offset(struct hdsp *hdsp) | |||
3109 | * dds_value = n / rate | 3108 | * dds_value = n / rate |
3110 | * rate = n / dds_value | 3109 | * rate = n / dds_value |
3111 | */ | 3110 | */ |
3112 | div64_32(&n, dds_value, &r); | 3111 | n = div_u64(n, dds_value); |
3113 | if (system_sample_rate >= 112000) | 3112 | if (system_sample_rate >= 112000) |
3114 | n *= 4; | 3113 | n *= 4; |
3115 | else if (system_sample_rate >= 56000) | 3114 | else if (system_sample_rate >= 56000) |
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index bac2dc0c5d85..0dce331a2a3b 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
31 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
32 | #include <linux/math64.h> | ||
32 | #include <asm/io.h> | 33 | #include <asm/io.h> |
33 | 34 | ||
34 | #include <sound/core.h> | 35 | #include <sound/core.h> |
@@ -831,7 +832,6 @@ static int hdspm_set_interrupt_interval(struct hdspm * s, unsigned int frames) | |||
831 | static void hdspm_set_dds_value(struct hdspm *hdspm, int rate) | 832 | static void hdspm_set_dds_value(struct hdspm *hdspm, int rate) |
832 | { | 833 | { |
833 | u64 n; | 834 | u64 n; |
834 | u32 r; | ||
835 | 835 | ||
836 | if (rate >= 112000) | 836 | if (rate >= 112000) |
837 | rate /= 4; | 837 | rate /= 4; |
@@ -844,7 +844,7 @@ static void hdspm_set_dds_value(struct hdspm *hdspm, int rate) | |||
844 | */ | 844 | */ |
845 | /* n = 104857600000000ULL; */ /* = 2^20 * 10^8 */ | 845 | /* n = 104857600000000ULL; */ /* = 2^20 * 10^8 */ |
846 | n = 110100480000000ULL; /* Value checked for AES32 and MADI */ | 846 | n = 110100480000000ULL; /* Value checked for AES32 and MADI */ |
847 | div64_32(&n, rate, &r); | 847 | n = div_u64(n, rate); |
848 | /* n should be less than 2^32 for being written to FREQ register */ | 848 | /* n should be less than 2^32 for being written to FREQ register */ |
849 | snd_BUG_ON(n >> 32); | 849 | snd_BUG_ON(n >> 32); |
850 | hdspm_write(hdspm, HDSPM_freqReg, (u32)n); | 850 | hdspm_write(hdspm, HDSPM_freqReg, (u32)n); |
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 1ef58c51c213..949fcaf6b70e 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
@@ -85,6 +85,7 @@ static int joystick; | |||
85 | static int ac97_clock = 48000; | 85 | static int ac97_clock = 48000; |
86 | static char *ac97_quirk; | 86 | static char *ac97_quirk; |
87 | static int dxs_support; | 87 | static int dxs_support; |
88 | static int nodelay; | ||
88 | 89 | ||
89 | module_param(index, int, 0444); | 90 | module_param(index, int, 0444); |
90 | MODULE_PARM_DESC(index, "Index value for VIA 82xx bridge."); | 91 | MODULE_PARM_DESC(index, "Index value for VIA 82xx bridge."); |
@@ -102,6 +103,8 @@ module_param(ac97_quirk, charp, 0444); | |||
102 | MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware."); | 103 | MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware."); |
103 | module_param(dxs_support, int, 0444); | 104 | module_param(dxs_support, int, 0444); |
104 | MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA, 5 = enable any sample rate)"); | 105 | MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA, 5 = enable any sample rate)"); |
106 | module_param(nodelay, int, 0444); | ||
107 | MODULE_PARM_DESC(nodelay, "Disable 500ms init delay"); | ||
105 | 108 | ||
106 | /* just for backward compatibility */ | 109 | /* just for backward compatibility */ |
107 | static int enable; | 110 | static int enable; |
@@ -549,7 +552,8 @@ static void snd_via82xx_codec_wait(struct snd_ac97 *ac97) | |||
549 | int err; | 552 | int err; |
550 | err = snd_via82xx_codec_ready(chip, ac97->num); | 553 | err = snd_via82xx_codec_ready(chip, ac97->num); |
551 | /* here we need to wait fairly for long time.. */ | 554 | /* here we need to wait fairly for long time.. */ |
552 | msleep(500); | 555 | if (!nodelay) |
556 | msleep(500); | ||
553 | } | 557 | } |
554 | 558 | ||
555 | static void snd_via82xx_codec_write(struct snd_ac97 *ac97, | 559 | static void snd_via82xx_codec_write(struct snd_ac97 *ac97, |
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c index 80df9b1f651e..2cc0eda4f20e 100644 --- a/sound/ppc/awacs.c +++ b/sound/ppc/awacs.c | |||
@@ -477,7 +477,7 @@ static int snd_pmac_awacs_put_master_amp(struct snd_kcontrol *kcontrol, | |||
477 | #define AMP_CH_SPK 0 | 477 | #define AMP_CH_SPK 0 |
478 | #define AMP_CH_HD 1 | 478 | #define AMP_CH_HD 1 |
479 | 479 | ||
480 | static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __initdata = { | 480 | static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __devinitdata = { |
481 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 481 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
482 | .name = "PC Speaker Playback Volume", | 482 | .name = "PC Speaker Playback Volume", |
483 | .info = snd_pmac_awacs_info_volume_amp, | 483 | .info = snd_pmac_awacs_info_volume_amp, |
@@ -514,7 +514,7 @@ static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __initdata = { | |||
514 | }, | 514 | }, |
515 | }; | 515 | }; |
516 | 516 | ||
517 | static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __initdata = { | 517 | static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __devinitdata = { |
518 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 518 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
519 | .name = "Headphone Playback Switch", | 519 | .name = "Headphone Playback Switch", |
520 | .info = snd_pmac_boolean_stereo_info, | 520 | .info = snd_pmac_boolean_stereo_info, |
@@ -523,7 +523,7 @@ static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __initdata = { | |||
523 | .private_value = AMP_CH_HD, | 523 | .private_value = AMP_CH_HD, |
524 | }; | 524 | }; |
525 | 525 | ||
526 | static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw __initdata = { | 526 | static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw __devinitdata = { |
527 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 527 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
528 | .name = "PC Speaker Playback Switch", | 528 | .name = "PC Speaker Playback Switch", |
529 | .info = snd_pmac_boolean_stereo_info, | 529 | .info = snd_pmac_boolean_stereo_info, |
@@ -595,46 +595,46 @@ static int snd_pmac_screamer_mic_boost_put(struct snd_kcontrol *kcontrol, | |||
595 | /* | 595 | /* |
596 | * lists of mixer elements | 596 | * lists of mixer elements |
597 | */ | 597 | */ |
598 | static struct snd_kcontrol_new snd_pmac_awacs_mixers[] __initdata = { | 598 | static struct snd_kcontrol_new snd_pmac_awacs_mixers[] __devinitdata = { |
599 | AWACS_SWITCH("Master Capture Switch", 1, SHIFT_LOOPTHRU, 0), | 599 | AWACS_SWITCH("Master Capture Switch", 1, SHIFT_LOOPTHRU, 0), |
600 | AWACS_VOLUME("Master Capture Volume", 0, 4, 0), | 600 | AWACS_VOLUME("Master Capture Volume", 0, 4, 0), |
601 | /* AWACS_SWITCH("Unknown Playback Switch", 6, SHIFT_PAROUT0, 0), */ | 601 | /* AWACS_SWITCH("Unknown Playback Switch", 6, SHIFT_PAROUT0, 0), */ |
602 | }; | 602 | }; |
603 | 603 | ||
604 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_beige[] __initdata = { | 604 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_beige[] __devinitdata = { |
605 | AWACS_VOLUME("Master Playback Volume", 2, 6, 1), | 605 | AWACS_VOLUME("Master Playback Volume", 2, 6, 1), |
606 | AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1), | 606 | AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1), |
607 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), | 607 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), |
608 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_LINE, 0), | 608 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_LINE, 0), |
609 | }; | 609 | }; |
610 | 610 | ||
611 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_lo[] __initdata = { | 611 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_lo[] __devinitdata = { |
612 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), | 612 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), |
613 | }; | 613 | }; |
614 | 614 | ||
615 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] __initdata = { | 615 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] __devinitdata = { |
616 | AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1), | 616 | AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1), |
617 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), | 617 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), |
618 | }; | 618 | }; |
619 | 619 | ||
620 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_g4agp[] __initdata = { | 620 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_g4agp[] __devinitdata = { |
621 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), | 621 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), |
622 | AWACS_VOLUME("Master Playback Volume", 5, 6, 1), | 622 | AWACS_VOLUME("Master Playback Volume", 5, 6, 1), |
623 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), | 623 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), |
624 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), | 624 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), |
625 | }; | 625 | }; |
626 | 626 | ||
627 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] __initdata = { | 627 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] __devinitdata = { |
628 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), | 628 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), |
629 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), | 629 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), |
630 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), | 630 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), |
631 | }; | 631 | }; |
632 | 632 | ||
633 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac5500[] __initdata = { | 633 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac5500[] __devinitdata = { |
634 | AWACS_VOLUME("Headphone Playback Volume", 2, 6, 1), | 634 | AWACS_VOLUME("Headphone Playback Volume", 2, 6, 1), |
635 | }; | 635 | }; |
636 | 636 | ||
637 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __initdata = { | 637 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __devinitdata = { |
638 | AWACS_VOLUME("Master Playback Volume", 2, 6, 1), | 638 | AWACS_VOLUME("Master Playback Volume", 2, 6, 1), |
639 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), | 639 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), |
640 | }; | 640 | }; |
@@ -642,34 +642,34 @@ static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __initdata = { | |||
642 | /* FIXME: is this correct order? | 642 | /* FIXME: is this correct order? |
643 | * screamer (powerbook G3 pismo) seems to have different bits... | 643 | * screamer (powerbook G3 pismo) seems to have different bits... |
644 | */ | 644 | */ |
645 | static struct snd_kcontrol_new snd_pmac_awacs_mixers2[] __initdata = { | 645 | static struct snd_kcontrol_new snd_pmac_awacs_mixers2[] __devinitdata = { |
646 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_LINE, 0), | 646 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_LINE, 0), |
647 | AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_MIC, 0), | 647 | AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_MIC, 0), |
648 | }; | 648 | }; |
649 | 649 | ||
650 | static struct snd_kcontrol_new snd_pmac_screamer_mixers2[] __initdata = { | 650 | static struct snd_kcontrol_new snd_pmac_screamer_mixers2[] __devinitdata = { |
651 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), | 651 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), |
652 | AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_LINE, 0), | 652 | AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_LINE, 0), |
653 | }; | 653 | }; |
654 | 654 | ||
655 | static struct snd_kcontrol_new snd_pmac_awacs_mixers2_pmac5500[] __initdata = { | 655 | static struct snd_kcontrol_new snd_pmac_awacs_mixers2_pmac5500[] __devinitdata = { |
656 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), | 656 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), |
657 | }; | 657 | }; |
658 | 658 | ||
659 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw __initdata = | 659 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw __devinitdata = |
660 | AWACS_SWITCH("Master Playback Switch", 1, SHIFT_HDMUTE, 1); | 660 | AWACS_SWITCH("Master Playback Switch", 1, SHIFT_HDMUTE, 1); |
661 | 661 | ||
662 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac __initdata = | 662 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac __devinitdata = |
663 | AWACS_SWITCH("Line out Playback Switch", 1, SHIFT_HDMUTE, 1); | 663 | AWACS_SWITCH("Line out Playback Switch", 1, SHIFT_HDMUTE, 1); |
664 | 664 | ||
665 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw_pmac5500 __initdata = | 665 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw_pmac5500 __devinitdata = |
666 | AWACS_SWITCH("Headphone Playback Switch", 1, SHIFT_HDMUTE, 1); | 666 | AWACS_SWITCH("Headphone Playback Switch", 1, SHIFT_HDMUTE, 1); |
667 | 667 | ||
668 | static struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] __initdata = { | 668 | static struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] __devinitdata = { |
669 | AWACS_SWITCH("Mic Boost Capture Switch", 0, SHIFT_GAINLINE, 0), | 669 | AWACS_SWITCH("Mic Boost Capture Switch", 0, SHIFT_GAINLINE, 0), |
670 | }; | 670 | }; |
671 | 671 | ||
672 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __initdata = { | 672 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __devinitdata = { |
673 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 673 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
674 | .name = "Mic Boost Capture Volume", | 674 | .name = "Mic Boost Capture Volume", |
675 | .info = snd_pmac_screamer_mic_boost_info, | 675 | .info = snd_pmac_screamer_mic_boost_info, |
@@ -678,34 +678,34 @@ static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __initdata = { | |||
678 | }, | 678 | }, |
679 | }; | 679 | }; |
680 | 680 | ||
681 | static struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] __initdata = | 681 | static struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] __devinitdata = |
682 | { | 682 | { |
683 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), | 683 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), |
684 | }; | 684 | }; |
685 | 685 | ||
686 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] __initdata = | 686 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] __devinitdata = |
687 | { | 687 | { |
688 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), | 688 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), |
689 | AWACS_SWITCH("CD Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0), | 689 | AWACS_SWITCH("CD Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0), |
690 | }; | 690 | }; |
691 | 691 | ||
692 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] __initdata = | 692 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] __devinitdata = |
693 | { | 693 | { |
694 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), | 694 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), |
695 | AWACS_SWITCH("Mic Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0), | 695 | AWACS_SWITCH("Mic Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0), |
696 | }; | 696 | }; |
697 | 697 | ||
698 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] __initdata = { | 698 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] __devinitdata = { |
699 | AWACS_VOLUME("PC Speaker Playback Volume", 4, 6, 1), | 699 | AWACS_VOLUME("PC Speaker Playback Volume", 4, 6, 1), |
700 | }; | 700 | }; |
701 | 701 | ||
702 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw __initdata = | 702 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw __devinitdata = |
703 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1); | 703 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1); |
704 | 704 | ||
705 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 __initdata = | 705 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 __devinitdata = |
706 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 1); | 706 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 1); |
707 | 707 | ||
708 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 __initdata = | 708 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 __devinitdata = |
709 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 0); | 709 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 0); |
710 | 710 | ||
711 | 711 | ||
@@ -872,7 +872,7 @@ static void snd_pmac_awacs_update_automute(struct snd_pmac *chip, int do_notify) | |||
872 | /* | 872 | /* |
873 | * initialize chip | 873 | * initialize chip |
874 | */ | 874 | */ |
875 | int __init | 875 | int __devinit |
876 | snd_pmac_awacs_init(struct snd_pmac *chip) | 876 | snd_pmac_awacs_init(struct snd_pmac *chip) |
877 | { | 877 | { |
878 | int pm7500 = IS_PM7500; | 878 | int pm7500 = IS_PM7500; |
diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c index 89f5c328acfe..a9d350789f55 100644 --- a/sound/ppc/beep.c +++ b/sound/ppc/beep.c | |||
@@ -215,7 +215,7 @@ static struct snd_kcontrol_new snd_pmac_beep_mixer = { | |||
215 | }; | 215 | }; |
216 | 216 | ||
217 | /* Initialize beep stuff */ | 217 | /* Initialize beep stuff */ |
218 | int __init snd_pmac_attach_beep(struct snd_pmac *chip) | 218 | int __devinit snd_pmac_attach_beep(struct snd_pmac *chip) |
219 | { | 219 | { |
220 | struct pmac_beep *beep; | 220 | struct pmac_beep *beep; |
221 | struct input_dev *input_dev; | 221 | struct input_dev *input_dev; |
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c index 45a76297c38d..16ed240e423c 100644 --- a/sound/ppc/burgundy.c +++ b/sound/ppc/burgundy.c | |||
@@ -46,12 +46,12 @@ snd_pmac_burgundy_extend_wait(struct snd_pmac *chip) | |||
46 | timeout = 50; | 46 | timeout = 50; |
47 | while (!(in_le32(&chip->awacs->codec_stat) & MASK_EXTEND) && timeout--) | 47 | while (!(in_le32(&chip->awacs->codec_stat) & MASK_EXTEND) && timeout--) |
48 | udelay(1); | 48 | udelay(1); |
49 | if (! timeout) | 49 | if (timeout < 0) |
50 | printk(KERN_DEBUG "burgundy_extend_wait: timeout #1\n"); | 50 | printk(KERN_DEBUG "burgundy_extend_wait: timeout #1\n"); |
51 | timeout = 50; | 51 | timeout = 50; |
52 | while ((in_le32(&chip->awacs->codec_stat) & MASK_EXTEND) && timeout--) | 52 | while ((in_le32(&chip->awacs->codec_stat) & MASK_EXTEND) && timeout--) |
53 | udelay(1); | 53 | udelay(1); |
54 | if (! timeout) | 54 | if (timeout < 0) |
55 | printk(KERN_DEBUG "burgundy_extend_wait: timeout #2\n"); | 55 | printk(KERN_DEBUG "burgundy_extend_wait: timeout #2\n"); |
56 | } | 56 | } |
57 | 57 | ||
@@ -468,7 +468,7 @@ static int snd_pmac_burgundy_put_switch_b(struct snd_kcontrol *kcontrol, | |||
468 | /* | 468 | /* |
469 | * Burgundy mixers | 469 | * Burgundy mixers |
470 | */ | 470 | */ |
471 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __initdata = { | 471 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __devinitdata = { |
472 | BURGUNDY_VOLUME_W("Master Playback Volume", 0, | 472 | BURGUNDY_VOLUME_W("Master Playback Volume", 0, |
473 | MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8), | 473 | MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8), |
474 | BURGUNDY_VOLUME_W("CD Capture Volume", 0, | 474 | BURGUNDY_VOLUME_W("CD Capture Volume", 0, |
@@ -496,7 +496,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __initdata = { | |||
496 | */ BURGUNDY_SWITCH_B("PCM Capture Switch", 0, | 496 | */ BURGUNDY_SWITCH_B("PCM Capture Switch", 0, |
497 | MASK_ADDR_BURGUNDY_HOSTIFEH, 0x01, 0, 0) | 497 | MASK_ADDR_BURGUNDY_HOSTIFEH, 0x01, 0, 0) |
498 | }; | 498 | }; |
499 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __initdata = { | 499 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __devinitdata = { |
500 | BURGUNDY_VOLUME_W("Line in Capture Volume", 0, | 500 | BURGUNDY_VOLUME_W("Line in Capture Volume", 0, |
501 | MASK_ADDR_BURGUNDY_VOLLINE, 16), | 501 | MASK_ADDR_BURGUNDY_VOLLINE, 16), |
502 | BURGUNDY_VOLUME_W("Mic Capture Volume", 0, | 502 | BURGUNDY_VOLUME_W("Mic Capture Volume", 0, |
@@ -522,7 +522,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __initdata = { | |||
522 | BURGUNDY_SWITCH_B("Mic Boost Capture Switch", 0, | 522 | BURGUNDY_SWITCH_B("Mic Boost Capture Switch", 0, |
523 | MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) | 523 | MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) |
524 | }; | 524 | }; |
525 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __initdata = { | 525 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __devinitdata = { |
526 | BURGUNDY_VOLUME_W("Line in Capture Volume", 0, | 526 | BURGUNDY_VOLUME_W("Line in Capture Volume", 0, |
527 | MASK_ADDR_BURGUNDY_VOLMIC, 16), | 527 | MASK_ADDR_BURGUNDY_VOLMIC, 16), |
528 | BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0, | 528 | BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0, |
@@ -538,33 +538,33 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __initdata = { | |||
538 | /* BURGUNDY_SWITCH_B("Line in Boost Capture Switch", 0, | 538 | /* BURGUNDY_SWITCH_B("Line in Boost Capture Switch", 0, |
539 | * MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) */ | 539 | * MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) */ |
540 | }; | 540 | }; |
541 | static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac __initdata = | 541 | static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac __devinitdata = |
542 | BURGUNDY_SWITCH_B("Master Playback Switch", 0, | 542 | BURGUNDY_SWITCH_B("Master Playback Switch", 0, |
543 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 543 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
544 | BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOUT_LEFT | BURGUNDY_HP_LEFT, | 544 | BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOUT_LEFT | BURGUNDY_HP_LEFT, |
545 | BURGUNDY_OUTPUT_RIGHT | BURGUNDY_LINEOUT_RIGHT | BURGUNDY_HP_RIGHT, 1); | 545 | BURGUNDY_OUTPUT_RIGHT | BURGUNDY_LINEOUT_RIGHT | BURGUNDY_HP_RIGHT, 1); |
546 | static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac __initdata = | 546 | static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac __devinitdata = |
547 | BURGUNDY_SWITCH_B("Master Playback Switch", 0, | 547 | BURGUNDY_SWITCH_B("Master Playback Switch", 0, |
548 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 548 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
549 | BURGUNDY_OUTPUT_INTERN | 549 | BURGUNDY_OUTPUT_INTERN |
550 | | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); | 550 | | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); |
551 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __initdata = | 551 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __devinitdata = |
552 | BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, | 552 | BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, |
553 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 553 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
554 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); | 554 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); |
555 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __initdata = | 555 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __devinitdata = |
556 | BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, | 556 | BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, |
557 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 557 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
558 | BURGUNDY_OUTPUT_INTERN, 0, 0); | 558 | BURGUNDY_OUTPUT_INTERN, 0, 0); |
559 | static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __initdata = | 559 | static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __devinitdata = |
560 | BURGUNDY_SWITCH_B("Line out Playback Switch", 0, | 560 | BURGUNDY_SWITCH_B("Line out Playback Switch", 0, |
561 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 561 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
562 | BURGUNDY_LINEOUT_LEFT, BURGUNDY_LINEOUT_RIGHT, 1); | 562 | BURGUNDY_LINEOUT_LEFT, BURGUNDY_LINEOUT_RIGHT, 1); |
563 | static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac __initdata = | 563 | static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac __devinitdata = |
564 | BURGUNDY_SWITCH_B("Line out Playback Switch", 0, | 564 | BURGUNDY_SWITCH_B("Line out Playback Switch", 0, |
565 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 565 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
566 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); | 566 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); |
567 | static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac __initdata = | 567 | static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac __devinitdata = |
568 | BURGUNDY_SWITCH_B("Headphone Playback Switch", 0, | 568 | BURGUNDY_SWITCH_B("Headphone Playback Switch", 0, |
569 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 569 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
570 | BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1); | 570 | BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1); |
@@ -618,7 +618,7 @@ static void snd_pmac_burgundy_update_automute(struct snd_pmac *chip, int do_noti | |||
618 | /* | 618 | /* |
619 | * initialize burgundy | 619 | * initialize burgundy |
620 | */ | 620 | */ |
621 | int __init snd_pmac_burgundy_init(struct snd_pmac *chip) | 621 | int __devinit snd_pmac_burgundy_init(struct snd_pmac *chip) |
622 | { | 622 | { |
623 | int imac = machine_is_compatible("iMac"); | 623 | int imac = machine_is_compatible("iMac"); |
624 | int i, err; | 624 | int i, err; |
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c index f8d478c2da62..24200b7bdace 100644 --- a/sound/ppc/daca.c +++ b/sound/ppc/daca.c | |||
@@ -244,7 +244,7 @@ static void daca_cleanup(struct snd_pmac *chip) | |||
244 | } | 244 | } |
245 | 245 | ||
246 | /* exported */ | 246 | /* exported */ |
247 | int __init snd_pmac_daca_init(struct snd_pmac *chip) | 247 | int __devinit snd_pmac_daca_init(struct snd_pmac *chip) |
248 | { | 248 | { |
249 | int i, err; | 249 | int i, err; |
250 | struct pmac_daca *mix; | 250 | struct pmac_daca *mix; |
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index a5afb2682e7f..835fa19ed461 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c | |||
@@ -33,10 +33,6 @@ | |||
33 | static struct pmac_keywest *keywest_ctx; | 33 | static struct pmac_keywest *keywest_ctx; |
34 | 34 | ||
35 | 35 | ||
36 | #ifndef i2c_device_name | ||
37 | #define i2c_device_name(x) ((x)->name) | ||
38 | #endif | ||
39 | |||
40 | static int keywest_probe(struct i2c_client *client, | 36 | static int keywest_probe(struct i2c_client *client, |
41 | const struct i2c_device_id *id) | 37 | const struct i2c_device_id *id) |
42 | { | 38 | { |
@@ -56,7 +52,7 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter) | |||
56 | if (! keywest_ctx) | 52 | if (! keywest_ctx) |
57 | return -EINVAL; | 53 | return -EINVAL; |
58 | 54 | ||
59 | if (strncmp(i2c_device_name(adapter), "mac-io", 6)) | 55 | if (strncmp(adapter->name, "mac-io", 6)) |
60 | return 0; /* ignored */ | 56 | return 0; /* ignored */ |
61 | 57 | ||
62 | memset(&info, 0, sizeof(struct i2c_board_info)); | 58 | memset(&info, 0, sizeof(struct i2c_board_info)); |
@@ -109,7 +105,7 @@ void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c) | |||
109 | } | 105 | } |
110 | } | 106 | } |
111 | 107 | ||
112 | int __init snd_pmac_tumbler_post_init(void) | 108 | int __devinit snd_pmac_tumbler_post_init(void) |
113 | { | 109 | { |
114 | int err; | 110 | int err; |
115 | 111 | ||
@@ -124,7 +120,7 @@ int __init snd_pmac_tumbler_post_init(void) | |||
124 | } | 120 | } |
125 | 121 | ||
126 | /* exported */ | 122 | /* exported */ |
127 | int __init snd_pmac_keywest_init(struct pmac_keywest *i2c) | 123 | int __devinit snd_pmac_keywest_init(struct pmac_keywest *i2c) |
128 | { | 124 | { |
129 | int err; | 125 | int err; |
130 | 126 | ||
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index 9b4e9c316695..7bc492ee77ec 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c | |||
@@ -702,7 +702,7 @@ static struct snd_pcm_ops snd_pmac_capture_ops = { | |||
702 | .pointer = snd_pmac_capture_pointer, | 702 | .pointer = snd_pmac_capture_pointer, |
703 | }; | 703 | }; |
704 | 704 | ||
705 | int __init snd_pmac_pcm_new(struct snd_pmac *chip) | 705 | int __devinit snd_pmac_pcm_new(struct snd_pmac *chip) |
706 | { | 706 | { |
707 | struct snd_pcm *pcm; | 707 | struct snd_pcm *pcm; |
708 | int err; | 708 | int err; |
@@ -908,7 +908,7 @@ static int snd_pmac_dev_free(struct snd_device *device) | |||
908 | * check the machine support byteswap (little-endian) | 908 | * check the machine support byteswap (little-endian) |
909 | */ | 909 | */ |
910 | 910 | ||
911 | static void __init detect_byte_swap(struct snd_pmac *chip) | 911 | static void __devinit detect_byte_swap(struct snd_pmac *chip) |
912 | { | 912 | { |
913 | struct device_node *mio; | 913 | struct device_node *mio; |
914 | 914 | ||
@@ -934,7 +934,7 @@ static void __init detect_byte_swap(struct snd_pmac *chip) | |||
934 | /* | 934 | /* |
935 | * detect a sound chip | 935 | * detect a sound chip |
936 | */ | 936 | */ |
937 | static int __init snd_pmac_detect(struct snd_pmac *chip) | 937 | static int __devinit snd_pmac_detect(struct snd_pmac *chip) |
938 | { | 938 | { |
939 | struct device_node *sound; | 939 | struct device_node *sound; |
940 | struct device_node *dn; | 940 | struct device_node *dn; |
@@ -1143,7 +1143,7 @@ static int pmac_hp_detect_get(struct snd_kcontrol *kcontrol, | |||
1143 | return 0; | 1143 | return 0; |
1144 | } | 1144 | } |
1145 | 1145 | ||
1146 | static struct snd_kcontrol_new auto_mute_controls[] __initdata = { | 1146 | static struct snd_kcontrol_new auto_mute_controls[] __devinitdata = { |
1147 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 1147 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
1148 | .name = "Auto Mute Switch", | 1148 | .name = "Auto Mute Switch", |
1149 | .info = snd_pmac_boolean_mono_info, | 1149 | .info = snd_pmac_boolean_mono_info, |
@@ -1158,7 +1158,7 @@ static struct snd_kcontrol_new auto_mute_controls[] __initdata = { | |||
1158 | }, | 1158 | }, |
1159 | }; | 1159 | }; |
1160 | 1160 | ||
1161 | int __init snd_pmac_add_automute(struct snd_pmac *chip) | 1161 | int __devinit snd_pmac_add_automute(struct snd_pmac *chip) |
1162 | { | 1162 | { |
1163 | int err; | 1163 | int err; |
1164 | chip->auto_mute = 1; | 1164 | chip->auto_mute = 1; |
@@ -1175,7 +1175,7 @@ int __init snd_pmac_add_automute(struct snd_pmac *chip) | |||
1175 | /* | 1175 | /* |
1176 | * create and detect a pmac chip record | 1176 | * create and detect a pmac chip record |
1177 | */ | 1177 | */ |
1178 | int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) | 1178 | int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) |
1179 | { | 1179 | { |
1180 | struct snd_pmac *chip; | 1180 | struct snd_pmac *chip; |
1181 | struct device_node *np; | 1181 | struct device_node *np; |
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index f361c26506aa..53c81a547613 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c | |||
@@ -18,81 +18,31 @@ | |||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/dma-mapping.h> | ||
22 | #include <linux/dmapool.h> | ||
21 | #include <linux/init.h> | 23 | #include <linux/init.h> |
22 | #include <linux/slab.h> | ||
23 | #include <linux/io.h> | ||
24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
25 | #include <linux/io.h> | ||
26 | #include <linux/slab.h> | ||
27 | |||
28 | #include <sound/asound.h> | ||
29 | #include <sound/control.h> | ||
25 | #include <sound/core.h> | 30 | #include <sound/core.h> |
26 | #include <sound/initval.h> | 31 | #include <sound/initval.h> |
27 | #include <sound/pcm.h> | ||
28 | #include <sound/asound.h> | ||
29 | #include <sound/memalloc.h> | 32 | #include <sound/memalloc.h> |
33 | #include <sound/pcm.h> | ||
30 | #include <sound/pcm_params.h> | 34 | #include <sound/pcm_params.h> |
31 | #include <sound/control.h> | 35 | |
32 | #include <linux/dmapool.h> | ||
33 | #include <linux/dma-mapping.h> | ||
34 | #include <asm/firmware.h> | ||
35 | #include <asm/dma.h> | 36 | #include <asm/dma.h> |
37 | #include <asm/firmware.h> | ||
36 | #include <asm/lv1call.h> | 38 | #include <asm/lv1call.h> |
37 | #include <asm/ps3.h> | 39 | #include <asm/ps3.h> |
38 | #include <asm/ps3av.h> | 40 | #include <asm/ps3av.h> |
39 | 41 | ||
40 | #include "snd_ps3_reg.h" | ||
41 | #include "snd_ps3.h" | 42 | #include "snd_ps3.h" |
42 | 43 | #include "snd_ps3_reg.h" | |
43 | MODULE_LICENSE("GPL v2"); | ||
44 | MODULE_DESCRIPTION("PS3 sound driver"); | ||
45 | MODULE_AUTHOR("Sony Computer Entertainment Inc."); | ||
46 | |||
47 | /* module entries */ | ||
48 | static int __init snd_ps3_init(void); | ||
49 | static void __exit snd_ps3_exit(void); | ||
50 | |||
51 | /* ALSA snd driver ops */ | ||
52 | static int snd_ps3_pcm_open(struct snd_pcm_substream *substream); | ||
53 | static int snd_ps3_pcm_close(struct snd_pcm_substream *substream); | ||
54 | static int snd_ps3_pcm_prepare(struct snd_pcm_substream *substream); | ||
55 | static int snd_ps3_pcm_trigger(struct snd_pcm_substream *substream, | ||
56 | int cmd); | ||
57 | static snd_pcm_uframes_t snd_ps3_pcm_pointer(struct snd_pcm_substream | ||
58 | *substream); | ||
59 | static int snd_ps3_pcm_hw_params(struct snd_pcm_substream *substream, | ||
60 | struct snd_pcm_hw_params *hw_params); | ||
61 | static int snd_ps3_pcm_hw_free(struct snd_pcm_substream *substream); | ||
62 | |||
63 | |||
64 | /* ps3_system_bus_driver entries */ | ||
65 | static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev); | ||
66 | static int snd_ps3_driver_remove(struct ps3_system_bus_device *dev); | ||
67 | |||
68 | /* address setup */ | ||
69 | static int snd_ps3_map_mmio(void); | ||
70 | static void snd_ps3_unmap_mmio(void); | ||
71 | static int snd_ps3_allocate_irq(void); | ||
72 | static void snd_ps3_free_irq(void); | ||
73 | static void snd_ps3_audio_set_base_addr(uint64_t ioaddr_start); | ||
74 | |||
75 | /* interrupt handler */ | ||
76 | static irqreturn_t snd_ps3_interrupt(int irq, void *dev_id); | ||
77 | |||
78 | |||
79 | /* set sampling rate/format */ | ||
80 | static int snd_ps3_set_avsetting(struct snd_pcm_substream *substream); | ||
81 | /* take effect parameter change */ | ||
82 | static int snd_ps3_change_avsetting(struct snd_ps3_card_info *card); | ||
83 | /* initialize avsetting and take it effect */ | ||
84 | static int snd_ps3_init_avsetting(struct snd_ps3_card_info *card); | ||
85 | /* setup dma */ | ||
86 | static int snd_ps3_program_dma(struct snd_ps3_card_info *card, | ||
87 | enum snd_ps3_dma_filltype filltype); | ||
88 | static void snd_ps3_wait_for_dma_stop(struct snd_ps3_card_info *card); | ||
89 | |||
90 | static dma_addr_t v_to_bus(struct snd_ps3_card_info *, void *vaddr, int ch); | ||
91 | 44 | ||
92 | 45 | ||
93 | module_init(snd_ps3_init); | ||
94 | module_exit(snd_ps3_exit); | ||
95 | |||
96 | /* | 46 | /* |
97 | * global | 47 | * global |
98 | */ | 48 | */ |
@@ -165,25 +115,13 @@ static const struct snd_pcm_hardware snd_ps3_pcm_hw = { | |||
165 | .fifo_size = PS3_AUDIO_FIFO_SIZE | 115 | .fifo_size = PS3_AUDIO_FIFO_SIZE |
166 | }; | 116 | }; |
167 | 117 | ||
168 | static struct snd_pcm_ops snd_ps3_pcm_spdif_ops = | ||
169 | { | ||
170 | .open = snd_ps3_pcm_open, | ||
171 | .close = snd_ps3_pcm_close, | ||
172 | .prepare = snd_ps3_pcm_prepare, | ||
173 | .ioctl = snd_pcm_lib_ioctl, | ||
174 | .trigger = snd_ps3_pcm_trigger, | ||
175 | .pointer = snd_ps3_pcm_pointer, | ||
176 | .hw_params = snd_ps3_pcm_hw_params, | ||
177 | .hw_free = snd_ps3_pcm_hw_free | ||
178 | }; | ||
179 | |||
180 | static int snd_ps3_verify_dma_stop(struct snd_ps3_card_info *card, | 118 | static int snd_ps3_verify_dma_stop(struct snd_ps3_card_info *card, |
181 | int count, int force_stop) | 119 | int count, int force_stop) |
182 | { | 120 | { |
183 | int dma_ch, done, retries, stop_forced = 0; | 121 | int dma_ch, done, retries, stop_forced = 0; |
184 | uint32_t status; | 122 | uint32_t status; |
185 | 123 | ||
186 | for (dma_ch = 0; dma_ch < 8; dma_ch ++) { | 124 | for (dma_ch = 0; dma_ch < 8; dma_ch++) { |
187 | retries = count; | 125 | retries = count; |
188 | do { | 126 | do { |
189 | status = read_reg(PS3_AUDIO_KICK(dma_ch)) & | 127 | status = read_reg(PS3_AUDIO_KICK(dma_ch)) & |
@@ -259,9 +197,7 @@ static void snd_ps3_kick_dma(struct snd_ps3_card_info *card) | |||
259 | /* | 197 | /* |
260 | * convert virtual addr to ioif bus addr. | 198 | * convert virtual addr to ioif bus addr. |
261 | */ | 199 | */ |
262 | static dma_addr_t v_to_bus(struct snd_ps3_card_info *card, | 200 | static dma_addr_t v_to_bus(struct snd_ps3_card_info *card, void *paddr, int ch) |
263 | void * paddr, | ||
264 | int ch) | ||
265 | { | 201 | { |
266 | return card->dma_start_bus_addr[ch] + | 202 | return card->dma_start_bus_addr[ch] + |
267 | (paddr - card->dma_start_vaddr[ch]); | 203 | (paddr - card->dma_start_vaddr[ch]); |
@@ -321,7 +257,7 @@ static int snd_ps3_program_dma(struct snd_ps3_card_info *card, | |||
321 | spin_lock_irqsave(&card->dma_lock, irqsave); | 257 | spin_lock_irqsave(&card->dma_lock, irqsave); |
322 | for (ch = 0; ch < 2; ch++) { | 258 | for (ch = 0; ch < 2; ch++) { |
323 | start_vaddr = card->dma_next_transfer_vaddr[0]; | 259 | start_vaddr = card->dma_next_transfer_vaddr[0]; |
324 | for (stage = 0; stage < fill_stages; stage ++) { | 260 | for (stage = 0; stage < fill_stages; stage++) { |
325 | dma_ch = stage * 2 + ch; | 261 | dma_ch = stage * 2 + ch; |
326 | if (silent) | 262 | if (silent) |
327 | dma_addr = card->null_buffer_start_dma_addr; | 263 | dma_addr = card->null_buffer_start_dma_addr; |
@@ -372,6 +308,71 @@ static int snd_ps3_program_dma(struct snd_ps3_card_info *card, | |||
372 | } | 308 | } |
373 | 309 | ||
374 | /* | 310 | /* |
311 | * Interrupt handler | ||
312 | */ | ||
313 | static irqreturn_t snd_ps3_interrupt(int irq, void *dev_id) | ||
314 | { | ||
315 | |||
316 | uint32_t port_intr; | ||
317 | int underflow_occured = 0; | ||
318 | struct snd_ps3_card_info *card = dev_id; | ||
319 | |||
320 | if (!card->running) { | ||
321 | update_reg(PS3_AUDIO_AX_IS, 0); | ||
322 | update_reg(PS3_AUDIO_INTR_0, 0); | ||
323 | return IRQ_HANDLED; | ||
324 | } | ||
325 | |||
326 | port_intr = read_reg(PS3_AUDIO_AX_IS); | ||
327 | /* | ||
328 | *serial buffer empty detected (every 4 times), | ||
329 | *program next dma and kick it | ||
330 | */ | ||
331 | if (port_intr & PS3_AUDIO_AX_IE_ASOBEIE(0)) { | ||
332 | write_reg(PS3_AUDIO_AX_IS, PS3_AUDIO_AX_IE_ASOBEIE(0)); | ||
333 | if (port_intr & PS3_AUDIO_AX_IE_ASOBUIE(0)) { | ||
334 | write_reg(PS3_AUDIO_AX_IS, port_intr); | ||
335 | underflow_occured = 1; | ||
336 | } | ||
337 | if (card->silent) { | ||
338 | /* we are still in silent time */ | ||
339 | snd_ps3_program_dma(card, | ||
340 | (underflow_occured) ? | ||
341 | SND_PS3_DMA_FILLTYPE_SILENT_FIRSTFILL : | ||
342 | SND_PS3_DMA_FILLTYPE_SILENT_RUNNING); | ||
343 | snd_ps3_kick_dma(card); | ||
344 | card->silent--; | ||
345 | } else { | ||
346 | snd_ps3_program_dma(card, | ||
347 | (underflow_occured) ? | ||
348 | SND_PS3_DMA_FILLTYPE_FIRSTFILL : | ||
349 | SND_PS3_DMA_FILLTYPE_RUNNING); | ||
350 | snd_ps3_kick_dma(card); | ||
351 | snd_pcm_period_elapsed(card->substream); | ||
352 | } | ||
353 | } else if (port_intr & PS3_AUDIO_AX_IE_ASOBUIE(0)) { | ||
354 | write_reg(PS3_AUDIO_AX_IS, PS3_AUDIO_AX_IE_ASOBUIE(0)); | ||
355 | /* | ||
356 | * serial out underflow, but buffer empty not detected. | ||
357 | * in this case, fill fifo with 0 to recover. After | ||
358 | * filling dummy data, serial automatically start to | ||
359 | * consume them and then will generate normal buffer | ||
360 | * empty interrupts. | ||
361 | * If both buffer underflow and buffer empty are occured, | ||
362 | * it is better to do nomal data transfer than empty one | ||
363 | */ | ||
364 | snd_ps3_program_dma(card, | ||
365 | SND_PS3_DMA_FILLTYPE_SILENT_FIRSTFILL); | ||
366 | snd_ps3_kick_dma(card); | ||
367 | snd_ps3_program_dma(card, | ||
368 | SND_PS3_DMA_FILLTYPE_SILENT_FIRSTFILL); | ||
369 | snd_ps3_kick_dma(card); | ||
370 | } | ||
371 | /* clear interrupt cause */ | ||
372 | return IRQ_HANDLED; | ||
373 | }; | ||
374 | |||
375 | /* | ||
375 | * audio mute on/off | 376 | * audio mute on/off |
376 | * mute_on : 0 output enabled | 377 | * mute_on : 0 output enabled |
377 | * 1 mute | 378 | * 1 mute |
@@ -382,6 +383,142 @@ static int snd_ps3_mute(int mute_on) | |||
382 | } | 383 | } |
383 | 384 | ||
384 | /* | 385 | /* |
386 | * av setting | ||
387 | * NOTE: calling this function may generate audio interrupt. | ||
388 | */ | ||
389 | static int snd_ps3_change_avsetting(struct snd_ps3_card_info *card) | ||
390 | { | ||
391 | int ret, retries, i; | ||
392 | pr_debug("%s: start\n", __func__); | ||
393 | |||
394 | ret = ps3av_set_audio_mode(card->avs.avs_audio_ch, | ||
395 | card->avs.avs_audio_rate, | ||
396 | card->avs.avs_audio_width, | ||
397 | card->avs.avs_audio_format, | ||
398 | card->avs.avs_audio_source); | ||
399 | /* | ||
400 | * Reset the following unwanted settings: | ||
401 | */ | ||
402 | |||
403 | /* disable all 3wire buffers */ | ||
404 | update_mask_reg(PS3_AUDIO_AO_3WMCTRL, | ||
405 | ~(PS3_AUDIO_AO_3WMCTRL_ASOEN(0) | | ||
406 | PS3_AUDIO_AO_3WMCTRL_ASOEN(1) | | ||
407 | PS3_AUDIO_AO_3WMCTRL_ASOEN(2) | | ||
408 | PS3_AUDIO_AO_3WMCTRL_ASOEN(3)), | ||
409 | 0); | ||
410 | wmb(); /* ensure the hardware sees the change */ | ||
411 | /* wait for actually stopped */ | ||
412 | retries = 1000; | ||
413 | while ((read_reg(PS3_AUDIO_AO_3WMCTRL) & | ||
414 | (PS3_AUDIO_AO_3WMCTRL_ASORUN(0) | | ||
415 | PS3_AUDIO_AO_3WMCTRL_ASORUN(1) | | ||
416 | PS3_AUDIO_AO_3WMCTRL_ASORUN(2) | | ||
417 | PS3_AUDIO_AO_3WMCTRL_ASORUN(3))) && | ||
418 | --retries) { | ||
419 | udelay(1); | ||
420 | } | ||
421 | |||
422 | /* reset buffer pointer */ | ||
423 | for (i = 0; i < 4; i++) { | ||
424 | update_reg(PS3_AUDIO_AO_3WCTRL(i), | ||
425 | PS3_AUDIO_AO_3WCTRL_ASOBRST_RESET); | ||
426 | udelay(10); | ||
427 | } | ||
428 | wmb(); /* ensure the hardware actually start resetting */ | ||
429 | |||
430 | /* enable 3wire#0 buffer */ | ||
431 | update_reg(PS3_AUDIO_AO_3WMCTRL, PS3_AUDIO_AO_3WMCTRL_ASOEN(0)); | ||
432 | |||
433 | |||
434 | /* In 24bit mode,ALSA inserts a zero byte at first byte of per sample */ | ||
435 | update_mask_reg(PS3_AUDIO_AO_3WCTRL(0), | ||
436 | ~PS3_AUDIO_AO_3WCTRL_ASODF, | ||
437 | PS3_AUDIO_AO_3WCTRL_ASODF_LSB); | ||
438 | update_mask_reg(PS3_AUDIO_AO_SPDCTRL(0), | ||
439 | ~PS3_AUDIO_AO_SPDCTRL_SPODF, | ||
440 | PS3_AUDIO_AO_SPDCTRL_SPODF_LSB); | ||
441 | /* ensure all the setting above is written back to register */ | ||
442 | wmb(); | ||
443 | /* avsetting driver altered AX_IE, caller must reset it if you want */ | ||
444 | pr_debug("%s: end\n", __func__); | ||
445 | return ret; | ||
446 | } | ||
447 | |||
448 | /* | ||
449 | * set sampling rate according to the substream | ||
450 | */ | ||
451 | static int snd_ps3_set_avsetting(struct snd_pcm_substream *substream) | ||
452 | { | ||
453 | struct snd_ps3_card_info *card = snd_pcm_substream_chip(substream); | ||
454 | struct snd_ps3_avsetting_info avs; | ||
455 | int ret; | ||
456 | |||
457 | avs = card->avs; | ||
458 | |||
459 | pr_debug("%s: called freq=%d width=%d\n", __func__, | ||
460 | substream->runtime->rate, | ||
461 | snd_pcm_format_width(substream->runtime->format)); | ||
462 | |||
463 | pr_debug("%s: before freq=%d width=%d\n", __func__, | ||
464 | card->avs.avs_audio_rate, card->avs.avs_audio_width); | ||
465 | |||
466 | /* sample rate */ | ||
467 | switch (substream->runtime->rate) { | ||
468 | case 44100: | ||
469 | avs.avs_audio_rate = PS3AV_CMD_AUDIO_FS_44K; | ||
470 | break; | ||
471 | case 48000: | ||
472 | avs.avs_audio_rate = PS3AV_CMD_AUDIO_FS_48K; | ||
473 | break; | ||
474 | case 88200: | ||
475 | avs.avs_audio_rate = PS3AV_CMD_AUDIO_FS_88K; | ||
476 | break; | ||
477 | case 96000: | ||
478 | avs.avs_audio_rate = PS3AV_CMD_AUDIO_FS_96K; | ||
479 | break; | ||
480 | default: | ||
481 | pr_info("%s: invalid rate %d\n", __func__, | ||
482 | substream->runtime->rate); | ||
483 | return 1; | ||
484 | } | ||
485 | |||
486 | /* width */ | ||
487 | switch (snd_pcm_format_width(substream->runtime->format)) { | ||
488 | case 16: | ||
489 | avs.avs_audio_width = PS3AV_CMD_AUDIO_WORD_BITS_16; | ||
490 | break; | ||
491 | case 24: | ||
492 | avs.avs_audio_width = PS3AV_CMD_AUDIO_WORD_BITS_24; | ||
493 | break; | ||
494 | default: | ||
495 | pr_info("%s: invalid width %d\n", __func__, | ||
496 | snd_pcm_format_width(substream->runtime->format)); | ||
497 | return 1; | ||
498 | } | ||
499 | |||
500 | memcpy(avs.avs_cs_info, ps3av_mode_cs_info, 8); | ||
501 | |||
502 | if (memcmp(&card->avs, &avs, sizeof(avs))) { | ||
503 | pr_debug("%s: after freq=%d width=%d\n", __func__, | ||
504 | card->avs.avs_audio_rate, card->avs.avs_audio_width); | ||
505 | |||
506 | card->avs = avs; | ||
507 | snd_ps3_change_avsetting(card); | ||
508 | ret = 0; | ||
509 | } else | ||
510 | ret = 1; | ||
511 | |||
512 | /* check CS non-audio bit and mute accordingly */ | ||
513 | if (avs.avs_cs_info[0] & 0x02) | ||
514 | ps3av_audio_mute_analog(1); /* mute if non-audio */ | ||
515 | else | ||
516 | ps3av_audio_mute_analog(0); | ||
517 | |||
518 | return ret; | ||
519 | } | ||
520 | |||
521 | /* | ||
385 | * PCM operators | 522 | * PCM operators |
386 | */ | 523 | */ |
387 | static int snd_ps3_pcm_open(struct snd_pcm_substream *substream) | 524 | static int snd_ps3_pcm_open(struct snd_pcm_substream *substream) |
@@ -406,6 +543,13 @@ static int snd_ps3_pcm_open(struct snd_pcm_substream *substream) | |||
406 | return 0; | 543 | return 0; |
407 | }; | 544 | }; |
408 | 545 | ||
546 | static int snd_ps3_pcm_close(struct snd_pcm_substream *substream) | ||
547 | { | ||
548 | /* mute on */ | ||
549 | snd_ps3_mute(1); | ||
550 | return 0; | ||
551 | }; | ||
552 | |||
409 | static int snd_ps3_pcm_hw_params(struct snd_pcm_substream *substream, | 553 | static int snd_ps3_pcm_hw_params(struct snd_pcm_substream *substream, |
410 | struct snd_pcm_hw_params *hw_params) | 554 | struct snd_pcm_hw_params *hw_params) |
411 | { | 555 | { |
@@ -417,6 +561,13 @@ static int snd_ps3_pcm_hw_params(struct snd_pcm_substream *substream, | |||
417 | return 0; | 561 | return 0; |
418 | }; | 562 | }; |
419 | 563 | ||
564 | static int snd_ps3_pcm_hw_free(struct snd_pcm_substream *substream) | ||
565 | { | ||
566 | int ret; | ||
567 | ret = snd_pcm_lib_free_pages(substream); | ||
568 | return ret; | ||
569 | }; | ||
570 | |||
420 | static int snd_ps3_delay_to_bytes(struct snd_pcm_substream *substream, | 571 | static int snd_ps3_delay_to_bytes(struct snd_pcm_substream *substream, |
421 | unsigned int delay_ms) | 572 | unsigned int delay_ms) |
422 | { | 573 | { |
@@ -556,202 +707,6 @@ static snd_pcm_uframes_t snd_ps3_pcm_pointer( | |||
556 | return ret; | 707 | return ret; |
557 | }; | 708 | }; |
558 | 709 | ||
559 | static int snd_ps3_pcm_hw_free(struct snd_pcm_substream *substream) | ||
560 | { | ||
561 | int ret; | ||
562 | ret = snd_pcm_lib_free_pages(substream); | ||
563 | return ret; | ||
564 | }; | ||
565 | |||
566 | static int snd_ps3_pcm_close(struct snd_pcm_substream *substream) | ||
567 | { | ||
568 | /* mute on */ | ||
569 | snd_ps3_mute(1); | ||
570 | return 0; | ||
571 | }; | ||
572 | |||
573 | static void snd_ps3_audio_fixup(struct snd_ps3_card_info *card) | ||
574 | { | ||
575 | /* | ||
576 | * avsetting driver seems to never change the followings | ||
577 | * so, init them here once | ||
578 | */ | ||
579 | |||
580 | /* no dma interrupt needed */ | ||
581 | write_reg(PS3_AUDIO_INTR_EN_0, 0); | ||
582 | |||
583 | /* use every 4 buffer empty interrupt */ | ||
584 | update_mask_reg(PS3_AUDIO_AX_IC, | ||
585 | PS3_AUDIO_AX_IC_AASOIMD_MASK, | ||
586 | PS3_AUDIO_AX_IC_AASOIMD_EVERY4); | ||
587 | |||
588 | /* enable 3wire clocks */ | ||
589 | update_mask_reg(PS3_AUDIO_AO_3WMCTRL, | ||
590 | ~(PS3_AUDIO_AO_3WMCTRL_ASOBCLKD_DISABLED | | ||
591 | PS3_AUDIO_AO_3WMCTRL_ASOLRCKD_DISABLED), | ||
592 | 0); | ||
593 | update_reg(PS3_AUDIO_AO_3WMCTRL, | ||
594 | PS3_AUDIO_AO_3WMCTRL_ASOPLRCK_DEFAULT); | ||
595 | } | ||
596 | |||
597 | /* | ||
598 | * av setting | ||
599 | * NOTE: calling this function may generate audio interrupt. | ||
600 | */ | ||
601 | static int snd_ps3_change_avsetting(struct snd_ps3_card_info *card) | ||
602 | { | ||
603 | int ret, retries, i; | ||
604 | pr_debug("%s: start\n", __func__); | ||
605 | |||
606 | ret = ps3av_set_audio_mode(card->avs.avs_audio_ch, | ||
607 | card->avs.avs_audio_rate, | ||
608 | card->avs.avs_audio_width, | ||
609 | card->avs.avs_audio_format, | ||
610 | card->avs.avs_audio_source); | ||
611 | /* | ||
612 | * Reset the following unwanted settings: | ||
613 | */ | ||
614 | |||
615 | /* disable all 3wire buffers */ | ||
616 | update_mask_reg(PS3_AUDIO_AO_3WMCTRL, | ||
617 | ~(PS3_AUDIO_AO_3WMCTRL_ASOEN(0) | | ||
618 | PS3_AUDIO_AO_3WMCTRL_ASOEN(1) | | ||
619 | PS3_AUDIO_AO_3WMCTRL_ASOEN(2) | | ||
620 | PS3_AUDIO_AO_3WMCTRL_ASOEN(3)), | ||
621 | 0); | ||
622 | wmb(); /* ensure the hardware sees the change */ | ||
623 | /* wait for actually stopped */ | ||
624 | retries = 1000; | ||
625 | while ((read_reg(PS3_AUDIO_AO_3WMCTRL) & | ||
626 | (PS3_AUDIO_AO_3WMCTRL_ASORUN(0) | | ||
627 | PS3_AUDIO_AO_3WMCTRL_ASORUN(1) | | ||
628 | PS3_AUDIO_AO_3WMCTRL_ASORUN(2) | | ||
629 | PS3_AUDIO_AO_3WMCTRL_ASORUN(3))) && | ||
630 | --retries) { | ||
631 | udelay(1); | ||
632 | } | ||
633 | |||
634 | /* reset buffer pointer */ | ||
635 | for (i = 0; i < 4; i++) { | ||
636 | update_reg(PS3_AUDIO_AO_3WCTRL(i), | ||
637 | PS3_AUDIO_AO_3WCTRL_ASOBRST_RESET); | ||
638 | udelay(10); | ||
639 | } | ||
640 | wmb(); /* ensure the hardware actually start resetting */ | ||
641 | |||
642 | /* enable 3wire#0 buffer */ | ||
643 | update_reg(PS3_AUDIO_AO_3WMCTRL, PS3_AUDIO_AO_3WMCTRL_ASOEN(0)); | ||
644 | |||
645 | |||
646 | /* In 24bit mode,ALSA inserts a zero byte at first byte of per sample */ | ||
647 | update_mask_reg(PS3_AUDIO_AO_3WCTRL(0), | ||
648 | ~PS3_AUDIO_AO_3WCTRL_ASODF, | ||
649 | PS3_AUDIO_AO_3WCTRL_ASODF_LSB); | ||
650 | update_mask_reg(PS3_AUDIO_AO_SPDCTRL(0), | ||
651 | ~PS3_AUDIO_AO_SPDCTRL_SPODF, | ||
652 | PS3_AUDIO_AO_SPDCTRL_SPODF_LSB); | ||
653 | /* ensure all the setting above is written back to register */ | ||
654 | wmb(); | ||
655 | /* avsetting driver altered AX_IE, caller must reset it if you want */ | ||
656 | pr_debug("%s: end\n", __func__); | ||
657 | return ret; | ||
658 | } | ||
659 | |||
660 | static int snd_ps3_init_avsetting(struct snd_ps3_card_info *card) | ||
661 | { | ||
662 | int ret; | ||
663 | pr_debug("%s: start\n", __func__); | ||
664 | card->avs.avs_audio_ch = PS3AV_CMD_AUDIO_NUM_OF_CH_2; | ||
665 | card->avs.avs_audio_rate = PS3AV_CMD_AUDIO_FS_48K; | ||
666 | card->avs.avs_audio_width = PS3AV_CMD_AUDIO_WORD_BITS_16; | ||
667 | card->avs.avs_audio_format = PS3AV_CMD_AUDIO_FORMAT_PCM; | ||
668 | card->avs.avs_audio_source = PS3AV_CMD_AUDIO_SOURCE_SERIAL; | ||
669 | memcpy(card->avs.avs_cs_info, ps3av_mode_cs_info, 8); | ||
670 | |||
671 | ret = snd_ps3_change_avsetting(card); | ||
672 | |||
673 | snd_ps3_audio_fixup(card); | ||
674 | |||
675 | /* to start to generate SPDIF signal, fill data */ | ||
676 | snd_ps3_program_dma(card, SND_PS3_DMA_FILLTYPE_SILENT_FIRSTFILL); | ||
677 | snd_ps3_kick_dma(card); | ||
678 | pr_debug("%s: end\n", __func__); | ||
679 | return ret; | ||
680 | } | ||
681 | |||
682 | /* | ||
683 | * set sampling rate according to the substream | ||
684 | */ | ||
685 | static int snd_ps3_set_avsetting(struct snd_pcm_substream *substream) | ||
686 | { | ||
687 | struct snd_ps3_card_info *card = snd_pcm_substream_chip(substream); | ||
688 | struct snd_ps3_avsetting_info avs; | ||
689 | int ret; | ||
690 | |||
691 | avs = card->avs; | ||
692 | |||
693 | pr_debug("%s: called freq=%d width=%d\n", __func__, | ||
694 | substream->runtime->rate, | ||
695 | snd_pcm_format_width(substream->runtime->format)); | ||
696 | |||
697 | pr_debug("%s: before freq=%d width=%d\n", __func__, | ||
698 | card->avs.avs_audio_rate, card->avs.avs_audio_width); | ||
699 | |||
700 | /* sample rate */ | ||
701 | switch (substream->runtime->rate) { | ||
702 | case 44100: | ||
703 | avs.avs_audio_rate = PS3AV_CMD_AUDIO_FS_44K; | ||
704 | break; | ||
705 | case 48000: | ||
706 | avs.avs_audio_rate = PS3AV_CMD_AUDIO_FS_48K; | ||
707 | break; | ||
708 | case 88200: | ||
709 | avs.avs_audio_rate = PS3AV_CMD_AUDIO_FS_88K; | ||
710 | break; | ||
711 | case 96000: | ||
712 | avs.avs_audio_rate = PS3AV_CMD_AUDIO_FS_96K; | ||
713 | break; | ||
714 | default: | ||
715 | pr_info("%s: invalid rate %d\n", __func__, | ||
716 | substream->runtime->rate); | ||
717 | return 1; | ||
718 | } | ||
719 | |||
720 | /* width */ | ||
721 | switch (snd_pcm_format_width(substream->runtime->format)) { | ||
722 | case 16: | ||
723 | avs.avs_audio_width = PS3AV_CMD_AUDIO_WORD_BITS_16; | ||
724 | break; | ||
725 | case 24: | ||
726 | avs.avs_audio_width = PS3AV_CMD_AUDIO_WORD_BITS_24; | ||
727 | break; | ||
728 | default: | ||
729 | pr_info("%s: invalid width %d\n", __func__, | ||
730 | snd_pcm_format_width(substream->runtime->format)); | ||
731 | return 1; | ||
732 | } | ||
733 | |||
734 | memcpy(avs.avs_cs_info, ps3av_mode_cs_info, 8); | ||
735 | |||
736 | if (memcmp(&card->avs, &avs, sizeof(avs))) { | ||
737 | pr_debug("%s: after freq=%d width=%d\n", __func__, | ||
738 | card->avs.avs_audio_rate, card->avs.avs_audio_width); | ||
739 | |||
740 | card->avs = avs; | ||
741 | snd_ps3_change_avsetting(card); | ||
742 | ret = 0; | ||
743 | } else | ||
744 | ret = 1; | ||
745 | |||
746 | /* check CS non-audio bit and mute accordingly */ | ||
747 | if (avs.avs_cs_info[0] & 0x02) | ||
748 | ps3av_audio_mute_analog(1); /* mute if non-audio */ | ||
749 | else | ||
750 | ps3av_audio_mute_analog(0); | ||
751 | |||
752 | return ret; | ||
753 | } | ||
754 | |||
755 | /* | 710 | /* |
756 | * SPDIF status bits controls | 711 | * SPDIF status bits controls |
757 | */ | 712 | */ |
@@ -798,28 +753,39 @@ static struct snd_kcontrol_new spdif_ctls[] = { | |||
798 | { | 753 | { |
799 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | 754 | .access = SNDRV_CTL_ELEM_ACCESS_READ, |
800 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 755 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
801 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), | 756 | .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, CON_MASK), |
802 | .info = snd_ps3_spdif_mask_info, | 757 | .info = snd_ps3_spdif_mask_info, |
803 | .get = snd_ps3_spdif_cmask_get, | 758 | .get = snd_ps3_spdif_cmask_get, |
804 | }, | 759 | }, |
805 | { | 760 | { |
806 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | 761 | .access = SNDRV_CTL_ELEM_ACCESS_READ, |
807 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 762 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
808 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), | 763 | .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, PRO_MASK), |
809 | .info = snd_ps3_spdif_mask_info, | 764 | .info = snd_ps3_spdif_mask_info, |
810 | .get = snd_ps3_spdif_pmask_get, | 765 | .get = snd_ps3_spdif_pmask_get, |
811 | }, | 766 | }, |
812 | { | 767 | { |
813 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 768 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
814 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), | 769 | .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT), |
815 | .info = snd_ps3_spdif_mask_info, | 770 | .info = snd_ps3_spdif_mask_info, |
816 | .get = snd_ps3_spdif_default_get, | 771 | .get = snd_ps3_spdif_default_get, |
817 | .put = snd_ps3_spdif_default_put, | 772 | .put = snd_ps3_spdif_default_put, |
818 | }, | 773 | }, |
819 | }; | 774 | }; |
820 | 775 | ||
776 | static struct snd_pcm_ops snd_ps3_pcm_spdif_ops = { | ||
777 | .open = snd_ps3_pcm_open, | ||
778 | .close = snd_ps3_pcm_close, | ||
779 | .ioctl = snd_pcm_lib_ioctl, | ||
780 | .hw_params = snd_ps3_pcm_hw_params, | ||
781 | .hw_free = snd_ps3_pcm_hw_free, | ||
782 | .prepare = snd_ps3_pcm_prepare, | ||
783 | .trigger = snd_ps3_pcm_trigger, | ||
784 | .pointer = snd_ps3_pcm_pointer, | ||
785 | }; | ||
786 | |||
821 | 787 | ||
822 | static int snd_ps3_map_mmio(void) | 788 | static int __devinit snd_ps3_map_mmio(void) |
823 | { | 789 | { |
824 | the_card.mapped_mmio_vaddr = | 790 | the_card.mapped_mmio_vaddr = |
825 | ioremap(the_card.ps3_dev->m_region->bus_addr, | 791 | ioremap(the_card.ps3_dev->m_region->bus_addr, |
@@ -841,7 +807,7 @@ static void snd_ps3_unmap_mmio(void) | |||
841 | the_card.mapped_mmio_vaddr = NULL; | 807 | the_card.mapped_mmio_vaddr = NULL; |
842 | } | 808 | } |
843 | 809 | ||
844 | static int snd_ps3_allocate_irq(void) | 810 | static int __devinit snd_ps3_allocate_irq(void) |
845 | { | 811 | { |
846 | int ret; | 812 | int ret; |
847 | u64 lpar_addr, lpar_size; | 813 | u64 lpar_addr, lpar_size; |
@@ -899,7 +865,7 @@ static void snd_ps3_free_irq(void) | |||
899 | ps3_irq_plug_destroy(the_card.irq_no); | 865 | ps3_irq_plug_destroy(the_card.irq_no); |
900 | } | 866 | } |
901 | 867 | ||
902 | static void snd_ps3_audio_set_base_addr(uint64_t ioaddr_start) | 868 | static void __devinit snd_ps3_audio_set_base_addr(uint64_t ioaddr_start) |
903 | { | 869 | { |
904 | uint64_t val; | 870 | uint64_t val; |
905 | int ret; | 871 | int ret; |
@@ -915,7 +881,53 @@ static void snd_ps3_audio_set_base_addr(uint64_t ioaddr_start) | |||
915 | ret); | 881 | ret); |
916 | } | 882 | } |
917 | 883 | ||
918 | static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev) | 884 | static void __devinit snd_ps3_audio_fixup(struct snd_ps3_card_info *card) |
885 | { | ||
886 | /* | ||
887 | * avsetting driver seems to never change the followings | ||
888 | * so, init them here once | ||
889 | */ | ||
890 | |||
891 | /* no dma interrupt needed */ | ||
892 | write_reg(PS3_AUDIO_INTR_EN_0, 0); | ||
893 | |||
894 | /* use every 4 buffer empty interrupt */ | ||
895 | update_mask_reg(PS3_AUDIO_AX_IC, | ||
896 | PS3_AUDIO_AX_IC_AASOIMD_MASK, | ||
897 | PS3_AUDIO_AX_IC_AASOIMD_EVERY4); | ||
898 | |||
899 | /* enable 3wire clocks */ | ||
900 | update_mask_reg(PS3_AUDIO_AO_3WMCTRL, | ||
901 | ~(PS3_AUDIO_AO_3WMCTRL_ASOBCLKD_DISABLED | | ||
902 | PS3_AUDIO_AO_3WMCTRL_ASOLRCKD_DISABLED), | ||
903 | 0); | ||
904 | update_reg(PS3_AUDIO_AO_3WMCTRL, | ||
905 | PS3_AUDIO_AO_3WMCTRL_ASOPLRCK_DEFAULT); | ||
906 | } | ||
907 | |||
908 | static int __devinit snd_ps3_init_avsetting(struct snd_ps3_card_info *card) | ||
909 | { | ||
910 | int ret; | ||
911 | pr_debug("%s: start\n", __func__); | ||
912 | card->avs.avs_audio_ch = PS3AV_CMD_AUDIO_NUM_OF_CH_2; | ||
913 | card->avs.avs_audio_rate = PS3AV_CMD_AUDIO_FS_48K; | ||
914 | card->avs.avs_audio_width = PS3AV_CMD_AUDIO_WORD_BITS_16; | ||
915 | card->avs.avs_audio_format = PS3AV_CMD_AUDIO_FORMAT_PCM; | ||
916 | card->avs.avs_audio_source = PS3AV_CMD_AUDIO_SOURCE_SERIAL; | ||
917 | memcpy(card->avs.avs_cs_info, ps3av_mode_cs_info, 8); | ||
918 | |||
919 | ret = snd_ps3_change_avsetting(card); | ||
920 | |||
921 | snd_ps3_audio_fixup(card); | ||
922 | |||
923 | /* to start to generate SPDIF signal, fill data */ | ||
924 | snd_ps3_program_dma(card, SND_PS3_DMA_FILLTYPE_SILENT_FIRSTFILL); | ||
925 | snd_ps3_kick_dma(card); | ||
926 | pr_debug("%s: end\n", __func__); | ||
927 | return ret; | ||
928 | } | ||
929 | |||
930 | static int __devinit snd_ps3_driver_probe(struct ps3_system_bus_device *dev) | ||
919 | { | 931 | { |
920 | int i, ret; | 932 | int i, ret; |
921 | u64 lpar_addr, lpar_size; | 933 | u64 lpar_addr, lpar_size; |
@@ -1020,11 +1032,12 @@ static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev) | |||
1020 | * its size should be lager than PS3_AUDIO_FIFO_STAGE_SIZE * 2 | 1032 | * its size should be lager than PS3_AUDIO_FIFO_STAGE_SIZE * 2 |
1021 | * PAGE_SIZE is enogh | 1033 | * PAGE_SIZE is enogh |
1022 | */ | 1034 | */ |
1023 | if (!(the_card.null_buffer_start_vaddr = | 1035 | the_card.null_buffer_start_vaddr = |
1024 | dma_alloc_coherent(&the_card.ps3_dev->core, | 1036 | dma_alloc_coherent(&the_card.ps3_dev->core, |
1025 | PAGE_SIZE, | 1037 | PAGE_SIZE, |
1026 | &the_card.null_buffer_start_dma_addr, | 1038 | &the_card.null_buffer_start_dma_addr, |
1027 | GFP_KERNEL))) { | 1039 | GFP_KERNEL); |
1040 | if (!the_card.null_buffer_start_vaddr) { | ||
1028 | pr_info("%s: nullbuffer alloc failed\n", __func__); | 1041 | pr_info("%s: nullbuffer alloc failed\n", __func__); |
1029 | goto clean_preallocate; | 1042 | goto clean_preallocate; |
1030 | } | 1043 | } |
@@ -1115,71 +1128,6 @@ static struct ps3_system_bus_driver snd_ps3_bus_driver_info = { | |||
1115 | 1128 | ||
1116 | 1129 | ||
1117 | /* | 1130 | /* |
1118 | * Interrupt handler | ||
1119 | */ | ||
1120 | static irqreturn_t snd_ps3_interrupt(int irq, void *dev_id) | ||
1121 | { | ||
1122 | |||
1123 | uint32_t port_intr; | ||
1124 | int underflow_occured = 0; | ||
1125 | struct snd_ps3_card_info *card = dev_id; | ||
1126 | |||
1127 | if (!card->running) { | ||
1128 | update_reg(PS3_AUDIO_AX_IS, 0); | ||
1129 | update_reg(PS3_AUDIO_INTR_0, 0); | ||
1130 | return IRQ_HANDLED; | ||
1131 | } | ||
1132 | |||
1133 | port_intr = read_reg(PS3_AUDIO_AX_IS); | ||
1134 | /* | ||
1135 | *serial buffer empty detected (every 4 times), | ||
1136 | *program next dma and kick it | ||
1137 | */ | ||
1138 | if (port_intr & PS3_AUDIO_AX_IE_ASOBEIE(0)) { | ||
1139 | write_reg(PS3_AUDIO_AX_IS, PS3_AUDIO_AX_IE_ASOBEIE(0)); | ||
1140 | if (port_intr & PS3_AUDIO_AX_IE_ASOBUIE(0)) { | ||
1141 | write_reg(PS3_AUDIO_AX_IS, port_intr); | ||
1142 | underflow_occured = 1; | ||
1143 | } | ||
1144 | if (card->silent) { | ||
1145 | /* we are still in silent time */ | ||
1146 | snd_ps3_program_dma(card, | ||
1147 | (underflow_occured) ? | ||
1148 | SND_PS3_DMA_FILLTYPE_SILENT_FIRSTFILL : | ||
1149 | SND_PS3_DMA_FILLTYPE_SILENT_RUNNING); | ||
1150 | snd_ps3_kick_dma(card); | ||
1151 | card->silent --; | ||
1152 | } else { | ||
1153 | snd_ps3_program_dma(card, | ||
1154 | (underflow_occured) ? | ||
1155 | SND_PS3_DMA_FILLTYPE_FIRSTFILL : | ||
1156 | SND_PS3_DMA_FILLTYPE_RUNNING); | ||
1157 | snd_ps3_kick_dma(card); | ||
1158 | snd_pcm_period_elapsed(card->substream); | ||
1159 | } | ||
1160 | } else if (port_intr & PS3_AUDIO_AX_IE_ASOBUIE(0)) { | ||
1161 | write_reg(PS3_AUDIO_AX_IS, PS3_AUDIO_AX_IE_ASOBUIE(0)); | ||
1162 | /* | ||
1163 | * serial out underflow, but buffer empty not detected. | ||
1164 | * in this case, fill fifo with 0 to recover. After | ||
1165 | * filling dummy data, serial automatically start to | ||
1166 | * consume them and then will generate normal buffer | ||
1167 | * empty interrupts. | ||
1168 | * If both buffer underflow and buffer empty are occured, | ||
1169 | * it is better to do nomal data transfer than empty one | ||
1170 | */ | ||
1171 | snd_ps3_program_dma(card, | ||
1172 | SND_PS3_DMA_FILLTYPE_SILENT_FIRSTFILL); | ||
1173 | snd_ps3_kick_dma(card); | ||
1174 | snd_ps3_program_dma(card, | ||
1175 | SND_PS3_DMA_FILLTYPE_SILENT_FIRSTFILL); | ||
1176 | snd_ps3_kick_dma(card); | ||
1177 | } | ||
1178 | /* clear interrupt cause */ | ||
1179 | return IRQ_HANDLED; | ||
1180 | }; | ||
1181 | |||
1182 | /* | ||
1183 | * module/subsystem initialize/terminate | 1131 | * module/subsystem initialize/terminate |
1184 | */ | 1132 | */ |
1185 | static int __init snd_ps3_init(void) | 1133 | static int __init snd_ps3_init(void) |
@@ -1197,10 +1145,15 @@ static int __init snd_ps3_init(void) | |||
1197 | 1145 | ||
1198 | return ret; | 1146 | return ret; |
1199 | } | 1147 | } |
1148 | module_init(snd_ps3_init); | ||
1200 | 1149 | ||
1201 | static void __exit snd_ps3_exit(void) | 1150 | static void __exit snd_ps3_exit(void) |
1202 | { | 1151 | { |
1203 | ps3_system_bus_driver_unregister(&snd_ps3_bus_driver_info); | 1152 | ps3_system_bus_driver_unregister(&snd_ps3_bus_driver_info); |
1204 | } | 1153 | } |
1154 | module_exit(snd_ps3_exit); | ||
1205 | 1155 | ||
1156 | MODULE_LICENSE("GPL v2"); | ||
1157 | MODULE_DESCRIPTION("PS3 sound driver"); | ||
1158 | MODULE_AUTHOR("Sony Computer Entertainment Inc."); | ||
1206 | MODULE_ALIAS(PS3_MODULE_ALIAS_SOUND); | 1159 | MODULE_ALIAS(PS3_MODULE_ALIAS_SOUND); |
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 40222fcc0878..08e584d1453a 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
@@ -838,7 +838,7 @@ static int snapper_put_capture_source(struct snd_kcontrol *kcontrol, | |||
838 | 838 | ||
839 | /* | 839 | /* |
840 | */ | 840 | */ |
841 | static struct snd_kcontrol_new tumbler_mixers[] __initdata = { | 841 | static struct snd_kcontrol_new tumbler_mixers[] __devinitdata = { |
842 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 842 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
843 | .name = "Master Playback Volume", | 843 | .name = "Master Playback Volume", |
844 | .info = tumbler_info_master_volume, | 844 | .info = tumbler_info_master_volume, |
@@ -862,7 +862,7 @@ static struct snd_kcontrol_new tumbler_mixers[] __initdata = { | |||
862 | }, | 862 | }, |
863 | }; | 863 | }; |
864 | 864 | ||
865 | static struct snd_kcontrol_new snapper_mixers[] __initdata = { | 865 | static struct snd_kcontrol_new snapper_mixers[] __devinitdata = { |
866 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 866 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
867 | .name = "Master Playback Volume", | 867 | .name = "Master Playback Volume", |
868 | .info = tumbler_info_master_volume, | 868 | .info = tumbler_info_master_volume, |
@@ -895,7 +895,7 @@ static struct snd_kcontrol_new snapper_mixers[] __initdata = { | |||
895 | }, | 895 | }, |
896 | }; | 896 | }; |
897 | 897 | ||
898 | static struct snd_kcontrol_new tumbler_hp_sw __initdata = { | 898 | static struct snd_kcontrol_new tumbler_hp_sw __devinitdata = { |
899 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 899 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
900 | .name = "Headphone Playback Switch", | 900 | .name = "Headphone Playback Switch", |
901 | .info = snd_pmac_boolean_mono_info, | 901 | .info = snd_pmac_boolean_mono_info, |
@@ -903,7 +903,7 @@ static struct snd_kcontrol_new tumbler_hp_sw __initdata = { | |||
903 | .put = tumbler_put_mute_switch, | 903 | .put = tumbler_put_mute_switch, |
904 | .private_value = TUMBLER_MUTE_HP, | 904 | .private_value = TUMBLER_MUTE_HP, |
905 | }; | 905 | }; |
906 | static struct snd_kcontrol_new tumbler_speaker_sw __initdata = { | 906 | static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = { |
907 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 907 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
908 | .name = "PC Speaker Playback Switch", | 908 | .name = "PC Speaker Playback Switch", |
909 | .info = snd_pmac_boolean_mono_info, | 909 | .info = snd_pmac_boolean_mono_info, |
@@ -911,7 +911,7 @@ static struct snd_kcontrol_new tumbler_speaker_sw __initdata = { | |||
911 | .put = tumbler_put_mute_switch, | 911 | .put = tumbler_put_mute_switch, |
912 | .private_value = TUMBLER_MUTE_AMP, | 912 | .private_value = TUMBLER_MUTE_AMP, |
913 | }; | 913 | }; |
914 | static struct snd_kcontrol_new tumbler_lineout_sw __initdata = { | 914 | static struct snd_kcontrol_new tumbler_lineout_sw __devinitdata = { |
915 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 915 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
916 | .name = "Line Out Playback Switch", | 916 | .name = "Line Out Playback Switch", |
917 | .info = snd_pmac_boolean_mono_info, | 917 | .info = snd_pmac_boolean_mono_info, |
@@ -919,7 +919,7 @@ static struct snd_kcontrol_new tumbler_lineout_sw __initdata = { | |||
919 | .put = tumbler_put_mute_switch, | 919 | .put = tumbler_put_mute_switch, |
920 | .private_value = TUMBLER_MUTE_LINE, | 920 | .private_value = TUMBLER_MUTE_LINE, |
921 | }; | 921 | }; |
922 | static struct snd_kcontrol_new tumbler_drc_sw __initdata = { | 922 | static struct snd_kcontrol_new tumbler_drc_sw __devinitdata = { |
923 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 923 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
924 | .name = "DRC Switch", | 924 | .name = "DRC Switch", |
925 | .info = snd_pmac_boolean_mono_info, | 925 | .info = snd_pmac_boolean_mono_info, |
@@ -1269,7 +1269,7 @@ static void tumbler_resume(struct snd_pmac *chip) | |||
1269 | #endif | 1269 | #endif |
1270 | 1270 | ||
1271 | /* initialize tumbler */ | 1271 | /* initialize tumbler */ |
1272 | static int __init tumbler_init(struct snd_pmac *chip) | 1272 | static int __devinit tumbler_init(struct snd_pmac *chip) |
1273 | { | 1273 | { |
1274 | int irq; | 1274 | int irq; |
1275 | struct pmac_tumbler *mix = chip->mixer_data; | 1275 | struct pmac_tumbler *mix = chip->mixer_data; |
@@ -1339,7 +1339,7 @@ static void tumbler_cleanup(struct snd_pmac *chip) | |||
1339 | } | 1339 | } |
1340 | 1340 | ||
1341 | /* exported */ | 1341 | /* exported */ |
1342 | int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | 1342 | int __devinit snd_pmac_tumbler_init(struct snd_pmac *chip) |
1343 | { | 1343 | { |
1344 | int i, err; | 1344 | int i, err; |
1345 | struct pmac_tumbler *mix; | 1345 | struct pmac_tumbler *mix; |
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 3d2bb6fc6dcc..d3e786a9a0a7 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig | |||
@@ -32,7 +32,9 @@ source "sound/soc/fsl/Kconfig" | |||
32 | source "sound/soc/omap/Kconfig" | 32 | source "sound/soc/omap/Kconfig" |
33 | source "sound/soc/pxa/Kconfig" | 33 | source "sound/soc/pxa/Kconfig" |
34 | source "sound/soc/s3c24xx/Kconfig" | 34 | source "sound/soc/s3c24xx/Kconfig" |
35 | source "sound/soc/s6000/Kconfig" | ||
35 | source "sound/soc/sh/Kconfig" | 36 | source "sound/soc/sh/Kconfig" |
37 | source "sound/soc/txx9/Kconfig" | ||
36 | 38 | ||
37 | # Supported codecs | 39 | # Supported codecs |
38 | source "sound/soc/codecs/Kconfig" | 40 | source "sound/soc/codecs/Kconfig" |
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 0237879fd412..6f1e28de23cf 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile | |||
@@ -10,4 +10,6 @@ obj-$(CONFIG_SND_SOC) += fsl/ | |||
10 | obj-$(CONFIG_SND_SOC) += omap/ | 10 | obj-$(CONFIG_SND_SOC) += omap/ |
11 | obj-$(CONFIG_SND_SOC) += pxa/ | 11 | obj-$(CONFIG_SND_SOC) += pxa/ |
12 | obj-$(CONFIG_SND_SOC) += s3c24xx/ | 12 | obj-$(CONFIG_SND_SOC) += s3c24xx/ |
13 | obj-$(CONFIG_SND_SOC) += s6000/ | ||
13 | obj-$(CONFIG_SND_SOC) += sh/ | 14 | obj-$(CONFIG_SND_SOC) += sh/ |
15 | obj-$(CONFIG_SND_SOC) += txx9/ | ||
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index a608d7009dbd..e720d5e6f04c 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig | |||
@@ -41,3 +41,11 @@ config SND_AT32_SOC_PLAYPAQ_SLAVE | |||
41 | and FRAME signals on the PlayPaq. Unless you want to play | 41 | and FRAME signals on the PlayPaq. Unless you want to play |
42 | with the AT32 as the SSC master, you probably want to say N here, | 42 | with the AT32 as the SSC master, you probably want to say N here, |
43 | as this will give you better sound quality. | 43 | as this will give you better sound quality. |
44 | |||
45 | config SND_AT91_SOC_AFEB9260 | ||
46 | tristate "SoC Audio support for AFEB9260 board" | ||
47 | depends on ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC | ||
48 | select SND_ATMEL_SOC_SSC | ||
49 | select SND_SOC_TLV320AIC23 | ||
50 | help | ||
51 | Say Y here to support sound on AFEB9260 board. | ||
diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile index f54a7cc68e66..e7ea56bd5f82 100644 --- a/sound/soc/atmel/Makefile +++ b/sound/soc/atmel/Makefile | |||
@@ -13,3 +13,4 @@ snd-soc-playpaq-objs := playpaq_wm8510.o | |||
13 | 13 | ||
14 | obj-$(CONFIG_SND_AT91_SOC_SAM9G20_WM8731) += snd-soc-sam9g20-wm8731.o | 14 | obj-$(CONFIG_SND_AT91_SOC_SAM9G20_WM8731) += snd-soc-sam9g20-wm8731.o |
15 | obj-$(CONFIG_SND_AT32_SOC_PLAYPAQ) += snd-soc-playpaq.o | 15 | obj-$(CONFIG_SND_AT32_SOC_PLAYPAQ) += snd-soc-playpaq.o |
16 | obj-$(CONFIG_SND_AT91_SOC_AFEB9260) += snd-soc-afeb9260.o | ||
diff --git a/sound/soc/atmel/playpaq_wm8510.c b/sound/soc/atmel/playpaq_wm8510.c index 70657534e6b1..9eb610c2ba91 100644 --- a/sound/soc/atmel/playpaq_wm8510.c +++ b/sound/soc/atmel/playpaq_wm8510.c | |||
@@ -117,7 +117,7 @@ static struct ssc_clock_data playpaq_wm8510_calc_ssc_clock( | |||
117 | * Find actual rate, compare to requested rate | 117 | * Find actual rate, compare to requested rate |
118 | */ | 118 | */ |
119 | actual_rate = (cd.ssc_rate / (cd.cmr_div * 2)) / (2 * (cd.period + 1)); | 119 | actual_rate = (cd.ssc_rate / (cd.cmr_div * 2)) / (2 * (cd.period + 1)); |
120 | pr_debug("playpaq_wm8510: Request rate = %d, actual rate = %d\n", | 120 | pr_debug("playpaq_wm8510: Request rate = %u, actual rate = %u\n", |
121 | rate, actual_rate); | 121 | rate, actual_rate); |
122 | 122 | ||
123 | 123 | ||
diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c new file mode 100644 index 000000000000..23349de27313 --- /dev/null +++ b/sound/soc/atmel/snd-soc-afeb9260.c | |||
@@ -0,0 +1,203 @@ | |||
1 | /* | ||
2 | * afeb9260.c -- SoC audio for AFEB9260 | ||
3 | * | ||
4 | * Copyright (C) 2009 Sergey Lapin <slapin@ossfans.org> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * version 2 as published by the Free Software Foundation. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, but | ||
11 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | * General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
18 | * 02110-1301 USA | ||
19 | * | ||
20 | */ | ||
21 | |||
22 | #include <linux/module.h> | ||
23 | #include <linux/moduleparam.h> | ||
24 | #include <linux/kernel.h> | ||
25 | #include <linux/clk.h> | ||
26 | #include <linux/platform_device.h> | ||
27 | |||
28 | #include <linux/atmel-ssc.h> | ||
29 | #include <sound/core.h> | ||
30 | #include <sound/pcm.h> | ||
31 | #include <sound/pcm_params.h> | ||
32 | #include <sound/soc.h> | ||
33 | #include <sound/soc-dapm.h> | ||
34 | |||
35 | #include <asm/mach-types.h> | ||
36 | #include <mach/hardware.h> | ||
37 | #include <linux/gpio.h> | ||
38 | |||
39 | #include "../codecs/tlv320aic23.h" | ||
40 | #include "atmel-pcm.h" | ||
41 | #include "atmel_ssc_dai.h" | ||
42 | |||
43 | #define CODEC_CLOCK 12000000 | ||
44 | |||
45 | static int afeb9260_hw_params(struct snd_pcm_substream *substream, | ||
46 | struct snd_pcm_hw_params *params) | ||
47 | { | ||
48 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
49 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; | ||
50 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | ||
51 | int err; | ||
52 | |||
53 | /* Set codec DAI configuration */ | ||
54 | err = snd_soc_dai_set_fmt(codec_dai, | ||
55 | SND_SOC_DAIFMT_I2S| | ||
56 | SND_SOC_DAIFMT_NB_IF | | ||
57 | SND_SOC_DAIFMT_CBM_CFM); | ||
58 | if (err < 0) { | ||
59 | printk(KERN_ERR "can't set codec DAI configuration\n"); | ||
60 | return err; | ||
61 | } | ||
62 | |||
63 | /* Set cpu DAI configuration */ | ||
64 | err = snd_soc_dai_set_fmt(cpu_dai, | ||
65 | SND_SOC_DAIFMT_I2S | | ||
66 | SND_SOC_DAIFMT_NB_IF | | ||
67 | SND_SOC_DAIFMT_CBM_CFM); | ||
68 | if (err < 0) { | ||
69 | printk(KERN_ERR "can't set cpu DAI configuration\n"); | ||
70 | return err; | ||
71 | } | ||
72 | |||
73 | /* Set the codec system clock for DAC and ADC */ | ||
74 | err = | ||
75 | snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK, SND_SOC_CLOCK_IN); | ||
76 | |||
77 | if (err < 0) { | ||
78 | printk(KERN_ERR "can't set codec system clock\n"); | ||
79 | return err; | ||
80 | } | ||
81 | |||
82 | return err; | ||
83 | } | ||
84 | |||
85 | static struct snd_soc_ops afeb9260_ops = { | ||
86 | .hw_params = afeb9260_hw_params, | ||
87 | }; | ||
88 | |||
89 | static const struct snd_soc_dapm_widget tlv320aic23_dapm_widgets[] = { | ||
90 | SND_SOC_DAPM_HP("Headphone Jack", NULL), | ||
91 | SND_SOC_DAPM_LINE("Line In", NULL), | ||
92 | SND_SOC_DAPM_MIC("Mic Jack", NULL), | ||
93 | }; | ||
94 | |||
95 | static const struct snd_soc_dapm_route audio_map[] = { | ||
96 | {"Headphone Jack", NULL, "LHPOUT"}, | ||
97 | {"Headphone Jack", NULL, "RHPOUT"}, | ||
98 | |||
99 | {"LLINEIN", NULL, "Line In"}, | ||
100 | {"RLINEIN", NULL, "Line In"}, | ||
101 | |||
102 | {"MICIN", NULL, "Mic Jack"}, | ||
103 | }; | ||
104 | |||
105 | static int afeb9260_tlv320aic23_init(struct snd_soc_codec *codec) | ||
106 | { | ||
107 | |||
108 | /* Add afeb9260 specific widgets */ | ||
109 | snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets, | ||
110 | ARRAY_SIZE(tlv320aic23_dapm_widgets)); | ||
111 | |||
112 | /* Set up afeb9260 specific audio path audio_map */ | ||
113 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | ||
114 | |||
115 | snd_soc_dapm_enable_pin(codec, "Headphone Jack"); | ||
116 | snd_soc_dapm_enable_pin(codec, "Line In"); | ||
117 | snd_soc_dapm_enable_pin(codec, "Mic Jack"); | ||
118 | |||
119 | snd_soc_dapm_sync(codec); | ||
120 | |||
121 | return 0; | ||
122 | } | ||
123 | |||
124 | /* Digital audio interface glue - connects codec <--> CPU */ | ||
125 | static struct snd_soc_dai_link afeb9260_dai = { | ||
126 | .name = "TLV320AIC23", | ||
127 | .stream_name = "AIC23", | ||
128 | .cpu_dai = &atmel_ssc_dai[0], | ||
129 | .codec_dai = &tlv320aic23_dai, | ||
130 | .init = afeb9260_tlv320aic23_init, | ||
131 | .ops = &afeb9260_ops, | ||
132 | }; | ||
133 | |||
134 | /* Audio machine driver */ | ||
135 | static struct snd_soc_card snd_soc_machine_afeb9260 = { | ||
136 | .name = "AFEB9260", | ||
137 | .platform = &atmel_soc_platform, | ||
138 | .dai_link = &afeb9260_dai, | ||
139 | .num_links = 1, | ||
140 | }; | ||
141 | |||
142 | /* Audio subsystem */ | ||
143 | static struct snd_soc_device afeb9260_snd_devdata = { | ||
144 | .card = &snd_soc_machine_afeb9260, | ||
145 | .codec_dev = &soc_codec_dev_tlv320aic23, | ||
146 | }; | ||
147 | |||
148 | static struct platform_device *afeb9260_snd_device; | ||
149 | |||
150 | static int __init afeb9260_soc_init(void) | ||
151 | { | ||
152 | int err; | ||
153 | struct device *dev; | ||
154 | struct atmel_ssc_info *ssc_p = afeb9260_dai.cpu_dai->private_data; | ||
155 | struct ssc_device *ssc = NULL; | ||
156 | |||
157 | if (!(machine_is_afeb9260())) | ||
158 | return -ENODEV; | ||
159 | |||
160 | ssc = ssc_request(0); | ||
161 | if (IS_ERR(ssc)) { | ||
162 | printk(KERN_ERR "ASoC: Failed to request SSC 0\n"); | ||
163 | err = PTR_ERR(ssc); | ||
164 | ssc = NULL; | ||
165 | goto err_ssc; | ||
166 | } | ||
167 | ssc_p->ssc = ssc; | ||
168 | |||
169 | afeb9260_snd_device = platform_device_alloc("soc-audio", -1); | ||
170 | if (!afeb9260_snd_device) { | ||
171 | printk(KERN_ERR "ASoC: Platform device allocation failed\n"); | ||
172 | return -ENOMEM; | ||
173 | } | ||
174 | |||
175 | platform_set_drvdata(afeb9260_snd_device, &afeb9260_snd_devdata); | ||
176 | afeb9260_snd_devdata.dev = &afeb9260_snd_device->dev; | ||
177 | err = platform_device_add(afeb9260_snd_device); | ||
178 | if (err) | ||
179 | goto err1; | ||
180 | |||
181 | dev = &afeb9260_snd_device->dev; | ||
182 | |||
183 | return 0; | ||
184 | err1: | ||
185 | platform_device_del(afeb9260_snd_device); | ||
186 | platform_device_put(afeb9260_snd_device); | ||
187 | err_ssc: | ||
188 | return err; | ||
189 | |||
190 | } | ||
191 | |||
192 | static void __exit afeb9260_soc_exit(void) | ||
193 | { | ||
194 | platform_device_unregister(afeb9260_snd_device); | ||
195 | } | ||
196 | |||
197 | module_init(afeb9260_soc_init); | ||
198 | module_exit(afeb9260_soc_exit); | ||
199 | |||
200 | MODULE_AUTHOR("Sergey Lapin <slapin@ossfans.org>"); | ||
201 | MODULE_DESCRIPTION("ALSA SoC for AFEB9260"); | ||
202 | MODULE_LICENSE("GPL"); | ||
203 | |||
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index 8a935f2d1767..b1ed423fabd5 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c | |||
@@ -31,6 +31,15 @@ | |||
31 | #include "bf5xx-sport.h" | 31 | #include "bf5xx-sport.h" |
32 | #include "bf5xx-ac97.h" | 32 | #include "bf5xx-ac97.h" |
33 | 33 | ||
34 | /* Anomaly notes: | ||
35 | * 05000250 - AD1980 is running in TDM mode and RFS/TFS are generated by SPORT | ||
36 | * contrtoller. But, RFSDIV and TFSDIV are always set to 16*16-1, | ||
37 | * while the max AC97 data size is 13*16. The DIV is always larger | ||
38 | * than data size. AD73311 and ad2602 are not running in TDM mode. | ||
39 | * AD1836 and AD73322 depend on external RFS/TFS only. So, this | ||
40 | * anomaly does not affect blackfin sound drivers. | ||
41 | */ | ||
42 | |||
34 | static int *cmd_count; | 43 | static int *cmd_count; |
35 | static int sport_num = CONFIG_SND_BF5XX_SPORT_NUM; | 44 | static int sport_num = CONFIG_SND_BF5XX_SPORT_NUM; |
36 | 45 | ||
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c index 964824419678..af06904bab0f 100644 --- a/sound/soc/blackfin/bf5xx-i2s.c +++ b/sound/soc/blackfin/bf5xx-i2s.c | |||
@@ -50,6 +50,7 @@ struct bf5xx_i2s_port { | |||
50 | u16 tcr2; | 50 | u16 tcr2; |
51 | u16 rcr2; | 51 | u16 rcr2; |
52 | int counter; | 52 | int counter; |
53 | int configured; | ||
53 | }; | 54 | }; |
54 | 55 | ||
55 | static struct bf5xx_i2s_port bf5xx_i2s; | 56 | static struct bf5xx_i2s_port bf5xx_i2s; |
@@ -168,7 +169,7 @@ static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream, | |||
168 | break; | 169 | break; |
169 | } | 170 | } |
170 | 171 | ||
171 | if (bf5xx_i2s.counter == 1) { | 172 | if (!bf5xx_i2s.configured) { |
172 | /* | 173 | /* |
173 | * TX and RX are not independent,they are enabled at the | 174 | * TX and RX are not independent,they are enabled at the |
174 | * same time, even if only one side is running. So, we | 175 | * same time, even if only one side is running. So, we |
@@ -177,6 +178,7 @@ static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream, | |||
177 | * | 178 | * |
178 | * CPU DAI:slave mode. | 179 | * CPU DAI:slave mode. |
179 | */ | 180 | */ |
181 | bf5xx_i2s.configured = 1; | ||
180 | ret = sport_config_rx(sport_handle, bf5xx_i2s.rcr1, | 182 | ret = sport_config_rx(sport_handle, bf5xx_i2s.rcr1, |
181 | bf5xx_i2s.rcr2, 0, 0); | 183 | bf5xx_i2s.rcr2, 0, 0); |
182 | if (ret) { | 184 | if (ret) { |
@@ -200,6 +202,9 @@ static void bf5xx_i2s_shutdown(struct snd_pcm_substream *substream, | |||
200 | { | 202 | { |
201 | pr_debug("%s enter\n", __func__); | 203 | pr_debug("%s enter\n", __func__); |
202 | bf5xx_i2s.counter--; | 204 | bf5xx_i2s.counter--; |
205 | /* No active stream, SPORT is allowed to be configured again. */ | ||
206 | if (!bf5xx_i2s.counter) | ||
207 | bf5xx_i2s.configured = 0; | ||
203 | } | 208 | } |
204 | 209 | ||
205 | static int bf5xx_i2s_probe(struct platform_device *pdev, | 210 | static int bf5xx_i2s_probe(struct platform_device *pdev, |
@@ -244,8 +249,7 @@ static int bf5xx_i2s_suspend(struct snd_soc_dai *dai) | |||
244 | return 0; | 249 | return 0; |
245 | } | 250 | } |
246 | 251 | ||
247 | static int bf5xx_i2s_resume(struct platform_device *pdev, | 252 | static int bf5xx_i2s_resume(struct snd_soc_dai *dai) |
248 | struct snd_soc_dai *dai) | ||
249 | { | 253 | { |
250 | int ret; | 254 | int ret; |
251 | struct sport_device *sport = | 255 | struct sport_device *sport = |
diff --git a/sound/soc/blackfin/bf5xx-sport.c b/sound/soc/blackfin/bf5xx-sport.c index b7953c8cf838..469ce7fab20c 100644 --- a/sound/soc/blackfin/bf5xx-sport.c +++ b/sound/soc/blackfin/bf5xx-sport.c | |||
@@ -190,7 +190,7 @@ static inline int sport_hook_rx_dummy(struct sport_device *sport) | |||
190 | desc = get_dma_next_desc_ptr(sport->dma_rx_chan); | 190 | desc = get_dma_next_desc_ptr(sport->dma_rx_chan); |
191 | /* Copy the descriptor which will be damaged to backup */ | 191 | /* Copy the descriptor which will be damaged to backup */ |
192 | temp_desc = *desc; | 192 | temp_desc = *desc; |
193 | desc->x_count = 0xa; | 193 | desc->x_count = sport->dummy_count / 2; |
194 | desc->y_count = 0; | 194 | desc->y_count = 0; |
195 | desc->next_desc_addr = sport->dummy_rx_desc; | 195 | desc->next_desc_addr = sport->dummy_rx_desc; |
196 | local_irq_restore(flags); | 196 | local_irq_restore(flags); |
@@ -309,7 +309,7 @@ static inline int sport_hook_tx_dummy(struct sport_device *sport) | |||
309 | desc = get_dma_next_desc_ptr(sport->dma_tx_chan); | 309 | desc = get_dma_next_desc_ptr(sport->dma_tx_chan); |
310 | /* Store the descriptor which will be damaged */ | 310 | /* Store the descriptor which will be damaged */ |
311 | temp_desc = *desc; | 311 | temp_desc = *desc; |
312 | desc->x_count = 0xa; | 312 | desc->x_count = sport->dummy_count / 2; |
313 | desc->y_count = 0; | 313 | desc->y_count = 0; |
314 | desc->next_desc_addr = sport->dummy_tx_desc; | 314 | desc->next_desc_addr = sport->dummy_tx_desc; |
315 | local_irq_restore(flags); | 315 | local_irq_restore(flags); |
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index b6c7f7a01cb0..bbc97fd76648 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
@@ -18,7 +18,9 @@ config SND_SOC_ALL_CODECS | |||
18 | select SND_SOC_AK4535 if I2C | 18 | select SND_SOC_AK4535 if I2C |
19 | select SND_SOC_CS4270 if I2C | 19 | select SND_SOC_CS4270 if I2C |
20 | select SND_SOC_PCM3008 | 20 | select SND_SOC_PCM3008 |
21 | select SND_SOC_SPDIF | ||
21 | select SND_SOC_SSM2602 if I2C | 22 | select SND_SOC_SSM2602 if I2C |
23 | select SND_SOC_STAC9766 if SND_SOC_AC97_BUS | ||
22 | select SND_SOC_TLV320AIC23 if I2C | 24 | select SND_SOC_TLV320AIC23 if I2C |
23 | select SND_SOC_TLV320AIC26 if SPI_MASTER | 25 | select SND_SOC_TLV320AIC26 if SPI_MASTER |
24 | select SND_SOC_TLV320AIC3X if I2C | 26 | select SND_SOC_TLV320AIC3X if I2C |
@@ -35,8 +37,12 @@ config SND_SOC_ALL_CODECS | |||
35 | select SND_SOC_WM8753 if SND_SOC_I2C_AND_SPI | 37 | select SND_SOC_WM8753 if SND_SOC_I2C_AND_SPI |
36 | select SND_SOC_WM8900 if I2C | 38 | select SND_SOC_WM8900 if I2C |
37 | select SND_SOC_WM8903 if I2C | 39 | select SND_SOC_WM8903 if I2C |
40 | select SND_SOC_WM8940 if I2C | ||
41 | select SND_SOC_WM8960 if I2C | ||
38 | select SND_SOC_WM8971 if I2C | 42 | select SND_SOC_WM8971 if I2C |
43 | select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI | ||
39 | select SND_SOC_WM8990 if I2C | 44 | select SND_SOC_WM8990 if I2C |
45 | select SND_SOC_WM9081 if I2C | ||
40 | select SND_SOC_WM9705 if SND_SOC_AC97_BUS | 46 | select SND_SOC_WM9705 if SND_SOC_AC97_BUS |
41 | select SND_SOC_WM9712 if SND_SOC_AC97_BUS | 47 | select SND_SOC_WM9712 if SND_SOC_AC97_BUS |
42 | select SND_SOC_WM9713 if SND_SOC_AC97_BUS | 48 | select SND_SOC_WM9713 if SND_SOC_AC97_BUS |
@@ -86,9 +92,15 @@ config SND_SOC_L3 | |||
86 | config SND_SOC_PCM3008 | 92 | config SND_SOC_PCM3008 |
87 | tristate | 93 | tristate |
88 | 94 | ||
95 | config SND_SOC_SPDIF | ||
96 | tristate | ||
97 | |||
89 | config SND_SOC_SSM2602 | 98 | config SND_SOC_SSM2602 |
90 | tristate | 99 | tristate |
91 | 100 | ||
101 | config SND_SOC_STAC9766 | ||
102 | tristate | ||
103 | |||
92 | config SND_SOC_TLV320AIC23 | 104 | config SND_SOC_TLV320AIC23 |
93 | tristate | 105 | tristate |
94 | 106 | ||
@@ -138,12 +150,24 @@ config SND_SOC_WM8900 | |||
138 | config SND_SOC_WM8903 | 150 | config SND_SOC_WM8903 |
139 | tristate | 151 | tristate |
140 | 152 | ||
153 | config SND_SOC_WM8940 | ||
154 | tristate | ||
155 | |||
156 | config SND_SOC_WM8960 | ||
157 | tristate | ||
158 | |||
141 | config SND_SOC_WM8971 | 159 | config SND_SOC_WM8971 |
142 | tristate | 160 | tristate |
143 | 161 | ||
162 | config SND_SOC_WM8988 | ||
163 | tristate | ||
164 | |||
144 | config SND_SOC_WM8990 | 165 | config SND_SOC_WM8990 |
145 | tristate | 166 | tristate |
146 | 167 | ||
168 | config SND_SOC_WM9081 | ||
169 | tristate | ||
170 | |||
147 | config SND_SOC_WM9705 | 171 | config SND_SOC_WM9705 |
148 | tristate | 172 | tristate |
149 | 173 | ||
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index f2653803ede8..8b7530546f4d 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile | |||
@@ -6,7 +6,9 @@ snd-soc-ak4535-objs := ak4535.o | |||
6 | snd-soc-cs4270-objs := cs4270.o | 6 | snd-soc-cs4270-objs := cs4270.o |
7 | snd-soc-l3-objs := l3.o | 7 | snd-soc-l3-objs := l3.o |
8 | snd-soc-pcm3008-objs := pcm3008.o | 8 | snd-soc-pcm3008-objs := pcm3008.o |
9 | snd-soc-spdif-objs := spdif_transciever.o | ||
9 | snd-soc-ssm2602-objs := ssm2602.o | 10 | snd-soc-ssm2602-objs := ssm2602.o |
11 | snd-soc-stac9766-objs := stac9766.o | ||
10 | snd-soc-tlv320aic23-objs := tlv320aic23.o | 12 | snd-soc-tlv320aic23-objs := tlv320aic23.o |
11 | snd-soc-tlv320aic26-objs := tlv320aic26.o | 13 | snd-soc-tlv320aic26-objs := tlv320aic26.o |
12 | snd-soc-tlv320aic3x-objs := tlv320aic3x.o | 14 | snd-soc-tlv320aic3x-objs := tlv320aic3x.o |
@@ -23,8 +25,12 @@ snd-soc-wm8750-objs := wm8750.o | |||
23 | snd-soc-wm8753-objs := wm8753.o | 25 | snd-soc-wm8753-objs := wm8753.o |
24 | snd-soc-wm8900-objs := wm8900.o | 26 | snd-soc-wm8900-objs := wm8900.o |
25 | snd-soc-wm8903-objs := wm8903.o | 27 | snd-soc-wm8903-objs := wm8903.o |
28 | snd-soc-wm8940-objs := wm8940.o | ||
29 | snd-soc-wm8960-objs := wm8960.o | ||
26 | snd-soc-wm8971-objs := wm8971.o | 30 | snd-soc-wm8971-objs := wm8971.o |
31 | snd-soc-wm8988-objs := wm8988.o | ||
27 | snd-soc-wm8990-objs := wm8990.o | 32 | snd-soc-wm8990-objs := wm8990.o |
33 | snd-soc-wm9081-objs := wm9081.o | ||
28 | snd-soc-wm9705-objs := wm9705.o | 34 | snd-soc-wm9705-objs := wm9705.o |
29 | snd-soc-wm9712-objs := wm9712.o | 35 | snd-soc-wm9712-objs := wm9712.o |
30 | snd-soc-wm9713-objs := wm9713.o | 36 | snd-soc-wm9713-objs := wm9713.o |
@@ -37,7 +43,9 @@ obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o | |||
37 | obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o | 43 | obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o |
38 | obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o | 44 | obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o |
39 | obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o | 45 | obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o |
46 | obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o | ||
40 | obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o | 47 | obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o |
48 | obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o | ||
41 | obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o | 49 | obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o |
42 | obj-$(CONFIG_SND_SOC_TLV320AIC26) += snd-soc-tlv320aic26.o | 50 | obj-$(CONFIG_SND_SOC_TLV320AIC26) += snd-soc-tlv320aic26.o |
43 | obj-$(CONFIG_SND_SOC_TLV320AIC3X) += snd-soc-tlv320aic3x.o | 51 | obj-$(CONFIG_SND_SOC_TLV320AIC3X) += snd-soc-tlv320aic3x.o |
@@ -55,7 +63,11 @@ obj-$(CONFIG_SND_SOC_WM8753) += snd-soc-wm8753.o | |||
55 | obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o | 63 | obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o |
56 | obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o | 64 | obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o |
57 | obj-$(CONFIG_SND_SOC_WM8971) += snd-soc-wm8971.o | 65 | obj-$(CONFIG_SND_SOC_WM8971) += snd-soc-wm8971.o |
66 | obj-$(CONFIG_SND_SOC_WM8940) += snd-soc-wm8940.o | ||
67 | obj-$(CONFIG_SND_SOC_WM8960) += snd-soc-wm8960.o | ||
68 | obj-$(CONFIG_SND_SOC_WM8988) += snd-soc-wm8988.o | ||
58 | obj-$(CONFIG_SND_SOC_WM8990) += snd-soc-wm8990.o | 69 | obj-$(CONFIG_SND_SOC_WM8990) += snd-soc-wm8990.o |
70 | obj-$(CONFIG_SND_SOC_WM9081) += snd-soc-wm9081.o | ||
59 | obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o | 71 | obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o |
60 | obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o | 72 | obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o |
61 | obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o | 73 | obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o |
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index b0d4af145b87..932299bb5d1e 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c | |||
@@ -53,13 +53,13 @@ struct snd_soc_dai ac97_dai = { | |||
53 | .channels_min = 1, | 53 | .channels_min = 1, |
54 | .channels_max = 2, | 54 | .channels_max = 2, |
55 | .rates = STD_AC97_RATES, | 55 | .rates = STD_AC97_RATES, |
56 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 56 | .formats = SND_SOC_STD_AC97_FMTS,}, |
57 | .capture = { | 57 | .capture = { |
58 | .stream_name = "AC97 Capture", | 58 | .stream_name = "AC97 Capture", |
59 | .channels_min = 1, | 59 | .channels_min = 1, |
60 | .channels_max = 2, | 60 | .channels_max = 2, |
61 | .rates = STD_AC97_RATES, | 61 | .rates = STD_AC97_RATES, |
62 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 62 | .formats = SND_SOC_STD_AC97_FMTS,}, |
63 | .ops = &ac97_dai_ops, | 63 | .ops = &ac97_dai_ops, |
64 | }; | 64 | }; |
65 | EXPORT_SYMBOL_GPL(ac97_dai); | 65 | EXPORT_SYMBOL_GPL(ac97_dai); |
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index ddb3b08ac23c..d7440a982d22 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c | |||
@@ -137,13 +137,13 @@ struct snd_soc_dai ad1980_dai = { | |||
137 | .channels_min = 2, | 137 | .channels_min = 2, |
138 | .channels_max = 6, | 138 | .channels_max = 6, |
139 | .rates = SNDRV_PCM_RATE_48000, | 139 | .rates = SNDRV_PCM_RATE_48000, |
140 | .formats = SNDRV_PCM_FMTBIT_S16_LE, }, | 140 | .formats = SND_SOC_STD_AC97_FMTS, }, |
141 | .capture = { | 141 | .capture = { |
142 | .stream_name = "Capture", | 142 | .stream_name = "Capture", |
143 | .channels_min = 2, | 143 | .channels_min = 2, |
144 | .channels_max = 2, | 144 | .channels_max = 2, |
145 | .rates = SNDRV_PCM_RATE_48000, | 145 | .rates = SNDRV_PCM_RATE_48000, |
146 | .formats = SNDRV_PCM_FMTBIT_S16_LE, }, | 146 | .formats = SND_SOC_STD_AC97_FMTS, }, |
147 | }; | 147 | }; |
148 | EXPORT_SYMBOL_GPL(ad1980_dai); | 148 | EXPORT_SYMBOL_GPL(ad1980_dai); |
149 | 149 | ||
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 7fa09a387622..a32b8226c8a4 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * - The machine driver's 'startup' function must call | 18 | * - The machine driver's 'startup' function must call |
19 | * cs4270_set_dai_sysclk() with the value of MCLK. | 19 | * cs4270_set_dai_sysclk() with the value of MCLK. |
20 | * - Only I2S and left-justified modes are supported | 20 | * - Only I2S and left-justified modes are supported |
21 | * - Power management is not supported | 21 | * - Power management is supported |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
@@ -27,6 +27,7 @@ | |||
27 | #include <sound/soc.h> | 27 | #include <sound/soc.h> |
28 | #include <sound/initval.h> | 28 | #include <sound/initval.h> |
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/delay.h> | ||
30 | 31 | ||
31 | #include "cs4270.h" | 32 | #include "cs4270.h" |
32 | 33 | ||
@@ -56,6 +57,7 @@ | |||
56 | #define CS4270_FIRSTREG 0x01 | 57 | #define CS4270_FIRSTREG 0x01 |
57 | #define CS4270_LASTREG 0x08 | 58 | #define CS4270_LASTREG 0x08 |
58 | #define CS4270_NUMREGS (CS4270_LASTREG - CS4270_FIRSTREG + 1) | 59 | #define CS4270_NUMREGS (CS4270_LASTREG - CS4270_FIRSTREG + 1) |
60 | #define CS4270_I2C_INCR 0x80 | ||
59 | 61 | ||
60 | /* Bit masks for the CS4270 registers */ | 62 | /* Bit masks for the CS4270 registers */ |
61 | #define CS4270_CHIPID_ID 0xF0 | 63 | #define CS4270_CHIPID_ID 0xF0 |
@@ -64,6 +66,8 @@ | |||
64 | #define CS4270_PWRCTL_PDN_ADC 0x20 | 66 | #define CS4270_PWRCTL_PDN_ADC 0x20 |
65 | #define CS4270_PWRCTL_PDN_DAC 0x02 | 67 | #define CS4270_PWRCTL_PDN_DAC 0x02 |
66 | #define CS4270_PWRCTL_PDN 0x01 | 68 | #define CS4270_PWRCTL_PDN 0x01 |
69 | #define CS4270_PWRCTL_PDN_ALL \ | ||
70 | (CS4270_PWRCTL_PDN_ADC | CS4270_PWRCTL_PDN_DAC | CS4270_PWRCTL_PDN) | ||
67 | #define CS4270_MODE_SPEED_MASK 0x30 | 71 | #define CS4270_MODE_SPEED_MASK 0x30 |
68 | #define CS4270_MODE_1X 0x00 | 72 | #define CS4270_MODE_1X 0x00 |
69 | #define CS4270_MODE_2X 0x10 | 73 | #define CS4270_MODE_2X 0x10 |
@@ -109,6 +113,7 @@ struct cs4270_private { | |||
109 | unsigned int mclk; /* Input frequency of the MCLK pin */ | 113 | unsigned int mclk; /* Input frequency of the MCLK pin */ |
110 | unsigned int mode; /* The mode (I2S or left-justified) */ | 114 | unsigned int mode; /* The mode (I2S or left-justified) */ |
111 | unsigned int slave_mode; | 115 | unsigned int slave_mode; |
116 | unsigned int manual_mute; | ||
112 | }; | 117 | }; |
113 | 118 | ||
114 | /** | 119 | /** |
@@ -295,7 +300,7 @@ static int cs4270_fill_cache(struct snd_soc_codec *codec) | |||
295 | s32 length; | 300 | s32 length; |
296 | 301 | ||
297 | length = i2c_smbus_read_i2c_block_data(i2c_client, | 302 | length = i2c_smbus_read_i2c_block_data(i2c_client, |
298 | CS4270_FIRSTREG | 0x80, CS4270_NUMREGS, cache); | 303 | CS4270_FIRSTREG | CS4270_I2C_INCR, CS4270_NUMREGS, cache); |
299 | 304 | ||
300 | if (length != CS4270_NUMREGS) { | 305 | if (length != CS4270_NUMREGS) { |
301 | dev_err(codec->dev, "i2c read failure, addr=0x%x\n", | 306 | dev_err(codec->dev, "i2c read failure, addr=0x%x\n", |
@@ -453,7 +458,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, | |||
453 | } | 458 | } |
454 | 459 | ||
455 | /** | 460 | /** |
456 | * cs4270_mute - enable/disable the CS4270 external mute | 461 | * cs4270_dai_mute - enable/disable the CS4270 external mute |
457 | * @dai: the SOC DAI | 462 | * @dai: the SOC DAI |
458 | * @mute: 0 = disable mute, 1 = enable mute | 463 | * @mute: 0 = disable mute, 1 = enable mute |
459 | * | 464 | * |
@@ -462,21 +467,52 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, | |||
462 | * board does not have the MUTEA or MUTEB pins connected to such circuitry, | 467 | * board does not have the MUTEA or MUTEB pins connected to such circuitry, |
463 | * then this function will do nothing. | 468 | * then this function will do nothing. |
464 | */ | 469 | */ |
465 | static int cs4270_mute(struct snd_soc_dai *dai, int mute) | 470 | static int cs4270_dai_mute(struct snd_soc_dai *dai, int mute) |
466 | { | 471 | { |
467 | struct snd_soc_codec *codec = dai->codec; | 472 | struct snd_soc_codec *codec = dai->codec; |
473 | struct cs4270_private *cs4270 = codec->private_data; | ||
468 | int reg6; | 474 | int reg6; |
469 | 475 | ||
470 | reg6 = snd_soc_read(codec, CS4270_MUTE); | 476 | reg6 = snd_soc_read(codec, CS4270_MUTE); |
471 | 477 | ||
472 | if (mute) | 478 | if (mute) |
473 | reg6 |= CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B; | 479 | reg6 |= CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B; |
474 | else | 480 | else { |
475 | reg6 &= ~(CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B); | 481 | reg6 &= ~(CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B); |
482 | reg6 |= cs4270->manual_mute; | ||
483 | } | ||
476 | 484 | ||
477 | return snd_soc_write(codec, CS4270_MUTE, reg6); | 485 | return snd_soc_write(codec, CS4270_MUTE, reg6); |
478 | } | 486 | } |
479 | 487 | ||
488 | /** | ||
489 | * cs4270_soc_put_mute - put callback for the 'Master Playback switch' | ||
490 | * alsa control. | ||
491 | * @kcontrol: mixer control | ||
492 | * @ucontrol: control element information | ||
493 | * | ||
494 | * This function basically passes the arguments on to the generic | ||
495 | * snd_soc_put_volsw() function and saves the mute information in | ||
496 | * our private data structure. This is because we want to prevent | ||
497 | * cs4270_dai_mute() neglecting the user's decision to manually | ||
498 | * mute the codec's output. | ||
499 | * | ||
500 | * Returns 0 for success. | ||
501 | */ | ||
502 | static int cs4270_soc_put_mute(struct snd_kcontrol *kcontrol, | ||
503 | struct snd_ctl_elem_value *ucontrol) | ||
504 | { | ||
505 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | ||
506 | struct cs4270_private *cs4270 = codec->private_data; | ||
507 | int left = !ucontrol->value.integer.value[0]; | ||
508 | int right = !ucontrol->value.integer.value[1]; | ||
509 | |||
510 | cs4270->manual_mute = (left ? CS4270_MUTE_DAC_A : 0) | | ||
511 | (right ? CS4270_MUTE_DAC_B : 0); | ||
512 | |||
513 | return snd_soc_put_volsw(kcontrol, ucontrol); | ||
514 | } | ||
515 | |||
480 | /* A list of non-DAPM controls that the CS4270 supports */ | 516 | /* A list of non-DAPM controls that the CS4270 supports */ |
481 | static const struct snd_kcontrol_new cs4270_snd_controls[] = { | 517 | static const struct snd_kcontrol_new cs4270_snd_controls[] = { |
482 | SOC_DOUBLE_R("Master Playback Volume", | 518 | SOC_DOUBLE_R("Master Playback Volume", |
@@ -486,7 +522,9 @@ static const struct snd_kcontrol_new cs4270_snd_controls[] = { | |||
486 | SOC_SINGLE("Zero Cross Switch", CS4270_TRANS, 5, 1, 0), | 522 | SOC_SINGLE("Zero Cross Switch", CS4270_TRANS, 5, 1, 0), |
487 | SOC_SINGLE("Popguard Switch", CS4270_MODE, 0, 1, 1), | 523 | SOC_SINGLE("Popguard Switch", CS4270_MODE, 0, 1, 1), |
488 | SOC_SINGLE("Auto-Mute Switch", CS4270_MUTE, 5, 1, 0), | 524 | SOC_SINGLE("Auto-Mute Switch", CS4270_MUTE, 5, 1, 0), |
489 | SOC_DOUBLE("Master Capture Switch", CS4270_MUTE, 3, 4, 1, 0) | 525 | SOC_DOUBLE("Master Capture Switch", CS4270_MUTE, 3, 4, 1, 1), |
526 | SOC_DOUBLE_EXT("Master Playback Switch", CS4270_MUTE, 0, 1, 1, 1, | ||
527 | snd_soc_get_volsw, cs4270_soc_put_mute), | ||
490 | }; | 528 | }; |
491 | 529 | ||
492 | /* | 530 | /* |
@@ -506,7 +544,7 @@ static struct snd_soc_dai_ops cs4270_dai_ops = { | |||
506 | .hw_params = cs4270_hw_params, | 544 | .hw_params = cs4270_hw_params, |
507 | .set_sysclk = cs4270_set_dai_sysclk, | 545 | .set_sysclk = cs4270_set_dai_sysclk, |
508 | .set_fmt = cs4270_set_dai_fmt, | 546 | .set_fmt = cs4270_set_dai_fmt, |
509 | .digital_mute = cs4270_mute, | 547 | .digital_mute = cs4270_dai_mute, |
510 | }; | 548 | }; |
511 | 549 | ||
512 | struct snd_soc_dai cs4270_dai = { | 550 | struct snd_soc_dai cs4270_dai = { |
@@ -753,6 +791,57 @@ static struct i2c_device_id cs4270_id[] = { | |||
753 | }; | 791 | }; |
754 | MODULE_DEVICE_TABLE(i2c, cs4270_id); | 792 | MODULE_DEVICE_TABLE(i2c, cs4270_id); |
755 | 793 | ||
794 | #ifdef CONFIG_PM | ||
795 | |||
796 | /* This suspend/resume implementation can handle both - a simple standby | ||
797 | * where the codec remains powered, and a full suspend, where the voltage | ||
798 | * domain the codec is connected to is teared down and/or any other hardware | ||
799 | * reset condition is asserted. | ||
800 | * | ||
801 | * The codec's own power saving features are enabled in the suspend callback, | ||
802 | * and all registers are written back to the hardware when resuming. | ||
803 | */ | ||
804 | |||
805 | static int cs4270_i2c_suspend(struct i2c_client *client, pm_message_t mesg) | ||
806 | { | ||
807 | struct cs4270_private *cs4270 = i2c_get_clientdata(client); | ||
808 | struct snd_soc_codec *codec = &cs4270->codec; | ||
809 | int reg = snd_soc_read(codec, CS4270_PWRCTL) | CS4270_PWRCTL_PDN_ALL; | ||
810 | |||
811 | return snd_soc_write(codec, CS4270_PWRCTL, reg); | ||
812 | } | ||
813 | |||
814 | static int cs4270_i2c_resume(struct i2c_client *client) | ||
815 | { | ||
816 | struct cs4270_private *cs4270 = i2c_get_clientdata(client); | ||
817 | struct snd_soc_codec *codec = &cs4270->codec; | ||
818 | int reg; | ||
819 | |||
820 | /* In case the device was put to hard reset during sleep, we need to | ||
821 | * wait 500ns here before any I2C communication. */ | ||
822 | ndelay(500); | ||
823 | |||
824 | /* first restore the entire register cache ... */ | ||
825 | for (reg = CS4270_FIRSTREG; reg <= CS4270_LASTREG; reg++) { | ||
826 | u8 val = snd_soc_read(codec, reg); | ||
827 | |||
828 | if (i2c_smbus_write_byte_data(client, reg, val)) { | ||
829 | dev_err(codec->dev, "i2c write failed\n"); | ||
830 | return -EIO; | ||
831 | } | ||
832 | } | ||
833 | |||
834 | /* ... then disable the power-down bits */ | ||
835 | reg = snd_soc_read(codec, CS4270_PWRCTL); | ||
836 | reg &= ~CS4270_PWRCTL_PDN_ALL; | ||
837 | |||
838 | return snd_soc_write(codec, CS4270_PWRCTL, reg); | ||
839 | } | ||
840 | #else | ||
841 | #define cs4270_i2c_suspend NULL | ||
842 | #define cs4270_i2c_resume NULL | ||
843 | #endif /* CONFIG_PM */ | ||
844 | |||
756 | /* | 845 | /* |
757 | * cs4270_i2c_driver - I2C device identification | 846 | * cs4270_i2c_driver - I2C device identification |
758 | * | 847 | * |
@@ -767,6 +856,8 @@ static struct i2c_driver cs4270_i2c_driver = { | |||
767 | .id_table = cs4270_id, | 856 | .id_table = cs4270_id, |
768 | .probe = cs4270_i2c_probe, | 857 | .probe = cs4270_i2c_probe, |
769 | .remove = cs4270_i2c_remove, | 858 | .remove = cs4270_i2c_remove, |
859 | .suspend = cs4270_i2c_suspend, | ||
860 | .resume = cs4270_i2c_resume, | ||
770 | }; | 861 | }; |
771 | 862 | ||
772 | /* | 863 | /* |
diff --git a/sound/soc/codecs/spdif_transciever.c b/sound/soc/codecs/spdif_transciever.c new file mode 100644 index 000000000000..218b33adad90 --- /dev/null +++ b/sound/soc/codecs/spdif_transciever.c | |||
@@ -0,0 +1,71 @@ | |||
1 | /* | ||
2 | * ALSA SoC SPDIF DIT driver | ||
3 | * | ||
4 | * This driver is used by controllers which can operate in DIT (SPDI/F) where | ||
5 | * no codec is needed. This file provides stub codec that can be used | ||
6 | * in these configurations. TI DaVinci Audio controller uses this driver. | ||
7 | * | ||
8 | * Author: Steve Chen, <schen@mvista.com> | ||
9 | * Copyright: (C) 2009 MontaVista Software, Inc., <source@mvista.com> | ||
10 | * Copyright: (C) 2009 Texas Instruments, India | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or modify | ||
13 | * it under the terms of the GNU General Public License version 2 as | ||
14 | * published by the Free Software Foundation. | ||
15 | */ | ||
16 | |||
17 | #include <linux/module.h> | ||
18 | #include <linux/moduleparam.h> | ||
19 | #include <sound/soc.h> | ||
20 | #include <sound/pcm.h> | ||
21 | |||
22 | #include "spdif_transciever.h" | ||
23 | |||
24 | #define STUB_RATES SNDRV_PCM_RATE_8000_96000 | ||
25 | #define STUB_FORMATS SNDRV_PCM_FMTBIT_S16_LE | ||
26 | |||
27 | struct snd_soc_dai dit_stub_dai = { | ||
28 | .name = "DIT", | ||
29 | .playback = { | ||
30 | .stream_name = "Playback", | ||
31 | .channels_min = 1, | ||
32 | .channels_max = 384, | ||
33 | .rates = STUB_RATES, | ||
34 | .formats = STUB_FORMATS, | ||
35 | }, | ||
36 | }; | ||
37 | |||
38 | static int spdif_dit_probe(struct platform_device *pdev) | ||
39 | { | ||
40 | dit_stub_dai.dev = &pdev->dev; | ||
41 | return snd_soc_register_dai(&dit_stub_dai); | ||
42 | } | ||
43 | |||
44 | static int spdif_dit_remove(struct platform_device *pdev) | ||
45 | { | ||
46 | snd_soc_unregister_dai(&dit_stub_dai); | ||
47 | return 0; | ||
48 | } | ||
49 | |||
50 | static struct platform_driver spdif_dit_driver = { | ||
51 | .probe = spdif_dit_probe, | ||
52 | .remove = spdif_dit_remove, | ||
53 | .driver = { | ||
54 | .name = "spdif-dit", | ||
55 | .owner = THIS_MODULE, | ||
56 | }, | ||
57 | }; | ||
58 | |||
59 | static int __init dit_modinit(void) | ||
60 | { | ||
61 | return platform_driver_register(&spdif_dit_driver); | ||
62 | } | ||
63 | |||
64 | static void __exit dit_exit(void) | ||
65 | { | ||
66 | platform_driver_unregister(&spdif_dit_driver); | ||
67 | } | ||
68 | |||
69 | module_init(dit_modinit); | ||
70 | module_exit(dit_exit); | ||
71 | |||
diff --git a/sound/soc/codecs/spdif_transciever.h b/sound/soc/codecs/spdif_transciever.h new file mode 100644 index 000000000000..296f2eb6c4ef --- /dev/null +++ b/sound/soc/codecs/spdif_transciever.h | |||
@@ -0,0 +1,17 @@ | |||
1 | /* | ||
2 | * ALSA SoC DIT/DIR driver header | ||
3 | * | ||
4 | * Author: Steve Chen, <schen@mvista.com> | ||
5 | * Copyright: (C) 2008 MontaVista Software, Inc., <source@mvista.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #ifndef CODEC_STUBS_H | ||
13 | #define CODEC_STUBS_H | ||
14 | |||
15 | extern struct snd_soc_dai dit_stub_dai; | ||
16 | |||
17 | #endif /* CODEC_STUBS_H */ | ||
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 87f606c76822..c550750c79c0 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c | |||
@@ -336,15 +336,17 @@ static int ssm2602_startup(struct snd_pcm_substream *substream, | |||
336 | master_runtime->sample_bits, | 336 | master_runtime->sample_bits, |
337 | master_runtime->rate); | 337 | master_runtime->rate); |
338 | 338 | ||
339 | snd_pcm_hw_constraint_minmax(substream->runtime, | 339 | if (master_runtime->rate != 0) |
340 | SNDRV_PCM_HW_PARAM_RATE, | 340 | snd_pcm_hw_constraint_minmax(substream->runtime, |
341 | master_runtime->rate, | 341 | SNDRV_PCM_HW_PARAM_RATE, |
342 | master_runtime->rate); | 342 | master_runtime->rate, |
343 | 343 | master_runtime->rate); | |
344 | snd_pcm_hw_constraint_minmax(substream->runtime, | 344 | |
345 | SNDRV_PCM_HW_PARAM_SAMPLE_BITS, | 345 | if (master_runtime->sample_bits != 0) |
346 | master_runtime->sample_bits, | 346 | snd_pcm_hw_constraint_minmax(substream->runtime, |
347 | master_runtime->sample_bits); | 347 | SNDRV_PCM_HW_PARAM_SAMPLE_BITS, |
348 | master_runtime->sample_bits, | ||
349 | master_runtime->sample_bits); | ||
348 | 350 | ||
349 | ssm2602->slave_substream = substream; | 351 | ssm2602->slave_substream = substream; |
350 | } else | 352 | } else |
@@ -372,6 +374,7 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream, | |||
372 | struct snd_soc_device *socdev = rtd->socdev; | 374 | struct snd_soc_device *socdev = rtd->socdev; |
373 | struct snd_soc_codec *codec = socdev->card->codec; | 375 | struct snd_soc_codec *codec = socdev->card->codec; |
374 | struct ssm2602_priv *ssm2602 = codec->private_data; | 376 | struct ssm2602_priv *ssm2602 = codec->private_data; |
377 | |||
375 | /* deactivate */ | 378 | /* deactivate */ |
376 | if (!codec->active) | 379 | if (!codec->active) |
377 | ssm2602_write(codec, SSM2602_ACTIVE, 0); | 380 | ssm2602_write(codec, SSM2602_ACTIVE, 0); |
@@ -497,11 +500,9 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec, | |||
497 | return 0; | 500 | return 0; |
498 | } | 501 | } |
499 | 502 | ||
500 | #define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ | 503 | #define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_32000 |\ |
501 | SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\ | 504 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\ |
502 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\ | 505 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) |
503 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\ | ||
504 | SNDRV_PCM_RATE_96000) | ||
505 | 506 | ||
506 | #define SSM2602_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ | 507 | #define SSM2602_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ |
507 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) | 508 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) |
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c new file mode 100644 index 000000000000..8ad4b7b3e3ba --- /dev/null +++ b/sound/soc/codecs/stac9766.c | |||
@@ -0,0 +1,463 @@ | |||
1 | /* | ||
2 | * stac9766.c -- ALSA SoC STAC9766 codec support | ||
3 | * | ||
4 | * Copyright 2009 Jon Smirl, Digispeaker | ||
5 | * Author: Jon Smirl <jonsmirl@gmail.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License as published by the | ||
9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
10 | * option) any later version. | ||
11 | * | ||
12 | * Features:- | ||
13 | * | ||
14 | * o Support for AC97 Codec, S/PDIF | ||
15 | */ | ||
16 | |||
17 | #include <linux/init.h> | ||
18 | #include <linux/module.h> | ||
19 | #include <linux/device.h> | ||
20 | #include <sound/core.h> | ||
21 | #include <sound/pcm.h> | ||
22 | #include <sound/ac97_codec.h> | ||
23 | #include <sound/initval.h> | ||
24 | #include <sound/pcm_params.h> | ||
25 | #include <sound/soc.h> | ||
26 | #include <sound/tlv.h> | ||
27 | #include <sound/soc-of-simple.h> | ||
28 | |||
29 | #include "stac9766.h" | ||
30 | |||
31 | #define STAC9766_VERSION "0.10" | ||
32 | |||
33 | /* | ||
34 | * STAC9766 register cache | ||
35 | */ | ||
36 | static const u16 stac9766_reg[] = { | ||
37 | 0x6A90, 0x8000, 0x8000, 0x8000, /* 6 */ | ||
38 | 0x0000, 0x0000, 0x8008, 0x8008, /* e */ | ||
39 | 0x8808, 0x8808, 0x8808, 0x8808, /* 16 */ | ||
40 | 0x8808, 0x0000, 0x8000, 0x0000, /* 1e */ | ||
41 | 0x0000, 0x0000, 0x0000, 0x000f, /* 26 */ | ||
42 | 0x0a05, 0x0400, 0xbb80, 0x0000, /* 2e */ | ||
43 | 0x0000, 0xbb80, 0x0000, 0x0000, /* 36 */ | ||
44 | 0x0000, 0x2000, 0x0000, 0x0100, /* 3e */ | ||
45 | 0x0000, 0x0000, 0x0080, 0x0000, /* 46 */ | ||
46 | 0x0000, 0x0000, 0x0003, 0xffff, /* 4e */ | ||
47 | 0x0000, 0x0000, 0x0000, 0x0000, /* 56 */ | ||
48 | 0x4000, 0x0000, 0x0000, 0x0000, /* 5e */ | ||
49 | 0x1201, 0xFFFF, 0xFFFF, 0x0000, /* 66 */ | ||
50 | 0x0000, 0x0000, 0x0000, 0x0000, /* 6e */ | ||
51 | 0x0000, 0x0000, 0x0000, 0x0006, /* 76 */ | ||
52 | 0x0000, 0x0000, 0x0000, 0x0000, /* 7e */ | ||
53 | }; | ||
54 | |||
55 | static const char *stac9766_record_mux[] = {"Mic", "CD", "Video", "AUX", | ||
56 | "Line", "Stereo Mix", "Mono Mix", "Phone"}; | ||
57 | static const char *stac9766_mono_mux[] = {"Mix", "Mic"}; | ||
58 | static const char *stac9766_mic_mux[] = {"Mic1", "Mic2"}; | ||
59 | static const char *stac9766_SPDIF_mux[] = {"PCM", "ADC Record"}; | ||
60 | static const char *stac9766_popbypass_mux[] = {"Normal", "Bypass Mixer"}; | ||
61 | static const char *stac9766_record_all_mux[] = {"All analog", | ||
62 | "Analog plus DAC"}; | ||
63 | static const char *stac9766_boost1[] = {"0dB", "10dB"}; | ||
64 | static const char *stac9766_boost2[] = {"0dB", "20dB"}; | ||
65 | static const char *stac9766_stereo_mic[] = {"Off", "On"}; | ||
66 | |||
67 | static const struct soc_enum stac9766_record_enum = | ||
68 | SOC_ENUM_DOUBLE(AC97_REC_SEL, 8, 0, 8, stac9766_record_mux); | ||
69 | static const struct soc_enum stac9766_mono_enum = | ||
70 | SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 9, 2, stac9766_mono_mux); | ||
71 | static const struct soc_enum stac9766_mic_enum = | ||
72 | SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 8, 2, stac9766_mic_mux); | ||
73 | static const struct soc_enum stac9766_SPDIF_enum = | ||
74 | SOC_ENUM_SINGLE(AC97_STAC_DA_CONTROL, 1, 2, stac9766_SPDIF_mux); | ||
75 | static const struct soc_enum stac9766_popbypass_enum = | ||
76 | SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 15, 2, stac9766_popbypass_mux); | ||
77 | static const struct soc_enum stac9766_record_all_enum = | ||
78 | SOC_ENUM_SINGLE(AC97_STAC_ANALOG_SPECIAL, 12, 2, | ||
79 | stac9766_record_all_mux); | ||
80 | static const struct soc_enum stac9766_boost1_enum = | ||
81 | SOC_ENUM_SINGLE(AC97_MIC, 6, 2, stac9766_boost1); /* 0/10dB */ | ||
82 | static const struct soc_enum stac9766_boost2_enum = | ||
83 | SOC_ENUM_SINGLE(AC97_STAC_ANALOG_SPECIAL, 2, 2, stac9766_boost2); /* 0/20dB */ | ||
84 | static const struct soc_enum stac9766_stereo_mic_enum = | ||
85 | SOC_ENUM_SINGLE(AC97_STAC_STEREO_MIC, 2, 1, stac9766_stereo_mic); | ||
86 | |||
87 | static const DECLARE_TLV_DB_LINEAR(master_tlv, -4600, 0); | ||
88 | static const DECLARE_TLV_DB_LINEAR(record_tlv, 0, 2250); | ||
89 | static const DECLARE_TLV_DB_LINEAR(beep_tlv, -4500, 0); | ||
90 | static const DECLARE_TLV_DB_LINEAR(mix_tlv, -3450, 1200); | ||
91 | |||
92 | static const struct snd_kcontrol_new stac9766_snd_ac97_controls[] = { | ||
93 | SOC_DOUBLE_TLV("Speaker Volume", AC97_MASTER, 8, 0, 31, 1, master_tlv), | ||
94 | SOC_SINGLE("Speaker Switch", AC97_MASTER, 15, 1, 1), | ||
95 | SOC_DOUBLE_TLV("Headphone Volume", AC97_HEADPHONE, 8, 0, 31, 1, | ||
96 | master_tlv), | ||
97 | SOC_SINGLE("Headphone Switch", AC97_HEADPHONE, 15, 1, 1), | ||
98 | SOC_SINGLE_TLV("Mono Out Volume", AC97_MASTER_MONO, 0, 31, 1, | ||
99 | master_tlv), | ||
100 | SOC_SINGLE("Mono Out Switch", AC97_MASTER_MONO, 15, 1, 1), | ||
101 | |||
102 | SOC_DOUBLE_TLV("Record Volume", AC97_REC_GAIN, 8, 0, 15, 0, record_tlv), | ||
103 | SOC_SINGLE("Record Switch", AC97_REC_GAIN, 15, 1, 1), | ||
104 | |||
105 | |||
106 | SOC_SINGLE_TLV("Beep Volume", AC97_PC_BEEP, 1, 15, 1, beep_tlv), | ||
107 | SOC_SINGLE("Beep Switch", AC97_PC_BEEP, 15, 1, 1), | ||
108 | SOC_SINGLE("Beep Frequency", AC97_PC_BEEP, 5, 127, 1), | ||
109 | SOC_SINGLE_TLV("Phone Volume", AC97_PHONE, 0, 31, 1, mix_tlv), | ||
110 | SOC_SINGLE("Phone Switch", AC97_PHONE, 15, 1, 1), | ||
111 | |||
112 | SOC_ENUM("Mic Boost1", stac9766_boost1_enum), | ||
113 | SOC_ENUM("Mic Boost2", stac9766_boost2_enum), | ||
114 | SOC_SINGLE_TLV("Mic Volume", AC97_MIC, 0, 31, 1, mix_tlv), | ||
115 | SOC_SINGLE("Mic Switch", AC97_MIC, 15, 1, 1), | ||
116 | SOC_ENUM("Stereo Mic", stac9766_stereo_mic_enum), | ||
117 | |||
118 | SOC_DOUBLE_TLV("Line Volume", AC97_LINE, 8, 0, 31, 1, mix_tlv), | ||
119 | SOC_SINGLE("Line Switch", AC97_LINE, 15, 1, 1), | ||
120 | SOC_DOUBLE_TLV("CD Volume", AC97_CD, 8, 0, 31, 1, mix_tlv), | ||
121 | SOC_SINGLE("CD Switch", AC97_CD, 15, 1, 1), | ||
122 | SOC_DOUBLE_TLV("AUX Volume", AC97_AUX, 8, 0, 31, 1, mix_tlv), | ||
123 | SOC_SINGLE("AUX Switch", AC97_AUX, 15, 1, 1), | ||
124 | SOC_DOUBLE_TLV("Video Volume", AC97_VIDEO, 8, 0, 31, 1, mix_tlv), | ||
125 | SOC_SINGLE("Video Switch", AC97_VIDEO, 15, 1, 1), | ||
126 | |||
127 | SOC_DOUBLE_TLV("DAC Volume", AC97_PCM, 8, 0, 31, 1, mix_tlv), | ||
128 | SOC_SINGLE("DAC Switch", AC97_PCM, 15, 1, 1), | ||
129 | SOC_SINGLE("Loopback Test Switch", AC97_GENERAL_PURPOSE, 7, 1, 0), | ||
130 | SOC_SINGLE("3D Volume", AC97_3D_CONTROL, 3, 2, 1), | ||
131 | SOC_SINGLE("3D Switch", AC97_GENERAL_PURPOSE, 13, 1, 0), | ||
132 | |||
133 | SOC_ENUM("SPDIF Mux", stac9766_SPDIF_enum), | ||
134 | SOC_ENUM("Mic1/2 Mux", stac9766_mic_enum), | ||
135 | SOC_ENUM("Record All Mux", stac9766_record_all_enum), | ||
136 | SOC_ENUM("Record Mux", stac9766_record_enum), | ||
137 | SOC_ENUM("Mono Mux", stac9766_mono_enum), | ||
138 | SOC_ENUM("Pop Bypass Mux", stac9766_popbypass_enum), | ||
139 | }; | ||
140 | |||
141 | static int stac9766_ac97_write(struct snd_soc_codec *codec, unsigned int reg, | ||
142 | unsigned int val) | ||
143 | { | ||
144 | u16 *cache = codec->reg_cache; | ||
145 | |||
146 | if (reg > AC97_STAC_PAGE0) { | ||
147 | stac9766_ac97_write(codec, AC97_INT_PAGING, 0); | ||
148 | soc_ac97_ops.write(codec->ac97, reg, val); | ||
149 | stac9766_ac97_write(codec, AC97_INT_PAGING, 1); | ||
150 | return 0; | ||
151 | } | ||
152 | if (reg / 2 > ARRAY_SIZE(stac9766_reg)) | ||
153 | return -EIO; | ||
154 | |||
155 | soc_ac97_ops.write(codec->ac97, reg, val); | ||
156 | cache[reg / 2] = val; | ||
157 | return 0; | ||
158 | } | ||
159 | |||
160 | static unsigned int stac9766_ac97_read(struct snd_soc_codec *codec, | ||
161 | unsigned int reg) | ||
162 | { | ||
163 | u16 val = 0, *cache = codec->reg_cache; | ||
164 | |||
165 | if (reg > AC97_STAC_PAGE0) { | ||
166 | stac9766_ac97_write(codec, AC97_INT_PAGING, 0); | ||
167 | val = soc_ac97_ops.read(codec->ac97, reg - AC97_STAC_PAGE0); | ||
168 | stac9766_ac97_write(codec, AC97_INT_PAGING, 1); | ||
169 | return val; | ||
170 | } | ||
171 | if (reg / 2 > ARRAY_SIZE(stac9766_reg)) | ||
172 | return -EIO; | ||
173 | |||
174 | if (reg == AC97_RESET || reg == AC97_GPIO_STATUS || | ||
175 | reg == AC97_INT_PAGING || reg == AC97_VENDOR_ID1 || | ||
176 | reg == AC97_VENDOR_ID2) { | ||
177 | |||
178 | val = soc_ac97_ops.read(codec->ac97, reg); | ||
179 | return val; | ||
180 | } | ||
181 | return cache[reg / 2]; | ||
182 | } | ||
183 | |||
184 | static int ac97_analog_prepare(struct snd_pcm_substream *substream, | ||
185 | struct snd_soc_dai *dai) | ||
186 | { | ||
187 | struct snd_soc_codec *codec = dai->codec; | ||
188 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
189 | unsigned short reg, vra; | ||
190 | |||
191 | vra = stac9766_ac97_read(codec, AC97_EXTENDED_STATUS); | ||
192 | |||
193 | vra |= 0x1; /* enable variable rate audio */ | ||
194 | |||
195 | stac9766_ac97_write(codec, AC97_EXTENDED_STATUS, vra); | ||
196 | |||
197 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
198 | reg = AC97_PCM_FRONT_DAC_RATE; | ||
199 | else | ||
200 | reg = AC97_PCM_LR_ADC_RATE; | ||
201 | |||
202 | return stac9766_ac97_write(codec, reg, runtime->rate); | ||
203 | } | ||
204 | |||
205 | static int ac97_digital_prepare(struct snd_pcm_substream *substream, | ||
206 | struct snd_soc_dai *dai) | ||
207 | { | ||
208 | struct snd_soc_codec *codec = dai->codec; | ||
209 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
210 | unsigned short reg, vra; | ||
211 | |||
212 | stac9766_ac97_write(codec, AC97_SPDIF, 0x2002); | ||
213 | |||
214 | vra = stac9766_ac97_read(codec, AC97_EXTENDED_STATUS); | ||
215 | vra |= 0x5; /* Enable VRA and SPDIF out */ | ||
216 | |||
217 | stac9766_ac97_write(codec, AC97_EXTENDED_STATUS, vra); | ||
218 | |||
219 | reg = AC97_PCM_FRONT_DAC_RATE; | ||
220 | |||
221 | return stac9766_ac97_write(codec, reg, runtime->rate); | ||
222 | } | ||
223 | |||
224 | static int ac97_digital_trigger(struct snd_pcm_substream *substream, | ||
225 | int cmd, struct snd_soc_dai *dai) | ||
226 | { | ||
227 | struct snd_soc_codec *codec = dai->codec; | ||
228 | unsigned short vra; | ||
229 | |||
230 | switch (cmd) { | ||
231 | case SNDRV_PCM_TRIGGER_STOP: | ||
232 | vra = stac9766_ac97_read(codec, AC97_EXTENDED_STATUS); | ||
233 | vra &= !0x04; | ||
234 | stac9766_ac97_write(codec, AC97_EXTENDED_STATUS, vra); | ||
235 | break; | ||
236 | } | ||
237 | return 0; | ||
238 | } | ||
239 | |||
240 | static int stac9766_set_bias_level(struct snd_soc_codec *codec, | ||
241 | enum snd_soc_bias_level level) | ||
242 | { | ||
243 | switch (level) { | ||
244 | case SND_SOC_BIAS_ON: /* full On */ | ||
245 | case SND_SOC_BIAS_PREPARE: /* partial On */ | ||
246 | case SND_SOC_BIAS_STANDBY: /* Off, with power */ | ||
247 | stac9766_ac97_write(codec, AC97_POWERDOWN, 0x0000); | ||
248 | break; | ||
249 | case SND_SOC_BIAS_OFF: /* Off, without power */ | ||
250 | /* disable everything including AC link */ | ||
251 | stac9766_ac97_write(codec, AC97_POWERDOWN, 0xffff); | ||
252 | break; | ||
253 | } | ||
254 | codec->bias_level = level; | ||
255 | return 0; | ||
256 | } | ||
257 | |||
258 | static int stac9766_reset(struct snd_soc_codec *codec, int try_warm) | ||
259 | { | ||
260 | if (try_warm && soc_ac97_ops.warm_reset) { | ||
261 | soc_ac97_ops.warm_reset(codec->ac97); | ||
262 | if (stac9766_ac97_read(codec, 0) == stac9766_reg[0]) | ||
263 | return 1; | ||
264 | } | ||
265 | |||
266 | soc_ac97_ops.reset(codec->ac97); | ||
267 | if (soc_ac97_ops.warm_reset) | ||
268 | soc_ac97_ops.warm_reset(codec->ac97); | ||
269 | if (stac9766_ac97_read(codec, 0) != stac9766_reg[0]) | ||
270 | return -EIO; | ||
271 | return 0; | ||
272 | } | ||
273 | |||
274 | static int stac9766_codec_suspend(struct platform_device *pdev, | ||
275 | pm_message_t state) | ||
276 | { | ||
277 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
278 | struct snd_soc_codec *codec = socdev->card->codec; | ||
279 | |||
280 | stac9766_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
281 | return 0; | ||
282 | } | ||
283 | |||
284 | static int stac9766_codec_resume(struct platform_device *pdev) | ||
285 | { | ||
286 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
287 | struct snd_soc_codec *codec = socdev->card->codec; | ||
288 | u16 id, reset; | ||
289 | |||
290 | reset = 0; | ||
291 | /* give the codec an AC97 warm reset to start the link */ | ||
292 | reset: | ||
293 | if (reset > 5) { | ||
294 | printk(KERN_ERR "stac9766 failed to resume"); | ||
295 | return -EIO; | ||
296 | } | ||
297 | codec->ac97->bus->ops->warm_reset(codec->ac97); | ||
298 | id = soc_ac97_ops.read(codec->ac97, AC97_VENDOR_ID2); | ||
299 | if (id != 0x4c13) { | ||
300 | stac9766_reset(codec, 0); | ||
301 | reset++; | ||
302 | goto reset; | ||
303 | } | ||
304 | stac9766_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
305 | |||
306 | if (codec->suspend_bias_level == SND_SOC_BIAS_ON) | ||
307 | stac9766_set_bias_level(codec, SND_SOC_BIAS_ON); | ||
308 | |||
309 | return 0; | ||
310 | } | ||
311 | |||
312 | static struct snd_soc_dai_ops stac9766_dai_ops_analog = { | ||
313 | .prepare = ac97_analog_prepare, | ||
314 | }; | ||
315 | |||
316 | static struct snd_soc_dai_ops stac9766_dai_ops_digital = { | ||
317 | .prepare = ac97_digital_prepare, | ||
318 | .trigger = ac97_digital_trigger, | ||
319 | }; | ||
320 | |||
321 | struct snd_soc_dai stac9766_dai[] = { | ||
322 | { | ||
323 | .name = "stac9766 analog", | ||
324 | .id = 0, | ||
325 | .ac97_control = 1, | ||
326 | |||
327 | /* stream cababilities */ | ||
328 | .playback = { | ||
329 | .stream_name = "stac9766 analog", | ||
330 | .channels_min = 1, | ||
331 | .channels_max = 2, | ||
332 | .rates = SNDRV_PCM_RATE_8000_48000, | ||
333 | .formats = SND_SOC_STD_AC97_FMTS, | ||
334 | }, | ||
335 | .capture = { | ||
336 | .stream_name = "stac9766 analog", | ||
337 | .channels_min = 1, | ||
338 | .channels_max = 2, | ||
339 | .rates = SNDRV_PCM_RATE_8000_48000, | ||
340 | .formats = SND_SOC_STD_AC97_FMTS, | ||
341 | }, | ||
342 | /* alsa ops */ | ||
343 | .ops = &stac9766_dai_ops_analog, | ||
344 | }, | ||
345 | { | ||
346 | .name = "stac9766 IEC958", | ||
347 | .id = 1, | ||
348 | .ac97_control = 1, | ||
349 | |||
350 | /* stream cababilities */ | ||
351 | .playback = { | ||
352 | .stream_name = "stac9766 IEC958", | ||
353 | .channels_min = 1, | ||
354 | .channels_max = 2, | ||
355 | .rates = SNDRV_PCM_RATE_32000 | \ | ||
356 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, | ||
357 | .formats = SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE, | ||
358 | }, | ||
359 | /* alsa ops */ | ||
360 | .ops = &stac9766_dai_ops_digital, | ||
361 | } | ||
362 | }; | ||
363 | EXPORT_SYMBOL_GPL(stac9766_dai); | ||
364 | |||
365 | static int stac9766_codec_probe(struct platform_device *pdev) | ||
366 | { | ||
367 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
368 | struct snd_soc_codec *codec; | ||
369 | int ret = 0; | ||
370 | |||
371 | printk(KERN_INFO "STAC9766 SoC Audio Codec %s\n", STAC9766_VERSION); | ||
372 | |||
373 | socdev->card->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); | ||
374 | if (socdev->card->codec == NULL) | ||
375 | return -ENOMEM; | ||
376 | codec = socdev->card->codec; | ||
377 | mutex_init(&codec->mutex); | ||
378 | |||
379 | codec->reg_cache = kmemdup(stac9766_reg, sizeof(stac9766_reg), | ||
380 | GFP_KERNEL); | ||
381 | if (codec->reg_cache == NULL) { | ||
382 | ret = -ENOMEM; | ||
383 | goto cache_err; | ||
384 | } | ||
385 | codec->reg_cache_size = sizeof(stac9766_reg); | ||
386 | codec->reg_cache_step = 2; | ||
387 | |||
388 | codec->name = "STAC9766"; | ||
389 | codec->owner = THIS_MODULE; | ||
390 | codec->dai = stac9766_dai; | ||
391 | codec->num_dai = ARRAY_SIZE(stac9766_dai); | ||
392 | codec->write = stac9766_ac97_write; | ||
393 | codec->read = stac9766_ac97_read; | ||
394 | codec->set_bias_level = stac9766_set_bias_level; | ||
395 | INIT_LIST_HEAD(&codec->dapm_widgets); | ||
396 | INIT_LIST_HEAD(&codec->dapm_paths); | ||
397 | |||
398 | ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); | ||
399 | if (ret < 0) | ||
400 | goto codec_err; | ||
401 | |||
402 | /* register pcms */ | ||
403 | ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); | ||
404 | if (ret < 0) | ||
405 | goto pcm_err; | ||
406 | |||
407 | /* do a cold reset for the controller and then try | ||
408 | * a warm reset followed by an optional cold reset for codec */ | ||
409 | stac9766_reset(codec, 0); | ||
410 | ret = stac9766_reset(codec, 1); | ||
411 | if (ret < 0) { | ||
412 | printk(KERN_ERR "Failed to reset STAC9766: AC97 link error\n"); | ||
413 | goto reset_err; | ||
414 | } | ||
415 | |||
416 | stac9766_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
417 | |||
418 | snd_soc_add_controls(codec, stac9766_snd_ac97_controls, | ||
419 | ARRAY_SIZE(stac9766_snd_ac97_controls)); | ||
420 | |||
421 | ret = snd_soc_init_card(socdev); | ||
422 | if (ret < 0) | ||
423 | goto reset_err; | ||
424 | return 0; | ||
425 | |||
426 | reset_err: | ||
427 | snd_soc_free_pcms(socdev); | ||
428 | pcm_err: | ||
429 | snd_soc_free_ac97_codec(codec); | ||
430 | codec_err: | ||
431 | kfree(codec->private_data); | ||
432 | cache_err: | ||
433 | kfree(socdev->card->codec); | ||
434 | socdev->card->codec = NULL; | ||
435 | return ret; | ||
436 | } | ||
437 | |||
438 | static int stac9766_codec_remove(struct platform_device *pdev) | ||
439 | { | ||
440 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
441 | struct snd_soc_codec *codec = socdev->card->codec; | ||
442 | |||
443 | if (codec == NULL) | ||
444 | return 0; | ||
445 | |||
446 | snd_soc_free_pcms(socdev); | ||
447 | snd_soc_free_ac97_codec(codec); | ||
448 | kfree(codec->reg_cache); | ||
449 | kfree(codec); | ||
450 | return 0; | ||
451 | } | ||
452 | |||
453 | struct snd_soc_codec_device soc_codec_dev_stac9766 = { | ||
454 | .probe = stac9766_codec_probe, | ||
455 | .remove = stac9766_codec_remove, | ||
456 | .suspend = stac9766_codec_suspend, | ||
457 | .resume = stac9766_codec_resume, | ||
458 | }; | ||
459 | EXPORT_SYMBOL_GPL(soc_codec_dev_stac9766); | ||
460 | |||
461 | MODULE_DESCRIPTION("ASoC stac9766 driver"); | ||
462 | MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>"); | ||
463 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/codecs/stac9766.h b/sound/soc/codecs/stac9766.h new file mode 100644 index 000000000000..65642eb8393e --- /dev/null +++ b/sound/soc/codecs/stac9766.h | |||
@@ -0,0 +1,21 @@ | |||
1 | /* | ||
2 | * stac9766.h -- STAC9766 Soc Audio driver | ||
3 | */ | ||
4 | |||
5 | #ifndef _STAC9766_H | ||
6 | #define _STAC9766_H | ||
7 | |||
8 | #define AC97_STAC_PAGE0 0x1000 | ||
9 | #define AC97_STAC_DA_CONTROL (AC97_STAC_PAGE0 | 0x6A) | ||
10 | #define AC97_STAC_ANALOG_SPECIAL (AC97_STAC_PAGE0 | 0x6E) | ||
11 | #define AC97_STAC_STEREO_MIC 0x78 | ||
12 | |||
13 | /* STAC9766 DAI ID's */ | ||
14 | #define STAC9766_DAI_AC97_ANALOG 0 | ||
15 | #define STAC9766_DAI_AC97_DIGITAL 1 | ||
16 | |||
17 | extern struct snd_soc_dai stac9766_dai[]; | ||
18 | extern struct snd_soc_codec_device soc_codec_dev_stac9766; | ||
19 | |||
20 | |||
21 | #endif | ||
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index c3f4afb5d017..0b8dcb5cd729 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c | |||
@@ -86,7 +86,7 @@ static int tlv320aic23_write(struct snd_soc_codec *codec, unsigned int reg, | |||
86 | */ | 86 | */ |
87 | 87 | ||
88 | if ((reg < 0 || reg > 9) && (reg != 15)) { | 88 | if ((reg < 0 || reg > 9) && (reg != 15)) { |
89 | printk(KERN_WARNING "%s Invalid register R%d\n", __func__, reg); | 89 | printk(KERN_WARNING "%s Invalid register R%u\n", __func__, reg); |
90 | return -1; | 90 | return -1; |
91 | } | 91 | } |
92 | 92 | ||
@@ -98,7 +98,7 @@ static int tlv320aic23_write(struct snd_soc_codec *codec, unsigned int reg, | |||
98 | if (codec->hw_write(codec->control_data, data, 2) == 2) | 98 | if (codec->hw_write(codec->control_data, data, 2) == 2) |
99 | return 0; | 99 | return 0; |
100 | 100 | ||
101 | printk(KERN_ERR "%s cannot write %03x to register R%d\n", __func__, | 101 | printk(KERN_ERR "%s cannot write %03x to register R%u\n", __func__, |
102 | value, reg); | 102 | value, reg); |
103 | 103 | ||
104 | return -EIO; | 104 | return -EIO; |
@@ -273,14 +273,14 @@ static const unsigned short sr_valid_mask[] = { | |||
273 | * Every divisor is a factor of 11*12 | 273 | * Every divisor is a factor of 11*12 |
274 | */ | 274 | */ |
275 | #define SR_MULT (11*12) | 275 | #define SR_MULT (11*12) |
276 | #define A(x) (x) ? (SR_MULT/x) : 0 | 276 | #define A(x) (SR_MULT/x) |
277 | static const unsigned char sr_adc_mult_table[] = { | 277 | static const unsigned char sr_adc_mult_table[] = { |
278 | A(2), A(2), A(12), A(12), A(0), A(0), A(3), A(1), | 278 | A(2), A(2), A(12), A(12), 0, 0, A(3), A(1), |
279 | A(2), A(2), A(11), A(11), A(0), A(0), A(0), A(1) | 279 | A(2), A(2), A(11), A(11), 0, 0, 0, A(1) |
280 | }; | 280 | }; |
281 | static const unsigned char sr_dac_mult_table[] = { | 281 | static const unsigned char sr_dac_mult_table[] = { |
282 | A(2), A(12), A(2), A(12), A(0), A(0), A(3), A(1), | 282 | A(2), A(12), A(2), A(12), 0, 0, A(3), A(1), |
283 | A(2), A(11), A(2), A(11), A(0), A(0), A(0), A(1) | 283 | A(2), A(11), A(2), A(11), 0, 0, 0, A(1) |
284 | }; | 284 | }; |
285 | 285 | ||
286 | static unsigned get_score(int adc, int adc_l, int adc_h, int need_adc, | 286 | static unsigned get_score(int adc, int adc_l, int adc_h, int need_adc, |
@@ -523,6 +523,8 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai, | |||
523 | case SND_SOC_DAIFMT_I2S: | 523 | case SND_SOC_DAIFMT_I2S: |
524 | iface_reg |= TLV320AIC23_FOR_I2S; | 524 | iface_reg |= TLV320AIC23_FOR_I2S; |
525 | break; | 525 | break; |
526 | case SND_SOC_DAIFMT_DSP_A: | ||
527 | iface_reg |= TLV320AIC23_LRP_ON; | ||
526 | case SND_SOC_DAIFMT_DSP_B: | 528 | case SND_SOC_DAIFMT_DSP_B: |
527 | iface_reg |= TLV320AIC23_FOR_DSP; | 529 | iface_reg |= TLV320AIC23_FOR_DSP; |
528 | break; | 530 | break; |
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index df7c8c281d2f..4dbb853eef5a 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -115,6 +115,7 @@ static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = { | |||
115 | 0x00, /* REG_VIBRA_PWM_SET (0x47) */ | 115 | 0x00, /* REG_VIBRA_PWM_SET (0x47) */ |
116 | 0x00, /* REG_ANAMIC_GAIN (0x48) */ | 116 | 0x00, /* REG_ANAMIC_GAIN (0x48) */ |
117 | 0x00, /* REG_MISC_SET_2 (0x49) */ | 117 | 0x00, /* REG_MISC_SET_2 (0x49) */ |
118 | 0x00, /* REG_SW_SHADOW (0x4A) - Shadow, non HW register */ | ||
118 | }; | 119 | }; |
119 | 120 | ||
120 | /* codec private data */ | 121 | /* codec private data */ |
@@ -125,6 +126,17 @@ struct twl4030_priv { | |||
125 | 126 | ||
126 | struct snd_pcm_substream *master_substream; | 127 | struct snd_pcm_substream *master_substream; |
127 | struct snd_pcm_substream *slave_substream; | 128 | struct snd_pcm_substream *slave_substream; |
129 | |||
130 | unsigned int configured; | ||
131 | unsigned int rate; | ||
132 | unsigned int sample_bits; | ||
133 | unsigned int channels; | ||
134 | |||
135 | unsigned int sysclk; | ||
136 | |||
137 | /* Headset output state handling */ | ||
138 | unsigned int hsl_enabled; | ||
139 | unsigned int hsr_enabled; | ||
128 | }; | 140 | }; |
129 | 141 | ||
130 | /* | 142 | /* |
@@ -161,7 +173,11 @@ static int twl4030_write(struct snd_soc_codec *codec, | |||
161 | unsigned int reg, unsigned int value) | 173 | unsigned int reg, unsigned int value) |
162 | { | 174 | { |
163 | twl4030_write_reg_cache(codec, reg, value); | 175 | twl4030_write_reg_cache(codec, reg, value); |
164 | return twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, value, reg); | 176 | if (likely(reg < TWL4030_REG_SW_SHADOW)) |
177 | return twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, value, | ||
178 | reg); | ||
179 | else | ||
180 | return 0; | ||
165 | } | 181 | } |
166 | 182 | ||
167 | static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable) | 183 | static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable) |
@@ -188,6 +204,7 @@ static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable) | |||
188 | 204 | ||
189 | static void twl4030_init_chip(struct snd_soc_codec *codec) | 205 | static void twl4030_init_chip(struct snd_soc_codec *codec) |
190 | { | 206 | { |
207 | u8 *cache = codec->reg_cache; | ||
191 | int i; | 208 | int i; |
192 | 209 | ||
193 | /* clear CODECPDZ prior to setting register defaults */ | 210 | /* clear CODECPDZ prior to setting register defaults */ |
@@ -195,7 +212,7 @@ static void twl4030_init_chip(struct snd_soc_codec *codec) | |||
195 | 212 | ||
196 | /* set all audio section registers to reasonable defaults */ | 213 | /* set all audio section registers to reasonable defaults */ |
197 | for (i = TWL4030_REG_OPTION; i <= TWL4030_REG_MISC_SET_2; i++) | 214 | for (i = TWL4030_REG_OPTION; i <= TWL4030_REG_MISC_SET_2; i++) |
198 | twl4030_write(codec, i, twl4030_reg[i]); | 215 | twl4030_write(codec, i, cache[i]); |
199 | 216 | ||
200 | } | 217 | } |
201 | 218 | ||
@@ -232,7 +249,7 @@ static void twl4030_codec_mute(struct snd_soc_codec *codec, int mute) | |||
232 | TWL4030_REG_PRECKL_CTL); | 249 | TWL4030_REG_PRECKL_CTL); |
233 | reg_val = twl4030_read_reg_cache(codec, TWL4030_REG_PRECKR_CTL); | 250 | reg_val = twl4030_read_reg_cache(codec, TWL4030_REG_PRECKR_CTL); |
234 | twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, | 251 | twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, |
235 | reg_val & (~TWL4030_PRECKL_GAIN), | 252 | reg_val & (~TWL4030_PRECKR_GAIN), |
236 | TWL4030_REG_PRECKR_CTL); | 253 | TWL4030_REG_PRECKR_CTL); |
237 | 254 | ||
238 | /* Disable PLL */ | 255 | /* Disable PLL */ |
@@ -316,104 +333,60 @@ static void twl4030_power_down(struct snd_soc_codec *codec) | |||
316 | } | 333 | } |
317 | 334 | ||
318 | /* Earpiece */ | 335 | /* Earpiece */ |
319 | static const char *twl4030_earpiece_texts[] = | 336 | static const struct snd_kcontrol_new twl4030_dapm_earpiece_controls[] = { |
320 | {"Off", "DACL1", "DACL2", "DACR1"}; | 337 | SOC_DAPM_SINGLE("Voice", TWL4030_REG_EAR_CTL, 0, 1, 0), |
321 | 338 | SOC_DAPM_SINGLE("AudioL1", TWL4030_REG_EAR_CTL, 1, 1, 0), | |
322 | static const unsigned int twl4030_earpiece_values[] = | 339 | SOC_DAPM_SINGLE("AudioL2", TWL4030_REG_EAR_CTL, 2, 1, 0), |
323 | {0x0, 0x1, 0x2, 0x4}; | 340 | SOC_DAPM_SINGLE("AudioR1", TWL4030_REG_EAR_CTL, 3, 1, 0), |
324 | 341 | }; | |
325 | static const struct soc_enum twl4030_earpiece_enum = | ||
326 | SOC_VALUE_ENUM_SINGLE(TWL4030_REG_EAR_CTL, 1, 0x7, | ||
327 | ARRAY_SIZE(twl4030_earpiece_texts), | ||
328 | twl4030_earpiece_texts, | ||
329 | twl4030_earpiece_values); | ||
330 | |||
331 | static const struct snd_kcontrol_new twl4030_dapm_earpiece_control = | ||
332 | SOC_DAPM_VALUE_ENUM("Route", twl4030_earpiece_enum); | ||
333 | 342 | ||
334 | /* PreDrive Left */ | 343 | /* PreDrive Left */ |
335 | static const char *twl4030_predrivel_texts[] = | 344 | static const struct snd_kcontrol_new twl4030_dapm_predrivel_controls[] = { |
336 | {"Off", "DACL1", "DACL2", "DACR2"}; | 345 | SOC_DAPM_SINGLE("Voice", TWL4030_REG_PREDL_CTL, 0, 1, 0), |
337 | 346 | SOC_DAPM_SINGLE("AudioL1", TWL4030_REG_PREDL_CTL, 1, 1, 0), | |
338 | static const unsigned int twl4030_predrivel_values[] = | 347 | SOC_DAPM_SINGLE("AudioL2", TWL4030_REG_PREDL_CTL, 2, 1, 0), |
339 | {0x0, 0x1, 0x2, 0x4}; | 348 | SOC_DAPM_SINGLE("AudioR2", TWL4030_REG_PREDL_CTL, 3, 1, 0), |
340 | 349 | }; | |
341 | static const struct soc_enum twl4030_predrivel_enum = | ||
342 | SOC_VALUE_ENUM_SINGLE(TWL4030_REG_PREDL_CTL, 1, 0x7, | ||
343 | ARRAY_SIZE(twl4030_predrivel_texts), | ||
344 | twl4030_predrivel_texts, | ||
345 | twl4030_predrivel_values); | ||
346 | |||
347 | static const struct snd_kcontrol_new twl4030_dapm_predrivel_control = | ||
348 | SOC_DAPM_VALUE_ENUM("Route", twl4030_predrivel_enum); | ||
349 | 350 | ||
350 | /* PreDrive Right */ | 351 | /* PreDrive Right */ |
351 | static const char *twl4030_predriver_texts[] = | 352 | static const struct snd_kcontrol_new twl4030_dapm_predriver_controls[] = { |
352 | {"Off", "DACR1", "DACR2", "DACL2"}; | 353 | SOC_DAPM_SINGLE("Voice", TWL4030_REG_PREDR_CTL, 0, 1, 0), |
353 | 354 | SOC_DAPM_SINGLE("AudioR1", TWL4030_REG_PREDR_CTL, 1, 1, 0), | |
354 | static const unsigned int twl4030_predriver_values[] = | 355 | SOC_DAPM_SINGLE("AudioR2", TWL4030_REG_PREDR_CTL, 2, 1, 0), |
355 | {0x0, 0x1, 0x2, 0x4}; | 356 | SOC_DAPM_SINGLE("AudioL2", TWL4030_REG_PREDR_CTL, 3, 1, 0), |
356 | 357 | }; | |
357 | static const struct soc_enum twl4030_predriver_enum = | ||
358 | SOC_VALUE_ENUM_SINGLE(TWL4030_REG_PREDR_CTL, 1, 0x7, | ||
359 | ARRAY_SIZE(twl4030_predriver_texts), | ||
360 | twl4030_predriver_texts, | ||
361 | twl4030_predriver_values); | ||
362 | |||
363 | static const struct snd_kcontrol_new twl4030_dapm_predriver_control = | ||
364 | SOC_DAPM_VALUE_ENUM("Route", twl4030_predriver_enum); | ||
365 | 358 | ||
366 | /* Headset Left */ | 359 | /* Headset Left */ |
367 | static const char *twl4030_hsol_texts[] = | 360 | static const struct snd_kcontrol_new twl4030_dapm_hsol_controls[] = { |
368 | {"Off", "DACL1", "DACL2"}; | 361 | SOC_DAPM_SINGLE("Voice", TWL4030_REG_HS_SEL, 0, 1, 0), |
369 | 362 | SOC_DAPM_SINGLE("AudioL1", TWL4030_REG_HS_SEL, 1, 1, 0), | |
370 | static const struct soc_enum twl4030_hsol_enum = | 363 | SOC_DAPM_SINGLE("AudioL2", TWL4030_REG_HS_SEL, 2, 1, 0), |
371 | SOC_ENUM_SINGLE(TWL4030_REG_HS_SEL, 1, | 364 | }; |
372 | ARRAY_SIZE(twl4030_hsol_texts), | ||
373 | twl4030_hsol_texts); | ||
374 | |||
375 | static const struct snd_kcontrol_new twl4030_dapm_hsol_control = | ||
376 | SOC_DAPM_ENUM("Route", twl4030_hsol_enum); | ||
377 | 365 | ||
378 | /* Headset Right */ | 366 | /* Headset Right */ |
379 | static const char *twl4030_hsor_texts[] = | 367 | static const struct snd_kcontrol_new twl4030_dapm_hsor_controls[] = { |
380 | {"Off", "DACR1", "DACR2"}; | 368 | SOC_DAPM_SINGLE("Voice", TWL4030_REG_HS_SEL, 3, 1, 0), |
381 | 369 | SOC_DAPM_SINGLE("AudioR1", TWL4030_REG_HS_SEL, 4, 1, 0), | |
382 | static const struct soc_enum twl4030_hsor_enum = | 370 | SOC_DAPM_SINGLE("AudioR2", TWL4030_REG_HS_SEL, 5, 1, 0), |
383 | SOC_ENUM_SINGLE(TWL4030_REG_HS_SEL, 4, | 371 | }; |
384 | ARRAY_SIZE(twl4030_hsor_texts), | ||
385 | twl4030_hsor_texts); | ||
386 | |||
387 | static const struct snd_kcontrol_new twl4030_dapm_hsor_control = | ||
388 | SOC_DAPM_ENUM("Route", twl4030_hsor_enum); | ||
389 | 372 | ||
390 | /* Carkit Left */ | 373 | /* Carkit Left */ |
391 | static const char *twl4030_carkitl_texts[] = | 374 | static const struct snd_kcontrol_new twl4030_dapm_carkitl_controls[] = { |
392 | {"Off", "DACL1", "DACL2"}; | 375 | SOC_DAPM_SINGLE("Voice", TWL4030_REG_PRECKL_CTL, 0, 1, 0), |
393 | 376 | SOC_DAPM_SINGLE("AudioL1", TWL4030_REG_PRECKL_CTL, 1, 1, 0), | |
394 | static const struct soc_enum twl4030_carkitl_enum = | 377 | SOC_DAPM_SINGLE("AudioL2", TWL4030_REG_PRECKL_CTL, 2, 1, 0), |
395 | SOC_ENUM_SINGLE(TWL4030_REG_PRECKL_CTL, 1, | 378 | }; |
396 | ARRAY_SIZE(twl4030_carkitl_texts), | ||
397 | twl4030_carkitl_texts); | ||
398 | |||
399 | static const struct snd_kcontrol_new twl4030_dapm_carkitl_control = | ||
400 | SOC_DAPM_ENUM("Route", twl4030_carkitl_enum); | ||
401 | 379 | ||
402 | /* Carkit Right */ | 380 | /* Carkit Right */ |
403 | static const char *twl4030_carkitr_texts[] = | 381 | static const struct snd_kcontrol_new twl4030_dapm_carkitr_controls[] = { |
404 | {"Off", "DACR1", "DACR2"}; | 382 | SOC_DAPM_SINGLE("Voice", TWL4030_REG_PRECKR_CTL, 0, 1, 0), |
405 | 383 | SOC_DAPM_SINGLE("AudioR1", TWL4030_REG_PRECKR_CTL, 1, 1, 0), | |
406 | static const struct soc_enum twl4030_carkitr_enum = | 384 | SOC_DAPM_SINGLE("AudioR2", TWL4030_REG_PRECKR_CTL, 2, 1, 0), |
407 | SOC_ENUM_SINGLE(TWL4030_REG_PRECKR_CTL, 1, | 385 | }; |
408 | ARRAY_SIZE(twl4030_carkitr_texts), | ||
409 | twl4030_carkitr_texts); | ||
410 | |||
411 | static const struct snd_kcontrol_new twl4030_dapm_carkitr_control = | ||
412 | SOC_DAPM_ENUM("Route", twl4030_carkitr_enum); | ||
413 | 386 | ||
414 | /* Handsfree Left */ | 387 | /* Handsfree Left */ |
415 | static const char *twl4030_handsfreel_texts[] = | 388 | static const char *twl4030_handsfreel_texts[] = |
416 | {"Voice", "DACL1", "DACL2", "DACR2"}; | 389 | {"Voice", "AudioL1", "AudioL2", "AudioR2"}; |
417 | 390 | ||
418 | static const struct soc_enum twl4030_handsfreel_enum = | 391 | static const struct soc_enum twl4030_handsfreel_enum = |
419 | SOC_ENUM_SINGLE(TWL4030_REG_HFL_CTL, 0, | 392 | SOC_ENUM_SINGLE(TWL4030_REG_HFL_CTL, 0, |
@@ -423,9 +396,13 @@ static const struct soc_enum twl4030_handsfreel_enum = | |||
423 | static const struct snd_kcontrol_new twl4030_dapm_handsfreel_control = | 396 | static const struct snd_kcontrol_new twl4030_dapm_handsfreel_control = |
424 | SOC_DAPM_ENUM("Route", twl4030_handsfreel_enum); | 397 | SOC_DAPM_ENUM("Route", twl4030_handsfreel_enum); |
425 | 398 | ||
399 | /* Handsfree Left virtual mute */ | ||
400 | static const struct snd_kcontrol_new twl4030_dapm_handsfreelmute_control = | ||
401 | SOC_DAPM_SINGLE("Switch", TWL4030_REG_SW_SHADOW, 0, 1, 0); | ||
402 | |||
426 | /* Handsfree Right */ | 403 | /* Handsfree Right */ |
427 | static const char *twl4030_handsfreer_texts[] = | 404 | static const char *twl4030_handsfreer_texts[] = |
428 | {"Voice", "DACR1", "DACR2", "DACL2"}; | 405 | {"Voice", "AudioR1", "AudioR2", "AudioL2"}; |
429 | 406 | ||
430 | static const struct soc_enum twl4030_handsfreer_enum = | 407 | static const struct soc_enum twl4030_handsfreer_enum = |
431 | SOC_ENUM_SINGLE(TWL4030_REG_HFR_CTL, 0, | 408 | SOC_ENUM_SINGLE(TWL4030_REG_HFR_CTL, 0, |
@@ -435,37 +412,48 @@ static const struct soc_enum twl4030_handsfreer_enum = | |||
435 | static const struct snd_kcontrol_new twl4030_dapm_handsfreer_control = | 412 | static const struct snd_kcontrol_new twl4030_dapm_handsfreer_control = |
436 | SOC_DAPM_ENUM("Route", twl4030_handsfreer_enum); | 413 | SOC_DAPM_ENUM("Route", twl4030_handsfreer_enum); |
437 | 414 | ||
438 | /* Left analog microphone selection */ | 415 | /* Handsfree Right virtual mute */ |
439 | static const char *twl4030_analoglmic_texts[] = | 416 | static const struct snd_kcontrol_new twl4030_dapm_handsfreermute_control = |
440 | {"Off", "Main mic", "Headset mic", "AUXL", "Carkit mic"}; | 417 | SOC_DAPM_SINGLE("Switch", TWL4030_REG_SW_SHADOW, 1, 1, 0); |
441 | 418 | ||
442 | static const unsigned int twl4030_analoglmic_values[] = | 419 | /* Vibra */ |
443 | {0x0, 0x1, 0x2, 0x4, 0x8}; | 420 | /* Vibra audio path selection */ |
421 | static const char *twl4030_vibra_texts[] = | ||
422 | {"AudioL1", "AudioR1", "AudioL2", "AudioR2"}; | ||
444 | 423 | ||
445 | static const struct soc_enum twl4030_analoglmic_enum = | 424 | static const struct soc_enum twl4030_vibra_enum = |
446 | SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICL, 0, 0xf, | 425 | SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 2, |
447 | ARRAY_SIZE(twl4030_analoglmic_texts), | 426 | ARRAY_SIZE(twl4030_vibra_texts), |
448 | twl4030_analoglmic_texts, | 427 | twl4030_vibra_texts); |
449 | twl4030_analoglmic_values); | ||
450 | 428 | ||
451 | static const struct snd_kcontrol_new twl4030_dapm_analoglmic_control = | 429 | static const struct snd_kcontrol_new twl4030_dapm_vibra_control = |
452 | SOC_DAPM_VALUE_ENUM("Route", twl4030_analoglmic_enum); | 430 | SOC_DAPM_ENUM("Route", twl4030_vibra_enum); |
453 | 431 | ||
454 | /* Right analog microphone selection */ | 432 | /* Vibra path selection: local vibrator (PWM) or audio driven */ |
455 | static const char *twl4030_analogrmic_texts[] = | 433 | static const char *twl4030_vibrapath_texts[] = |
456 | {"Off", "Sub mic", "AUXR"}; | 434 | {"Local vibrator", "Audio"}; |
457 | 435 | ||
458 | static const unsigned int twl4030_analogrmic_values[] = | 436 | static const struct soc_enum twl4030_vibrapath_enum = |
459 | {0x0, 0x1, 0x4}; | 437 | SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 4, |
438 | ARRAY_SIZE(twl4030_vibrapath_texts), | ||
439 | twl4030_vibrapath_texts); | ||
460 | 440 | ||
461 | static const struct soc_enum twl4030_analogrmic_enum = | 441 | static const struct snd_kcontrol_new twl4030_dapm_vibrapath_control = |
462 | SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICR, 0, 0x5, | 442 | SOC_DAPM_ENUM("Route", twl4030_vibrapath_enum); |
463 | ARRAY_SIZE(twl4030_analogrmic_texts), | ||
464 | twl4030_analogrmic_texts, | ||
465 | twl4030_analogrmic_values); | ||
466 | 443 | ||
467 | static const struct snd_kcontrol_new twl4030_dapm_analogrmic_control = | 444 | /* Left analog microphone selection */ |
468 | SOC_DAPM_VALUE_ENUM("Route", twl4030_analogrmic_enum); | 445 | static const struct snd_kcontrol_new twl4030_dapm_analoglmic_controls[] = { |
446 | SOC_DAPM_SINGLE("Main mic", TWL4030_REG_ANAMICL, 0, 1, 0), | ||
447 | SOC_DAPM_SINGLE("Headset mic", TWL4030_REG_ANAMICL, 1, 1, 0), | ||
448 | SOC_DAPM_SINGLE("AUXL", TWL4030_REG_ANAMICL, 2, 1, 0), | ||
449 | SOC_DAPM_SINGLE("Carkit mic", TWL4030_REG_ANAMICL, 3, 1, 0), | ||
450 | }; | ||
451 | |||
452 | /* Right analog microphone selection */ | ||
453 | static const struct snd_kcontrol_new twl4030_dapm_analogrmic_controls[] = { | ||
454 | SOC_DAPM_SINGLE("Sub mic", TWL4030_REG_ANAMICR, 0, 1, 0), | ||
455 | SOC_DAPM_SINGLE("AUXR", TWL4030_REG_ANAMICR, 2, 1, 0), | ||
456 | }; | ||
469 | 457 | ||
470 | /* TX1 L/R Analog/Digital microphone selection */ | 458 | /* TX1 L/R Analog/Digital microphone selection */ |
471 | static const char *twl4030_micpathtx1_texts[] = | 459 | static const char *twl4030_micpathtx1_texts[] = |
@@ -507,6 +495,10 @@ static const struct snd_kcontrol_new twl4030_dapm_abypassr2_control = | |||
507 | static const struct snd_kcontrol_new twl4030_dapm_abypassl2_control = | 495 | static const struct snd_kcontrol_new twl4030_dapm_abypassl2_control = |
508 | SOC_DAPM_SINGLE("Switch", TWL4030_REG_ARXL2_APGA_CTL, 2, 1, 0); | 496 | SOC_DAPM_SINGLE("Switch", TWL4030_REG_ARXL2_APGA_CTL, 2, 1, 0); |
509 | 497 | ||
498 | /* Analog bypass for Voice */ | ||
499 | static const struct snd_kcontrol_new twl4030_dapm_abypassv_control = | ||
500 | SOC_DAPM_SINGLE("Switch", TWL4030_REG_VDL_APGA_CTL, 2, 1, 0); | ||
501 | |||
510 | /* Digital bypass gain, 0 mutes the bypass */ | 502 | /* Digital bypass gain, 0 mutes the bypass */ |
511 | static const unsigned int twl4030_dapm_dbypass_tlv[] = { | 503 | static const unsigned int twl4030_dapm_dbypass_tlv[] = { |
512 | TLV_DB_RANGE_HEAD(2), | 504 | TLV_DB_RANGE_HEAD(2), |
@@ -526,6 +518,18 @@ static const struct snd_kcontrol_new twl4030_dapm_dbypassr_control = | |||
526 | TWL4030_REG_ATX2ARXPGA, 0, 7, 0, | 518 | TWL4030_REG_ATX2ARXPGA, 0, 7, 0, |
527 | twl4030_dapm_dbypass_tlv); | 519 | twl4030_dapm_dbypass_tlv); |
528 | 520 | ||
521 | /* | ||
522 | * Voice Sidetone GAIN volume control: | ||
523 | * from -51 to -10 dB in 1 dB steps (mute instead of -51 dB) | ||
524 | */ | ||
525 | static DECLARE_TLV_DB_SCALE(twl4030_dapm_dbypassv_tlv, -5100, 100, 1); | ||
526 | |||
527 | /* Digital bypass voice: sidetone (VUL -> VDL)*/ | ||
528 | static const struct snd_kcontrol_new twl4030_dapm_dbypassv_control = | ||
529 | SOC_DAPM_SINGLE_TLV("Volume", | ||
530 | TWL4030_REG_VSTPGA, 0, 0x29, 0, | ||
531 | twl4030_dapm_dbypassv_tlv); | ||
532 | |||
529 | static int micpath_event(struct snd_soc_dapm_widget *w, | 533 | static int micpath_event(struct snd_soc_dapm_widget *w, |
530 | struct snd_kcontrol *kcontrol, int event) | 534 | struct snd_kcontrol *kcontrol, int event) |
531 | { | 535 | { |
@@ -556,63 +560,143 @@ static int micpath_event(struct snd_soc_dapm_widget *w, | |||
556 | return 0; | 560 | return 0; |
557 | } | 561 | } |
558 | 562 | ||
559 | static int handsfree_event(struct snd_soc_dapm_widget *w, | 563 | static void handsfree_ramp(struct snd_soc_codec *codec, int reg, int ramp) |
560 | struct snd_kcontrol *kcontrol, int event) | ||
561 | { | 564 | { |
562 | struct soc_enum *e = (struct soc_enum *)w->kcontrols->private_value; | ||
563 | unsigned char hs_ctl; | 565 | unsigned char hs_ctl; |
564 | 566 | ||
565 | hs_ctl = twl4030_read_reg_cache(w->codec, e->reg); | 567 | hs_ctl = twl4030_read_reg_cache(codec, reg); |
566 | 568 | ||
567 | if (hs_ctl & TWL4030_HF_CTL_REF_EN) { | 569 | if (ramp) { |
570 | /* HF ramp-up */ | ||
571 | hs_ctl |= TWL4030_HF_CTL_REF_EN; | ||
572 | twl4030_write(codec, reg, hs_ctl); | ||
573 | udelay(10); | ||
568 | hs_ctl |= TWL4030_HF_CTL_RAMP_EN; | 574 | hs_ctl |= TWL4030_HF_CTL_RAMP_EN; |
569 | twl4030_write(w->codec, e->reg, hs_ctl); | 575 | twl4030_write(codec, reg, hs_ctl); |
576 | udelay(40); | ||
570 | hs_ctl |= TWL4030_HF_CTL_LOOP_EN; | 577 | hs_ctl |= TWL4030_HF_CTL_LOOP_EN; |
571 | twl4030_write(w->codec, e->reg, hs_ctl); | ||
572 | hs_ctl |= TWL4030_HF_CTL_HB_EN; | 578 | hs_ctl |= TWL4030_HF_CTL_HB_EN; |
573 | twl4030_write(w->codec, e->reg, hs_ctl); | 579 | twl4030_write(codec, reg, hs_ctl); |
574 | } else { | 580 | } else { |
575 | hs_ctl &= ~(TWL4030_HF_CTL_RAMP_EN | TWL4030_HF_CTL_LOOP_EN | 581 | /* HF ramp-down */ |
576 | | TWL4030_HF_CTL_HB_EN); | 582 | hs_ctl &= ~TWL4030_HF_CTL_LOOP_EN; |
577 | twl4030_write(w->codec, e->reg, hs_ctl); | 583 | hs_ctl &= ~TWL4030_HF_CTL_HB_EN; |
584 | twl4030_write(codec, reg, hs_ctl); | ||
585 | hs_ctl &= ~TWL4030_HF_CTL_RAMP_EN; | ||
586 | twl4030_write(codec, reg, hs_ctl); | ||
587 | udelay(40); | ||
588 | hs_ctl &= ~TWL4030_HF_CTL_REF_EN; | ||
589 | twl4030_write(codec, reg, hs_ctl); | ||
578 | } | 590 | } |
591 | } | ||
579 | 592 | ||
593 | static int handsfreelpga_event(struct snd_soc_dapm_widget *w, | ||
594 | struct snd_kcontrol *kcontrol, int event) | ||
595 | { | ||
596 | switch (event) { | ||
597 | case SND_SOC_DAPM_POST_PMU: | ||
598 | handsfree_ramp(w->codec, TWL4030_REG_HFL_CTL, 1); | ||
599 | break; | ||
600 | case SND_SOC_DAPM_POST_PMD: | ||
601 | handsfree_ramp(w->codec, TWL4030_REG_HFL_CTL, 0); | ||
602 | break; | ||
603 | } | ||
580 | return 0; | 604 | return 0; |
581 | } | 605 | } |
582 | 606 | ||
583 | static int headsetl_event(struct snd_soc_dapm_widget *w, | 607 | static int handsfreerpga_event(struct snd_soc_dapm_widget *w, |
584 | struct snd_kcontrol *kcontrol, int event) | 608 | struct snd_kcontrol *kcontrol, int event) |
585 | { | 609 | { |
610 | switch (event) { | ||
611 | case SND_SOC_DAPM_POST_PMU: | ||
612 | handsfree_ramp(w->codec, TWL4030_REG_HFR_CTL, 1); | ||
613 | break; | ||
614 | case SND_SOC_DAPM_POST_PMD: | ||
615 | handsfree_ramp(w->codec, TWL4030_REG_HFR_CTL, 0); | ||
616 | break; | ||
617 | } | ||
618 | return 0; | ||
619 | } | ||
620 | |||
621 | static void headset_ramp(struct snd_soc_codec *codec, int ramp) | ||
622 | { | ||
586 | unsigned char hs_gain, hs_pop; | 623 | unsigned char hs_gain, hs_pop; |
624 | struct twl4030_priv *twl4030 = codec->private_data; | ||
625 | /* Base values for ramp delay calculation: 2^19 - 2^26 */ | ||
626 | unsigned int ramp_base[] = {524288, 1048576, 2097152, 4194304, | ||
627 | 8388608, 16777216, 33554432, 67108864}; | ||
587 | 628 | ||
588 | /* Save the current volume */ | 629 | hs_gain = twl4030_read_reg_cache(codec, TWL4030_REG_HS_GAIN_SET); |
589 | hs_gain = twl4030_read_reg_cache(w->codec, TWL4030_REG_HS_GAIN_SET); | 630 | hs_pop = twl4030_read_reg_cache(codec, TWL4030_REG_HS_POPN_SET); |
590 | hs_pop = twl4030_read_reg_cache(w->codec, TWL4030_REG_HS_POPN_SET); | ||
591 | 631 | ||
592 | switch (event) { | 632 | if (ramp) { |
593 | case SND_SOC_DAPM_POST_PMU: | 633 | /* Headset ramp-up according to the TRM */ |
594 | /* Do the anti-pop/bias ramp enable according to the TRM */ | ||
595 | hs_pop |= TWL4030_VMID_EN; | 634 | hs_pop |= TWL4030_VMID_EN; |
596 | twl4030_write(w->codec, TWL4030_REG_HS_POPN_SET, hs_pop); | 635 | twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop); |
597 | /* Is this needed? Can we just use whatever gain here? */ | 636 | twl4030_write(codec, TWL4030_REG_HS_GAIN_SET, hs_gain); |
598 | twl4030_write(w->codec, TWL4030_REG_HS_GAIN_SET, | ||
599 | (hs_gain & (~0x0f)) | 0x0a); | ||
600 | hs_pop |= TWL4030_RAMP_EN; | 637 | hs_pop |= TWL4030_RAMP_EN; |
601 | twl4030_write(w->codec, TWL4030_REG_HS_POPN_SET, hs_pop); | 638 | twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop); |
602 | 639 | } else { | |
603 | /* Restore the original volume */ | 640 | /* Headset ramp-down _not_ according to |
604 | twl4030_write(w->codec, TWL4030_REG_HS_GAIN_SET, hs_gain); | 641 | * the TRM, but in a way that it is working */ |
605 | break; | ||
606 | case SND_SOC_DAPM_POST_PMD: | ||
607 | /* Do the anti-pop/bias ramp disable according to the TRM */ | ||
608 | hs_pop &= ~TWL4030_RAMP_EN; | 642 | hs_pop &= ~TWL4030_RAMP_EN; |
609 | twl4030_write(w->codec, TWL4030_REG_HS_POPN_SET, hs_pop); | 643 | twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop); |
644 | /* Wait ramp delay time + 1, so the VMID can settle */ | ||
645 | mdelay((ramp_base[(hs_pop & TWL4030_RAMP_DELAY) >> 2] / | ||
646 | twl4030->sysclk) + 1); | ||
610 | /* Bypass the reg_cache to mute the headset */ | 647 | /* Bypass the reg_cache to mute the headset */ |
611 | twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, | 648 | twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, |
612 | hs_gain & (~0x0f), | 649 | hs_gain & (~0x0f), |
613 | TWL4030_REG_HS_GAIN_SET); | 650 | TWL4030_REG_HS_GAIN_SET); |
651 | |||
614 | hs_pop &= ~TWL4030_VMID_EN; | 652 | hs_pop &= ~TWL4030_VMID_EN; |
615 | twl4030_write(w->codec, TWL4030_REG_HS_POPN_SET, hs_pop); | 653 | twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop); |
654 | } | ||
655 | } | ||
656 | |||
657 | static int headsetlpga_event(struct snd_soc_dapm_widget *w, | ||
658 | struct snd_kcontrol *kcontrol, int event) | ||
659 | { | ||
660 | struct twl4030_priv *twl4030 = w->codec->private_data; | ||
661 | |||
662 | switch (event) { | ||
663 | case SND_SOC_DAPM_POST_PMU: | ||
664 | /* Do the ramp-up only once */ | ||
665 | if (!twl4030->hsr_enabled) | ||
666 | headset_ramp(w->codec, 1); | ||
667 | |||
668 | twl4030->hsl_enabled = 1; | ||
669 | break; | ||
670 | case SND_SOC_DAPM_POST_PMD: | ||
671 | /* Do the ramp-down only if both headsetL/R is disabled */ | ||
672 | if (!twl4030->hsr_enabled) | ||
673 | headset_ramp(w->codec, 0); | ||
674 | |||
675 | twl4030->hsl_enabled = 0; | ||
676 | break; | ||
677 | } | ||
678 | return 0; | ||
679 | } | ||
680 | |||
681 | static int headsetrpga_event(struct snd_soc_dapm_widget *w, | ||
682 | struct snd_kcontrol *kcontrol, int event) | ||
683 | { | ||
684 | struct twl4030_priv *twl4030 = w->codec->private_data; | ||
685 | |||
686 | switch (event) { | ||
687 | case SND_SOC_DAPM_POST_PMU: | ||
688 | /* Do the ramp-up only once */ | ||
689 | if (!twl4030->hsl_enabled) | ||
690 | headset_ramp(w->codec, 1); | ||
691 | |||
692 | twl4030->hsr_enabled = 1; | ||
693 | break; | ||
694 | case SND_SOC_DAPM_POST_PMD: | ||
695 | /* Do the ramp-down only if both headsetL/R is disabled */ | ||
696 | if (!twl4030->hsl_enabled) | ||
697 | headset_ramp(w->codec, 0); | ||
698 | |||
699 | twl4030->hsr_enabled = 0; | ||
616 | break; | 700 | break; |
617 | } | 701 | } |
618 | return 0; | 702 | return 0; |
@@ -624,7 +708,7 @@ static int bypass_event(struct snd_soc_dapm_widget *w, | |||
624 | struct soc_mixer_control *m = | 708 | struct soc_mixer_control *m = |
625 | (struct soc_mixer_control *)w->kcontrols->private_value; | 709 | (struct soc_mixer_control *)w->kcontrols->private_value; |
626 | struct twl4030_priv *twl4030 = w->codec->private_data; | 710 | struct twl4030_priv *twl4030 = w->codec->private_data; |
627 | unsigned char reg; | 711 | unsigned char reg, misc; |
628 | 712 | ||
629 | reg = twl4030_read_reg_cache(w->codec, m->reg); | 713 | reg = twl4030_read_reg_cache(w->codec, m->reg); |
630 | 714 | ||
@@ -636,14 +720,34 @@ static int bypass_event(struct snd_soc_dapm_widget *w, | |||
636 | else | 720 | else |
637 | twl4030->bypass_state &= | 721 | twl4030->bypass_state &= |
638 | ~(1 << (m->reg - TWL4030_REG_ARXL1_APGA_CTL)); | 722 | ~(1 << (m->reg - TWL4030_REG_ARXL1_APGA_CTL)); |
723 | } else if (m->reg == TWL4030_REG_VDL_APGA_CTL) { | ||
724 | /* Analog voice bypass */ | ||
725 | if (reg & (1 << m->shift)) | ||
726 | twl4030->bypass_state |= (1 << 4); | ||
727 | else | ||
728 | twl4030->bypass_state &= ~(1 << 4); | ||
729 | } else if (m->reg == TWL4030_REG_VSTPGA) { | ||
730 | /* Voice digital bypass */ | ||
731 | if (reg) | ||
732 | twl4030->bypass_state |= (1 << 5); | ||
733 | else | ||
734 | twl4030->bypass_state &= ~(1 << 5); | ||
639 | } else { | 735 | } else { |
640 | /* Digital bypass */ | 736 | /* Digital bypass */ |
641 | if (reg & (0x7 << m->shift)) | 737 | if (reg & (0x7 << m->shift)) |
642 | twl4030->bypass_state |= (1 << (m->shift ? 5 : 4)); | 738 | twl4030->bypass_state |= (1 << (m->shift ? 7 : 6)); |
643 | else | 739 | else |
644 | twl4030->bypass_state &= ~(1 << (m->shift ? 5 : 4)); | 740 | twl4030->bypass_state &= ~(1 << (m->shift ? 7 : 6)); |
645 | } | 741 | } |
646 | 742 | ||
743 | /* Enable master analog loopback mode if any analog switch is enabled*/ | ||
744 | misc = twl4030_read_reg_cache(w->codec, TWL4030_REG_MISC_SET_1); | ||
745 | if (twl4030->bypass_state & 0x1F) | ||
746 | misc |= TWL4030_FMLOOP_EN; | ||
747 | else | ||
748 | misc &= ~TWL4030_FMLOOP_EN; | ||
749 | twl4030_write(w->codec, TWL4030_REG_MISC_SET_1, misc); | ||
750 | |||
647 | if (w->codec->bias_level == SND_SOC_BIAS_STANDBY) { | 751 | if (w->codec->bias_level == SND_SOC_BIAS_STANDBY) { |
648 | if (twl4030->bypass_state) | 752 | if (twl4030->bypass_state) |
649 | twl4030_codec_mute(w->codec, 0); | 753 | twl4030_codec_mute(w->codec, 0); |
@@ -810,6 +914,48 @@ static int snd_soc_put_volsw_r2_twl4030(struct snd_kcontrol *kcontrol, | |||
810 | return err; | 914 | return err; |
811 | } | 915 | } |
812 | 916 | ||
917 | /* Codec operation modes */ | ||
918 | static const char *twl4030_op_modes_texts[] = { | ||
919 | "Option 2 (voice/audio)", "Option 1 (audio)" | ||
920 | }; | ||
921 | |||
922 | static const struct soc_enum twl4030_op_modes_enum = | ||
923 | SOC_ENUM_SINGLE(TWL4030_REG_CODEC_MODE, 0, | ||
924 | ARRAY_SIZE(twl4030_op_modes_texts), | ||
925 | twl4030_op_modes_texts); | ||
926 | |||
927 | int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol, | ||
928 | struct snd_ctl_elem_value *ucontrol) | ||
929 | { | ||
930 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | ||
931 | struct twl4030_priv *twl4030 = codec->private_data; | ||
932 | struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; | ||
933 | unsigned short val; | ||
934 | unsigned short mask, bitmask; | ||
935 | |||
936 | if (twl4030->configured) { | ||
937 | printk(KERN_ERR "twl4030 operation mode cannot be " | ||
938 | "changed on-the-fly\n"); | ||
939 | return -EBUSY; | ||
940 | } | ||
941 | |||
942 | for (bitmask = 1; bitmask < e->max; bitmask <<= 1) | ||
943 | ; | ||
944 | if (ucontrol->value.enumerated.item[0] > e->max - 1) | ||
945 | return -EINVAL; | ||
946 | |||
947 | val = ucontrol->value.enumerated.item[0] << e->shift_l; | ||
948 | mask = (bitmask - 1) << e->shift_l; | ||
949 | if (e->shift_l != e->shift_r) { | ||
950 | if (ucontrol->value.enumerated.item[1] > e->max - 1) | ||
951 | return -EINVAL; | ||
952 | val |= ucontrol->value.enumerated.item[1] << e->shift_r; | ||
953 | mask |= (bitmask - 1) << e->shift_r; | ||
954 | } | ||
955 | |||
956 | return snd_soc_update_bits(codec, e->reg, mask, val); | ||
957 | } | ||
958 | |||
813 | /* | 959 | /* |
814 | * FGAIN volume control: | 960 | * FGAIN volume control: |
815 | * from -62 to 0 dB in 1 dB steps (mute instead of -63 dB) | 961 | * from -62 to 0 dB in 1 dB steps (mute instead of -63 dB) |
@@ -824,6 +970,12 @@ static DECLARE_TLV_DB_SCALE(digital_fine_tlv, -6300, 100, 1); | |||
824 | static DECLARE_TLV_DB_SCALE(digital_coarse_tlv, 0, 600, 0); | 970 | static DECLARE_TLV_DB_SCALE(digital_coarse_tlv, 0, 600, 0); |
825 | 971 | ||
826 | /* | 972 | /* |
973 | * Voice Downlink GAIN volume control: | ||
974 | * from -37 to 12 dB in 1 dB steps (mute instead of -37 dB) | ||
975 | */ | ||
976 | static DECLARE_TLV_DB_SCALE(digital_voice_downlink_tlv, -3700, 100, 1); | ||
977 | |||
978 | /* | ||
827 | * Analog playback gain | 979 | * Analog playback gain |
828 | * -24 dB to 12 dB in 2 dB steps | 980 | * -24 dB to 12 dB in 2 dB steps |
829 | */ | 981 | */ |
@@ -864,7 +1016,32 @@ static const struct soc_enum twl4030_rampdelay_enum = | |||
864 | ARRAY_SIZE(twl4030_rampdelay_texts), | 1016 | ARRAY_SIZE(twl4030_rampdelay_texts), |
865 | twl4030_rampdelay_texts); | 1017 | twl4030_rampdelay_texts); |
866 | 1018 | ||
1019 | /* Vibra H-bridge direction mode */ | ||
1020 | static const char *twl4030_vibradirmode_texts[] = { | ||
1021 | "Vibra H-bridge direction", "Audio data MSB", | ||
1022 | }; | ||
1023 | |||
1024 | static const struct soc_enum twl4030_vibradirmode_enum = | ||
1025 | SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 5, | ||
1026 | ARRAY_SIZE(twl4030_vibradirmode_texts), | ||
1027 | twl4030_vibradirmode_texts); | ||
1028 | |||
1029 | /* Vibra H-bridge direction */ | ||
1030 | static const char *twl4030_vibradir_texts[] = { | ||
1031 | "Positive polarity", "Negative polarity", | ||
1032 | }; | ||
1033 | |||
1034 | static const struct soc_enum twl4030_vibradir_enum = | ||
1035 | SOC_ENUM_SINGLE(TWL4030_REG_VIBRA_CTL, 1, | ||
1036 | ARRAY_SIZE(twl4030_vibradir_texts), | ||
1037 | twl4030_vibradir_texts); | ||
1038 | |||
867 | static const struct snd_kcontrol_new twl4030_snd_controls[] = { | 1039 | static const struct snd_kcontrol_new twl4030_snd_controls[] = { |
1040 | /* Codec operation mode control */ | ||
1041 | SOC_ENUM_EXT("Codec Operation Mode", twl4030_op_modes_enum, | ||
1042 | snd_soc_get_enum_double, | ||
1043 | snd_soc_put_twl4030_opmode_enum_double), | ||
1044 | |||
868 | /* Common playback gain controls */ | 1045 | /* Common playback gain controls */ |
869 | SOC_DOUBLE_R_TLV("DAC1 Digital Fine Playback Volume", | 1046 | SOC_DOUBLE_R_TLV("DAC1 Digital Fine Playback Volume", |
870 | TWL4030_REG_ARXL1PGA, TWL4030_REG_ARXR1PGA, | 1047 | TWL4030_REG_ARXL1PGA, TWL4030_REG_ARXR1PGA, |
@@ -893,6 +1070,16 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = { | |||
893 | TWL4030_REG_ARXL2_APGA_CTL, TWL4030_REG_ARXR2_APGA_CTL, | 1070 | TWL4030_REG_ARXL2_APGA_CTL, TWL4030_REG_ARXR2_APGA_CTL, |
894 | 1, 1, 0), | 1071 | 1, 1, 0), |
895 | 1072 | ||
1073 | /* Common voice downlink gain controls */ | ||
1074 | SOC_SINGLE_TLV("DAC Voice Digital Downlink Volume", | ||
1075 | TWL4030_REG_VRXPGA, 0, 0x31, 0, digital_voice_downlink_tlv), | ||
1076 | |||
1077 | SOC_SINGLE_TLV("DAC Voice Analog Downlink Volume", | ||
1078 | TWL4030_REG_VDL_APGA_CTL, 3, 0x12, 1, analog_tlv), | ||
1079 | |||
1080 | SOC_SINGLE("DAC Voice Analog Downlink Switch", | ||
1081 | TWL4030_REG_VDL_APGA_CTL, 1, 1, 0), | ||
1082 | |||
896 | /* Separate output gain controls */ | 1083 | /* Separate output gain controls */ |
897 | SOC_DOUBLE_R_TLV_TWL4030("PreDriv Playback Volume", | 1084 | SOC_DOUBLE_R_TLV_TWL4030("PreDriv Playback Volume", |
898 | TWL4030_REG_PREDL_CTL, TWL4030_REG_PREDR_CTL, | 1085 | TWL4030_REG_PREDL_CTL, TWL4030_REG_PREDR_CTL, |
@@ -920,6 +1107,9 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = { | |||
920 | 0, 3, 5, 0, input_gain_tlv), | 1107 | 0, 3, 5, 0, input_gain_tlv), |
921 | 1108 | ||
922 | SOC_ENUM("HS ramp delay", twl4030_rampdelay_enum), | 1109 | SOC_ENUM("HS ramp delay", twl4030_rampdelay_enum), |
1110 | |||
1111 | SOC_ENUM("Vibra H-bridge mode", twl4030_vibradirmode_enum), | ||
1112 | SOC_ENUM("Vibra H-bridge direction", twl4030_vibradir_enum), | ||
923 | }; | 1113 | }; |
924 | 1114 | ||
925 | static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | 1115 | static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { |
@@ -947,26 +1137,19 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | |||
947 | SND_SOC_DAPM_OUTPUT("CARKITR"), | 1137 | SND_SOC_DAPM_OUTPUT("CARKITR"), |
948 | SND_SOC_DAPM_OUTPUT("HFL"), | 1138 | SND_SOC_DAPM_OUTPUT("HFL"), |
949 | SND_SOC_DAPM_OUTPUT("HFR"), | 1139 | SND_SOC_DAPM_OUTPUT("HFR"), |
1140 | SND_SOC_DAPM_OUTPUT("VIBRA"), | ||
950 | 1141 | ||
951 | /* DACs */ | 1142 | /* DACs */ |
952 | SND_SOC_DAPM_DAC("DAC Right1", "Right Front Playback", | 1143 | SND_SOC_DAPM_DAC("DAC Right1", "Right Front HiFi Playback", |
953 | SND_SOC_NOPM, 0, 0), | 1144 | SND_SOC_NOPM, 0, 0), |
954 | SND_SOC_DAPM_DAC("DAC Left1", "Left Front Playback", | 1145 | SND_SOC_DAPM_DAC("DAC Left1", "Left Front HiFi Playback", |
955 | SND_SOC_NOPM, 0, 0), | 1146 | SND_SOC_NOPM, 0, 0), |
956 | SND_SOC_DAPM_DAC("DAC Right2", "Right Rear Playback", | 1147 | SND_SOC_DAPM_DAC("DAC Right2", "Right Rear HiFi Playback", |
957 | SND_SOC_NOPM, 0, 0), | 1148 | SND_SOC_NOPM, 0, 0), |
958 | SND_SOC_DAPM_DAC("DAC Left2", "Left Rear Playback", | 1149 | SND_SOC_DAPM_DAC("DAC Left2", "Left Rear HiFi Playback", |
1150 | SND_SOC_NOPM, 0, 0), | ||
1151 | SND_SOC_DAPM_DAC("DAC Voice", "Voice Playback", | ||
959 | SND_SOC_NOPM, 0, 0), | 1152 | SND_SOC_NOPM, 0, 0), |
960 | |||
961 | /* Analog PGAs */ | ||
962 | SND_SOC_DAPM_PGA("ARXR1_APGA", TWL4030_REG_ARXR1_APGA_CTL, | ||
963 | 0, 0, NULL, 0), | ||
964 | SND_SOC_DAPM_PGA("ARXL1_APGA", TWL4030_REG_ARXL1_APGA_CTL, | ||
965 | 0, 0, NULL, 0), | ||
966 | SND_SOC_DAPM_PGA("ARXR2_APGA", TWL4030_REG_ARXR2_APGA_CTL, | ||
967 | 0, 0, NULL, 0), | ||
968 | SND_SOC_DAPM_PGA("ARXL2_APGA", TWL4030_REG_ARXL2_APGA_CTL, | ||
969 | 0, 0, NULL, 0), | ||
970 | 1153 | ||
971 | /* Analog bypasses */ | 1154 | /* Analog bypasses */ |
972 | SND_SOC_DAPM_SWITCH_E("Right1 Analog Loopback", SND_SOC_NOPM, 0, 0, | 1155 | SND_SOC_DAPM_SWITCH_E("Right1 Analog Loopback", SND_SOC_NOPM, 0, 0, |
@@ -981,6 +1164,9 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | |||
981 | SND_SOC_DAPM_SWITCH_E("Left2 Analog Loopback", SND_SOC_NOPM, 0, 0, | 1164 | SND_SOC_DAPM_SWITCH_E("Left2 Analog Loopback", SND_SOC_NOPM, 0, 0, |
982 | &twl4030_dapm_abypassl2_control, | 1165 | &twl4030_dapm_abypassl2_control, |
983 | bypass_event, SND_SOC_DAPM_POST_REG), | 1166 | bypass_event, SND_SOC_DAPM_POST_REG), |
1167 | SND_SOC_DAPM_SWITCH_E("Voice Analog Loopback", SND_SOC_NOPM, 0, 0, | ||
1168 | &twl4030_dapm_abypassv_control, | ||
1169 | bypass_event, SND_SOC_DAPM_POST_REG), | ||
984 | 1170 | ||
985 | /* Digital bypasses */ | 1171 | /* Digital bypasses */ |
986 | SND_SOC_DAPM_SWITCH_E("Left Digital Loopback", SND_SOC_NOPM, 0, 0, | 1172 | SND_SOC_DAPM_SWITCH_E("Left Digital Loopback", SND_SOC_NOPM, 0, 0, |
@@ -989,43 +1175,88 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | |||
989 | SND_SOC_DAPM_SWITCH_E("Right Digital Loopback", SND_SOC_NOPM, 0, 0, | 1175 | SND_SOC_DAPM_SWITCH_E("Right Digital Loopback", SND_SOC_NOPM, 0, 0, |
990 | &twl4030_dapm_dbypassr_control, bypass_event, | 1176 | &twl4030_dapm_dbypassr_control, bypass_event, |
991 | SND_SOC_DAPM_POST_REG), | 1177 | SND_SOC_DAPM_POST_REG), |
1178 | SND_SOC_DAPM_SWITCH_E("Voice Digital Loopback", SND_SOC_NOPM, 0, 0, | ||
1179 | &twl4030_dapm_dbypassv_control, bypass_event, | ||
1180 | SND_SOC_DAPM_POST_REG), | ||
992 | 1181 | ||
993 | SND_SOC_DAPM_MIXER("Analog R1 Playback Mixer", TWL4030_REG_AVDAC_CTL, | 1182 | /* Digital mixers, power control for the physical DACs */ |
994 | 0, 0, NULL, 0), | 1183 | SND_SOC_DAPM_MIXER("Digital R1 Playback Mixer", |
995 | SND_SOC_DAPM_MIXER("Analog L1 Playback Mixer", TWL4030_REG_AVDAC_CTL, | 1184 | TWL4030_REG_AVDAC_CTL, 0, 0, NULL, 0), |
996 | 1, 0, NULL, 0), | 1185 | SND_SOC_DAPM_MIXER("Digital L1 Playback Mixer", |
997 | SND_SOC_DAPM_MIXER("Analog R2 Playback Mixer", TWL4030_REG_AVDAC_CTL, | 1186 | TWL4030_REG_AVDAC_CTL, 1, 0, NULL, 0), |
998 | 2, 0, NULL, 0), | 1187 | SND_SOC_DAPM_MIXER("Digital R2 Playback Mixer", |
999 | SND_SOC_DAPM_MIXER("Analog L2 Playback Mixer", TWL4030_REG_AVDAC_CTL, | 1188 | TWL4030_REG_AVDAC_CTL, 2, 0, NULL, 0), |
1000 | 3, 0, NULL, 0), | 1189 | SND_SOC_DAPM_MIXER("Digital L2 Playback Mixer", |
1001 | 1190 | TWL4030_REG_AVDAC_CTL, 3, 0, NULL, 0), | |
1002 | /* Output MUX controls */ | 1191 | SND_SOC_DAPM_MIXER("Digital Voice Playback Mixer", |
1192 | TWL4030_REG_AVDAC_CTL, 4, 0, NULL, 0), | ||
1193 | |||
1194 | /* Analog mixers, power control for the physical PGAs */ | ||
1195 | SND_SOC_DAPM_MIXER("Analog R1 Playback Mixer", | ||
1196 | TWL4030_REG_ARXR1_APGA_CTL, 0, 0, NULL, 0), | ||
1197 | SND_SOC_DAPM_MIXER("Analog L1 Playback Mixer", | ||
1198 | TWL4030_REG_ARXL1_APGA_CTL, 0, 0, NULL, 0), | ||
1199 | SND_SOC_DAPM_MIXER("Analog R2 Playback Mixer", | ||
1200 | TWL4030_REG_ARXR2_APGA_CTL, 0, 0, NULL, 0), | ||
1201 | SND_SOC_DAPM_MIXER("Analog L2 Playback Mixer", | ||
1202 | TWL4030_REG_ARXL2_APGA_CTL, 0, 0, NULL, 0), | ||
1203 | SND_SOC_DAPM_MIXER("Analog Voice Playback Mixer", | ||
1204 | TWL4030_REG_VDL_APGA_CTL, 0, 0, NULL, 0), | ||
1205 | |||
1206 | /* Output MIXER controls */ | ||
1003 | /* Earpiece */ | 1207 | /* Earpiece */ |
1004 | SND_SOC_DAPM_VALUE_MUX("Earpiece Mux", SND_SOC_NOPM, 0, 0, | 1208 | SND_SOC_DAPM_MIXER("Earpiece Mixer", SND_SOC_NOPM, 0, 0, |
1005 | &twl4030_dapm_earpiece_control), | 1209 | &twl4030_dapm_earpiece_controls[0], |
1210 | ARRAY_SIZE(twl4030_dapm_earpiece_controls)), | ||
1006 | /* PreDrivL/R */ | 1211 | /* PreDrivL/R */ |
1007 | SND_SOC_DAPM_VALUE_MUX("PredriveL Mux", SND_SOC_NOPM, 0, 0, | 1212 | SND_SOC_DAPM_MIXER("PredriveL Mixer", SND_SOC_NOPM, 0, 0, |
1008 | &twl4030_dapm_predrivel_control), | 1213 | &twl4030_dapm_predrivel_controls[0], |
1009 | SND_SOC_DAPM_VALUE_MUX("PredriveR Mux", SND_SOC_NOPM, 0, 0, | 1214 | ARRAY_SIZE(twl4030_dapm_predrivel_controls)), |
1010 | &twl4030_dapm_predriver_control), | 1215 | SND_SOC_DAPM_MIXER("PredriveR Mixer", SND_SOC_NOPM, 0, 0, |
1216 | &twl4030_dapm_predriver_controls[0], | ||
1217 | ARRAY_SIZE(twl4030_dapm_predriver_controls)), | ||
1011 | /* HeadsetL/R */ | 1218 | /* HeadsetL/R */ |
1012 | SND_SOC_DAPM_MUX_E("HeadsetL Mux", SND_SOC_NOPM, 0, 0, | 1219 | SND_SOC_DAPM_MIXER("HeadsetL Mixer", SND_SOC_NOPM, 0, 0, |
1013 | &twl4030_dapm_hsol_control, headsetl_event, | 1220 | &twl4030_dapm_hsol_controls[0], |
1014 | SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), | 1221 | ARRAY_SIZE(twl4030_dapm_hsol_controls)), |
1015 | SND_SOC_DAPM_MUX("HeadsetR Mux", SND_SOC_NOPM, 0, 0, | 1222 | SND_SOC_DAPM_PGA_E("HeadsetL PGA", SND_SOC_NOPM, |
1016 | &twl4030_dapm_hsor_control), | 1223 | 0, 0, NULL, 0, headsetlpga_event, |
1224 | SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), | ||
1225 | SND_SOC_DAPM_MIXER("HeadsetR Mixer", SND_SOC_NOPM, 0, 0, | ||
1226 | &twl4030_dapm_hsor_controls[0], | ||
1227 | ARRAY_SIZE(twl4030_dapm_hsor_controls)), | ||
1228 | SND_SOC_DAPM_PGA_E("HeadsetR PGA", SND_SOC_NOPM, | ||
1229 | 0, 0, NULL, 0, headsetrpga_event, | ||
1230 | SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), | ||
1017 | /* CarkitL/R */ | 1231 | /* CarkitL/R */ |
1018 | SND_SOC_DAPM_MUX("CarkitL Mux", SND_SOC_NOPM, 0, 0, | 1232 | SND_SOC_DAPM_MIXER("CarkitL Mixer", SND_SOC_NOPM, 0, 0, |
1019 | &twl4030_dapm_carkitl_control), | 1233 | &twl4030_dapm_carkitl_controls[0], |
1020 | SND_SOC_DAPM_MUX("CarkitR Mux", SND_SOC_NOPM, 0, 0, | 1234 | ARRAY_SIZE(twl4030_dapm_carkitl_controls)), |
1021 | &twl4030_dapm_carkitr_control), | 1235 | SND_SOC_DAPM_MIXER("CarkitR Mixer", SND_SOC_NOPM, 0, 0, |
1236 | &twl4030_dapm_carkitr_controls[0], | ||
1237 | ARRAY_SIZE(twl4030_dapm_carkitr_controls)), | ||
1238 | |||
1239 | /* Output MUX controls */ | ||
1022 | /* HandsfreeL/R */ | 1240 | /* HandsfreeL/R */ |
1023 | SND_SOC_DAPM_MUX_E("HandsfreeL Mux", TWL4030_REG_HFL_CTL, 5, 0, | 1241 | SND_SOC_DAPM_MUX("HandsfreeL Mux", SND_SOC_NOPM, 0, 0, |
1024 | &twl4030_dapm_handsfreel_control, handsfree_event, | 1242 | &twl4030_dapm_handsfreel_control), |
1025 | SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), | 1243 | SND_SOC_DAPM_SWITCH("HandsfreeL Switch", SND_SOC_NOPM, 0, 0, |
1026 | SND_SOC_DAPM_MUX_E("HandsfreeR Mux", TWL4030_REG_HFR_CTL, 5, 0, | 1244 | &twl4030_dapm_handsfreelmute_control), |
1027 | &twl4030_dapm_handsfreer_control, handsfree_event, | 1245 | SND_SOC_DAPM_PGA_E("HandsfreeL PGA", SND_SOC_NOPM, |
1028 | SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), | 1246 | 0, 0, NULL, 0, handsfreelpga_event, |
1247 | SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), | ||
1248 | SND_SOC_DAPM_MUX("HandsfreeR Mux", SND_SOC_NOPM, 5, 0, | ||
1249 | &twl4030_dapm_handsfreer_control), | ||
1250 | SND_SOC_DAPM_SWITCH("HandsfreeR Switch", SND_SOC_NOPM, 0, 0, | ||
1251 | &twl4030_dapm_handsfreermute_control), | ||
1252 | SND_SOC_DAPM_PGA_E("HandsfreeR PGA", SND_SOC_NOPM, | ||
1253 | 0, 0, NULL, 0, handsfreerpga_event, | ||
1254 | SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), | ||
1255 | /* Vibra */ | ||
1256 | SND_SOC_DAPM_MUX("Vibra Mux", TWL4030_REG_VIBRA_CTL, 0, 0, | ||
1257 | &twl4030_dapm_vibra_control), | ||
1258 | SND_SOC_DAPM_MUX("Vibra Route", SND_SOC_NOPM, 0, 0, | ||
1259 | &twl4030_dapm_vibrapath_control), | ||
1029 | 1260 | ||
1030 | /* Introducing four virtual ADC, since TWL4030 have four channel for | 1261 | /* Introducing four virtual ADC, since TWL4030 have four channel for |
1031 | capture */ | 1262 | capture */ |
@@ -1050,11 +1281,15 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | |||
1050 | SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD| | 1281 | SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD| |
1051 | SND_SOC_DAPM_POST_REG), | 1282 | SND_SOC_DAPM_POST_REG), |
1052 | 1283 | ||
1053 | /* Analog input muxes with switch for the capture amplifiers */ | 1284 | /* Analog input mixers for the capture amplifiers */ |
1054 | SND_SOC_DAPM_VALUE_MUX("Analog Left Capture Route", | 1285 | SND_SOC_DAPM_MIXER("Analog Left Capture Route", |
1055 | TWL4030_REG_ANAMICL, 4, 0, &twl4030_dapm_analoglmic_control), | 1286 | TWL4030_REG_ANAMICL, 4, 0, |
1056 | SND_SOC_DAPM_VALUE_MUX("Analog Right Capture Route", | 1287 | &twl4030_dapm_analoglmic_controls[0], |
1057 | TWL4030_REG_ANAMICR, 4, 0, &twl4030_dapm_analogrmic_control), | 1288 | ARRAY_SIZE(twl4030_dapm_analoglmic_controls)), |
1289 | SND_SOC_DAPM_MIXER("Analog Right Capture Route", | ||
1290 | TWL4030_REG_ANAMICR, 4, 0, | ||
1291 | &twl4030_dapm_analogrmic_controls[0], | ||
1292 | ARRAY_SIZE(twl4030_dapm_analogrmic_controls)), | ||
1058 | 1293 | ||
1059 | SND_SOC_DAPM_PGA("ADC Physical Left", | 1294 | SND_SOC_DAPM_PGA("ADC Physical Left", |
1060 | TWL4030_REG_AVADC_CTL, 3, 0, NULL, 0), | 1295 | TWL4030_REG_AVADC_CTL, 3, 0, NULL, 0), |
@@ -1073,62 +1308,86 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | |||
1073 | }; | 1308 | }; |
1074 | 1309 | ||
1075 | static const struct snd_soc_dapm_route intercon[] = { | 1310 | static const struct snd_soc_dapm_route intercon[] = { |
1076 | {"Analog L1 Playback Mixer", NULL, "DAC Left1"}, | 1311 | {"Digital L1 Playback Mixer", NULL, "DAC Left1"}, |
1077 | {"Analog R1 Playback Mixer", NULL, "DAC Right1"}, | 1312 | {"Digital R1 Playback Mixer", NULL, "DAC Right1"}, |
1078 | {"Analog L2 Playback Mixer", NULL, "DAC Left2"}, | 1313 | {"Digital L2 Playback Mixer", NULL, "DAC Left2"}, |
1079 | {"Analog R2 Playback Mixer", NULL, "DAC Right2"}, | 1314 | {"Digital R2 Playback Mixer", NULL, "DAC Right2"}, |
1080 | 1315 | {"Digital Voice Playback Mixer", NULL, "DAC Voice"}, | |
1081 | {"ARXL1_APGA", NULL, "Analog L1 Playback Mixer"}, | 1316 | |
1082 | {"ARXR1_APGA", NULL, "Analog R1 Playback Mixer"}, | 1317 | {"Analog L1 Playback Mixer", NULL, "Digital L1 Playback Mixer"}, |
1083 | {"ARXL2_APGA", NULL, "Analog L2 Playback Mixer"}, | 1318 | {"Analog R1 Playback Mixer", NULL, "Digital R1 Playback Mixer"}, |
1084 | {"ARXR2_APGA", NULL, "Analog R2 Playback Mixer"}, | 1319 | {"Analog L2 Playback Mixer", NULL, "Digital L2 Playback Mixer"}, |
1320 | {"Analog R2 Playback Mixer", NULL, "Digital R2 Playback Mixer"}, | ||
1321 | {"Analog Voice Playback Mixer", NULL, "Digital Voice Playback Mixer"}, | ||
1085 | 1322 | ||
1086 | /* Internal playback routings */ | 1323 | /* Internal playback routings */ |
1087 | /* Earpiece */ | 1324 | /* Earpiece */ |
1088 | {"Earpiece Mux", "DACL1", "ARXL1_APGA"}, | 1325 | {"Earpiece Mixer", "Voice", "Analog Voice Playback Mixer"}, |
1089 | {"Earpiece Mux", "DACL2", "ARXL2_APGA"}, | 1326 | {"Earpiece Mixer", "AudioL1", "Analog L1 Playback Mixer"}, |
1090 | {"Earpiece Mux", "DACR1", "ARXR1_APGA"}, | 1327 | {"Earpiece Mixer", "AudioL2", "Analog L2 Playback Mixer"}, |
1328 | {"Earpiece Mixer", "AudioR1", "Analog R1 Playback Mixer"}, | ||
1091 | /* PreDrivL */ | 1329 | /* PreDrivL */ |
1092 | {"PredriveL Mux", "DACL1", "ARXL1_APGA"}, | 1330 | {"PredriveL Mixer", "Voice", "Analog Voice Playback Mixer"}, |
1093 | {"PredriveL Mux", "DACL2", "ARXL2_APGA"}, | 1331 | {"PredriveL Mixer", "AudioL1", "Analog L1 Playback Mixer"}, |
1094 | {"PredriveL Mux", "DACR2", "ARXR2_APGA"}, | 1332 | {"PredriveL Mixer", "AudioL2", "Analog L2 Playback Mixer"}, |
1333 | {"PredriveL Mixer", "AudioR2", "Analog R2 Playback Mixer"}, | ||
1095 | /* PreDrivR */ | 1334 | /* PreDrivR */ |
1096 | {"PredriveR Mux", "DACR1", "ARXR1_APGA"}, | 1335 | {"PredriveR Mixer", "Voice", "Analog Voice Playback Mixer"}, |
1097 | {"PredriveR Mux", "DACR2", "ARXR2_APGA"}, | 1336 | {"PredriveR Mixer", "AudioR1", "Analog R1 Playback Mixer"}, |
1098 | {"PredriveR Mux", "DACL2", "ARXL2_APGA"}, | 1337 | {"PredriveR Mixer", "AudioR2", "Analog R2 Playback Mixer"}, |
1338 | {"PredriveR Mixer", "AudioL2", "Analog L2 Playback Mixer"}, | ||
1099 | /* HeadsetL */ | 1339 | /* HeadsetL */ |
1100 | {"HeadsetL Mux", "DACL1", "ARXL1_APGA"}, | 1340 | {"HeadsetL Mixer", "Voice", "Analog Voice Playback Mixer"}, |
1101 | {"HeadsetL Mux", "DACL2", "ARXL2_APGA"}, | 1341 | {"HeadsetL Mixer", "AudioL1", "Analog L1 Playback Mixer"}, |
1342 | {"HeadsetL Mixer", "AudioL2", "Analog L2 Playback Mixer"}, | ||
1343 | {"HeadsetL PGA", NULL, "HeadsetL Mixer"}, | ||
1102 | /* HeadsetR */ | 1344 | /* HeadsetR */ |
1103 | {"HeadsetR Mux", "DACR1", "ARXR1_APGA"}, | 1345 | {"HeadsetR Mixer", "Voice", "Analog Voice Playback Mixer"}, |
1104 | {"HeadsetR Mux", "DACR2", "ARXR2_APGA"}, | 1346 | {"HeadsetR Mixer", "AudioR1", "Analog R1 Playback Mixer"}, |
1347 | {"HeadsetR Mixer", "AudioR2", "Analog R2 Playback Mixer"}, | ||
1348 | {"HeadsetR PGA", NULL, "HeadsetR Mixer"}, | ||
1105 | /* CarkitL */ | 1349 | /* CarkitL */ |
1106 | {"CarkitL Mux", "DACL1", "ARXL1_APGA"}, | 1350 | {"CarkitL Mixer", "Voice", "Analog Voice Playback Mixer"}, |
1107 | {"CarkitL Mux", "DACL2", "ARXL2_APGA"}, | 1351 | {"CarkitL Mixer", "AudioL1", "Analog L1 Playback Mixer"}, |
1352 | {"CarkitL Mixer", "AudioL2", "Analog L2 Playback Mixer"}, | ||
1108 | /* CarkitR */ | 1353 | /* CarkitR */ |
1109 | {"CarkitR Mux", "DACR1", "ARXR1_APGA"}, | 1354 | {"CarkitR Mixer", "Voice", "Analog Voice Playback Mixer"}, |
1110 | {"CarkitR Mux", "DACR2", "ARXR2_APGA"}, | 1355 | {"CarkitR Mixer", "AudioR1", "Analog R1 Playback Mixer"}, |
1356 | {"CarkitR Mixer", "AudioR2", "Analog R2 Playback Mixer"}, | ||
1111 | /* HandsfreeL */ | 1357 | /* HandsfreeL */ |
1112 | {"HandsfreeL Mux", "DACL1", "ARXL1_APGA"}, | 1358 | {"HandsfreeL Mux", "Voice", "Analog Voice Playback Mixer"}, |
1113 | {"HandsfreeL Mux", "DACL2", "ARXL2_APGA"}, | 1359 | {"HandsfreeL Mux", "AudioL1", "Analog L1 Playback Mixer"}, |
1114 | {"HandsfreeL Mux", "DACR2", "ARXR2_APGA"}, | 1360 | {"HandsfreeL Mux", "AudioL2", "Analog L2 Playback Mixer"}, |
1361 | {"HandsfreeL Mux", "AudioR2", "Analog R2 Playback Mixer"}, | ||
1362 | {"HandsfreeL Switch", "Switch", "HandsfreeL Mux"}, | ||
1363 | {"HandsfreeL PGA", NULL, "HandsfreeL Switch"}, | ||
1115 | /* HandsfreeR */ | 1364 | /* HandsfreeR */ |
1116 | {"HandsfreeR Mux", "DACR1", "ARXR1_APGA"}, | 1365 | {"HandsfreeR Mux", "Voice", "Analog Voice Playback Mixer"}, |
1117 | {"HandsfreeR Mux", "DACR2", "ARXR2_APGA"}, | 1366 | {"HandsfreeR Mux", "AudioR1", "Analog R1 Playback Mixer"}, |
1118 | {"HandsfreeR Mux", "DACL2", "ARXL2_APGA"}, | 1367 | {"HandsfreeR Mux", "AudioR2", "Analog R2 Playback Mixer"}, |
1368 | {"HandsfreeR Mux", "AudioL2", "Analog L2 Playback Mixer"}, | ||
1369 | {"HandsfreeR Switch", "Switch", "HandsfreeR Mux"}, | ||
1370 | {"HandsfreeR PGA", NULL, "HandsfreeR Switch"}, | ||
1371 | /* Vibra */ | ||
1372 | {"Vibra Mux", "AudioL1", "DAC Left1"}, | ||
1373 | {"Vibra Mux", "AudioR1", "DAC Right1"}, | ||
1374 | {"Vibra Mux", "AudioL2", "DAC Left2"}, | ||
1375 | {"Vibra Mux", "AudioR2", "DAC Right2"}, | ||
1119 | 1376 | ||
1120 | /* outputs */ | 1377 | /* outputs */ |
1121 | {"OUTL", NULL, "ARXL2_APGA"}, | 1378 | {"OUTL", NULL, "Analog L2 Playback Mixer"}, |
1122 | {"OUTR", NULL, "ARXR2_APGA"}, | 1379 | {"OUTR", NULL, "Analog R2 Playback Mixer"}, |
1123 | {"EARPIECE", NULL, "Earpiece Mux"}, | 1380 | {"EARPIECE", NULL, "Earpiece Mixer"}, |
1124 | {"PREDRIVEL", NULL, "PredriveL Mux"}, | 1381 | {"PREDRIVEL", NULL, "PredriveL Mixer"}, |
1125 | {"PREDRIVER", NULL, "PredriveR Mux"}, | 1382 | {"PREDRIVER", NULL, "PredriveR Mixer"}, |
1126 | {"HSOL", NULL, "HeadsetL Mux"}, | 1383 | {"HSOL", NULL, "HeadsetL PGA"}, |
1127 | {"HSOR", NULL, "HeadsetR Mux"}, | 1384 | {"HSOR", NULL, "HeadsetR PGA"}, |
1128 | {"CARKITL", NULL, "CarkitL Mux"}, | 1385 | {"CARKITL", NULL, "CarkitL Mixer"}, |
1129 | {"CARKITR", NULL, "CarkitR Mux"}, | 1386 | {"CARKITR", NULL, "CarkitR Mixer"}, |
1130 | {"HFL", NULL, "HandsfreeL Mux"}, | 1387 | {"HFL", NULL, "HandsfreeL PGA"}, |
1131 | {"HFR", NULL, "HandsfreeR Mux"}, | 1388 | {"HFR", NULL, "HandsfreeR PGA"}, |
1389 | {"Vibra Route", "Audio", "Vibra Mux"}, | ||
1390 | {"VIBRA", NULL, "Vibra Route"}, | ||
1132 | 1391 | ||
1133 | /* Capture path */ | 1392 | /* Capture path */ |
1134 | {"Analog Left Capture Route", "Main mic", "MAINMIC"}, | 1393 | {"Analog Left Capture Route", "Main mic", "MAINMIC"}, |
@@ -1168,18 +1427,22 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
1168 | {"Left1 Analog Loopback", "Switch", "Analog Left Capture Route"}, | 1427 | {"Left1 Analog Loopback", "Switch", "Analog Left Capture Route"}, |
1169 | {"Right2 Analog Loopback", "Switch", "Analog Right Capture Route"}, | 1428 | {"Right2 Analog Loopback", "Switch", "Analog Right Capture Route"}, |
1170 | {"Left2 Analog Loopback", "Switch", "Analog Left Capture Route"}, | 1429 | {"Left2 Analog Loopback", "Switch", "Analog Left Capture Route"}, |
1430 | {"Voice Analog Loopback", "Switch", "Analog Left Capture Route"}, | ||
1171 | 1431 | ||
1172 | {"Analog R1 Playback Mixer", NULL, "Right1 Analog Loopback"}, | 1432 | {"Analog R1 Playback Mixer", NULL, "Right1 Analog Loopback"}, |
1173 | {"Analog L1 Playback Mixer", NULL, "Left1 Analog Loopback"}, | 1433 | {"Analog L1 Playback Mixer", NULL, "Left1 Analog Loopback"}, |
1174 | {"Analog R2 Playback Mixer", NULL, "Right2 Analog Loopback"}, | 1434 | {"Analog R2 Playback Mixer", NULL, "Right2 Analog Loopback"}, |
1175 | {"Analog L2 Playback Mixer", NULL, "Left2 Analog Loopback"}, | 1435 | {"Analog L2 Playback Mixer", NULL, "Left2 Analog Loopback"}, |
1436 | {"Analog Voice Playback Mixer", NULL, "Voice Analog Loopback"}, | ||
1176 | 1437 | ||
1177 | /* Digital bypass routes */ | 1438 | /* Digital bypass routes */ |
1178 | {"Right Digital Loopback", "Volume", "TX1 Capture Route"}, | 1439 | {"Right Digital Loopback", "Volume", "TX1 Capture Route"}, |
1179 | {"Left Digital Loopback", "Volume", "TX1 Capture Route"}, | 1440 | {"Left Digital Loopback", "Volume", "TX1 Capture Route"}, |
1441 | {"Voice Digital Loopback", "Volume", "TX2 Capture Route"}, | ||
1180 | 1442 | ||
1181 | {"Analog R2 Playback Mixer", NULL, "Right Digital Loopback"}, | 1443 | {"Digital R2 Playback Mixer", NULL, "Right Digital Loopback"}, |
1182 | {"Analog L2 Playback Mixer", NULL, "Left Digital Loopback"}, | 1444 | {"Digital L2 Playback Mixer", NULL, "Left Digital Loopback"}, |
1445 | {"Digital Voice Playback Mixer", NULL, "Voice Digital Loopback"}, | ||
1183 | 1446 | ||
1184 | }; | 1447 | }; |
1185 | 1448 | ||
@@ -1226,6 +1489,58 @@ static int twl4030_set_bias_level(struct snd_soc_codec *codec, | |||
1226 | return 0; | 1489 | return 0; |
1227 | } | 1490 | } |
1228 | 1491 | ||
1492 | static void twl4030_constraints(struct twl4030_priv *twl4030, | ||
1493 | struct snd_pcm_substream *mst_substream) | ||
1494 | { | ||
1495 | struct snd_pcm_substream *slv_substream; | ||
1496 | |||
1497 | /* Pick the stream, which need to be constrained */ | ||
1498 | if (mst_substream == twl4030->master_substream) | ||
1499 | slv_substream = twl4030->slave_substream; | ||
1500 | else if (mst_substream == twl4030->slave_substream) | ||
1501 | slv_substream = twl4030->master_substream; | ||
1502 | else /* This should not happen.. */ | ||
1503 | return; | ||
1504 | |||
1505 | /* Set the constraints according to the already configured stream */ | ||
1506 | snd_pcm_hw_constraint_minmax(slv_substream->runtime, | ||
1507 | SNDRV_PCM_HW_PARAM_RATE, | ||
1508 | twl4030->rate, | ||
1509 | twl4030->rate); | ||
1510 | |||
1511 | snd_pcm_hw_constraint_minmax(slv_substream->runtime, | ||
1512 | SNDRV_PCM_HW_PARAM_SAMPLE_BITS, | ||
1513 | twl4030->sample_bits, | ||
1514 | twl4030->sample_bits); | ||
1515 | |||
1516 | snd_pcm_hw_constraint_minmax(slv_substream->runtime, | ||
1517 | SNDRV_PCM_HW_PARAM_CHANNELS, | ||
1518 | twl4030->channels, | ||
1519 | twl4030->channels); | ||
1520 | } | ||
1521 | |||
1522 | /* In case of 4 channel mode, the RX1 L/R for playback and the TX2 L/R for | ||
1523 | * capture has to be enabled/disabled. */ | ||
1524 | static void twl4030_tdm_enable(struct snd_soc_codec *codec, int direction, | ||
1525 | int enable) | ||
1526 | { | ||
1527 | u8 reg, mask; | ||
1528 | |||
1529 | reg = twl4030_read_reg_cache(codec, TWL4030_REG_OPTION); | ||
1530 | |||
1531 | if (direction == SNDRV_PCM_STREAM_PLAYBACK) | ||
1532 | mask = TWL4030_ARXL1_VRX_EN | TWL4030_ARXR1_EN; | ||
1533 | else | ||
1534 | mask = TWL4030_ATXL2_VTXL_EN | TWL4030_ATXR2_VTXR_EN; | ||
1535 | |||
1536 | if (enable) | ||
1537 | reg |= mask; | ||
1538 | else | ||
1539 | reg &= ~mask; | ||
1540 | |||
1541 | twl4030_write(codec, TWL4030_REG_OPTION, reg); | ||
1542 | } | ||
1543 | |||
1229 | static int twl4030_startup(struct snd_pcm_substream *substream, | 1544 | static int twl4030_startup(struct snd_pcm_substream *substream, |
1230 | struct snd_soc_dai *dai) | 1545 | struct snd_soc_dai *dai) |
1231 | { | 1546 | { |
@@ -1234,26 +1549,25 @@ static int twl4030_startup(struct snd_pcm_substream *substream, | |||
1234 | struct snd_soc_codec *codec = socdev->card->codec; | 1549 | struct snd_soc_codec *codec = socdev->card->codec; |
1235 | struct twl4030_priv *twl4030 = codec->private_data; | 1550 | struct twl4030_priv *twl4030 = codec->private_data; |
1236 | 1551 | ||
1237 | /* If we already have a playback or capture going then constrain | ||
1238 | * this substream to match it. | ||
1239 | */ | ||
1240 | if (twl4030->master_substream) { | 1552 | if (twl4030->master_substream) { |
1241 | struct snd_pcm_runtime *master_runtime; | ||
1242 | master_runtime = twl4030->master_substream->runtime; | ||
1243 | |||
1244 | snd_pcm_hw_constraint_minmax(substream->runtime, | ||
1245 | SNDRV_PCM_HW_PARAM_RATE, | ||
1246 | master_runtime->rate, | ||
1247 | master_runtime->rate); | ||
1248 | |||
1249 | snd_pcm_hw_constraint_minmax(substream->runtime, | ||
1250 | SNDRV_PCM_HW_PARAM_SAMPLE_BITS, | ||
1251 | master_runtime->sample_bits, | ||
1252 | master_runtime->sample_bits); | ||
1253 | |||
1254 | twl4030->slave_substream = substream; | 1553 | twl4030->slave_substream = substream; |
1255 | } else | 1554 | /* The DAI has one configuration for playback and capture, so |
1555 | * if the DAI has been already configured then constrain this | ||
1556 | * substream to match it. */ | ||
1557 | if (twl4030->configured) | ||
1558 | twl4030_constraints(twl4030, twl4030->master_substream); | ||
1559 | } else { | ||
1560 | if (!(twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE) & | ||
1561 | TWL4030_OPTION_1)) { | ||
1562 | /* In option2 4 channel is not supported, set the | ||
1563 | * constraint for the first stream for channels, the | ||
1564 | * second stream will 'inherit' this cosntraint */ | ||
1565 | snd_pcm_hw_constraint_minmax(substream->runtime, | ||
1566 | SNDRV_PCM_HW_PARAM_CHANNELS, | ||
1567 | 2, 2); | ||
1568 | } | ||
1256 | twl4030->master_substream = substream; | 1569 | twl4030->master_substream = substream; |
1570 | } | ||
1257 | 1571 | ||
1258 | return 0; | 1572 | return 0; |
1259 | } | 1573 | } |
@@ -1270,6 +1584,17 @@ static void twl4030_shutdown(struct snd_pcm_substream *substream, | |||
1270 | twl4030->master_substream = twl4030->slave_substream; | 1584 | twl4030->master_substream = twl4030->slave_substream; |
1271 | 1585 | ||
1272 | twl4030->slave_substream = NULL; | 1586 | twl4030->slave_substream = NULL; |
1587 | |||
1588 | /* If all streams are closed, or the remaining stream has not yet | ||
1589 | * been configured than set the DAI as not configured. */ | ||
1590 | if (!twl4030->master_substream) | ||
1591 | twl4030->configured = 0; | ||
1592 | else if (!twl4030->master_substream->runtime->channels) | ||
1593 | twl4030->configured = 0; | ||
1594 | |||
1595 | /* If the closing substream had 4 channel, do the necessary cleanup */ | ||
1596 | if (substream->runtime->channels == 4) | ||
1597 | twl4030_tdm_enable(codec, substream->stream, 0); | ||
1273 | } | 1598 | } |
1274 | 1599 | ||
1275 | static int twl4030_hw_params(struct snd_pcm_substream *substream, | 1600 | static int twl4030_hw_params(struct snd_pcm_substream *substream, |
@@ -1282,8 +1607,24 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream, | |||
1282 | struct twl4030_priv *twl4030 = codec->private_data; | 1607 | struct twl4030_priv *twl4030 = codec->private_data; |
1283 | u8 mode, old_mode, format, old_format; | 1608 | u8 mode, old_mode, format, old_format; |
1284 | 1609 | ||
1285 | if (substream == twl4030->slave_substream) | 1610 | /* If the substream has 4 channel, do the necessary setup */ |
1286 | /* Ignoring hw_params for slave substream */ | 1611 | if (params_channels(params) == 4) { |
1612 | u8 format, mode; | ||
1613 | |||
1614 | format = twl4030_read_reg_cache(codec, TWL4030_REG_AUDIO_IF); | ||
1615 | mode = twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE); | ||
1616 | |||
1617 | /* Safety check: are we in the correct operating mode and | ||
1618 | * the interface is in TDM mode? */ | ||
1619 | if ((mode & TWL4030_OPTION_1) && | ||
1620 | ((format & TWL4030_AIF_FORMAT) == TWL4030_AIF_FORMAT_TDM)) | ||
1621 | twl4030_tdm_enable(codec, substream->stream, 1); | ||
1622 | else | ||
1623 | return -EINVAL; | ||
1624 | } | ||
1625 | |||
1626 | if (twl4030->configured) | ||
1627 | /* Ignoring hw_params for already configured DAI */ | ||
1287 | return 0; | 1628 | return 0; |
1288 | 1629 | ||
1289 | /* bit rate */ | 1630 | /* bit rate */ |
@@ -1363,6 +1704,21 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream, | |||
1363 | /* set CODECPDZ afterwards */ | 1704 | /* set CODECPDZ afterwards */ |
1364 | twl4030_codec_enable(codec, 1); | 1705 | twl4030_codec_enable(codec, 1); |
1365 | } | 1706 | } |
1707 | |||
1708 | /* Store the important parameters for the DAI configuration and set | ||
1709 | * the DAI as configured */ | ||
1710 | twl4030->configured = 1; | ||
1711 | twl4030->rate = params_rate(params); | ||
1712 | twl4030->sample_bits = hw_param_interval(params, | ||
1713 | SNDRV_PCM_HW_PARAM_SAMPLE_BITS)->min; | ||
1714 | twl4030->channels = params_channels(params); | ||
1715 | |||
1716 | /* If both playback and capture streams are open, and one of them | ||
1717 | * is setting the hw parameters right now (since we are here), set | ||
1718 | * constraints to the other stream to match the current one. */ | ||
1719 | if (twl4030->slave_substream) | ||
1720 | twl4030_constraints(twl4030, substream); | ||
1721 | |||
1366 | return 0; | 1722 | return 0; |
1367 | } | 1723 | } |
1368 | 1724 | ||
@@ -1370,17 +1726,21 @@ static int twl4030_set_dai_sysclk(struct snd_soc_dai *codec_dai, | |||
1370 | int clk_id, unsigned int freq, int dir) | 1726 | int clk_id, unsigned int freq, int dir) |
1371 | { | 1727 | { |
1372 | struct snd_soc_codec *codec = codec_dai->codec; | 1728 | struct snd_soc_codec *codec = codec_dai->codec; |
1729 | struct twl4030_priv *twl4030 = codec->private_data; | ||
1373 | u8 infreq; | 1730 | u8 infreq; |
1374 | 1731 | ||
1375 | switch (freq) { | 1732 | switch (freq) { |
1376 | case 19200000: | 1733 | case 19200000: |
1377 | infreq = TWL4030_APLL_INFREQ_19200KHZ; | 1734 | infreq = TWL4030_APLL_INFREQ_19200KHZ; |
1735 | twl4030->sysclk = 19200; | ||
1378 | break; | 1736 | break; |
1379 | case 26000000: | 1737 | case 26000000: |
1380 | infreq = TWL4030_APLL_INFREQ_26000KHZ; | 1738 | infreq = TWL4030_APLL_INFREQ_26000KHZ; |
1739 | twl4030->sysclk = 26000; | ||
1381 | break; | 1740 | break; |
1382 | case 38400000: | 1741 | case 38400000: |
1383 | infreq = TWL4030_APLL_INFREQ_38400KHZ; | 1742 | infreq = TWL4030_APLL_INFREQ_38400KHZ; |
1743 | twl4030->sysclk = 38400; | ||
1384 | break; | 1744 | break; |
1385 | default: | 1745 | default: |
1386 | printk(KERN_ERR "TWL4030 set sysclk: unknown rate %d\n", | 1746 | printk(KERN_ERR "TWL4030 set sysclk: unknown rate %d\n", |
@@ -1424,6 +1784,9 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai, | |||
1424 | case SND_SOC_DAIFMT_I2S: | 1784 | case SND_SOC_DAIFMT_I2S: |
1425 | format |= TWL4030_AIF_FORMAT_CODEC; | 1785 | format |= TWL4030_AIF_FORMAT_CODEC; |
1426 | break; | 1786 | break; |
1787 | case SND_SOC_DAIFMT_DSP_A: | ||
1788 | format |= TWL4030_AIF_FORMAT_TDM; | ||
1789 | break; | ||
1427 | default: | 1790 | default: |
1428 | return -EINVAL; | 1791 | return -EINVAL; |
1429 | } | 1792 | } |
@@ -1443,6 +1806,180 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai, | |||
1443 | return 0; | 1806 | return 0; |
1444 | } | 1807 | } |
1445 | 1808 | ||
1809 | /* In case of voice mode, the RX1 L(VRX) for downlink and the TX2 L/R | ||
1810 | * (VTXL, VTXR) for uplink has to be enabled/disabled. */ | ||
1811 | static void twl4030_voice_enable(struct snd_soc_codec *codec, int direction, | ||
1812 | int enable) | ||
1813 | { | ||
1814 | u8 reg, mask; | ||
1815 | |||
1816 | reg = twl4030_read_reg_cache(codec, TWL4030_REG_OPTION); | ||
1817 | |||
1818 | if (direction == SNDRV_PCM_STREAM_PLAYBACK) | ||
1819 | mask = TWL4030_ARXL1_VRX_EN; | ||
1820 | else | ||
1821 | mask = TWL4030_ATXL2_VTXL_EN | TWL4030_ATXR2_VTXR_EN; | ||
1822 | |||
1823 | if (enable) | ||
1824 | reg |= mask; | ||
1825 | else | ||
1826 | reg &= ~mask; | ||
1827 | |||
1828 | twl4030_write(codec, TWL4030_REG_OPTION, reg); | ||
1829 | } | ||
1830 | |||
1831 | static int twl4030_voice_startup(struct snd_pcm_substream *substream, | ||
1832 | struct snd_soc_dai *dai) | ||
1833 | { | ||
1834 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
1835 | struct snd_soc_device *socdev = rtd->socdev; | ||
1836 | struct snd_soc_codec *codec = socdev->card->codec; | ||
1837 | u8 infreq; | ||
1838 | u8 mode; | ||
1839 | |||
1840 | /* If the system master clock is not 26MHz, the voice PCM interface is | ||
1841 | * not avilable. | ||
1842 | */ | ||
1843 | infreq = twl4030_read_reg_cache(codec, TWL4030_REG_APLL_CTL) | ||
1844 | & TWL4030_APLL_INFREQ; | ||
1845 | |||
1846 | if (infreq != TWL4030_APLL_INFREQ_26000KHZ) { | ||
1847 | printk(KERN_ERR "TWL4030 voice startup: " | ||
1848 | "MCLK is not 26MHz, call set_sysclk() on init\n"); | ||
1849 | return -EINVAL; | ||
1850 | } | ||
1851 | |||
1852 | /* If the codec mode is not option2, the voice PCM interface is not | ||
1853 | * avilable. | ||
1854 | */ | ||
1855 | mode = twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE) | ||
1856 | & TWL4030_OPT_MODE; | ||
1857 | |||
1858 | if (mode != TWL4030_OPTION_2) { | ||
1859 | printk(KERN_ERR "TWL4030 voice startup: " | ||
1860 | "the codec mode is not option2\n"); | ||
1861 | return -EINVAL; | ||
1862 | } | ||
1863 | |||
1864 | return 0; | ||
1865 | } | ||
1866 | |||
1867 | static void twl4030_voice_shutdown(struct snd_pcm_substream *substream, | ||
1868 | struct snd_soc_dai *dai) | ||
1869 | { | ||
1870 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
1871 | struct snd_soc_device *socdev = rtd->socdev; | ||
1872 | struct snd_soc_codec *codec = socdev->card->codec; | ||
1873 | |||
1874 | /* Enable voice digital filters */ | ||
1875 | twl4030_voice_enable(codec, substream->stream, 0); | ||
1876 | } | ||
1877 | |||
1878 | static int twl4030_voice_hw_params(struct snd_pcm_substream *substream, | ||
1879 | struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) | ||
1880 | { | ||
1881 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
1882 | struct snd_soc_device *socdev = rtd->socdev; | ||
1883 | struct snd_soc_codec *codec = socdev->card->codec; | ||
1884 | u8 old_mode, mode; | ||
1885 | |||
1886 | /* Enable voice digital filters */ | ||
1887 | twl4030_voice_enable(codec, substream->stream, 1); | ||
1888 | |||
1889 | /* bit rate */ | ||
1890 | old_mode = twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE) | ||
1891 | & ~(TWL4030_CODECPDZ); | ||
1892 | mode = old_mode; | ||
1893 | |||
1894 | switch (params_rate(params)) { | ||
1895 | case 8000: | ||
1896 | mode &= ~(TWL4030_SEL_16K); | ||
1897 | break; | ||
1898 | case 16000: | ||
1899 | mode |= TWL4030_SEL_16K; | ||
1900 | break; | ||
1901 | default: | ||
1902 | printk(KERN_ERR "TWL4030 voice hw params: unknown rate %d\n", | ||
1903 | params_rate(params)); | ||
1904 | return -EINVAL; | ||
1905 | } | ||
1906 | |||
1907 | if (mode != old_mode) { | ||
1908 | /* change rate and set CODECPDZ */ | ||
1909 | twl4030_codec_enable(codec, 0); | ||
1910 | twl4030_write(codec, TWL4030_REG_CODEC_MODE, mode); | ||
1911 | twl4030_codec_enable(codec, 1); | ||
1912 | } | ||
1913 | |||
1914 | return 0; | ||
1915 | } | ||
1916 | |||
1917 | static int twl4030_voice_set_dai_sysclk(struct snd_soc_dai *codec_dai, | ||
1918 | int clk_id, unsigned int freq, int dir) | ||
1919 | { | ||
1920 | struct snd_soc_codec *codec = codec_dai->codec; | ||
1921 | u8 infreq; | ||
1922 | |||
1923 | switch (freq) { | ||
1924 | case 26000000: | ||
1925 | infreq = TWL4030_APLL_INFREQ_26000KHZ; | ||
1926 | break; | ||
1927 | default: | ||
1928 | printk(KERN_ERR "TWL4030 voice set sysclk: unknown rate %d\n", | ||
1929 | freq); | ||
1930 | return -EINVAL; | ||
1931 | } | ||
1932 | |||
1933 | infreq |= TWL4030_APLL_EN; | ||
1934 | twl4030_write(codec, TWL4030_REG_APLL_CTL, infreq); | ||
1935 | |||
1936 | return 0; | ||
1937 | } | ||
1938 | |||
1939 | static int twl4030_voice_set_dai_fmt(struct snd_soc_dai *codec_dai, | ||
1940 | unsigned int fmt) | ||
1941 | { | ||
1942 | struct snd_soc_codec *codec = codec_dai->codec; | ||
1943 | u8 old_format, format; | ||
1944 | |||
1945 | /* get format */ | ||
1946 | old_format = twl4030_read_reg_cache(codec, TWL4030_REG_VOICE_IF); | ||
1947 | format = old_format; | ||
1948 | |||
1949 | /* set master/slave audio interface */ | ||
1950 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | ||
1951 | case SND_SOC_DAIFMT_CBS_CFM: | ||
1952 | format &= ~(TWL4030_VIF_SLAVE_EN); | ||
1953 | break; | ||
1954 | case SND_SOC_DAIFMT_CBS_CFS: | ||
1955 | format |= TWL4030_VIF_SLAVE_EN; | ||
1956 | break; | ||
1957 | default: | ||
1958 | return -EINVAL; | ||
1959 | } | ||
1960 | |||
1961 | /* clock inversion */ | ||
1962 | switch (fmt & SND_SOC_DAIFMT_INV_MASK) { | ||
1963 | case SND_SOC_DAIFMT_IB_NF: | ||
1964 | format &= ~(TWL4030_VIF_FORMAT); | ||
1965 | break; | ||
1966 | case SND_SOC_DAIFMT_NB_IF: | ||
1967 | format |= TWL4030_VIF_FORMAT; | ||
1968 | break; | ||
1969 | default: | ||
1970 | return -EINVAL; | ||
1971 | } | ||
1972 | |||
1973 | if (format != old_format) { | ||
1974 | /* change format and set CODECPDZ */ | ||
1975 | twl4030_codec_enable(codec, 0); | ||
1976 | twl4030_write(codec, TWL4030_REG_VOICE_IF, format); | ||
1977 | twl4030_codec_enable(codec, 1); | ||
1978 | } | ||
1979 | |||
1980 | return 0; | ||
1981 | } | ||
1982 | |||
1446 | #define TWL4030_RATES (SNDRV_PCM_RATE_8000_48000) | 1983 | #define TWL4030_RATES (SNDRV_PCM_RATE_8000_48000) |
1447 | #define TWL4030_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE) | 1984 | #define TWL4030_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE) |
1448 | 1985 | ||
@@ -1454,21 +1991,47 @@ static struct snd_soc_dai_ops twl4030_dai_ops = { | |||
1454 | .set_fmt = twl4030_set_dai_fmt, | 1991 | .set_fmt = twl4030_set_dai_fmt, |
1455 | }; | 1992 | }; |
1456 | 1993 | ||
1457 | struct snd_soc_dai twl4030_dai = { | 1994 | static struct snd_soc_dai_ops twl4030_dai_voice_ops = { |
1995 | .startup = twl4030_voice_startup, | ||
1996 | .shutdown = twl4030_voice_shutdown, | ||
1997 | .hw_params = twl4030_voice_hw_params, | ||
1998 | .set_sysclk = twl4030_voice_set_dai_sysclk, | ||
1999 | .set_fmt = twl4030_voice_set_dai_fmt, | ||
2000 | }; | ||
2001 | |||
2002 | struct snd_soc_dai twl4030_dai[] = { | ||
2003 | { | ||
1458 | .name = "twl4030", | 2004 | .name = "twl4030", |
1459 | .playback = { | 2005 | .playback = { |
1460 | .stream_name = "Playback", | 2006 | .stream_name = "HiFi Playback", |
1461 | .channels_min = 2, | 2007 | .channels_min = 2, |
1462 | .channels_max = 2, | 2008 | .channels_max = 4, |
1463 | .rates = TWL4030_RATES | SNDRV_PCM_RATE_96000, | 2009 | .rates = TWL4030_RATES | SNDRV_PCM_RATE_96000, |
1464 | .formats = TWL4030_FORMATS,}, | 2010 | .formats = TWL4030_FORMATS,}, |
1465 | .capture = { | 2011 | .capture = { |
1466 | .stream_name = "Capture", | 2012 | .stream_name = "Capture", |
1467 | .channels_min = 2, | 2013 | .channels_min = 2, |
1468 | .channels_max = 2, | 2014 | .channels_max = 4, |
1469 | .rates = TWL4030_RATES, | 2015 | .rates = TWL4030_RATES, |
1470 | .formats = TWL4030_FORMATS,}, | 2016 | .formats = TWL4030_FORMATS,}, |
1471 | .ops = &twl4030_dai_ops, | 2017 | .ops = &twl4030_dai_ops, |
2018 | }, | ||
2019 | { | ||
2020 | .name = "twl4030 Voice", | ||
2021 | .playback = { | ||
2022 | .stream_name = "Voice Playback", | ||
2023 | .channels_min = 1, | ||
2024 | .channels_max = 1, | ||
2025 | .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000, | ||
2026 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | ||
2027 | .capture = { | ||
2028 | .stream_name = "Capture", | ||
2029 | .channels_min = 1, | ||
2030 | .channels_max = 2, | ||
2031 | .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000, | ||
2032 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | ||
2033 | .ops = &twl4030_dai_voice_ops, | ||
2034 | }, | ||
1472 | }; | 2035 | }; |
1473 | EXPORT_SYMBOL_GPL(twl4030_dai); | 2036 | EXPORT_SYMBOL_GPL(twl4030_dai); |
1474 | 2037 | ||
@@ -1500,6 +2063,8 @@ static int twl4030_resume(struct platform_device *pdev) | |||
1500 | static int twl4030_init(struct snd_soc_device *socdev) | 2063 | static int twl4030_init(struct snd_soc_device *socdev) |
1501 | { | 2064 | { |
1502 | struct snd_soc_codec *codec = socdev->card->codec; | 2065 | struct snd_soc_codec *codec = socdev->card->codec; |
2066 | struct twl4030_setup_data *setup = socdev->codec_data; | ||
2067 | struct twl4030_priv *twl4030 = codec->private_data; | ||
1503 | int ret = 0; | 2068 | int ret = 0; |
1504 | 2069 | ||
1505 | printk(KERN_INFO "TWL4030 Audio Codec init \n"); | 2070 | printk(KERN_INFO "TWL4030 Audio Codec init \n"); |
@@ -1509,14 +2074,31 @@ static int twl4030_init(struct snd_soc_device *socdev) | |||
1509 | codec->read = twl4030_read_reg_cache; | 2074 | codec->read = twl4030_read_reg_cache; |
1510 | codec->write = twl4030_write; | 2075 | codec->write = twl4030_write; |
1511 | codec->set_bias_level = twl4030_set_bias_level; | 2076 | codec->set_bias_level = twl4030_set_bias_level; |
1512 | codec->dai = &twl4030_dai; | 2077 | codec->dai = twl4030_dai; |
1513 | codec->num_dai = 1; | 2078 | codec->num_dai = ARRAY_SIZE(twl4030_dai), |
1514 | codec->reg_cache_size = sizeof(twl4030_reg); | 2079 | codec->reg_cache_size = sizeof(twl4030_reg); |
1515 | codec->reg_cache = kmemdup(twl4030_reg, sizeof(twl4030_reg), | 2080 | codec->reg_cache = kmemdup(twl4030_reg, sizeof(twl4030_reg), |
1516 | GFP_KERNEL); | 2081 | GFP_KERNEL); |
1517 | if (codec->reg_cache == NULL) | 2082 | if (codec->reg_cache == NULL) |
1518 | return -ENOMEM; | 2083 | return -ENOMEM; |
1519 | 2084 | ||
2085 | /* Configuration for headset ramp delay from setup data */ | ||
2086 | if (setup) { | ||
2087 | unsigned char hs_pop; | ||
2088 | |||
2089 | if (setup->sysclk) | ||
2090 | twl4030->sysclk = setup->sysclk; | ||
2091 | else | ||
2092 | twl4030->sysclk = 26000; | ||
2093 | |||
2094 | hs_pop = twl4030_read_reg_cache(codec, TWL4030_REG_HS_POPN_SET); | ||
2095 | hs_pop &= ~TWL4030_RAMP_DELAY; | ||
2096 | hs_pop |= (setup->ramp_delay_value << 2); | ||
2097 | twl4030_write_reg_cache(codec, TWL4030_REG_HS_POPN_SET, hs_pop); | ||
2098 | } else { | ||
2099 | twl4030->sysclk = 26000; | ||
2100 | } | ||
2101 | |||
1520 | /* register pcms */ | 2102 | /* register pcms */ |
1521 | ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); | 2103 | ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); |
1522 | if (ret < 0) { | 2104 | if (ret < 0) { |
@@ -1604,13 +2186,13 @@ EXPORT_SYMBOL_GPL(soc_codec_dev_twl4030); | |||
1604 | 2186 | ||
1605 | static int __init twl4030_modinit(void) | 2187 | static int __init twl4030_modinit(void) |
1606 | { | 2188 | { |
1607 | return snd_soc_register_dai(&twl4030_dai); | 2189 | return snd_soc_register_dais(&twl4030_dai[0], ARRAY_SIZE(twl4030_dai)); |
1608 | } | 2190 | } |
1609 | module_init(twl4030_modinit); | 2191 | module_init(twl4030_modinit); |
1610 | 2192 | ||
1611 | static void __exit twl4030_exit(void) | 2193 | static void __exit twl4030_exit(void) |
1612 | { | 2194 | { |
1613 | snd_soc_unregister_dai(&twl4030_dai); | 2195 | snd_soc_unregister_dais(&twl4030_dai[0], ARRAY_SIZE(twl4030_dai)); |
1614 | } | 2196 | } |
1615 | module_exit(twl4030_exit); | 2197 | module_exit(twl4030_exit); |
1616 | 2198 | ||
diff --git a/sound/soc/codecs/twl4030.h b/sound/soc/codecs/twl4030.h index cb63765db1df..fe5f395d9e4f 100644 --- a/sound/soc/codecs/twl4030.h +++ b/sound/soc/codecs/twl4030.h | |||
@@ -92,8 +92,9 @@ | |||
92 | #define TWL4030_REG_VIBRA_PWM_SET 0x47 | 92 | #define TWL4030_REG_VIBRA_PWM_SET 0x47 |
93 | #define TWL4030_REG_ANAMIC_GAIN 0x48 | 93 | #define TWL4030_REG_ANAMIC_GAIN 0x48 |
94 | #define TWL4030_REG_MISC_SET_2 0x49 | 94 | #define TWL4030_REG_MISC_SET_2 0x49 |
95 | #define TWL4030_REG_SW_SHADOW 0x4A | ||
95 | 96 | ||
96 | #define TWL4030_CACHEREGNUM (TWL4030_REG_MISC_SET_2 + 1) | 97 | #define TWL4030_CACHEREGNUM (TWL4030_REG_SW_SHADOW + 1) |
97 | 98 | ||
98 | /* Bitfield Definitions */ | 99 | /* Bitfield Definitions */ |
99 | 100 | ||
@@ -110,9 +111,22 @@ | |||
110 | #define TWL4030_APLL_RATE_44100 0x90 | 111 | #define TWL4030_APLL_RATE_44100 0x90 |
111 | #define TWL4030_APLL_RATE_48000 0xA0 | 112 | #define TWL4030_APLL_RATE_48000 0xA0 |
112 | #define TWL4030_APLL_RATE_96000 0xE0 | 113 | #define TWL4030_APLL_RATE_96000 0xE0 |
113 | #define TWL4030_SEL_16K 0x04 | 114 | #define TWL4030_SEL_16K 0x08 |
114 | #define TWL4030_CODECPDZ 0x02 | 115 | #define TWL4030_CODECPDZ 0x02 |
115 | #define TWL4030_OPT_MODE 0x01 | 116 | #define TWL4030_OPT_MODE 0x01 |
117 | #define TWL4030_OPTION_1 (1 << 0) | ||
118 | #define TWL4030_OPTION_2 (0 << 0) | ||
119 | |||
120 | /* TWL4030_OPTION (0x02) Fields */ | ||
121 | |||
122 | #define TWL4030_ATXL1_EN (1 << 0) | ||
123 | #define TWL4030_ATXR1_EN (1 << 1) | ||
124 | #define TWL4030_ATXL2_VTXL_EN (1 << 2) | ||
125 | #define TWL4030_ATXR2_VTXR_EN (1 << 3) | ||
126 | #define TWL4030_ARXL1_VRX_EN (1 << 4) | ||
127 | #define TWL4030_ARXR1_EN (1 << 5) | ||
128 | #define TWL4030_ARXL2_EN (1 << 6) | ||
129 | #define TWL4030_ARXR2_EN (1 << 7) | ||
116 | 130 | ||
117 | /* TWL4030_REG_MICBIAS_CTL (0x04) Fields */ | 131 | /* TWL4030_REG_MICBIAS_CTL (0x04) Fields */ |
118 | 132 | ||
@@ -171,6 +185,17 @@ | |||
171 | #define TWL4030_CLK256FS_EN 0x02 | 185 | #define TWL4030_CLK256FS_EN 0x02 |
172 | #define TWL4030_AIF_EN 0x01 | 186 | #define TWL4030_AIF_EN 0x01 |
173 | 187 | ||
188 | /* VOICE_IF (0x0F) Fields */ | ||
189 | |||
190 | #define TWL4030_VIF_SLAVE_EN 0x80 | ||
191 | #define TWL4030_VIF_DIN_EN 0x40 | ||
192 | #define TWL4030_VIF_DOUT_EN 0x20 | ||
193 | #define TWL4030_VIF_SWAP 0x10 | ||
194 | #define TWL4030_VIF_FORMAT 0x08 | ||
195 | #define TWL4030_VIF_TRI_EN 0x04 | ||
196 | #define TWL4030_VIF_SUB_EN 0x02 | ||
197 | #define TWL4030_VIF_EN 0x01 | ||
198 | |||
174 | /* EAR_CTL (0x21) */ | 199 | /* EAR_CTL (0x21) */ |
175 | #define TWL4030_EAR_GAIN 0x30 | 200 | #define TWL4030_EAR_GAIN 0x30 |
176 | 201 | ||
@@ -236,7 +261,19 @@ | |||
236 | #define TWL4030_SMOOTH_ANAVOL_EN 0x02 | 261 | #define TWL4030_SMOOTH_ANAVOL_EN 0x02 |
237 | #define TWL4030_DIGMIC_LR_SWAP_EN 0x01 | 262 | #define TWL4030_DIGMIC_LR_SWAP_EN 0x01 |
238 | 263 | ||
239 | extern struct snd_soc_dai twl4030_dai; | 264 | /* TWL4030_REG_SW_SHADOW (0x4A) Fields */ |
265 | #define TWL4030_HFL_EN 0x01 | ||
266 | #define TWL4030_HFR_EN 0x02 | ||
267 | |||
268 | #define TWL4030_DAI_HIFI 0 | ||
269 | #define TWL4030_DAI_VOICE 1 | ||
270 | |||
271 | extern struct snd_soc_dai twl4030_dai[2]; | ||
240 | extern struct snd_soc_codec_device soc_codec_dev_twl4030; | 272 | extern struct snd_soc_codec_device soc_codec_dev_twl4030; |
241 | 273 | ||
274 | struct twl4030_setup_data { | ||
275 | unsigned int ramp_delay_value; | ||
276 | unsigned int sysclk; | ||
277 | }; | ||
278 | |||
242 | #endif /* End of __TWL4030_AUDIO_H__ */ | 279 | #endif /* End of __TWL4030_AUDIO_H__ */ |
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index ddefb8f80145..269b108e1de6 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c | |||
@@ -101,7 +101,7 @@ static int uda134x_write(struct snd_soc_codec *codec, unsigned int reg, | |||
101 | pr_debug("%s reg: %02X, value:%02X\n", __func__, reg, value); | 101 | pr_debug("%s reg: %02X, value:%02X\n", __func__, reg, value); |
102 | 102 | ||
103 | if (reg >= UDA134X_REGS_NUM) { | 103 | if (reg >= UDA134X_REGS_NUM) { |
104 | printk(KERN_ERR "%s unkown register: reg: %d", | 104 | printk(KERN_ERR "%s unkown register: reg: %u", |
105 | __func__, reg); | 105 | __func__, reg); |
106 | return -EINVAL; | 106 | return -EINVAL; |
107 | } | 107 | } |
@@ -296,7 +296,7 @@ static int uda134x_set_dai_sysclk(struct snd_soc_dai *codec_dai, | |||
296 | struct snd_soc_codec *codec = codec_dai->codec; | 296 | struct snd_soc_codec *codec = codec_dai->codec; |
297 | struct uda134x_priv *uda134x = codec->private_data; | 297 | struct uda134x_priv *uda134x = codec->private_data; |
298 | 298 | ||
299 | pr_debug("%s clk_id: %d, freq: %d, dir: %d\n", __func__, | 299 | pr_debug("%s clk_id: %d, freq: %u, dir: %d\n", __func__, |
300 | clk_id, freq, dir); | 300 | clk_id, freq, dir); |
301 | 301 | ||
302 | /* Anything between 256fs*8Khz and 512fs*48Khz should be acceptable | 302 | /* Anything between 256fs*8Khz and 512fs*48Khz should be acceptable |
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 0275321ff8ab..e7348d341b76 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
@@ -1108,7 +1108,7 @@ static int wm8350_set_fll(struct snd_soc_dai *codec_dai, | |||
1108 | if (ret < 0) | 1108 | if (ret < 0) |
1109 | return ret; | 1109 | return ret; |
1110 | dev_dbg(wm8350->dev, | 1110 | dev_dbg(wm8350->dev, |
1111 | "FLL in %d FLL out %d N 0x%x K 0x%x div %d ratio %d", | 1111 | "FLL in %u FLL out %u N 0x%x K 0x%x div %d ratio %d", |
1112 | freq_in, freq_out, fll_div.n, fll_div.k, fll_div.div, | 1112 | freq_in, freq_out, fll_div.n, fll_div.k, fll_div.div, |
1113 | fll_div.ratio); | 1113 | fll_div.ratio); |
1114 | 1114 | ||
diff --git a/sound/soc/codecs/wm8350.h b/sound/soc/codecs/wm8350.h index d11bd9288cf9..d088eb4b88bb 100644 --- a/sound/soc/codecs/wm8350.h +++ b/sound/soc/codecs/wm8350.h | |||
@@ -13,6 +13,7 @@ | |||
13 | #define _WM8350_H | 13 | #define _WM8350_H |
14 | 14 | ||
15 | #include <sound/soc.h> | 15 | #include <sound/soc.h> |
16 | #include <linux/mfd/wm8350/audio.h> | ||
16 | 17 | ||
17 | extern struct snd_soc_dai wm8350_dai; | 18 | extern struct snd_soc_dai wm8350_dai; |
18 | extern struct snd_soc_codec_device soc_codec_dev_wm8350; | 19 | extern struct snd_soc_codec_device soc_codec_dev_wm8350; |
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 510efa604008..502eefac1ecd 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c | |||
@@ -954,7 +954,7 @@ static int fll_factors(struct wm8400_priv *wm8400, struct fll_factors *factors, | |||
954 | factors->outdiv *= 2; | 954 | factors->outdiv *= 2; |
955 | if (factors->outdiv > 32) { | 955 | if (factors->outdiv > 32) { |
956 | dev_err(wm8400->wm8400->dev, | 956 | dev_err(wm8400->wm8400->dev, |
957 | "Unsupported FLL output frequency %dHz\n", | 957 | "Unsupported FLL output frequency %uHz\n", |
958 | Fout); | 958 | Fout); |
959 | return -EINVAL; | 959 | return -EINVAL; |
960 | } | 960 | } |
@@ -1003,7 +1003,7 @@ static int fll_factors(struct wm8400_priv *wm8400, struct fll_factors *factors, | |||
1003 | factors->k = K / 10; | 1003 | factors->k = K / 10; |
1004 | 1004 | ||
1005 | dev_dbg(wm8400->wm8400->dev, | 1005 | dev_dbg(wm8400->wm8400->dev, |
1006 | "FLL: Fref=%d Fout=%d N=%x K=%x, FRATIO=%x OUTDIV=%x\n", | 1006 | "FLL: Fref=%u Fout=%u N=%x K=%x, FRATIO=%x OUTDIV=%x\n", |
1007 | Fref, Fout, | 1007 | Fref, Fout, |
1008 | factors->n, factors->k, factors->fratio, factors->outdiv); | 1008 | factors->n, factors->k, factors->fratio, factors->outdiv); |
1009 | 1009 | ||
@@ -1473,8 +1473,8 @@ static int wm8400_codec_probe(struct platform_device *dev) | |||
1473 | 1473 | ||
1474 | codec = &priv->codec; | 1474 | codec = &priv->codec; |
1475 | codec->private_data = priv; | 1475 | codec->private_data = priv; |
1476 | codec->control_data = dev->dev.driver_data; | 1476 | codec->control_data = dev_get_drvdata(&dev->dev); |
1477 | priv->wm8400 = dev->dev.driver_data; | 1477 | priv->wm8400 = dev_get_drvdata(&dev->dev); |
1478 | 1478 | ||
1479 | ret = regulator_bulk_get(priv->wm8400->dev, | 1479 | ret = regulator_bulk_get(priv->wm8400->dev, |
1480 | ARRAY_SIZE(power), &power[0]); | 1480 | ARRAY_SIZE(power), &power[0]); |
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 6a4cea09c45d..c8b8dba85890 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c | |||
@@ -298,7 +298,7 @@ static void pll_factors(unsigned int target, unsigned int source) | |||
298 | 298 | ||
299 | if ((Ndiv < 6) || (Ndiv > 12)) | 299 | if ((Ndiv < 6) || (Ndiv > 12)) |
300 | printk(KERN_WARNING | 300 | printk(KERN_WARNING |
301 | "WM8510 N value %d outwith recommended range!d\n", | 301 | "WM8510 N value %u outwith recommended range!d\n", |
302 | Ndiv); | 302 | Ndiv); |
303 | 303 | ||
304 | pll_div.n = Ndiv; | 304 | pll_div.n = Ndiv; |
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 9f6be3d31ac0..86c4b24db817 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c | |||
@@ -415,7 +415,7 @@ static int pll_factors(struct _pll_div *pll_div, unsigned int target, | |||
415 | unsigned int K, Ndiv, Nmod; | 415 | unsigned int K, Ndiv, Nmod; |
416 | int i; | 416 | int i; |
417 | 417 | ||
418 | pr_debug("wm8580: PLL %dHz->%dHz\n", source, target); | 418 | pr_debug("wm8580: PLL %uHz->%uHz\n", source, target); |
419 | 419 | ||
420 | /* Scale the output frequency up; the PLL should run in the | 420 | /* Scale the output frequency up; the PLL should run in the |
421 | * region of 90-100MHz. | 421 | * region of 90-100MHz. |
@@ -447,7 +447,7 @@ static int pll_factors(struct _pll_div *pll_div, unsigned int target, | |||
447 | 447 | ||
448 | if ((Ndiv < 5) || (Ndiv > 13)) { | 448 | if ((Ndiv < 5) || (Ndiv > 13)) { |
449 | printk(KERN_ERR | 449 | printk(KERN_ERR |
450 | "WM8580 N=%d outside supported range\n", Ndiv); | 450 | "WM8580 N=%u outside supported range\n", Ndiv); |
451 | return -EINVAL; | 451 | return -EINVAL; |
452 | } | 452 | } |
453 | 453 | ||
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index e043e3f60008..7a205876ef4f 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c | |||
@@ -666,14 +666,14 @@ static int __devinit wm8731_spi_probe(struct spi_device *spi) | |||
666 | codec->hw_write = (hw_write_t)wm8731_spi_write; | 666 | codec->hw_write = (hw_write_t)wm8731_spi_write; |
667 | codec->dev = &spi->dev; | 667 | codec->dev = &spi->dev; |
668 | 668 | ||
669 | spi->dev.driver_data = wm8731; | 669 | dev_set_drvdata(&spi->dev, wm8731); |
670 | 670 | ||
671 | return wm8731_register(wm8731); | 671 | return wm8731_register(wm8731); |
672 | } | 672 | } |
673 | 673 | ||
674 | static int __devexit wm8731_spi_remove(struct spi_device *spi) | 674 | static int __devexit wm8731_spi_remove(struct spi_device *spi) |
675 | { | 675 | { |
676 | struct wm8731_priv *wm8731 = spi->dev.driver_data; | 676 | struct wm8731_priv *wm8731 = dev_get_drvdata(&spi->dev); |
677 | 677 | ||
678 | wm8731_unregister(wm8731); | 678 | wm8731_unregister(wm8731); |
679 | 679 | ||
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index a6e8f3f7f052..d28eeaceb857 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
@@ -703,7 +703,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target, | |||
703 | 703 | ||
704 | if ((Ndiv < 6) || (Ndiv > 12)) | 704 | if ((Ndiv < 6) || (Ndiv > 12)) |
705 | printk(KERN_WARNING | 705 | printk(KERN_WARNING |
706 | "wm8753: unsupported N = %d\n", Ndiv); | 706 | "wm8753: unsupported N = %u\n", Ndiv); |
707 | 707 | ||
708 | pll_div->n = Ndiv; | 708 | pll_div->n = Ndiv; |
709 | Nmod = target % source; | 709 | Nmod = target % source; |
@@ -1822,14 +1822,14 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi) | |||
1822 | codec->hw_write = (hw_write_t)wm8753_spi_write; | 1822 | codec->hw_write = (hw_write_t)wm8753_spi_write; |
1823 | codec->dev = &spi->dev; | 1823 | codec->dev = &spi->dev; |
1824 | 1824 | ||
1825 | spi->dev.driver_data = wm8753; | 1825 | dev_set_drvdata(&spi->dev, wm8753); |
1826 | 1826 | ||
1827 | return wm8753_register(wm8753); | 1827 | return wm8753_register(wm8753); |
1828 | } | 1828 | } |
1829 | 1829 | ||
1830 | static int __devexit wm8753_spi_remove(struct spi_device *spi) | 1830 | static int __devexit wm8753_spi_remove(struct spi_device *spi) |
1831 | { | 1831 | { |
1832 | struct wm8753_priv *wm8753 = spi->dev.driver_data; | 1832 | struct wm8753_priv *wm8753 = dev_get_drvdata(&spi->dev); |
1833 | wm8753_unregister(wm8753); | 1833 | wm8753_unregister(wm8753); |
1834 | return 0; | 1834 | return 0; |
1835 | } | 1835 | } |
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 46c5ea1ff921..3c78945244b8 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c | |||
@@ -778,11 +778,11 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref, | |||
778 | } | 778 | } |
779 | 779 | ||
780 | if (target > 100000000) | 780 | if (target > 100000000) |
781 | printk(KERN_WARNING "wm8900: FLL rate %d out of range, Fref=%d" | 781 | printk(KERN_WARNING "wm8900: FLL rate %u out of range, Fref=%u" |
782 | " Fout=%d\n", target, Fref, Fout); | 782 | " Fout=%u\n", target, Fref, Fout); |
783 | if (div > 32) { | 783 | if (div > 32) { |
784 | printk(KERN_ERR "wm8900: Invalid FLL division rate %u, " | 784 | printk(KERN_ERR "wm8900: Invalid FLL division rate %u, " |
785 | "Fref=%d, Fout=%d, target=%d\n", | 785 | "Fref=%u, Fout=%u, target=%u\n", |
786 | div, Fref, Fout, target); | 786 | div, Fref, Fout, target); |
787 | return -EINVAL; | 787 | return -EINVAL; |
788 | } | 788 | } |
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 8cf571f1a803..e8d2e3e14c45 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
@@ -217,7 +217,6 @@ struct wm8903_priv { | |||
217 | int sysclk; | 217 | int sysclk; |
218 | 218 | ||
219 | /* Reference counts */ | 219 | /* Reference counts */ |
220 | int charge_pump_users; | ||
221 | int class_w_users; | 220 | int class_w_users; |
222 | int playback_active; | 221 | int playback_active; |
223 | int capture_active; | 222 | int capture_active; |
@@ -373,6 +372,15 @@ static void wm8903_reset(struct snd_soc_codec *codec) | |||
373 | #define WM8903_OUTPUT_INT 0x2 | 372 | #define WM8903_OUTPUT_INT 0x2 |
374 | #define WM8903_OUTPUT_IN 0x1 | 373 | #define WM8903_OUTPUT_IN 0x1 |
375 | 374 | ||
375 | static int wm8903_cp_event(struct snd_soc_dapm_widget *w, | ||
376 | struct snd_kcontrol *kcontrol, int event) | ||
377 | { | ||
378 | WARN_ON(event != SND_SOC_DAPM_POST_PMU); | ||
379 | mdelay(4); | ||
380 | |||
381 | return 0; | ||
382 | } | ||
383 | |||
376 | /* | 384 | /* |
377 | * Event for headphone and line out amplifier power changes. Special | 385 | * Event for headphone and line out amplifier power changes. Special |
378 | * power up/down sequences are required in order to maximise pop/click | 386 | * power up/down sequences are required in order to maximise pop/click |
@@ -382,19 +390,20 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w, | |||
382 | struct snd_kcontrol *kcontrol, int event) | 390 | struct snd_kcontrol *kcontrol, int event) |
383 | { | 391 | { |
384 | struct snd_soc_codec *codec = w->codec; | 392 | struct snd_soc_codec *codec = w->codec; |
385 | struct wm8903_priv *wm8903 = codec->private_data; | ||
386 | struct i2c_client *i2c = codec->control_data; | ||
387 | u16 val; | 393 | u16 val; |
388 | u16 reg; | 394 | u16 reg; |
395 | u16 dcs_reg; | ||
396 | u16 dcs_bit; | ||
389 | int shift; | 397 | int shift; |
390 | u16 cp_reg = wm8903_read(codec, WM8903_CHARGE_PUMP_0); | ||
391 | 398 | ||
392 | switch (w->reg) { | 399 | switch (w->reg) { |
393 | case WM8903_POWER_MANAGEMENT_2: | 400 | case WM8903_POWER_MANAGEMENT_2: |
394 | reg = WM8903_ANALOGUE_HP_0; | 401 | reg = WM8903_ANALOGUE_HP_0; |
402 | dcs_bit = 0 + w->shift; | ||
395 | break; | 403 | break; |
396 | case WM8903_POWER_MANAGEMENT_3: | 404 | case WM8903_POWER_MANAGEMENT_3: |
397 | reg = WM8903_ANALOGUE_LINEOUT_0; | 405 | reg = WM8903_ANALOGUE_LINEOUT_0; |
406 | dcs_bit = 2 + w->shift; | ||
398 | break; | 407 | break; |
399 | default: | 408 | default: |
400 | BUG(); | 409 | BUG(); |
@@ -419,18 +428,6 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w, | |||
419 | /* Short the output */ | 428 | /* Short the output */ |
420 | val &= ~(WM8903_OUTPUT_SHORT << shift); | 429 | val &= ~(WM8903_OUTPUT_SHORT << shift); |
421 | wm8903_write(codec, reg, val); | 430 | wm8903_write(codec, reg, val); |
422 | |||
423 | wm8903->charge_pump_users++; | ||
424 | |||
425 | dev_dbg(&i2c->dev, "Charge pump use count now %d\n", | ||
426 | wm8903->charge_pump_users); | ||
427 | |||
428 | if (wm8903->charge_pump_users == 1) { | ||
429 | dev_dbg(&i2c->dev, "Enabling charge pump\n"); | ||
430 | wm8903_write(codec, WM8903_CHARGE_PUMP_0, | ||
431 | cp_reg | WM8903_CP_ENA); | ||
432 | mdelay(4); | ||
433 | } | ||
434 | } | 431 | } |
435 | 432 | ||
436 | if (event & SND_SOC_DAPM_POST_PMU) { | 433 | if (event & SND_SOC_DAPM_POST_PMU) { |
@@ -446,6 +443,11 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w, | |||
446 | val |= (WM8903_OUTPUT_OUT << shift); | 443 | val |= (WM8903_OUTPUT_OUT << shift); |
447 | wm8903_write(codec, reg, val); | 444 | wm8903_write(codec, reg, val); |
448 | 445 | ||
446 | /* Enable the DC servo */ | ||
447 | dcs_reg = wm8903_read(codec, WM8903_DC_SERVO_0); | ||
448 | dcs_reg |= dcs_bit; | ||
449 | wm8903_write(codec, WM8903_DC_SERVO_0, dcs_reg); | ||
450 | |||
449 | /* Remove the short */ | 451 | /* Remove the short */ |
450 | val |= (WM8903_OUTPUT_SHORT << shift); | 452 | val |= (WM8903_OUTPUT_SHORT << shift); |
451 | wm8903_write(codec, reg, val); | 453 | wm8903_write(codec, reg, val); |
@@ -458,25 +460,17 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w, | |||
458 | val &= ~(WM8903_OUTPUT_SHORT << shift); | 460 | val &= ~(WM8903_OUTPUT_SHORT << shift); |
459 | wm8903_write(codec, reg, val); | 461 | wm8903_write(codec, reg, val); |
460 | 462 | ||
463 | /* Disable the DC servo */ | ||
464 | dcs_reg = wm8903_read(codec, WM8903_DC_SERVO_0); | ||
465 | dcs_reg &= ~dcs_bit; | ||
466 | wm8903_write(codec, WM8903_DC_SERVO_0, dcs_reg); | ||
467 | |||
461 | /* Then disable the intermediate and output stages */ | 468 | /* Then disable the intermediate and output stages */ |
462 | val &= ~((WM8903_OUTPUT_OUT | WM8903_OUTPUT_INT | | 469 | val &= ~((WM8903_OUTPUT_OUT | WM8903_OUTPUT_INT | |
463 | WM8903_OUTPUT_IN) << shift); | 470 | WM8903_OUTPUT_IN) << shift); |
464 | wm8903_write(codec, reg, val); | 471 | wm8903_write(codec, reg, val); |
465 | } | 472 | } |
466 | 473 | ||
467 | if (event & SND_SOC_DAPM_POST_PMD) { | ||
468 | wm8903->charge_pump_users--; | ||
469 | |||
470 | dev_dbg(&i2c->dev, "Charge pump use count now %d\n", | ||
471 | wm8903->charge_pump_users); | ||
472 | |||
473 | if (wm8903->charge_pump_users == 0) { | ||
474 | dev_dbg(&i2c->dev, "Disabling charge pump\n"); | ||
475 | wm8903_write(codec, WM8903_CHARGE_PUMP_0, | ||
476 | cp_reg & ~WM8903_CP_ENA); | ||
477 | } | ||
478 | } | ||
479 | |||
480 | return 0; | 474 | return 0; |
481 | } | 475 | } |
482 | 476 | ||
@@ -539,6 +533,7 @@ static int wm8903_class_w_put(struct snd_kcontrol *kcontrol, | |||
539 | /* ALSA can only do steps of .01dB */ | 533 | /* ALSA can only do steps of .01dB */ |
540 | static const DECLARE_TLV_DB_SCALE(digital_tlv, -7200, 75, 1); | 534 | static const DECLARE_TLV_DB_SCALE(digital_tlv, -7200, 75, 1); |
541 | 535 | ||
536 | static const DECLARE_TLV_DB_SCALE(digital_sidetone_tlv, -3600, 300, 0); | ||
542 | static const DECLARE_TLV_DB_SCALE(out_tlv, -5700, 100, 0); | 537 | static const DECLARE_TLV_DB_SCALE(out_tlv, -5700, 100, 0); |
543 | 538 | ||
544 | static const DECLARE_TLV_DB_SCALE(drc_tlv_thresh, 0, 75, 0); | 539 | static const DECLARE_TLV_DB_SCALE(drc_tlv_thresh, 0, 75, 0); |
@@ -657,6 +652,16 @@ static const struct soc_enum rinput_inv_enum = | |||
657 | SOC_ENUM_SINGLE(WM8903_ANALOGUE_RIGHT_INPUT_1, 4, 3, rinput_mux_text); | 652 | SOC_ENUM_SINGLE(WM8903_ANALOGUE_RIGHT_INPUT_1, 4, 3, rinput_mux_text); |
658 | 653 | ||
659 | 654 | ||
655 | static const char *sidetone_text[] = { | ||
656 | "None", "Left", "Right" | ||
657 | }; | ||
658 | |||
659 | static const struct soc_enum lsidetone_enum = | ||
660 | SOC_ENUM_SINGLE(WM8903_DAC_DIGITAL_0, 2, 3, sidetone_text); | ||
661 | |||
662 | static const struct soc_enum rsidetone_enum = | ||
663 | SOC_ENUM_SINGLE(WM8903_DAC_DIGITAL_0, 0, 3, sidetone_text); | ||
664 | |||
660 | static const struct snd_kcontrol_new wm8903_snd_controls[] = { | 665 | static const struct snd_kcontrol_new wm8903_snd_controls[] = { |
661 | 666 | ||
662 | /* Input PGAs - No TLV since the scale depends on PGA mode */ | 667 | /* Input PGAs - No TLV since the scale depends on PGA mode */ |
@@ -700,6 +705,9 @@ SOC_DOUBLE_R_TLV("Digital Capture Volume", WM8903_ADC_DIGITAL_VOLUME_LEFT, | |||
700 | SOC_ENUM("ADC Companding Mode", adc_companding), | 705 | SOC_ENUM("ADC Companding Mode", adc_companding), |
701 | SOC_SINGLE("ADC Companding Switch", WM8903_AUDIO_INTERFACE_0, 3, 1, 0), | 706 | SOC_SINGLE("ADC Companding Switch", WM8903_AUDIO_INTERFACE_0, 3, 1, 0), |
702 | 707 | ||
708 | SOC_DOUBLE_TLV("Digital Sidetone Volume", WM8903_DAC_DIGITAL_0, 4, 8, | ||
709 | 12, 0, digital_sidetone_tlv), | ||
710 | |||
703 | /* DAC */ | 711 | /* DAC */ |
704 | SOC_DOUBLE_R_TLV("Digital Playback Volume", WM8903_DAC_DIGITAL_VOLUME_LEFT, | 712 | SOC_DOUBLE_R_TLV("Digital Playback Volume", WM8903_DAC_DIGITAL_VOLUME_LEFT, |
705 | WM8903_DAC_DIGITAL_VOLUME_RIGHT, 1, 120, 0, digital_tlv), | 713 | WM8903_DAC_DIGITAL_VOLUME_RIGHT, 1, 120, 0, digital_tlv), |
@@ -762,6 +770,12 @@ static const struct snd_kcontrol_new rinput_mux = | |||
762 | static const struct snd_kcontrol_new rinput_inv_mux = | 770 | static const struct snd_kcontrol_new rinput_inv_mux = |
763 | SOC_DAPM_ENUM("Right Inverting Input Mux", rinput_inv_enum); | 771 | SOC_DAPM_ENUM("Right Inverting Input Mux", rinput_inv_enum); |
764 | 772 | ||
773 | static const struct snd_kcontrol_new lsidetone_mux = | ||
774 | SOC_DAPM_ENUM("DACL Sidetone Mux", lsidetone_enum); | ||
775 | |||
776 | static const struct snd_kcontrol_new rsidetone_mux = | ||
777 | SOC_DAPM_ENUM("DACR Sidetone Mux", rsidetone_enum); | ||
778 | |||
765 | static const struct snd_kcontrol_new left_output_mixer[] = { | 779 | static const struct snd_kcontrol_new left_output_mixer[] = { |
766 | SOC_DAPM_SINGLE("DACL Switch", WM8903_ANALOGUE_LEFT_MIX_0, 3, 1, 0), | 780 | SOC_DAPM_SINGLE("DACL Switch", WM8903_ANALOGUE_LEFT_MIX_0, 3, 1, 0), |
767 | SOC_DAPM_SINGLE("DACR Switch", WM8903_ANALOGUE_LEFT_MIX_0, 2, 1, 0), | 781 | SOC_DAPM_SINGLE("DACR Switch", WM8903_ANALOGUE_LEFT_MIX_0, 2, 1, 0), |
@@ -828,6 +842,9 @@ SND_SOC_DAPM_PGA("Right Input PGA", WM8903_POWER_MANAGEMENT_0, 0, 0, NULL, 0), | |||
828 | SND_SOC_DAPM_ADC("ADCL", "Left HiFi Capture", WM8903_POWER_MANAGEMENT_6, 1, 0), | 842 | SND_SOC_DAPM_ADC("ADCL", "Left HiFi Capture", WM8903_POWER_MANAGEMENT_6, 1, 0), |
829 | SND_SOC_DAPM_ADC("ADCR", "Right HiFi Capture", WM8903_POWER_MANAGEMENT_6, 0, 0), | 843 | SND_SOC_DAPM_ADC("ADCR", "Right HiFi Capture", WM8903_POWER_MANAGEMENT_6, 0, 0), |
830 | 844 | ||
845 | SND_SOC_DAPM_MUX("DACL Sidetone", SND_SOC_NOPM, 0, 0, &lsidetone_mux), | ||
846 | SND_SOC_DAPM_MUX("DACR Sidetone", SND_SOC_NOPM, 0, 0, &rsidetone_mux), | ||
847 | |||
831 | SND_SOC_DAPM_DAC("DACL", "Left Playback", WM8903_POWER_MANAGEMENT_6, 3, 0), | 848 | SND_SOC_DAPM_DAC("DACL", "Left Playback", WM8903_POWER_MANAGEMENT_6, 3, 0), |
832 | SND_SOC_DAPM_DAC("DACR", "Right Playback", WM8903_POWER_MANAGEMENT_6, 2, 0), | 849 | SND_SOC_DAPM_DAC("DACR", "Right Playback", WM8903_POWER_MANAGEMENT_6, 2, 0), |
833 | 850 | ||
@@ -844,26 +861,29 @@ SND_SOC_DAPM_MIXER("Right Speaker Mixer", WM8903_POWER_MANAGEMENT_4, 0, 0, | |||
844 | SND_SOC_DAPM_PGA_E("Left Headphone Output PGA", WM8903_POWER_MANAGEMENT_2, | 861 | SND_SOC_DAPM_PGA_E("Left Headphone Output PGA", WM8903_POWER_MANAGEMENT_2, |
845 | 1, 0, NULL, 0, wm8903_output_event, | 862 | 1, 0, NULL, 0, wm8903_output_event, |
846 | SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | | 863 | SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | |
847 | SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD), | 864 | SND_SOC_DAPM_PRE_PMD), |
848 | SND_SOC_DAPM_PGA_E("Right Headphone Output PGA", WM8903_POWER_MANAGEMENT_2, | 865 | SND_SOC_DAPM_PGA_E("Right Headphone Output PGA", WM8903_POWER_MANAGEMENT_2, |
849 | 0, 0, NULL, 0, wm8903_output_event, | 866 | 0, 0, NULL, 0, wm8903_output_event, |
850 | SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | | 867 | SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | |
851 | SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD), | 868 | SND_SOC_DAPM_PRE_PMD), |
852 | 869 | ||
853 | SND_SOC_DAPM_PGA_E("Left Line Output PGA", WM8903_POWER_MANAGEMENT_3, 1, 0, | 870 | SND_SOC_DAPM_PGA_E("Left Line Output PGA", WM8903_POWER_MANAGEMENT_3, 1, 0, |
854 | NULL, 0, wm8903_output_event, | 871 | NULL, 0, wm8903_output_event, |
855 | SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | | 872 | SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | |
856 | SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD), | 873 | SND_SOC_DAPM_PRE_PMD), |
857 | SND_SOC_DAPM_PGA_E("Right Line Output PGA", WM8903_POWER_MANAGEMENT_3, 0, 0, | 874 | SND_SOC_DAPM_PGA_E("Right Line Output PGA", WM8903_POWER_MANAGEMENT_3, 0, 0, |
858 | NULL, 0, wm8903_output_event, | 875 | NULL, 0, wm8903_output_event, |
859 | SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | | 876 | SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | |
860 | SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD), | 877 | SND_SOC_DAPM_PRE_PMD), |
861 | 878 | ||
862 | SND_SOC_DAPM_PGA("Left Speaker PGA", WM8903_POWER_MANAGEMENT_5, 1, 0, | 879 | SND_SOC_DAPM_PGA("Left Speaker PGA", WM8903_POWER_MANAGEMENT_5, 1, 0, |
863 | NULL, 0), | 880 | NULL, 0), |
864 | SND_SOC_DAPM_PGA("Right Speaker PGA", WM8903_POWER_MANAGEMENT_5, 0, 0, | 881 | SND_SOC_DAPM_PGA("Right Speaker PGA", WM8903_POWER_MANAGEMENT_5, 0, 0, |
865 | NULL, 0), | 882 | NULL, 0), |
866 | 883 | ||
884 | SND_SOC_DAPM_SUPPLY("Charge Pump", WM8903_CHARGE_PUMP_0, 0, 0, | ||
885 | wm8903_cp_event, SND_SOC_DAPM_POST_PMU), | ||
886 | SND_SOC_DAPM_SUPPLY("CLK_DSP", WM8903_CLOCK_RATES_2, 1, 0, NULL, 0), | ||
867 | }; | 887 | }; |
868 | 888 | ||
869 | static const struct snd_soc_dapm_route intercon[] = { | 889 | static const struct snd_soc_dapm_route intercon[] = { |
@@ -909,7 +929,19 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
909 | { "Right Input PGA", NULL, "Right Input Mode Mux" }, | 929 | { "Right Input PGA", NULL, "Right Input Mode Mux" }, |
910 | 930 | ||
911 | { "ADCL", NULL, "Left Input PGA" }, | 931 | { "ADCL", NULL, "Left Input PGA" }, |
932 | { "ADCL", NULL, "CLK_DSP" }, | ||
912 | { "ADCR", NULL, "Right Input PGA" }, | 933 | { "ADCR", NULL, "Right Input PGA" }, |
934 | { "ADCR", NULL, "CLK_DSP" }, | ||
935 | |||
936 | { "DACL Sidetone", "Left", "ADCL" }, | ||
937 | { "DACL Sidetone", "Right", "ADCR" }, | ||
938 | { "DACR Sidetone", "Left", "ADCL" }, | ||
939 | { "DACR Sidetone", "Right", "ADCR" }, | ||
940 | |||
941 | { "DACL", NULL, "DACL Sidetone" }, | ||
942 | { "DACL", NULL, "CLK_DSP" }, | ||
943 | { "DACR", NULL, "DACR Sidetone" }, | ||
944 | { "DACR", NULL, "CLK_DSP" }, | ||
913 | 945 | ||
914 | { "Left Output Mixer", "Left Bypass Switch", "Left Input PGA" }, | 946 | { "Left Output Mixer", "Left Bypass Switch", "Left Input PGA" }, |
915 | { "Left Output Mixer", "Right Bypass Switch", "Right Input PGA" }, | 947 | { "Left Output Mixer", "Right Bypass Switch", "Right Input PGA" }, |
@@ -951,6 +983,11 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
951 | 983 | ||
952 | { "ROP", NULL, "Right Speaker PGA" }, | 984 | { "ROP", NULL, "Right Speaker PGA" }, |
953 | { "RON", NULL, "Right Speaker PGA" }, | 985 | { "RON", NULL, "Right Speaker PGA" }, |
986 | |||
987 | { "Left Headphone Output PGA", NULL, "Charge Pump" }, | ||
988 | { "Right Headphone Output PGA", NULL, "Charge Pump" }, | ||
989 | { "Left Line Output PGA", NULL, "Charge Pump" }, | ||
990 | { "Right Line Output PGA", NULL, "Charge Pump" }, | ||
954 | }; | 991 | }; |
955 | 992 | ||
956 | static int wm8903_add_widgets(struct snd_soc_codec *codec) | 993 | static int wm8903_add_widgets(struct snd_soc_codec *codec) |
@@ -985,6 +1022,11 @@ static int wm8903_set_bias_level(struct snd_soc_codec *codec, | |||
985 | wm8903_write(codec, WM8903_CLOCK_RATES_2, | 1022 | wm8903_write(codec, WM8903_CLOCK_RATES_2, |
986 | WM8903_CLK_SYS_ENA); | 1023 | WM8903_CLK_SYS_ENA); |
987 | 1024 | ||
1025 | /* Change DC servo dither level in startup sequence */ | ||
1026 | wm8903_write(codec, WM8903_WRITE_SEQUENCER_0, 0x11); | ||
1027 | wm8903_write(codec, WM8903_WRITE_SEQUENCER_1, 0x1257); | ||
1028 | wm8903_write(codec, WM8903_WRITE_SEQUENCER_2, 0x2); | ||
1029 | |||
988 | wm8903_run_sequence(codec, 0); | 1030 | wm8903_run_sequence(codec, 0); |
989 | wm8903_sync_reg_cache(codec, codec->reg_cache); | 1031 | wm8903_sync_reg_cache(codec, codec->reg_cache); |
990 | 1032 | ||
@@ -1215,22 +1257,18 @@ static struct { | |||
1215 | int div; | 1257 | int div; |
1216 | } bclk_divs[] = { | 1258 | } bclk_divs[] = { |
1217 | { 10, 0 }, | 1259 | { 10, 0 }, |
1218 | { 15, 1 }, | ||
1219 | { 20, 2 }, | 1260 | { 20, 2 }, |
1220 | { 30, 3 }, | 1261 | { 30, 3 }, |
1221 | { 40, 4 }, | 1262 | { 40, 4 }, |
1222 | { 50, 5 }, | 1263 | { 50, 5 }, |
1223 | { 55, 6 }, | ||
1224 | { 60, 7 }, | 1264 | { 60, 7 }, |
1225 | { 80, 8 }, | 1265 | { 80, 8 }, |
1226 | { 100, 9 }, | 1266 | { 100, 9 }, |
1227 | { 110, 10 }, | ||
1228 | { 120, 11 }, | 1267 | { 120, 11 }, |
1229 | { 160, 12 }, | 1268 | { 160, 12 }, |
1230 | { 200, 13 }, | 1269 | { 200, 13 }, |
1231 | { 220, 14 }, | 1270 | { 220, 14 }, |
1232 | { 240, 15 }, | 1271 | { 240, 15 }, |
1233 | { 250, 16 }, | ||
1234 | { 300, 17 }, | 1272 | { 300, 17 }, |
1235 | { 320, 18 }, | 1273 | { 320, 18 }, |
1236 | { 440, 19 }, | 1274 | { 440, 19 }, |
@@ -1277,14 +1315,8 @@ static int wm8903_startup(struct snd_pcm_substream *substream, | |||
1277 | if (wm8903->master_substream) { | 1315 | if (wm8903->master_substream) { |
1278 | master_runtime = wm8903->master_substream->runtime; | 1316 | master_runtime = wm8903->master_substream->runtime; |
1279 | 1317 | ||
1280 | dev_dbg(&i2c->dev, "Constraining to %d bits at %dHz\n", | 1318 | dev_dbg(&i2c->dev, "Constraining to %d bits\n", |
1281 | master_runtime->sample_bits, | 1319 | master_runtime->sample_bits); |
1282 | master_runtime->rate); | ||
1283 | |||
1284 | snd_pcm_hw_constraint_minmax(substream->runtime, | ||
1285 | SNDRV_PCM_HW_PARAM_RATE, | ||
1286 | master_runtime->rate, | ||
1287 | master_runtime->rate); | ||
1288 | 1320 | ||
1289 | snd_pcm_hw_constraint_minmax(substream->runtime, | 1321 | snd_pcm_hw_constraint_minmax(substream->runtime, |
1290 | SNDRV_PCM_HW_PARAM_SAMPLE_BITS, | 1322 | SNDRV_PCM_HW_PARAM_SAMPLE_BITS, |
@@ -1523,6 +1555,7 @@ struct snd_soc_dai wm8903_dai = { | |||
1523 | .formats = WM8903_FORMATS, | 1555 | .formats = WM8903_FORMATS, |
1524 | }, | 1556 | }, |
1525 | .ops = &wm8903_dai_ops, | 1557 | .ops = &wm8903_dai_ops, |
1558 | .symmetric_rates = 1, | ||
1526 | }; | 1559 | }; |
1527 | EXPORT_SYMBOL_GPL(wm8903_dai); | 1560 | EXPORT_SYMBOL_GPL(wm8903_dai); |
1528 | 1561 | ||
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c new file mode 100644 index 000000000000..b8e17d6bc1f7 --- /dev/null +++ b/sound/soc/codecs/wm8940.c | |||
@@ -0,0 +1,955 @@ | |||
1 | /* | ||
2 | * wm8940.c -- WM8940 ALSA Soc Audio driver | ||
3 | * | ||
4 | * Author: Jonathan Cameron <jic23@cam.ac.uk> | ||
5 | * | ||
6 | * Based on wm8510.c | ||
7 | * Copyright 2006 Wolfson Microelectronics PLC. | ||
8 | * Author: Liam Girdwood <lrg@slimlogic.co.uk> | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | * | ||
14 | * Not currently handled: | ||
15 | * Notch filter control | ||
16 | * AUXMode (inverting vs mixer) | ||
17 | * No means to obtain current gain if alc enabled. | ||
18 | * No use made of gpio | ||
19 | * Fast VMID discharge for power down | ||
20 | * Soft Start | ||
21 | * DLR and ALR Swaps not enabled | ||
22 | * Digital Sidetone not supported | ||
23 | */ | ||
24 | #include <linux/module.h> | ||
25 | #include <linux/moduleparam.h> | ||
26 | #include <linux/kernel.h> | ||
27 | #include <linux/init.h> | ||
28 | #include <linux/delay.h> | ||
29 | #include <linux/pm.h> | ||
30 | #include <linux/i2c.h> | ||
31 | #include <linux/platform_device.h> | ||
32 | #include <linux/spi/spi.h> | ||
33 | #include <sound/core.h> | ||
34 | #include <sound/pcm.h> | ||
35 | #include <sound/pcm_params.h> | ||
36 | #include <sound/soc.h> | ||
37 | #include <sound/soc-dapm.h> | ||
38 | #include <sound/initval.h> | ||
39 | #include <sound/tlv.h> | ||
40 | |||
41 | #include "wm8940.h" | ||
42 | |||
43 | struct wm8940_priv { | ||
44 | unsigned int sysclk; | ||
45 | u16 reg_cache[WM8940_CACHEREGNUM]; | ||
46 | struct snd_soc_codec codec; | ||
47 | }; | ||
48 | |||
49 | static u16 wm8940_reg_defaults[] = { | ||
50 | 0x8940, /* Soft Reset */ | ||
51 | 0x0000, /* Power 1 */ | ||
52 | 0x0000, /* Power 2 */ | ||
53 | 0x0000, /* Power 3 */ | ||
54 | 0x0010, /* Interface Control */ | ||
55 | 0x0000, /* Companding Control */ | ||
56 | 0x0140, /* Clock Control */ | ||
57 | 0x0000, /* Additional Controls */ | ||
58 | 0x0000, /* GPIO Control */ | ||
59 | 0x0002, /* Auto Increment Control */ | ||
60 | 0x0000, /* DAC Control */ | ||
61 | 0x00FF, /* DAC Volume */ | ||
62 | 0, | ||
63 | 0, | ||
64 | 0x0100, /* ADC Control */ | ||
65 | 0x00FF, /* ADC Volume */ | ||
66 | 0x0000, /* Notch Filter 1 Control 1 */ | ||
67 | 0x0000, /* Notch Filter 1 Control 2 */ | ||
68 | 0x0000, /* Notch Filter 2 Control 1 */ | ||
69 | 0x0000, /* Notch Filter 2 Control 2 */ | ||
70 | 0x0000, /* Notch Filter 3 Control 1 */ | ||
71 | 0x0000, /* Notch Filter 3 Control 2 */ | ||
72 | 0x0000, /* Notch Filter 4 Control 1 */ | ||
73 | 0x0000, /* Notch Filter 4 Control 2 */ | ||
74 | 0x0032, /* DAC Limit Control 1 */ | ||
75 | 0x0000, /* DAC Limit Control 2 */ | ||
76 | 0, | ||
77 | 0, | ||
78 | 0, | ||
79 | 0, | ||
80 | 0, | ||
81 | 0, | ||
82 | 0x0038, /* ALC Control 1 */ | ||
83 | 0x000B, /* ALC Control 2 */ | ||
84 | 0x0032, /* ALC Control 3 */ | ||
85 | 0x0000, /* Noise Gate */ | ||
86 | 0x0041, /* PLLN */ | ||
87 | 0x000C, /* PLLK1 */ | ||
88 | 0x0093, /* PLLK2 */ | ||
89 | 0x00E9, /* PLLK3 */ | ||
90 | 0, | ||
91 | 0, | ||
92 | 0x0030, /* ALC Control 4 */ | ||
93 | 0, | ||
94 | 0x0002, /* Input Control */ | ||
95 | 0x0050, /* PGA Gain */ | ||
96 | 0, | ||
97 | 0x0002, /* ADC Boost Control */ | ||
98 | 0, | ||
99 | 0x0002, /* Output Control */ | ||
100 | 0x0000, /* Speaker Mixer Control */ | ||
101 | 0, | ||
102 | 0, | ||
103 | 0, | ||
104 | 0x0079, /* Speaker Volume */ | ||
105 | 0, | ||
106 | 0x0000, /* Mono Mixer Control */ | ||
107 | }; | ||
108 | |||
109 | static inline unsigned int wm8940_read_reg_cache(struct snd_soc_codec *codec, | ||
110 | unsigned int reg) | ||
111 | { | ||
112 | u16 *cache = codec->reg_cache; | ||
113 | |||
114 | if (reg >= ARRAY_SIZE(wm8940_reg_defaults)) | ||
115 | return -1; | ||
116 | |||
117 | return cache[reg]; | ||
118 | } | ||
119 | |||
120 | static inline int wm8940_write_reg_cache(struct snd_soc_codec *codec, | ||
121 | u16 reg, unsigned int value) | ||
122 | { | ||
123 | u16 *cache = codec->reg_cache; | ||
124 | |||
125 | if (reg >= ARRAY_SIZE(wm8940_reg_defaults)) | ||
126 | return -1; | ||
127 | |||
128 | cache[reg] = value; | ||
129 | |||
130 | return 0; | ||
131 | } | ||
132 | |||
133 | static int wm8940_write(struct snd_soc_codec *codec, unsigned int reg, | ||
134 | unsigned int value) | ||
135 | { | ||
136 | int ret; | ||
137 | u8 data[3] = { reg, | ||
138 | (value & 0xff00) >> 8, | ||
139 | (value & 0x00ff) | ||
140 | }; | ||
141 | |||
142 | wm8940_write_reg_cache(codec, reg, value); | ||
143 | |||
144 | ret = codec->hw_write(codec->control_data, data, 3); | ||
145 | |||
146 | if (ret < 0) | ||
147 | return ret; | ||
148 | else if (ret != 3) | ||
149 | return -EIO; | ||
150 | return 0; | ||
151 | } | ||
152 | |||
153 | static const char *wm8940_companding[] = { "Off", "NC", "u-law", "A-law" }; | ||
154 | static const struct soc_enum wm8940_adc_companding_enum | ||
155 | = SOC_ENUM_SINGLE(WM8940_COMPANDINGCTL, 1, 4, wm8940_companding); | ||
156 | static const struct soc_enum wm8940_dac_companding_enum | ||
157 | = SOC_ENUM_SINGLE(WM8940_COMPANDINGCTL, 3, 4, wm8940_companding); | ||
158 | |||
159 | static const char *wm8940_alc_mode_text[] = {"ALC", "Limiter"}; | ||
160 | static const struct soc_enum wm8940_alc_mode_enum | ||
161 | = SOC_ENUM_SINGLE(WM8940_ALC3, 8, 2, wm8940_alc_mode_text); | ||
162 | |||
163 | static const char *wm8940_mic_bias_level_text[] = {"0.9", "0.65"}; | ||
164 | static const struct soc_enum wm8940_mic_bias_level_enum | ||
165 | = SOC_ENUM_SINGLE(WM8940_INPUTCTL, 8, 2, wm8940_mic_bias_level_text); | ||
166 | |||
167 | static const char *wm8940_filter_mode_text[] = {"Audio", "Application"}; | ||
168 | static const struct soc_enum wm8940_filter_mode_enum | ||
169 | = SOC_ENUM_SINGLE(WM8940_ADC, 7, 2, wm8940_filter_mode_text); | ||
170 | |||
171 | static DECLARE_TLV_DB_SCALE(wm8940_spk_vol_tlv, -5700, 100, 1); | ||
172 | static DECLARE_TLV_DB_SCALE(wm8940_att_tlv, -1000, 1000, 0); | ||
173 | static DECLARE_TLV_DB_SCALE(wm8940_pga_vol_tlv, -1200, 75, 0); | ||
174 | static DECLARE_TLV_DB_SCALE(wm8940_alc_min_tlv, -1200, 600, 0); | ||
175 | static DECLARE_TLV_DB_SCALE(wm8940_alc_max_tlv, 675, 600, 0); | ||
176 | static DECLARE_TLV_DB_SCALE(wm8940_alc_tar_tlv, -2250, 50, 0); | ||
177 | static DECLARE_TLV_DB_SCALE(wm8940_lim_boost_tlv, 0, 100, 0); | ||
178 | static DECLARE_TLV_DB_SCALE(wm8940_lim_thresh_tlv, -600, 100, 0); | ||
179 | static DECLARE_TLV_DB_SCALE(wm8940_adc_tlv, -12750, 50, 1); | ||
180 | static DECLARE_TLV_DB_SCALE(wm8940_capture_boost_vol_tlv, 0, 2000, 0); | ||
181 | |||
182 | static const struct snd_kcontrol_new wm8940_snd_controls[] = { | ||
183 | SOC_SINGLE("Digital Loopback Switch", WM8940_COMPANDINGCTL, | ||
184 | 6, 1, 0), | ||
185 | SOC_ENUM("DAC Companding", wm8940_dac_companding_enum), | ||
186 | SOC_ENUM("ADC Companding", wm8940_adc_companding_enum), | ||
187 | |||
188 | SOC_ENUM("ALC Mode", wm8940_alc_mode_enum), | ||
189 | SOC_SINGLE("ALC Switch", WM8940_ALC1, 8, 1, 0), | ||
190 | SOC_SINGLE_TLV("ALC Capture Max Gain", WM8940_ALC1, | ||
191 | 3, 7, 1, wm8940_alc_max_tlv), | ||
192 | SOC_SINGLE_TLV("ALC Capture Min Gain", WM8940_ALC1, | ||
193 | 0, 7, 0, wm8940_alc_min_tlv), | ||
194 | SOC_SINGLE_TLV("ALC Capture Target", WM8940_ALC2, | ||
195 | 0, 14, 0, wm8940_alc_tar_tlv), | ||
196 | SOC_SINGLE("ALC Capture Hold", WM8940_ALC2, 4, 10, 0), | ||
197 | SOC_SINGLE("ALC Capture Decay", WM8940_ALC3, 4, 10, 0), | ||
198 | SOC_SINGLE("ALC Capture Attach", WM8940_ALC3, 0, 10, 0), | ||
199 | SOC_SINGLE("ALC ZC Switch", WM8940_ALC4, 1, 1, 0), | ||
200 | SOC_SINGLE("ALC Capture Noise Gate Switch", WM8940_NOISEGATE, | ||
201 | 3, 1, 0), | ||
202 | SOC_SINGLE("ALC Capture Noise Gate Threshold", WM8940_NOISEGATE, | ||
203 | 0, 7, 0), | ||
204 | |||
205 | SOC_SINGLE("DAC Playback Limiter Switch", WM8940_DACLIM1, 8, 1, 0), | ||
206 | SOC_SINGLE("DAC Playback Limiter Attack", WM8940_DACLIM1, 0, 9, 0), | ||
207 | SOC_SINGLE("DAC Playback Limiter Decay", WM8940_DACLIM1, 4, 11, 0), | ||
208 | SOC_SINGLE_TLV("DAC Playback Limiter Threshold", WM8940_DACLIM2, | ||
209 | 4, 9, 1, wm8940_lim_thresh_tlv), | ||
210 | SOC_SINGLE_TLV("DAC Playback Limiter Boost", WM8940_DACLIM2, | ||
211 | 0, 12, 0, wm8940_lim_boost_tlv), | ||
212 | |||
213 | SOC_SINGLE("Capture PGA ZC Switch", WM8940_PGAGAIN, 7, 1, 0), | ||
214 | SOC_SINGLE_TLV("Capture PGA Volume", WM8940_PGAGAIN, | ||
215 | 0, 63, 0, wm8940_pga_vol_tlv), | ||
216 | SOC_SINGLE_TLV("Digital Playback Volume", WM8940_DACVOL, | ||
217 | 0, 255, 0, wm8940_adc_tlv), | ||
218 | SOC_SINGLE_TLV("Digital Capture Volume", WM8940_ADCVOL, | ||
219 | 0, 255, 0, wm8940_adc_tlv), | ||
220 | SOC_ENUM("Mic Bias Level", wm8940_mic_bias_level_enum), | ||
221 | SOC_SINGLE_TLV("Capture Boost Volue", WM8940_ADCBOOST, | ||
222 | 8, 1, 0, wm8940_capture_boost_vol_tlv), | ||
223 | SOC_SINGLE_TLV("Speaker Playback Volume", WM8940_SPKVOL, | ||
224 | 0, 63, 0, wm8940_spk_vol_tlv), | ||
225 | SOC_SINGLE("Speaker Playback Switch", WM8940_SPKVOL, 6, 1, 1), | ||
226 | |||
227 | SOC_SINGLE_TLV("Speaker Mixer Line Bypass Volume", WM8940_SPKVOL, | ||
228 | 8, 1, 1, wm8940_att_tlv), | ||
229 | SOC_SINGLE("Speaker Playback ZC Switch", WM8940_SPKVOL, 7, 1, 0), | ||
230 | |||
231 | SOC_SINGLE("Mono Out Switch", WM8940_MONOMIX, 6, 1, 1), | ||
232 | SOC_SINGLE_TLV("Mono Mixer Line Bypass Volume", WM8940_MONOMIX, | ||
233 | 7, 1, 1, wm8940_att_tlv), | ||
234 | |||
235 | SOC_SINGLE("High Pass Filter Switch", WM8940_ADC, 8, 1, 0), | ||
236 | SOC_ENUM("High Pass Filter Mode", wm8940_filter_mode_enum), | ||
237 | SOC_SINGLE("High Pass Filter Cut Off", WM8940_ADC, 4, 7, 0), | ||
238 | SOC_SINGLE("ADC Inversion Switch", WM8940_ADC, 0, 1, 0), | ||
239 | SOC_SINGLE("DAC Inversion Switch", WM8940_DAC, 0, 1, 0), | ||
240 | SOC_SINGLE("DAC Auto Mute Switch", WM8940_DAC, 2, 1, 0), | ||
241 | SOC_SINGLE("ZC Timeout Clock Switch", WM8940_ADDCNTRL, 0, 1, 0), | ||
242 | }; | ||
243 | |||
244 | static const struct snd_kcontrol_new wm8940_speaker_mixer_controls[] = { | ||
245 | SOC_DAPM_SINGLE("Line Bypass Switch", WM8940_SPKMIX, 1, 1, 0), | ||
246 | SOC_DAPM_SINGLE("Aux Playback Switch", WM8940_SPKMIX, 5, 1, 0), | ||
247 | SOC_DAPM_SINGLE("PCM Playback Switch", WM8940_SPKMIX, 0, 1, 0), | ||
248 | }; | ||
249 | |||
250 | static const struct snd_kcontrol_new wm8940_mono_mixer_controls[] = { | ||
251 | SOC_DAPM_SINGLE("Line Bypass Switch", WM8940_MONOMIX, 1, 1, 0), | ||
252 | SOC_DAPM_SINGLE("Aux Playback Switch", WM8940_MONOMIX, 2, 1, 0), | ||
253 | SOC_DAPM_SINGLE("PCM Playback Switch", WM8940_MONOMIX, 0, 1, 0), | ||
254 | }; | ||
255 | |||
256 | static DECLARE_TLV_DB_SCALE(wm8940_boost_vol_tlv, -1500, 300, 1); | ||
257 | static const struct snd_kcontrol_new wm8940_input_boost_controls[] = { | ||
258 | SOC_DAPM_SINGLE("Mic PGA Switch", WM8940_PGAGAIN, 6, 1, 1), | ||
259 | SOC_DAPM_SINGLE_TLV("Aux Volume", WM8940_ADCBOOST, | ||
260 | 0, 7, 0, wm8940_boost_vol_tlv), | ||
261 | SOC_DAPM_SINGLE_TLV("Mic Volume", WM8940_ADCBOOST, | ||
262 | 4, 7, 0, wm8940_boost_vol_tlv), | ||
263 | }; | ||
264 | |||
265 | static const struct snd_kcontrol_new wm8940_micpga_controls[] = { | ||
266 | SOC_DAPM_SINGLE("AUX Switch", WM8940_INPUTCTL, 2, 1, 0), | ||
267 | SOC_DAPM_SINGLE("MICP Switch", WM8940_INPUTCTL, 0, 1, 0), | ||
268 | SOC_DAPM_SINGLE("MICN Switch", WM8940_INPUTCTL, 1, 1, 0), | ||
269 | }; | ||
270 | |||
271 | static const struct snd_soc_dapm_widget wm8940_dapm_widgets[] = { | ||
272 | SND_SOC_DAPM_MIXER("Speaker Mixer", WM8940_POWER3, 2, 0, | ||
273 | &wm8940_speaker_mixer_controls[0], | ||
274 | ARRAY_SIZE(wm8940_speaker_mixer_controls)), | ||
275 | SND_SOC_DAPM_MIXER("Mono Mixer", WM8940_POWER3, 3, 0, | ||
276 | &wm8940_mono_mixer_controls[0], | ||
277 | ARRAY_SIZE(wm8940_mono_mixer_controls)), | ||
278 | SND_SOC_DAPM_DAC("DAC", "HiFi Playback", WM8940_POWER3, 0, 0), | ||
279 | |||
280 | SND_SOC_DAPM_PGA("SpkN Out", WM8940_POWER3, 5, 0, NULL, 0), | ||
281 | SND_SOC_DAPM_PGA("SpkP Out", WM8940_POWER3, 6, 0, NULL, 0), | ||
282 | SND_SOC_DAPM_PGA("Mono Out", WM8940_POWER3, 7, 0, NULL, 0), | ||
283 | SND_SOC_DAPM_OUTPUT("MONOOUT"), | ||
284 | SND_SOC_DAPM_OUTPUT("SPKOUTP"), | ||
285 | SND_SOC_DAPM_OUTPUT("SPKOUTN"), | ||
286 | |||
287 | SND_SOC_DAPM_PGA("Aux Input", WM8940_POWER1, 6, 0, NULL, 0), | ||
288 | SND_SOC_DAPM_ADC("ADC", "HiFi Capture", WM8940_POWER2, 0, 0), | ||
289 | SND_SOC_DAPM_MIXER("Mic PGA", WM8940_POWER2, 2, 0, | ||
290 | &wm8940_micpga_controls[0], | ||
291 | ARRAY_SIZE(wm8940_micpga_controls)), | ||
292 | SND_SOC_DAPM_MIXER("Boost Mixer", WM8940_POWER2, 4, 0, | ||
293 | &wm8940_input_boost_controls[0], | ||
294 | ARRAY_SIZE(wm8940_input_boost_controls)), | ||
295 | SND_SOC_DAPM_MICBIAS("Mic Bias", WM8940_POWER1, 4, 0), | ||
296 | |||
297 | SND_SOC_DAPM_INPUT("MICN"), | ||
298 | SND_SOC_DAPM_INPUT("MICP"), | ||
299 | SND_SOC_DAPM_INPUT("AUX"), | ||
300 | }; | ||
301 | |||
302 | static const struct snd_soc_dapm_route audio_map[] = { | ||
303 | /* Mono output mixer */ | ||
304 | {"Mono Mixer", "PCM Playback Switch", "DAC"}, | ||
305 | {"Mono Mixer", "Aux Playback Switch", "Aux Input"}, | ||
306 | {"Mono Mixer", "Line Bypass Switch", "Boost Mixer"}, | ||
307 | |||
308 | /* Speaker output mixer */ | ||
309 | {"Speaker Mixer", "PCM Playback Switch", "DAC"}, | ||
310 | {"Speaker Mixer", "Aux Playback Switch", "Aux Input"}, | ||
311 | {"Speaker Mixer", "Line Bypass Switch", "Boost Mixer"}, | ||
312 | |||
313 | /* Outputs */ | ||
314 | {"Mono Out", NULL, "Mono Mixer"}, | ||
315 | {"MONOOUT", NULL, "Mono Out"}, | ||
316 | {"SpkN Out", NULL, "Speaker Mixer"}, | ||
317 | {"SpkP Out", NULL, "Speaker Mixer"}, | ||
318 | {"SPKOUTN", NULL, "SpkN Out"}, | ||
319 | {"SPKOUTP", NULL, "SpkP Out"}, | ||
320 | |||
321 | /* Microphone PGA */ | ||
322 | {"Mic PGA", "MICN Switch", "MICN"}, | ||
323 | {"Mic PGA", "MICP Switch", "MICP"}, | ||
324 | {"Mic PGA", "AUX Switch", "AUX"}, | ||
325 | |||
326 | /* Boost Mixer */ | ||
327 | {"Boost Mixer", "Mic PGA Switch", "Mic PGA"}, | ||
328 | {"Boost Mixer", "Mic Volume", "MICP"}, | ||
329 | {"Boost Mixer", "Aux Volume", "Aux Input"}, | ||
330 | |||
331 | {"ADC", NULL, "Boost Mixer"}, | ||
332 | }; | ||
333 | |||
334 | static int wm8940_add_widgets(struct snd_soc_codec *codec) | ||
335 | { | ||
336 | int ret; | ||
337 | |||
338 | ret = snd_soc_dapm_new_controls(codec, wm8940_dapm_widgets, | ||
339 | ARRAY_SIZE(wm8940_dapm_widgets)); | ||
340 | if (ret) | ||
341 | goto error_ret; | ||
342 | ret = snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | ||
343 | if (ret) | ||
344 | goto error_ret; | ||
345 | ret = snd_soc_dapm_new_widgets(codec); | ||
346 | |||
347 | error_ret: | ||
348 | return ret; | ||
349 | } | ||
350 | |||
351 | #define wm8940_reset(c) wm8940_write(c, WM8940_SOFTRESET, 0); | ||
352 | |||
353 | static int wm8940_set_dai_fmt(struct snd_soc_dai *codec_dai, | ||
354 | unsigned int fmt) | ||
355 | { | ||
356 | struct snd_soc_codec *codec = codec_dai->codec; | ||
357 | u16 iface = wm8940_read_reg_cache(codec, WM8940_IFACE) & 0xFE67; | ||
358 | u16 clk = wm8940_read_reg_cache(codec, WM8940_CLOCK) & 0x1fe; | ||
359 | |||
360 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | ||
361 | case SND_SOC_DAIFMT_CBM_CFM: | ||
362 | clk |= 1; | ||
363 | break; | ||
364 | case SND_SOC_DAIFMT_CBS_CFS: | ||
365 | break; | ||
366 | default: | ||
367 | return -EINVAL; | ||
368 | } | ||
369 | wm8940_write(codec, WM8940_CLOCK, clk); | ||
370 | |||
371 | switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { | ||
372 | case SND_SOC_DAIFMT_I2S: | ||
373 | iface |= (2 << 3); | ||
374 | break; | ||
375 | case SND_SOC_DAIFMT_LEFT_J: | ||
376 | iface |= (1 << 3); | ||
377 | break; | ||
378 | case SND_SOC_DAIFMT_RIGHT_J: | ||
379 | break; | ||
380 | case SND_SOC_DAIFMT_DSP_A: | ||
381 | iface |= (3 << 3); | ||
382 | break; | ||
383 | case SND_SOC_DAIFMT_DSP_B: | ||
384 | iface |= (3 << 3) | (1 << 7); | ||
385 | break; | ||
386 | } | ||
387 | |||
388 | switch (fmt & SND_SOC_DAIFMT_INV_MASK) { | ||
389 | case SND_SOC_DAIFMT_NB_NF: | ||
390 | break; | ||
391 | case SND_SOC_DAIFMT_NB_IF: | ||
392 | iface |= (1 << 7); | ||
393 | break; | ||
394 | case SND_SOC_DAIFMT_IB_NF: | ||
395 | iface |= (1 << 8); | ||
396 | break; | ||
397 | case SND_SOC_DAIFMT_IB_IF: | ||
398 | iface |= (1 << 8) | (1 << 7); | ||
399 | break; | ||
400 | } | ||
401 | |||
402 | wm8940_write(codec, WM8940_IFACE, iface); | ||
403 | |||
404 | return 0; | ||
405 | } | ||
406 | |||
407 | static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream, | ||
408 | struct snd_pcm_hw_params *params, | ||
409 | struct snd_soc_dai *dai) | ||
410 | { | ||
411 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
412 | struct snd_soc_device *socdev = rtd->socdev; | ||
413 | struct snd_soc_codec *codec = socdev->card->codec; | ||
414 | u16 iface = wm8940_read_reg_cache(codec, WM8940_IFACE) & 0xFD9F; | ||
415 | u16 addcntrl = wm8940_read_reg_cache(codec, WM8940_ADDCNTRL) & 0xFFF1; | ||
416 | u16 companding = wm8940_read_reg_cache(codec, | ||
417 | WM8940_COMPANDINGCTL) & 0xFFDF; | ||
418 | int ret; | ||
419 | |||
420 | /* LoutR control */ | ||
421 | if (substream->stream == SNDRV_PCM_STREAM_CAPTURE | ||
422 | && params_channels(params) == 2) | ||
423 | iface |= (1 << 9); | ||
424 | |||
425 | switch (params_rate(params)) { | ||
426 | case SNDRV_PCM_RATE_8000: | ||
427 | addcntrl |= (0x5 << 1); | ||
428 | break; | ||
429 | case SNDRV_PCM_RATE_11025: | ||
430 | addcntrl |= (0x4 << 1); | ||
431 | break; | ||
432 | case SNDRV_PCM_RATE_16000: | ||
433 | addcntrl |= (0x3 << 1); | ||
434 | break; | ||
435 | case SNDRV_PCM_RATE_22050: | ||
436 | addcntrl |= (0x2 << 1); | ||
437 | break; | ||
438 | case SNDRV_PCM_RATE_32000: | ||
439 | addcntrl |= (0x1 << 1); | ||
440 | break; | ||
441 | case SNDRV_PCM_RATE_44100: | ||
442 | case SNDRV_PCM_RATE_48000: | ||
443 | break; | ||
444 | } | ||
445 | ret = wm8940_write(codec, WM8940_ADDCNTRL, addcntrl); | ||
446 | if (ret) | ||
447 | goto error_ret; | ||
448 | |||
449 | switch (params_format(params)) { | ||
450 | case SNDRV_PCM_FORMAT_S8: | ||
451 | companding = companding | (1 << 5); | ||
452 | break; | ||
453 | case SNDRV_PCM_FORMAT_S16_LE: | ||
454 | break; | ||
455 | case SNDRV_PCM_FORMAT_S20_3LE: | ||
456 | iface |= (1 << 5); | ||
457 | break; | ||
458 | case SNDRV_PCM_FORMAT_S24_LE: | ||
459 | iface |= (2 << 5); | ||
460 | break; | ||
461 | case SNDRV_PCM_FORMAT_S32_LE: | ||
462 | iface |= (3 << 5); | ||
463 | break; | ||
464 | } | ||
465 | ret = wm8940_write(codec, WM8940_COMPANDINGCTL, companding); | ||
466 | if (ret) | ||
467 | goto error_ret; | ||
468 | ret = wm8940_write(codec, WM8940_IFACE, iface); | ||
469 | |||
470 | error_ret: | ||
471 | return ret; | ||
472 | } | ||
473 | |||
474 | static int wm8940_mute(struct snd_soc_dai *dai, int mute) | ||
475 | { | ||
476 | struct snd_soc_codec *codec = dai->codec; | ||
477 | u16 mute_reg = wm8940_read_reg_cache(codec, WM8940_DAC) & 0xffbf; | ||
478 | |||
479 | if (mute) | ||
480 | mute_reg |= 0x40; | ||
481 | |||
482 | return wm8940_write(codec, WM8940_DAC, mute_reg); | ||
483 | } | ||
484 | |||
485 | static int wm8940_set_bias_level(struct snd_soc_codec *codec, | ||
486 | enum snd_soc_bias_level level) | ||
487 | { | ||
488 | u16 val; | ||
489 | u16 pwr_reg = wm8940_read_reg_cache(codec, WM8940_POWER1) & 0x1F0; | ||
490 | int ret = 0; | ||
491 | |||
492 | switch (level) { | ||
493 | case SND_SOC_BIAS_ON: | ||
494 | /* ensure bufioen and biasen */ | ||
495 | pwr_reg |= (1 << 2) | (1 << 3); | ||
496 | /* Enable thermal shutdown */ | ||
497 | val = wm8940_read_reg_cache(codec, WM8940_OUTPUTCTL); | ||
498 | ret = wm8940_write(codec, WM8940_OUTPUTCTL, val | 0x2); | ||
499 | if (ret) | ||
500 | break; | ||
501 | /* set vmid to 75k */ | ||
502 | ret = wm8940_write(codec, WM8940_POWER1, pwr_reg | 0x1); | ||
503 | break; | ||
504 | case SND_SOC_BIAS_PREPARE: | ||
505 | /* ensure bufioen and biasen */ | ||
506 | pwr_reg |= (1 << 2) | (1 << 3); | ||
507 | ret = wm8940_write(codec, WM8940_POWER1, pwr_reg | 0x1); | ||
508 | break; | ||
509 | case SND_SOC_BIAS_STANDBY: | ||
510 | /* ensure bufioen and biasen */ | ||
511 | pwr_reg |= (1 << 2) | (1 << 3); | ||
512 | /* set vmid to 300k for standby */ | ||
513 | ret = wm8940_write(codec, WM8940_POWER1, pwr_reg | 0x2); | ||
514 | break; | ||
515 | case SND_SOC_BIAS_OFF: | ||
516 | ret = wm8940_write(codec, WM8940_POWER1, pwr_reg); | ||
517 | break; | ||
518 | } | ||
519 | |||
520 | return ret; | ||
521 | } | ||
522 | |||
523 | struct pll_ { | ||
524 | unsigned int pre_scale:2; | ||
525 | unsigned int n:4; | ||
526 | unsigned int k; | ||
527 | }; | ||
528 | |||
529 | static struct pll_ pll_div; | ||
530 | |||
531 | /* The size in bits of the pll divide multiplied by 10 | ||
532 | * to allow rounding later */ | ||
533 | #define FIXED_PLL_SIZE ((1 << 24) * 10) | ||
534 | static void pll_factors(unsigned int target, unsigned int source) | ||
535 | { | ||
536 | unsigned long long Kpart; | ||
537 | unsigned int K, Ndiv, Nmod; | ||
538 | /* The left shift ist to avoid accuracy loss when right shifting */ | ||
539 | Ndiv = target / source; | ||
540 | |||
541 | if (Ndiv > 12) { | ||
542 | source <<= 1; | ||
543 | /* Multiply by 2 */ | ||
544 | pll_div.pre_scale = 0; | ||
545 | Ndiv = target / source; | ||
546 | } else if (Ndiv < 3) { | ||
547 | source >>= 2; | ||
548 | /* Divide by 4 */ | ||
549 | pll_div.pre_scale = 3; | ||
550 | Ndiv = target / source; | ||
551 | } else if (Ndiv < 6) { | ||
552 | source >>= 1; | ||
553 | /* divide by 2 */ | ||
554 | pll_div.pre_scale = 2; | ||
555 | Ndiv = target / source; | ||
556 | } else | ||
557 | pll_div.pre_scale = 1; | ||
558 | |||
559 | if ((Ndiv < 6) || (Ndiv > 12)) | ||
560 | printk(KERN_WARNING | ||
561 | "WM8940 N value %d outwith recommended range!d\n", | ||
562 | Ndiv); | ||
563 | |||
564 | pll_div.n = Ndiv; | ||
565 | Nmod = target % source; | ||
566 | Kpart = FIXED_PLL_SIZE * (long long)Nmod; | ||
567 | |||
568 | do_div(Kpart, source); | ||
569 | |||
570 | K = Kpart & 0xFFFFFFFF; | ||
571 | |||
572 | /* Check if we need to round */ | ||
573 | if ((K % 10) >= 5) | ||
574 | K += 5; | ||
575 | |||
576 | /* Move down to proper range now rounding is done */ | ||
577 | K /= 10; | ||
578 | |||
579 | pll_div.k = K; | ||
580 | } | ||
581 | |||
582 | /* Untested at the moment */ | ||
583 | static int wm8940_set_dai_pll(struct snd_soc_dai *codec_dai, | ||
584 | int pll_id, unsigned int freq_in, unsigned int freq_out) | ||
585 | { | ||
586 | struct snd_soc_codec *codec = codec_dai->codec; | ||
587 | u16 reg; | ||
588 | |||
589 | /* Turn off PLL */ | ||
590 | reg = wm8940_read_reg_cache(codec, WM8940_POWER1); | ||
591 | wm8940_write(codec, WM8940_POWER1, reg & 0x1df); | ||
592 | |||
593 | if (freq_in == 0 || freq_out == 0) { | ||
594 | /* Clock CODEC directly from MCLK */ | ||
595 | reg = wm8940_read_reg_cache(codec, WM8940_CLOCK); | ||
596 | wm8940_write(codec, WM8940_CLOCK, reg & 0x0ff); | ||
597 | /* Pll power down */ | ||
598 | wm8940_write(codec, WM8940_PLLN, (1 << 7)); | ||
599 | return 0; | ||
600 | } | ||
601 | |||
602 | /* Pll is followed by a frequency divide by 4 */ | ||
603 | pll_factors(freq_out*4, freq_in); | ||
604 | if (pll_div.k) | ||
605 | wm8940_write(codec, WM8940_PLLN, | ||
606 | (pll_div.pre_scale << 4) | pll_div.n | (1 << 6)); | ||
607 | else /* No factional component */ | ||
608 | wm8940_write(codec, WM8940_PLLN, | ||
609 | (pll_div.pre_scale << 4) | pll_div.n); | ||
610 | wm8940_write(codec, WM8940_PLLK1, pll_div.k >> 18); | ||
611 | wm8940_write(codec, WM8940_PLLK2, (pll_div.k >> 9) & 0x1ff); | ||
612 | wm8940_write(codec, WM8940_PLLK3, pll_div.k & 0x1ff); | ||
613 | /* Enable the PLL */ | ||
614 | reg = wm8940_read_reg_cache(codec, WM8940_POWER1); | ||
615 | wm8940_write(codec, WM8940_POWER1, reg | 0x020); | ||
616 | |||
617 | /* Run CODEC from PLL instead of MCLK */ | ||
618 | reg = wm8940_read_reg_cache(codec, WM8940_CLOCK); | ||
619 | wm8940_write(codec, WM8940_CLOCK, reg | 0x100); | ||
620 | |||
621 | return 0; | ||
622 | } | ||
623 | |||
624 | static int wm8940_set_dai_sysclk(struct snd_soc_dai *codec_dai, | ||
625 | int clk_id, unsigned int freq, int dir) | ||
626 | { | ||
627 | struct snd_soc_codec *codec = codec_dai->codec; | ||
628 | struct wm8940_priv *wm8940 = codec->private_data; | ||
629 | |||
630 | switch (freq) { | ||
631 | case 11289600: | ||
632 | case 12000000: | ||
633 | case 12288000: | ||
634 | case 16934400: | ||
635 | case 18432000: | ||
636 | wm8940->sysclk = freq; | ||
637 | return 0; | ||
638 | } | ||
639 | return -EINVAL; | ||
640 | } | ||
641 | |||
642 | static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai, | ||
643 | int div_id, int div) | ||
644 | { | ||
645 | struct snd_soc_codec *codec = codec_dai->codec; | ||
646 | u16 reg; | ||
647 | int ret = 0; | ||
648 | |||
649 | switch (div_id) { | ||
650 | case WM8940_BCLKDIV: | ||
651 | reg = wm8940_read_reg_cache(codec, WM8940_CLOCK) & 0xFFEF3; | ||
652 | ret = wm8940_write(codec, WM8940_CLOCK, reg | (div << 2)); | ||
653 | break; | ||
654 | case WM8940_MCLKDIV: | ||
655 | reg = wm8940_read_reg_cache(codec, WM8940_CLOCK) & 0xFF1F; | ||
656 | ret = wm8940_write(codec, WM8940_CLOCK, reg | (div << 5)); | ||
657 | break; | ||
658 | case WM8940_OPCLKDIV: | ||
659 | reg = wm8940_read_reg_cache(codec, WM8940_ADDCNTRL) & 0xFFCF; | ||
660 | ret = wm8940_write(codec, WM8940_ADDCNTRL, reg | (div << 4)); | ||
661 | break; | ||
662 | } | ||
663 | return ret; | ||
664 | } | ||
665 | |||
666 | #define WM8940_RATES SNDRV_PCM_RATE_8000_48000 | ||
667 | |||
668 | #define WM8940_FORMATS (SNDRV_PCM_FMTBIT_S8 | \ | ||
669 | SNDRV_PCM_FMTBIT_S16_LE | \ | ||
670 | SNDRV_PCM_FMTBIT_S20_3LE | \ | ||
671 | SNDRV_PCM_FMTBIT_S24_LE | \ | ||
672 | SNDRV_PCM_FMTBIT_S32_LE) | ||
673 | |||
674 | static struct snd_soc_dai_ops wm8940_dai_ops = { | ||
675 | .hw_params = wm8940_i2s_hw_params, | ||
676 | .set_sysclk = wm8940_set_dai_sysclk, | ||
677 | .digital_mute = wm8940_mute, | ||
678 | .set_fmt = wm8940_set_dai_fmt, | ||
679 | .set_clkdiv = wm8940_set_dai_clkdiv, | ||
680 | .set_pll = wm8940_set_dai_pll, | ||
681 | }; | ||
682 | |||
683 | struct snd_soc_dai wm8940_dai = { | ||
684 | .name = "WM8940", | ||
685 | .playback = { | ||
686 | .stream_name = "Playback", | ||
687 | .channels_min = 1, | ||
688 | .channels_max = 2, | ||
689 | .rates = WM8940_RATES, | ||
690 | .formats = WM8940_FORMATS, | ||
691 | }, | ||
692 | .capture = { | ||
693 | .stream_name = "Capture", | ||
694 | .channels_min = 1, | ||
695 | .channels_max = 2, | ||
696 | .rates = WM8940_RATES, | ||
697 | .formats = WM8940_FORMATS, | ||
698 | }, | ||
699 | .ops = &wm8940_dai_ops, | ||
700 | .symmetric_rates = 1, | ||
701 | }; | ||
702 | EXPORT_SYMBOL_GPL(wm8940_dai); | ||
703 | |||
704 | static int wm8940_suspend(struct platform_device *pdev, pm_message_t state) | ||
705 | { | ||
706 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
707 | struct snd_soc_codec *codec = socdev->card->codec; | ||
708 | |||
709 | return wm8940_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
710 | } | ||
711 | |||
712 | static int wm8940_resume(struct platform_device *pdev) | ||
713 | { | ||
714 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
715 | struct snd_soc_codec *codec = socdev->card->codec; | ||
716 | int i; | ||
717 | int ret; | ||
718 | u8 data[3]; | ||
719 | u16 *cache = codec->reg_cache; | ||
720 | |||
721 | /* Sync reg_cache with the hardware | ||
722 | * Could use auto incremented writes to speed this up | ||
723 | */ | ||
724 | for (i = 0; i < ARRAY_SIZE(wm8940_reg_defaults); i++) { | ||
725 | data[0] = i; | ||
726 | data[1] = (cache[i] & 0xFF00) >> 8; | ||
727 | data[2] = cache[i] & 0x00FF; | ||
728 | ret = codec->hw_write(codec->control_data, data, 3); | ||
729 | if (ret < 0) | ||
730 | goto error_ret; | ||
731 | else if (ret != 3) { | ||
732 | ret = -EIO; | ||
733 | goto error_ret; | ||
734 | } | ||
735 | } | ||
736 | ret = wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
737 | if (ret) | ||
738 | goto error_ret; | ||
739 | ret = wm8940_set_bias_level(codec, codec->suspend_bias_level); | ||
740 | |||
741 | error_ret: | ||
742 | return ret; | ||
743 | } | ||
744 | |||
745 | static struct snd_soc_codec *wm8940_codec; | ||
746 | |||
747 | static int wm8940_probe(struct platform_device *pdev) | ||
748 | { | ||
749 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
750 | struct snd_soc_codec *codec; | ||
751 | |||
752 | int ret = 0; | ||
753 | |||
754 | if (wm8940_codec == NULL) { | ||
755 | dev_err(&pdev->dev, "Codec device not registered\n"); | ||
756 | return -ENODEV; | ||
757 | } | ||
758 | |||
759 | socdev->card->codec = wm8940_codec; | ||
760 | codec = wm8940_codec; | ||
761 | |||
762 | mutex_init(&codec->mutex); | ||
763 | /* register pcms */ | ||
764 | ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); | ||
765 | if (ret < 0) { | ||
766 | dev_err(codec->dev, "failed to create pcms: %d\n", ret); | ||
767 | goto pcm_err; | ||
768 | } | ||
769 | |||
770 | ret = snd_soc_add_controls(codec, wm8940_snd_controls, | ||
771 | ARRAY_SIZE(wm8940_snd_controls)); | ||
772 | if (ret) | ||
773 | goto error_free_pcms; | ||
774 | ret = wm8940_add_widgets(codec); | ||
775 | if (ret) | ||
776 | goto error_free_pcms; | ||
777 | |||
778 | ret = snd_soc_init_card(socdev); | ||
779 | if (ret < 0) { | ||
780 | dev_err(codec->dev, "failed to register card: %d\n", ret); | ||
781 | goto error_free_pcms; | ||
782 | } | ||
783 | |||
784 | return ret; | ||
785 | |||
786 | error_free_pcms: | ||
787 | snd_soc_free_pcms(socdev); | ||
788 | snd_soc_dapm_free(socdev); | ||
789 | pcm_err: | ||
790 | return ret; | ||
791 | } | ||
792 | |||
793 | static int wm8940_remove(struct platform_device *pdev) | ||
794 | { | ||
795 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
796 | |||
797 | snd_soc_free_pcms(socdev); | ||
798 | snd_soc_dapm_free(socdev); | ||
799 | |||
800 | return 0; | ||
801 | } | ||
802 | |||
803 | struct snd_soc_codec_device soc_codec_dev_wm8940 = { | ||
804 | .probe = wm8940_probe, | ||
805 | .remove = wm8940_remove, | ||
806 | .suspend = wm8940_suspend, | ||
807 | .resume = wm8940_resume, | ||
808 | }; | ||
809 | EXPORT_SYMBOL_GPL(soc_codec_dev_wm8940); | ||
810 | |||
811 | static int wm8940_register(struct wm8940_priv *wm8940) | ||
812 | { | ||
813 | struct wm8940_setup_data *pdata = wm8940->codec.dev->platform_data; | ||
814 | struct snd_soc_codec *codec = &wm8940->codec; | ||
815 | int ret; | ||
816 | u16 reg; | ||
817 | if (wm8940_codec) { | ||
818 | dev_err(codec->dev, "Another WM8940 is registered\n"); | ||
819 | return -EINVAL; | ||
820 | } | ||
821 | |||
822 | INIT_LIST_HEAD(&codec->dapm_widgets); | ||
823 | INIT_LIST_HEAD(&codec->dapm_paths); | ||
824 | |||
825 | codec->private_data = wm8940; | ||
826 | codec->name = "WM8940"; | ||
827 | codec->owner = THIS_MODULE; | ||
828 | codec->read = wm8940_read_reg_cache; | ||
829 | codec->write = wm8940_write; | ||
830 | codec->bias_level = SND_SOC_BIAS_OFF; | ||
831 | codec->set_bias_level = wm8940_set_bias_level; | ||
832 | codec->dai = &wm8940_dai; | ||
833 | codec->num_dai = 1; | ||
834 | codec->reg_cache_size = ARRAY_SIZE(wm8940_reg_defaults); | ||
835 | codec->reg_cache = &wm8940->reg_cache; | ||
836 | |||
837 | memcpy(codec->reg_cache, wm8940_reg_defaults, | ||
838 | sizeof(wm8940_reg_defaults)); | ||
839 | |||
840 | ret = wm8940_reset(codec); | ||
841 | if (ret < 0) { | ||
842 | dev_err(codec->dev, "Failed to issue reset\n"); | ||
843 | return ret; | ||
844 | } | ||
845 | |||
846 | wm8940_dai.dev = codec->dev; | ||
847 | |||
848 | wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
849 | |||
850 | ret = wm8940_write(codec, WM8940_POWER1, 0x180); | ||
851 | if (ret < 0) | ||
852 | return ret; | ||
853 | |||
854 | if (!pdata) | ||
855 | dev_warn(codec->dev, "No platform data supplied\n"); | ||
856 | else { | ||
857 | reg = wm8940_read_reg_cache(codec, WM8940_OUTPUTCTL); | ||
858 | ret = wm8940_write(codec, WM8940_OUTPUTCTL, reg | pdata->vroi); | ||
859 | if (ret < 0) | ||
860 | return ret; | ||
861 | } | ||
862 | |||
863 | |||
864 | wm8940_codec = codec; | ||
865 | |||
866 | ret = snd_soc_register_codec(codec); | ||
867 | if (ret) { | ||
868 | dev_err(codec->dev, "Failed to register codec: %d\n", ret); | ||
869 | return ret; | ||
870 | } | ||
871 | |||
872 | ret = snd_soc_register_dai(&wm8940_dai); | ||
873 | if (ret) { | ||
874 | dev_err(codec->dev, "Failed to register DAI: %d\n", ret); | ||
875 | snd_soc_unregister_codec(codec); | ||
876 | return ret; | ||
877 | } | ||
878 | |||
879 | return 0; | ||
880 | } | ||
881 | |||
882 | static void wm8940_unregister(struct wm8940_priv *wm8940) | ||
883 | { | ||
884 | wm8940_set_bias_level(&wm8940->codec, SND_SOC_BIAS_OFF); | ||
885 | snd_soc_unregister_dai(&wm8940_dai); | ||
886 | snd_soc_unregister_codec(&wm8940->codec); | ||
887 | kfree(wm8940); | ||
888 | wm8940_codec = NULL; | ||
889 | } | ||
890 | |||
891 | static int wm8940_i2c_probe(struct i2c_client *i2c, | ||
892 | const struct i2c_device_id *id) | ||
893 | { | ||
894 | struct wm8940_priv *wm8940; | ||
895 | struct snd_soc_codec *codec; | ||
896 | |||
897 | wm8940 = kzalloc(sizeof *wm8940, GFP_KERNEL); | ||
898 | if (wm8940 == NULL) | ||
899 | return -ENOMEM; | ||
900 | |||
901 | codec = &wm8940->codec; | ||
902 | codec->hw_write = (hw_write_t)i2c_master_send; | ||
903 | i2c_set_clientdata(i2c, wm8940); | ||
904 | codec->control_data = i2c; | ||
905 | codec->dev = &i2c->dev; | ||
906 | |||
907 | return wm8940_register(wm8940); | ||
908 | } | ||
909 | |||
910 | static int __devexit wm8940_i2c_remove(struct i2c_client *client) | ||
911 | { | ||
912 | struct wm8940_priv *wm8940 = i2c_get_clientdata(client); | ||
913 | |||
914 | wm8940_unregister(wm8940); | ||
915 | |||
916 | return 0; | ||
917 | } | ||
918 | |||
919 | static const struct i2c_device_id wm8940_i2c_id[] = { | ||
920 | { "wm8940", 0 }, | ||
921 | { } | ||
922 | }; | ||
923 | MODULE_DEVICE_TABLE(i2c, wm8940_i2c_id); | ||
924 | |||
925 | static struct i2c_driver wm8940_i2c_driver = { | ||
926 | .driver = { | ||
927 | .name = "WM8940 I2C Codec", | ||
928 | .owner = THIS_MODULE, | ||
929 | }, | ||
930 | .probe = wm8940_i2c_probe, | ||
931 | .remove = __devexit_p(wm8940_i2c_remove), | ||
932 | .id_table = wm8940_i2c_id, | ||
933 | }; | ||
934 | |||
935 | static int __init wm8940_modinit(void) | ||
936 | { | ||
937 | int ret; | ||
938 | |||
939 | ret = i2c_add_driver(&wm8940_i2c_driver); | ||
940 | if (ret) | ||
941 | printk(KERN_ERR "Failed to register WM8940 I2C driver: %d\n", | ||
942 | ret); | ||
943 | return ret; | ||
944 | } | ||
945 | module_init(wm8940_modinit); | ||
946 | |||
947 | static void __exit wm8940_exit(void) | ||
948 | { | ||
949 | i2c_del_driver(&wm8940_i2c_driver); | ||
950 | } | ||
951 | module_exit(wm8940_exit); | ||
952 | |||
953 | MODULE_DESCRIPTION("ASoC WM8940 driver"); | ||
954 | MODULE_AUTHOR("Jonathan Cameron"); | ||
955 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/codecs/wm8940.h b/sound/soc/codecs/wm8940.h new file mode 100644 index 000000000000..8410eed3ef84 --- /dev/null +++ b/sound/soc/codecs/wm8940.h | |||
@@ -0,0 +1,104 @@ | |||
1 | /* | ||
2 | * wm8940.h -- WM8940 Soc Audio driver | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | |||
9 | #ifndef _WM8940_H | ||
10 | #define _WM8940_H | ||
11 | |||
12 | struct wm8940_setup_data { | ||
13 | /* Vref to analogue output resistance */ | ||
14 | #define WM8940_VROI_1K 0 | ||
15 | #define WM8940_VROI_30K 1 | ||
16 | unsigned int vroi:1; | ||
17 | }; | ||
18 | extern struct snd_soc_dai wm8940_dai; | ||
19 | extern struct snd_soc_codec_device soc_codec_dev_wm8940; | ||
20 | |||
21 | /* WM8940 register space */ | ||
22 | #define WM8940_SOFTRESET 0x00 | ||
23 | #define WM8940_POWER1 0x01 | ||
24 | #define WM8940_POWER2 0x02 | ||
25 | #define WM8940_POWER3 0x03 | ||
26 | #define WM8940_IFACE 0x04 | ||
27 | #define WM8940_COMPANDINGCTL 0x05 | ||
28 | #define WM8940_CLOCK 0x06 | ||
29 | #define WM8940_ADDCNTRL 0x07 | ||
30 | #define WM8940_GPIO 0x08 | ||
31 | #define WM8940_CTLINT 0x09 | ||
32 | #define WM8940_DAC 0x0A | ||
33 | #define WM8940_DACVOL 0x0B | ||
34 | |||
35 | #define WM8940_ADC 0x0E | ||
36 | #define WM8940_ADCVOL 0x0F | ||
37 | #define WM8940_NOTCH1 0x10 | ||
38 | #define WM8940_NOTCH2 0x11 | ||
39 | #define WM8940_NOTCH3 0x12 | ||
40 | #define WM8940_NOTCH4 0x13 | ||
41 | #define WM8940_NOTCH5 0x14 | ||
42 | #define WM8940_NOTCH6 0x15 | ||
43 | #define WM8940_NOTCH7 0x16 | ||
44 | #define WM8940_NOTCH8 0x17 | ||
45 | #define WM8940_DACLIM1 0x18 | ||
46 | #define WM8940_DACLIM2 0x19 | ||
47 | |||
48 | #define WM8940_ALC1 0x20 | ||
49 | #define WM8940_ALC2 0x21 | ||
50 | #define WM8940_ALC3 0x22 | ||
51 | #define WM8940_NOISEGATE 0x23 | ||
52 | #define WM8940_PLLN 0x24 | ||
53 | #define WM8940_PLLK1 0x25 | ||
54 | #define WM8940_PLLK2 0x26 | ||
55 | #define WM8940_PLLK3 0x27 | ||
56 | |||
57 | #define WM8940_ALC4 0x2A | ||
58 | |||
59 | #define WM8940_INPUTCTL 0x2C | ||
60 | #define WM8940_PGAGAIN 0x2D | ||
61 | |||
62 | #define WM8940_ADCBOOST 0x2F | ||
63 | |||
64 | #define WM8940_OUTPUTCTL 0x31 | ||
65 | #define WM8940_SPKMIX 0x32 | ||
66 | |||
67 | #define WM8940_SPKVOL 0x36 | ||
68 | |||
69 | #define WM8940_MONOMIX 0x38 | ||
70 | |||
71 | #define WM8940_CACHEREGNUM 0x57 | ||
72 | |||
73 | |||
74 | /* Clock divider Id's */ | ||
75 | #define WM8940_BCLKDIV 0 | ||
76 | #define WM8940_MCLKDIV 1 | ||
77 | #define WM8940_OPCLKDIV 2 | ||
78 | |||
79 | /* MCLK clock dividers */ | ||
80 | #define WM8940_MCLKDIV_1 0 | ||
81 | #define WM8940_MCLKDIV_1_5 1 | ||
82 | #define WM8940_MCLKDIV_2 2 | ||
83 | #define WM8940_MCLKDIV_3 3 | ||
84 | #define WM8940_MCLKDIV_4 4 | ||
85 | #define WM8940_MCLKDIV_6 5 | ||
86 | #define WM8940_MCLKDIV_8 6 | ||
87 | #define WM8940_MCLKDIV_12 7 | ||
88 | |||
89 | /* BCLK clock dividers */ | ||
90 | #define WM8940_BCLKDIV_1 0 | ||
91 | #define WM8940_BCLKDIV_2 1 | ||
92 | #define WM8940_BCLKDIV_4 2 | ||
93 | #define WM8940_BCLKDIV_8 3 | ||
94 | #define WM8940_BCLKDIV_16 4 | ||
95 | #define WM8940_BCLKDIV_32 5 | ||
96 | |||
97 | /* PLL Out Dividers */ | ||
98 | #define WM8940_OPCLKDIV_1 0 | ||
99 | #define WM8940_OPCLKDIV_2 1 | ||
100 | #define WM8940_OPCLKDIV_3 2 | ||
101 | #define WM8940_OPCLKDIV_4 3 | ||
102 | |||
103 | #endif /* _WM8940_H */ | ||
104 | |||
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c new file mode 100644 index 000000000000..e224d8add170 --- /dev/null +++ b/sound/soc/codecs/wm8960.c | |||
@@ -0,0 +1,969 @@ | |||
1 | /* | ||
2 | * wm8960.c -- WM8960 ALSA SoC Audio driver | ||
3 | * | ||
4 | * Author: Liam Girdwood | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #include <linux/module.h> | ||
12 | #include <linux/moduleparam.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/delay.h> | ||
15 | #include <linux/pm.h> | ||
16 | #include <linux/i2c.h> | ||
17 | #include <linux/platform_device.h> | ||
18 | #include <sound/core.h> | ||
19 | #include <sound/pcm.h> | ||
20 | #include <sound/pcm_params.h> | ||
21 | #include <sound/soc.h> | ||
22 | #include <sound/soc-dapm.h> | ||
23 | #include <sound/initval.h> | ||
24 | #include <sound/tlv.h> | ||
25 | |||
26 | #include "wm8960.h" | ||
27 | |||
28 | #define AUDIO_NAME "wm8960" | ||
29 | |||
30 | struct snd_soc_codec_device soc_codec_dev_wm8960; | ||
31 | |||
32 | /* R25 - Power 1 */ | ||
33 | #define WM8960_VREF 0x40 | ||
34 | |||
35 | /* R28 - Anti-pop 1 */ | ||
36 | #define WM8960_POBCTRL 0x80 | ||
37 | #define WM8960_BUFDCOPEN 0x10 | ||
38 | #define WM8960_BUFIOEN 0x08 | ||
39 | #define WM8960_SOFT_ST 0x04 | ||
40 | #define WM8960_HPSTBY 0x01 | ||
41 | |||
42 | /* R29 - Anti-pop 2 */ | ||
43 | #define WM8960_DISOP 0x40 | ||
44 | |||
45 | /* | ||
46 | * wm8960 register cache | ||
47 | * We can't read the WM8960 register space when we are | ||
48 | * using 2 wire for device control, so we cache them instead. | ||
49 | */ | ||
50 | static const u16 wm8960_reg[WM8960_CACHEREGNUM] = { | ||
51 | 0x0097, 0x0097, 0x0000, 0x0000, | ||
52 | 0x0000, 0x0008, 0x0000, 0x000a, | ||
53 | 0x01c0, 0x0000, 0x00ff, 0x00ff, | ||
54 | 0x0000, 0x0000, 0x0000, 0x0000, | ||
55 | 0x0000, 0x007b, 0x0100, 0x0032, | ||
56 | 0x0000, 0x00c3, 0x00c3, 0x01c0, | ||
57 | 0x0000, 0x0000, 0x0000, 0x0000, | ||
58 | 0x0000, 0x0000, 0x0000, 0x0000, | ||
59 | 0x0100, 0x0100, 0x0050, 0x0050, | ||
60 | 0x0050, 0x0050, 0x0000, 0x0000, | ||
61 | 0x0000, 0x0000, 0x0040, 0x0000, | ||
62 | 0x0000, 0x0050, 0x0050, 0x0000, | ||
63 | 0x0002, 0x0037, 0x004d, 0x0080, | ||
64 | 0x0008, 0x0031, 0x0026, 0x00e9, | ||
65 | }; | ||
66 | |||
67 | struct wm8960_priv { | ||
68 | u16 reg_cache[WM8960_CACHEREGNUM]; | ||
69 | struct snd_soc_codec codec; | ||
70 | }; | ||
71 | |||
72 | /* | ||
73 | * read wm8960 register cache | ||
74 | */ | ||
75 | static inline unsigned int wm8960_read_reg_cache(struct snd_soc_codec *codec, | ||
76 | unsigned int reg) | ||
77 | { | ||
78 | u16 *cache = codec->reg_cache; | ||
79 | if (reg == WM8960_RESET) | ||
80 | return 0; | ||
81 | if (reg >= WM8960_CACHEREGNUM) | ||
82 | return -1; | ||
83 | return cache[reg]; | ||
84 | } | ||
85 | |||
86 | /* | ||
87 | * write wm8960 register cache | ||
88 | */ | ||
89 | static inline void wm8960_write_reg_cache(struct snd_soc_codec *codec, | ||
90 | u16 reg, unsigned int value) | ||
91 | { | ||
92 | u16 *cache = codec->reg_cache; | ||
93 | if (reg >= WM8960_CACHEREGNUM) | ||
94 | return; | ||
95 | cache[reg] = value; | ||
96 | } | ||
97 | |||
98 | static inline unsigned int wm8960_read(struct snd_soc_codec *codec, | ||
99 | unsigned int reg) | ||
100 | { | ||
101 | return wm8960_read_reg_cache(codec, reg); | ||
102 | } | ||
103 | |||
104 | /* | ||
105 | * write to the WM8960 register space | ||
106 | */ | ||
107 | static int wm8960_write(struct snd_soc_codec *codec, unsigned int reg, | ||
108 | unsigned int value) | ||
109 | { | ||
110 | u8 data[2]; | ||
111 | |||
112 | /* data is | ||
113 | * D15..D9 WM8960 register offset | ||
114 | * D8...D0 register data | ||
115 | */ | ||
116 | data[0] = (reg << 1) | ((value >> 8) & 0x0001); | ||
117 | data[1] = value & 0x00ff; | ||
118 | |||
119 | wm8960_write_reg_cache(codec, reg, value); | ||
120 | if (codec->hw_write(codec->control_data, data, 2) == 2) | ||
121 | return 0; | ||
122 | else | ||
123 | return -EIO; | ||
124 | } | ||
125 | |||
126 | #define wm8960_reset(c) wm8960_write(c, WM8960_RESET, 0) | ||
127 | |||
128 | /* enumerated controls */ | ||
129 | static const char *wm8960_deemph[] = {"None", "32Khz", "44.1Khz", "48Khz"}; | ||
130 | static const char *wm8960_polarity[] = {"No Inversion", "Left Inverted", | ||
131 | "Right Inverted", "Stereo Inversion"}; | ||
132 | static const char *wm8960_3d_upper_cutoff[] = {"High", "Low"}; | ||
133 | static const char *wm8960_3d_lower_cutoff[] = {"Low", "High"}; | ||
134 | static const char *wm8960_alcfunc[] = {"Off", "Right", "Left", "Stereo"}; | ||
135 | static const char *wm8960_alcmode[] = {"ALC", "Limiter"}; | ||
136 | |||
137 | static const struct soc_enum wm8960_enum[] = { | ||
138 | SOC_ENUM_SINGLE(WM8960_DACCTL1, 1, 4, wm8960_deemph), | ||
139 | SOC_ENUM_SINGLE(WM8960_DACCTL1, 5, 4, wm8960_polarity), | ||
140 | SOC_ENUM_SINGLE(WM8960_DACCTL2, 5, 4, wm8960_polarity), | ||
141 | SOC_ENUM_SINGLE(WM8960_3D, 6, 2, wm8960_3d_upper_cutoff), | ||
142 | SOC_ENUM_SINGLE(WM8960_3D, 5, 2, wm8960_3d_lower_cutoff), | ||
143 | SOC_ENUM_SINGLE(WM8960_ALC1, 7, 4, wm8960_alcfunc), | ||
144 | SOC_ENUM_SINGLE(WM8960_ALC3, 8, 2, wm8960_alcmode), | ||
145 | }; | ||
146 | |||
147 | static const DECLARE_TLV_DB_SCALE(adc_tlv, -9700, 50, 0); | ||
148 | static const DECLARE_TLV_DB_SCALE(dac_tlv, -12700, 50, 1); | ||
149 | static const DECLARE_TLV_DB_SCALE(bypass_tlv, -2100, 300, 0); | ||
150 | static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1); | ||
151 | |||
152 | static const struct snd_kcontrol_new wm8960_snd_controls[] = { | ||
153 | SOC_DOUBLE_R_TLV("Capture Volume", WM8960_LINVOL, WM8960_RINVOL, | ||
154 | 0, 63, 0, adc_tlv), | ||
155 | SOC_DOUBLE_R("Capture Volume ZC Switch", WM8960_LINVOL, WM8960_RINVOL, | ||
156 | 6, 1, 0), | ||
157 | SOC_DOUBLE_R("Capture Switch", WM8960_LINVOL, WM8960_RINVOL, | ||
158 | 7, 1, 0), | ||
159 | |||
160 | SOC_DOUBLE_R_TLV("Playback Volume", WM8960_LDAC, WM8960_RDAC, | ||
161 | 0, 255, 0, dac_tlv), | ||
162 | |||
163 | SOC_DOUBLE_R_TLV("Headphone Playback Volume", WM8960_LOUT1, WM8960_ROUT1, | ||
164 | 0, 127, 0, out_tlv), | ||
165 | SOC_DOUBLE_R("Headphone Playback ZC Switch", WM8960_LOUT1, WM8960_ROUT1, | ||
166 | 7, 1, 0), | ||
167 | |||
168 | SOC_DOUBLE_R_TLV("Speaker Playback Volume", WM8960_LOUT2, WM8960_ROUT2, | ||
169 | 0, 127, 0, out_tlv), | ||
170 | SOC_DOUBLE_R("Speaker Playback ZC Switch", WM8960_LOUT2, WM8960_ROUT2, | ||
171 | 7, 1, 0), | ||
172 | SOC_SINGLE("Speaker DC Volume", WM8960_CLASSD3, 3, 5, 0), | ||
173 | SOC_SINGLE("Speaker AC Volume", WM8960_CLASSD3, 0, 5, 0), | ||
174 | |||
175 | SOC_SINGLE("PCM Playback -6dB Switch", WM8960_DACCTL1, 7, 1, 0), | ||
176 | SOC_ENUM("ADC Polarity", wm8960_enum[1]), | ||
177 | SOC_ENUM("Playback De-emphasis", wm8960_enum[0]), | ||
178 | SOC_SINGLE("ADC High Pass Filter Switch", WM8960_DACCTL1, 0, 1, 0), | ||
179 | |||
180 | SOC_ENUM("DAC Polarity", wm8960_enum[2]), | ||
181 | |||
182 | SOC_ENUM("3D Filter Upper Cut-Off", wm8960_enum[3]), | ||
183 | SOC_ENUM("3D Filter Lower Cut-Off", wm8960_enum[4]), | ||
184 | SOC_SINGLE("3D Volume", WM8960_3D, 1, 15, 0), | ||
185 | SOC_SINGLE("3D Switch", WM8960_3D, 0, 1, 0), | ||
186 | |||
187 | SOC_ENUM("ALC Function", wm8960_enum[5]), | ||
188 | SOC_SINGLE("ALC Max Gain", WM8960_ALC1, 4, 7, 0), | ||
189 | SOC_SINGLE("ALC Target", WM8960_ALC1, 0, 15, 1), | ||
190 | SOC_SINGLE("ALC Min Gain", WM8960_ALC2, 4, 7, 0), | ||
191 | SOC_SINGLE("ALC Hold Time", WM8960_ALC2, 0, 15, 0), | ||
192 | SOC_ENUM("ALC Mode", wm8960_enum[6]), | ||
193 | SOC_SINGLE("ALC Decay", WM8960_ALC3, 4, 15, 0), | ||
194 | SOC_SINGLE("ALC Attack", WM8960_ALC3, 0, 15, 0), | ||
195 | |||
196 | SOC_SINGLE("Noise Gate Threshold", WM8960_NOISEG, 3, 31, 0), | ||
197 | SOC_SINGLE("Noise Gate Switch", WM8960_NOISEG, 0, 1, 0), | ||
198 | |||
199 | SOC_DOUBLE_R("ADC PCM Capture Volume", WM8960_LINPATH, WM8960_RINPATH, | ||
200 | 0, 127, 0), | ||
201 | |||
202 | SOC_SINGLE_TLV("Left Output Mixer Boost Bypass Volume", | ||
203 | WM8960_BYPASS1, 4, 7, 1, bypass_tlv), | ||
204 | SOC_SINGLE_TLV("Left Output Mixer LINPUT3 Volume", | ||
205 | WM8960_LOUTMIX, 4, 7, 1, bypass_tlv), | ||
206 | SOC_SINGLE_TLV("Right Output Mixer Boost Bypass Volume", | ||
207 | WM8960_BYPASS2, 4, 7, 1, bypass_tlv), | ||
208 | SOC_SINGLE_TLV("Right Output Mixer RINPUT3 Volume", | ||
209 | WM8960_ROUTMIX, 4, 7, 1, bypass_tlv), | ||
210 | }; | ||
211 | |||
212 | static const struct snd_kcontrol_new wm8960_lin_boost[] = { | ||
213 | SOC_DAPM_SINGLE("LINPUT2 Switch", WM8960_LINPATH, 6, 1, 0), | ||
214 | SOC_DAPM_SINGLE("LINPUT3 Switch", WM8960_LINPATH, 7, 1, 0), | ||
215 | SOC_DAPM_SINGLE("LINPUT1 Switch", WM8960_LINPATH, 8, 1, 0), | ||
216 | }; | ||
217 | |||
218 | static const struct snd_kcontrol_new wm8960_lin[] = { | ||
219 | SOC_DAPM_SINGLE("Boost Switch", WM8960_LINPATH, 3, 1, 0), | ||
220 | }; | ||
221 | |||
222 | static const struct snd_kcontrol_new wm8960_rin_boost[] = { | ||
223 | SOC_DAPM_SINGLE("RINPUT2 Switch", WM8960_RINPATH, 6, 1, 0), | ||
224 | SOC_DAPM_SINGLE("RINPUT3 Switch", WM8960_RINPATH, 7, 1, 0), | ||
225 | SOC_DAPM_SINGLE("RINPUT1 Switch", WM8960_RINPATH, 8, 1, 0), | ||
226 | }; | ||
227 | |||
228 | static const struct snd_kcontrol_new wm8960_rin[] = { | ||
229 | SOC_DAPM_SINGLE("Boost Switch", WM8960_RINPATH, 3, 1, 0), | ||
230 | }; | ||
231 | |||
232 | static const struct snd_kcontrol_new wm8960_loutput_mixer[] = { | ||
233 | SOC_DAPM_SINGLE("PCM Playback Switch", WM8960_LOUTMIX, 8, 1, 0), | ||
234 | SOC_DAPM_SINGLE("LINPUT3 Switch", WM8960_LOUTMIX, 7, 1, 0), | ||
235 | SOC_DAPM_SINGLE("Boost Bypass Switch", WM8960_BYPASS1, 7, 1, 0), | ||
236 | }; | ||
237 | |||
238 | static const struct snd_kcontrol_new wm8960_routput_mixer[] = { | ||
239 | SOC_DAPM_SINGLE("PCM Playback Switch", WM8960_ROUTMIX, 8, 1, 0), | ||
240 | SOC_DAPM_SINGLE("RINPUT3 Switch", WM8960_ROUTMIX, 7, 1, 0), | ||
241 | SOC_DAPM_SINGLE("Boost Bypass Switch", WM8960_BYPASS2, 7, 1, 0), | ||
242 | }; | ||
243 | |||
244 | static const struct snd_kcontrol_new wm8960_mono_out[] = { | ||
245 | SOC_DAPM_SINGLE("Left Switch", WM8960_MONOMIX1, 7, 1, 0), | ||
246 | SOC_DAPM_SINGLE("Right Switch", WM8960_MONOMIX2, 7, 1, 0), | ||
247 | }; | ||
248 | |||
249 | static const struct snd_soc_dapm_widget wm8960_dapm_widgets[] = { | ||
250 | SND_SOC_DAPM_INPUT("LINPUT1"), | ||
251 | SND_SOC_DAPM_INPUT("RINPUT1"), | ||
252 | SND_SOC_DAPM_INPUT("LINPUT2"), | ||
253 | SND_SOC_DAPM_INPUT("RINPUT2"), | ||
254 | SND_SOC_DAPM_INPUT("LINPUT3"), | ||
255 | SND_SOC_DAPM_INPUT("RINPUT3"), | ||
256 | |||
257 | SND_SOC_DAPM_MICBIAS("MICB", WM8960_POWER1, 1, 0), | ||
258 | |||
259 | SND_SOC_DAPM_MIXER("Left Boost Mixer", WM8960_POWER1, 5, 0, | ||
260 | wm8960_lin_boost, ARRAY_SIZE(wm8960_lin_boost)), | ||
261 | SND_SOC_DAPM_MIXER("Right Boost Mixer", WM8960_POWER1, 4, 0, | ||
262 | wm8960_rin_boost, ARRAY_SIZE(wm8960_rin_boost)), | ||
263 | |||
264 | SND_SOC_DAPM_MIXER("Left Input Mixer", WM8960_POWER3, 5, 0, | ||
265 | wm8960_lin, ARRAY_SIZE(wm8960_lin)), | ||
266 | SND_SOC_DAPM_MIXER("Right Input Mixer", WM8960_POWER3, 4, 0, | ||
267 | wm8960_rin, ARRAY_SIZE(wm8960_rin)), | ||
268 | |||
269 | SND_SOC_DAPM_ADC("Left ADC", "Capture", WM8960_POWER2, 3, 0), | ||
270 | SND_SOC_DAPM_ADC("Right ADC", "Capture", WM8960_POWER2, 2, 0), | ||
271 | |||
272 | SND_SOC_DAPM_DAC("Left DAC", "Playback", WM8960_POWER2, 8, 0), | ||
273 | SND_SOC_DAPM_DAC("Right DAC", "Playback", WM8960_POWER2, 7, 0), | ||
274 | |||
275 | SND_SOC_DAPM_MIXER("Left Output Mixer", WM8960_POWER3, 3, 0, | ||
276 | &wm8960_loutput_mixer[0], | ||
277 | ARRAY_SIZE(wm8960_loutput_mixer)), | ||
278 | SND_SOC_DAPM_MIXER("Right Output Mixer", WM8960_POWER3, 2, 0, | ||
279 | &wm8960_routput_mixer[0], | ||
280 | ARRAY_SIZE(wm8960_routput_mixer)), | ||
281 | |||
282 | SND_SOC_DAPM_MIXER("Mono Output Mixer", WM8960_POWER2, 1, 0, | ||
283 | &wm8960_mono_out[0], | ||
284 | ARRAY_SIZE(wm8960_mono_out)), | ||
285 | |||
286 | SND_SOC_DAPM_PGA("LOUT1 PGA", WM8960_POWER2, 6, 0, NULL, 0), | ||
287 | SND_SOC_DAPM_PGA("ROUT1 PGA", WM8960_POWER2, 5, 0, NULL, 0), | ||
288 | |||
289 | SND_SOC_DAPM_PGA("Left Speaker PGA", WM8960_POWER2, 4, 0, NULL, 0), | ||
290 | SND_SOC_DAPM_PGA("Right Speaker PGA", WM8960_POWER2, 3, 0, NULL, 0), | ||
291 | |||
292 | SND_SOC_DAPM_PGA("Right Speaker Output", WM8960_CLASSD1, 7, 0, NULL, 0), | ||
293 | SND_SOC_DAPM_PGA("Left Speaker Output", WM8960_CLASSD1, 6, 0, NULL, 0), | ||
294 | |||
295 | SND_SOC_DAPM_OUTPUT("SPK_LP"), | ||
296 | SND_SOC_DAPM_OUTPUT("SPK_LN"), | ||
297 | SND_SOC_DAPM_OUTPUT("HP_L"), | ||
298 | SND_SOC_DAPM_OUTPUT("HP_R"), | ||
299 | SND_SOC_DAPM_OUTPUT("SPK_RP"), | ||
300 | SND_SOC_DAPM_OUTPUT("SPK_RN"), | ||
301 | SND_SOC_DAPM_OUTPUT("OUT3"), | ||
302 | }; | ||
303 | |||
304 | static const struct snd_soc_dapm_route audio_paths[] = { | ||
305 | { "Left Boost Mixer", "LINPUT1 Switch", "LINPUT1" }, | ||
306 | { "Left Boost Mixer", "LINPUT2 Switch", "LINPUT2" }, | ||
307 | { "Left Boost Mixer", "LINPUT3 Switch", "LINPUT3" }, | ||
308 | |||
309 | { "Left Input Mixer", "Boost Switch", "Left Boost Mixer", }, | ||
310 | { "Left Input Mixer", NULL, "LINPUT1", }, /* Really Boost Switch */ | ||
311 | { "Left Input Mixer", NULL, "LINPUT2" }, | ||
312 | { "Left Input Mixer", NULL, "LINPUT3" }, | ||
313 | |||
314 | { "Right Boost Mixer", "RINPUT1 Switch", "RINPUT1" }, | ||
315 | { "Right Boost Mixer", "RINPUT2 Switch", "RINPUT2" }, | ||
316 | { "Right Boost Mixer", "RINPUT3 Switch", "RINPUT3" }, | ||
317 | |||
318 | { "Right Input Mixer", "Boost Switch", "Right Boost Mixer", }, | ||
319 | { "Right Input Mixer", NULL, "RINPUT1", }, /* Really Boost Switch */ | ||
320 | { "Right Input Mixer", NULL, "RINPUT2" }, | ||
321 | { "Right Input Mixer", NULL, "LINPUT3" }, | ||
322 | |||
323 | { "Left ADC", NULL, "Left Input Mixer" }, | ||
324 | { "Right ADC", NULL, "Right Input Mixer" }, | ||
325 | |||
326 | { "Left Output Mixer", "LINPUT3 Switch", "LINPUT3" }, | ||
327 | { "Left Output Mixer", "Boost Bypass Switch", "Left Boost Mixer"} , | ||
328 | { "Left Output Mixer", "PCM Playback Switch", "Left DAC" }, | ||
329 | |||
330 | { "Right Output Mixer", "RINPUT3 Switch", "RINPUT3" }, | ||
331 | { "Right Output Mixer", "Boost Bypass Switch", "Right Boost Mixer" } , | ||
332 | { "Right Output Mixer", "PCM Playback Switch", "Right DAC" }, | ||
333 | |||
334 | { "Mono Output Mixer", "Left Switch", "Left Output Mixer" }, | ||
335 | { "Mono Output Mixer", "Right Switch", "Right Output Mixer" }, | ||
336 | |||
337 | { "LOUT1 PGA", NULL, "Left Output Mixer" }, | ||
338 | { "ROUT1 PGA", NULL, "Right Output Mixer" }, | ||
339 | |||
340 | { "HP_L", NULL, "LOUT1 PGA" }, | ||
341 | { "HP_R", NULL, "ROUT1 PGA" }, | ||
342 | |||
343 | { "Left Speaker PGA", NULL, "Left Output Mixer" }, | ||
344 | { "Right Speaker PGA", NULL, "Right Output Mixer" }, | ||
345 | |||
346 | { "Left Speaker Output", NULL, "Left Speaker PGA" }, | ||
347 | { "Right Speaker Output", NULL, "Right Speaker PGA" }, | ||
348 | |||
349 | { "SPK_LN", NULL, "Left Speaker Output" }, | ||
350 | { "SPK_LP", NULL, "Left Speaker Output" }, | ||
351 | { "SPK_RN", NULL, "Right Speaker Output" }, | ||
352 | { "SPK_RP", NULL, "Right Speaker Output" }, | ||
353 | |||
354 | { "OUT3", NULL, "Mono Output Mixer", } | ||
355 | }; | ||
356 | |||
357 | static int wm8960_add_widgets(struct snd_soc_codec *codec) | ||
358 | { | ||
359 | snd_soc_dapm_new_controls(codec, wm8960_dapm_widgets, | ||
360 | ARRAY_SIZE(wm8960_dapm_widgets)); | ||
361 | |||
362 | snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths)); | ||
363 | |||
364 | snd_soc_dapm_new_widgets(codec); | ||
365 | return 0; | ||
366 | } | ||
367 | |||
368 | static int wm8960_set_dai_fmt(struct snd_soc_dai *codec_dai, | ||
369 | unsigned int fmt) | ||
370 | { | ||
371 | struct snd_soc_codec *codec = codec_dai->codec; | ||
372 | u16 iface = 0; | ||
373 | |||
374 | /* set master/slave audio interface */ | ||
375 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | ||
376 | case SND_SOC_DAIFMT_CBM_CFM: | ||
377 | iface |= 0x0040; | ||
378 | break; | ||
379 | case SND_SOC_DAIFMT_CBS_CFS: | ||
380 | break; | ||
381 | default: | ||
382 | return -EINVAL; | ||
383 | } | ||
384 | |||
385 | /* interface format */ | ||
386 | switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { | ||
387 | case SND_SOC_DAIFMT_I2S: | ||
388 | iface |= 0x0002; | ||
389 | break; | ||
390 | case SND_SOC_DAIFMT_RIGHT_J: | ||
391 | break; | ||
392 | case SND_SOC_DAIFMT_LEFT_J: | ||
393 | iface |= 0x0001; | ||
394 | break; | ||
395 | case SND_SOC_DAIFMT_DSP_A: | ||
396 | iface |= 0x0003; | ||
397 | break; | ||
398 | case SND_SOC_DAIFMT_DSP_B: | ||
399 | iface |= 0x0013; | ||
400 | break; | ||
401 | default: | ||
402 | return -EINVAL; | ||
403 | } | ||
404 | |||
405 | /* clock inversion */ | ||
406 | switch (fmt & SND_SOC_DAIFMT_INV_MASK) { | ||
407 | case SND_SOC_DAIFMT_NB_NF: | ||
408 | break; | ||
409 | case SND_SOC_DAIFMT_IB_IF: | ||
410 | iface |= 0x0090; | ||
411 | break; | ||
412 | case SND_SOC_DAIFMT_IB_NF: | ||
413 | iface |= 0x0080; | ||
414 | break; | ||
415 | case SND_SOC_DAIFMT_NB_IF: | ||
416 | iface |= 0x0010; | ||
417 | break; | ||
418 | default: | ||
419 | return -EINVAL; | ||
420 | } | ||
421 | |||
422 | /* set iface */ | ||
423 | wm8960_write(codec, WM8960_IFACE1, iface); | ||
424 | return 0; | ||
425 | } | ||
426 | |||
427 | static int wm8960_hw_params(struct snd_pcm_substream *substream, | ||
428 | struct snd_pcm_hw_params *params, | ||
429 | struct snd_soc_dai *dai) | ||
430 | { | ||
431 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
432 | struct snd_soc_device *socdev = rtd->socdev; | ||
433 | struct snd_soc_codec *codec = socdev->card->codec; | ||
434 | u16 iface = wm8960_read(codec, WM8960_IFACE1) & 0xfff3; | ||
435 | |||
436 | /* bit size */ | ||
437 | switch (params_format(params)) { | ||
438 | case SNDRV_PCM_FORMAT_S16_LE: | ||
439 | break; | ||
440 | case SNDRV_PCM_FORMAT_S20_3LE: | ||
441 | iface |= 0x0004; | ||
442 | break; | ||
443 | case SNDRV_PCM_FORMAT_S24_LE: | ||
444 | iface |= 0x0008; | ||
445 | break; | ||
446 | } | ||
447 | |||
448 | /* set iface */ | ||
449 | wm8960_write(codec, WM8960_IFACE1, iface); | ||
450 | return 0; | ||
451 | } | ||
452 | |||
453 | static int wm8960_mute(struct snd_soc_dai *dai, int mute) | ||
454 | { | ||
455 | struct snd_soc_codec *codec = dai->codec; | ||
456 | u16 mute_reg = wm8960_read(codec, WM8960_DACCTL1) & 0xfff7; | ||
457 | |||
458 | if (mute) | ||
459 | wm8960_write(codec, WM8960_DACCTL1, mute_reg | 0x8); | ||
460 | else | ||
461 | wm8960_write(codec, WM8960_DACCTL1, mute_reg); | ||
462 | return 0; | ||
463 | } | ||
464 | |||
465 | static int wm8960_set_bias_level(struct snd_soc_codec *codec, | ||
466 | enum snd_soc_bias_level level) | ||
467 | { | ||
468 | struct wm8960_data *pdata = codec->dev->platform_data; | ||
469 | u16 reg; | ||
470 | |||
471 | switch (level) { | ||
472 | case SND_SOC_BIAS_ON: | ||
473 | break; | ||
474 | |||
475 | case SND_SOC_BIAS_PREPARE: | ||
476 | /* Set VMID to 2x50k */ | ||
477 | reg = wm8960_read(codec, WM8960_POWER1); | ||
478 | reg &= ~0x180; | ||
479 | reg |= 0x80; | ||
480 | wm8960_write(codec, WM8960_POWER1, reg); | ||
481 | break; | ||
482 | |||
483 | case SND_SOC_BIAS_STANDBY: | ||
484 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | ||
485 | /* Enable anti-pop features */ | ||
486 | wm8960_write(codec, WM8960_APOP1, | ||
487 | WM8960_POBCTRL | WM8960_SOFT_ST | | ||
488 | WM8960_BUFDCOPEN | WM8960_BUFIOEN); | ||
489 | |||
490 | /* Discharge HP output */ | ||
491 | reg = WM8960_DISOP; | ||
492 | if (pdata) | ||
493 | reg |= pdata->dres << 4; | ||
494 | wm8960_write(codec, WM8960_APOP2, reg); | ||
495 | |||
496 | msleep(400); | ||
497 | |||
498 | wm8960_write(codec, WM8960_APOP2, 0); | ||
499 | |||
500 | /* Enable & ramp VMID at 2x50k */ | ||
501 | reg = wm8960_read(codec, WM8960_POWER1); | ||
502 | reg |= 0x80; | ||
503 | wm8960_write(codec, WM8960_POWER1, reg); | ||
504 | msleep(100); | ||
505 | |||
506 | /* Enable VREF */ | ||
507 | wm8960_write(codec, WM8960_POWER1, reg | WM8960_VREF); | ||
508 | |||
509 | /* Disable anti-pop features */ | ||
510 | wm8960_write(codec, WM8960_APOP1, WM8960_BUFIOEN); | ||
511 | } | ||
512 | |||
513 | /* Set VMID to 2x250k */ | ||
514 | reg = wm8960_read(codec, WM8960_POWER1); | ||
515 | reg &= ~0x180; | ||
516 | reg |= 0x100; | ||
517 | wm8960_write(codec, WM8960_POWER1, reg); | ||
518 | break; | ||
519 | |||
520 | case SND_SOC_BIAS_OFF: | ||
521 | /* Enable anti-pop features */ | ||
522 | wm8960_write(codec, WM8960_APOP1, | ||
523 | WM8960_POBCTRL | WM8960_SOFT_ST | | ||
524 | WM8960_BUFDCOPEN | WM8960_BUFIOEN); | ||
525 | |||
526 | /* Disable VMID and VREF, let them discharge */ | ||
527 | wm8960_write(codec, WM8960_POWER1, 0); | ||
528 | msleep(600); | ||
529 | |||
530 | wm8960_write(codec, WM8960_APOP1, 0); | ||
531 | break; | ||
532 | } | ||
533 | |||
534 | codec->bias_level = level; | ||
535 | |||
536 | return 0; | ||
537 | } | ||
538 | |||
539 | /* PLL divisors */ | ||
540 | struct _pll_div { | ||
541 | u32 pre_div:1; | ||
542 | u32 n:4; | ||
543 | u32 k:24; | ||
544 | }; | ||
545 | |||
546 | /* The size in bits of the pll divide multiplied by 10 | ||
547 | * to allow rounding later */ | ||
548 | #define FIXED_PLL_SIZE ((1 << 24) * 10) | ||
549 | |||
550 | static int pll_factors(unsigned int source, unsigned int target, | ||
551 | struct _pll_div *pll_div) | ||
552 | { | ||
553 | unsigned long long Kpart; | ||
554 | unsigned int K, Ndiv, Nmod; | ||
555 | |||
556 | pr_debug("WM8960 PLL: setting %dHz->%dHz\n", source, target); | ||
557 | |||
558 | /* Scale up target to PLL operating frequency */ | ||
559 | target *= 4; | ||
560 | |||
561 | Ndiv = target / source; | ||
562 | if (Ndiv < 6) { | ||
563 | source >>= 1; | ||
564 | pll_div->pre_div = 1; | ||
565 | Ndiv = target / source; | ||
566 | } else | ||
567 | pll_div->pre_div = 0; | ||
568 | |||
569 | if ((Ndiv < 6) || (Ndiv > 12)) { | ||
570 | pr_err("WM8960 PLL: Unsupported N=%d\n", Ndiv); | ||
571 | return -EINVAL; | ||
572 | } | ||
573 | |||
574 | pll_div->n = Ndiv; | ||
575 | Nmod = target % source; | ||
576 | Kpart = FIXED_PLL_SIZE * (long long)Nmod; | ||
577 | |||
578 | do_div(Kpart, source); | ||
579 | |||
580 | K = Kpart & 0xFFFFFFFF; | ||
581 | |||
582 | /* Check if we need to round */ | ||
583 | if ((K % 10) >= 5) | ||
584 | K += 5; | ||
585 | |||
586 | /* Move down to proper range now rounding is done */ | ||
587 | K /= 10; | ||
588 | |||
589 | pll_div->k = K; | ||
590 | |||
591 | pr_debug("WM8960 PLL: N=%x K=%x pre_div=%d\n", | ||
592 | pll_div->n, pll_div->k, pll_div->pre_div); | ||
593 | |||
594 | return 0; | ||
595 | } | ||
596 | |||
597 | static int wm8960_set_dai_pll(struct snd_soc_dai *codec_dai, | ||
598 | int pll_id, unsigned int freq_in, unsigned int freq_out) | ||
599 | { | ||
600 | struct snd_soc_codec *codec = codec_dai->codec; | ||
601 | u16 reg; | ||
602 | static struct _pll_div pll_div; | ||
603 | int ret; | ||
604 | |||
605 | if (freq_in && freq_out) { | ||
606 | ret = pll_factors(freq_in, freq_out, &pll_div); | ||
607 | if (ret != 0) | ||
608 | return ret; | ||
609 | } | ||
610 | |||
611 | /* Disable the PLL: even if we are changing the frequency the | ||
612 | * PLL needs to be disabled while we do so. */ | ||
613 | wm8960_write(codec, WM8960_CLOCK1, | ||
614 | wm8960_read(codec, WM8960_CLOCK1) & ~1); | ||
615 | wm8960_write(codec, WM8960_POWER2, | ||
616 | wm8960_read(codec, WM8960_POWER2) & ~1); | ||
617 | |||
618 | if (!freq_in || !freq_out) | ||
619 | return 0; | ||
620 | |||
621 | reg = wm8960_read(codec, WM8960_PLL1) & ~0x3f; | ||
622 | reg |= pll_div.pre_div << 4; | ||
623 | reg |= pll_div.n; | ||
624 | |||
625 | if (pll_div.k) { | ||
626 | reg |= 0x20; | ||
627 | |||
628 | wm8960_write(codec, WM8960_PLL2, (pll_div.k >> 18) & 0x3f); | ||
629 | wm8960_write(codec, WM8960_PLL3, (pll_div.k >> 9) & 0x1ff); | ||
630 | wm8960_write(codec, WM8960_PLL4, pll_div.k & 0x1ff); | ||
631 | } | ||
632 | wm8960_write(codec, WM8960_PLL1, reg); | ||
633 | |||
634 | /* Turn it on */ | ||
635 | wm8960_write(codec, WM8960_POWER2, | ||
636 | wm8960_read(codec, WM8960_POWER2) | 1); | ||
637 | msleep(250); | ||
638 | wm8960_write(codec, WM8960_CLOCK1, | ||
639 | wm8960_read(codec, WM8960_CLOCK1) | 1); | ||
640 | |||
641 | return 0; | ||
642 | } | ||
643 | |||
644 | static int wm8960_set_dai_clkdiv(struct snd_soc_dai *codec_dai, | ||
645 | int div_id, int div) | ||
646 | { | ||
647 | struct snd_soc_codec *codec = codec_dai->codec; | ||
648 | u16 reg; | ||
649 | |||
650 | switch (div_id) { | ||
651 | case WM8960_SYSCLKSEL: | ||
652 | reg = wm8960_read(codec, WM8960_CLOCK1) & 0x1fe; | ||
653 | wm8960_write(codec, WM8960_CLOCK1, reg | div); | ||
654 | break; | ||
655 | case WM8960_SYSCLKDIV: | ||
656 | reg = wm8960_read(codec, WM8960_CLOCK1) & 0x1f9; | ||
657 | wm8960_write(codec, WM8960_CLOCK1, reg | div); | ||
658 | break; | ||
659 | case WM8960_DACDIV: | ||
660 | reg = wm8960_read(codec, WM8960_CLOCK1) & 0x1c7; | ||
661 | wm8960_write(codec, WM8960_CLOCK1, reg | div); | ||
662 | break; | ||
663 | case WM8960_OPCLKDIV: | ||
664 | reg = wm8960_read(codec, WM8960_PLL1) & 0x03f; | ||
665 | wm8960_write(codec, WM8960_PLL1, reg | div); | ||
666 | break; | ||
667 | case WM8960_DCLKDIV: | ||
668 | reg = wm8960_read(codec, WM8960_CLOCK2) & 0x03f; | ||
669 | wm8960_write(codec, WM8960_CLOCK2, reg | div); | ||
670 | break; | ||
671 | case WM8960_TOCLKSEL: | ||
672 | reg = wm8960_read(codec, WM8960_ADDCTL1) & 0x1fd; | ||
673 | wm8960_write(codec, WM8960_ADDCTL1, reg | div); | ||
674 | break; | ||
675 | default: | ||
676 | return -EINVAL; | ||
677 | } | ||
678 | |||
679 | return 0; | ||
680 | } | ||
681 | |||
682 | #define WM8960_RATES SNDRV_PCM_RATE_8000_48000 | ||
683 | |||
684 | #define WM8960_FORMATS \ | ||
685 | (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ | ||
686 | SNDRV_PCM_FMTBIT_S24_LE) | ||
687 | |||
688 | static struct snd_soc_dai_ops wm8960_dai_ops = { | ||
689 | .hw_params = wm8960_hw_params, | ||
690 | .digital_mute = wm8960_mute, | ||
691 | .set_fmt = wm8960_set_dai_fmt, | ||
692 | .set_clkdiv = wm8960_set_dai_clkdiv, | ||
693 | .set_pll = wm8960_set_dai_pll, | ||
694 | }; | ||
695 | |||
696 | struct snd_soc_dai wm8960_dai = { | ||
697 | .name = "WM8960", | ||
698 | .playback = { | ||
699 | .stream_name = "Playback", | ||
700 | .channels_min = 1, | ||
701 | .channels_max = 2, | ||
702 | .rates = WM8960_RATES, | ||
703 | .formats = WM8960_FORMATS,}, | ||
704 | .capture = { | ||
705 | .stream_name = "Capture", | ||
706 | .channels_min = 1, | ||
707 | .channels_max = 2, | ||
708 | .rates = WM8960_RATES, | ||
709 | .formats = WM8960_FORMATS,}, | ||
710 | .ops = &wm8960_dai_ops, | ||
711 | .symmetric_rates = 1, | ||
712 | }; | ||
713 | EXPORT_SYMBOL_GPL(wm8960_dai); | ||
714 | |||
715 | static int wm8960_suspend(struct platform_device *pdev, pm_message_t state) | ||
716 | { | ||
717 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
718 | struct snd_soc_codec *codec = socdev->card->codec; | ||
719 | |||
720 | wm8960_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
721 | return 0; | ||
722 | } | ||
723 | |||
724 | static int wm8960_resume(struct platform_device *pdev) | ||
725 | { | ||
726 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
727 | struct snd_soc_codec *codec = socdev->card->codec; | ||
728 | int i; | ||
729 | u8 data[2]; | ||
730 | u16 *cache = codec->reg_cache; | ||
731 | |||
732 | /* Sync reg_cache with the hardware */ | ||
733 | for (i = 0; i < ARRAY_SIZE(wm8960_reg); i++) { | ||
734 | data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); | ||
735 | data[1] = cache[i] & 0x00ff; | ||
736 | codec->hw_write(codec->control_data, data, 2); | ||
737 | } | ||
738 | |||
739 | wm8960_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
740 | wm8960_set_bias_level(codec, codec->suspend_bias_level); | ||
741 | return 0; | ||
742 | } | ||
743 | |||
744 | static struct snd_soc_codec *wm8960_codec; | ||
745 | |||
746 | static int wm8960_probe(struct platform_device *pdev) | ||
747 | { | ||
748 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
749 | struct snd_soc_codec *codec; | ||
750 | int ret = 0; | ||
751 | |||
752 | if (wm8960_codec == NULL) { | ||
753 | dev_err(&pdev->dev, "Codec device not registered\n"); | ||
754 | return -ENODEV; | ||
755 | } | ||
756 | |||
757 | socdev->card->codec = wm8960_codec; | ||
758 | codec = wm8960_codec; | ||
759 | |||
760 | /* register pcms */ | ||
761 | ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); | ||
762 | if (ret < 0) { | ||
763 | dev_err(codec->dev, "failed to create pcms: %d\n", ret); | ||
764 | goto pcm_err; | ||
765 | } | ||
766 | |||
767 | snd_soc_add_controls(codec, wm8960_snd_controls, | ||
768 | ARRAY_SIZE(wm8960_snd_controls)); | ||
769 | wm8960_add_widgets(codec); | ||
770 | ret = snd_soc_init_card(socdev); | ||
771 | if (ret < 0) { | ||
772 | dev_err(codec->dev, "failed to register card: %d\n", ret); | ||
773 | goto card_err; | ||
774 | } | ||
775 | |||
776 | return ret; | ||
777 | |||
778 | card_err: | ||
779 | snd_soc_free_pcms(socdev); | ||
780 | snd_soc_dapm_free(socdev); | ||
781 | pcm_err: | ||
782 | return ret; | ||
783 | } | ||
784 | |||
785 | /* power down chip */ | ||
786 | static int wm8960_remove(struct platform_device *pdev) | ||
787 | { | ||
788 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
789 | |||
790 | snd_soc_free_pcms(socdev); | ||
791 | snd_soc_dapm_free(socdev); | ||
792 | |||
793 | return 0; | ||
794 | } | ||
795 | |||
796 | struct snd_soc_codec_device soc_codec_dev_wm8960 = { | ||
797 | .probe = wm8960_probe, | ||
798 | .remove = wm8960_remove, | ||
799 | .suspend = wm8960_suspend, | ||
800 | .resume = wm8960_resume, | ||
801 | }; | ||
802 | EXPORT_SYMBOL_GPL(soc_codec_dev_wm8960); | ||
803 | |||
804 | static int wm8960_register(struct wm8960_priv *wm8960) | ||
805 | { | ||
806 | struct wm8960_data *pdata = wm8960->codec.dev->platform_data; | ||
807 | struct snd_soc_codec *codec = &wm8960->codec; | ||
808 | int ret; | ||
809 | u16 reg; | ||
810 | |||
811 | if (wm8960_codec) { | ||
812 | dev_err(codec->dev, "Another WM8960 is registered\n"); | ||
813 | return -EINVAL; | ||
814 | } | ||
815 | |||
816 | if (!pdata) { | ||
817 | dev_warn(codec->dev, "No platform data supplied\n"); | ||
818 | } else { | ||
819 | if (pdata->dres > WM8960_DRES_MAX) { | ||
820 | dev_err(codec->dev, "Invalid DRES: %d\n", pdata->dres); | ||
821 | pdata->dres = 0; | ||
822 | } | ||
823 | } | ||
824 | |||
825 | mutex_init(&codec->mutex); | ||
826 | INIT_LIST_HEAD(&codec->dapm_widgets); | ||
827 | INIT_LIST_HEAD(&codec->dapm_paths); | ||
828 | |||
829 | codec->private_data = wm8960; | ||
830 | codec->name = "WM8960"; | ||
831 | codec->owner = THIS_MODULE; | ||
832 | codec->read = wm8960_read_reg_cache; | ||
833 | codec->write = wm8960_write; | ||
834 | codec->bias_level = SND_SOC_BIAS_OFF; | ||
835 | codec->set_bias_level = wm8960_set_bias_level; | ||
836 | codec->dai = &wm8960_dai; | ||
837 | codec->num_dai = 1; | ||
838 | codec->reg_cache_size = WM8960_CACHEREGNUM; | ||
839 | codec->reg_cache = &wm8960->reg_cache; | ||
840 | |||
841 | memcpy(codec->reg_cache, wm8960_reg, sizeof(wm8960_reg)); | ||
842 | |||
843 | ret = wm8960_reset(codec); | ||
844 | if (ret < 0) { | ||
845 | dev_err(codec->dev, "Failed to issue reset\n"); | ||
846 | return ret; | ||
847 | } | ||
848 | |||
849 | wm8960_dai.dev = codec->dev; | ||
850 | |||
851 | wm8960_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
852 | |||
853 | /* Latch the update bits */ | ||
854 | reg = wm8960_read(codec, WM8960_LINVOL); | ||
855 | wm8960_write(codec, WM8960_LINVOL, reg | 0x100); | ||
856 | reg = wm8960_read(codec, WM8960_RINVOL); | ||
857 | wm8960_write(codec, WM8960_RINVOL, reg | 0x100); | ||
858 | reg = wm8960_read(codec, WM8960_LADC); | ||
859 | wm8960_write(codec, WM8960_LADC, reg | 0x100); | ||
860 | reg = wm8960_read(codec, WM8960_RADC); | ||
861 | wm8960_write(codec, WM8960_RADC, reg | 0x100); | ||
862 | reg = wm8960_read(codec, WM8960_LDAC); | ||
863 | wm8960_write(codec, WM8960_LDAC, reg | 0x100); | ||
864 | reg = wm8960_read(codec, WM8960_RDAC); | ||
865 | wm8960_write(codec, WM8960_RDAC, reg | 0x100); | ||
866 | reg = wm8960_read(codec, WM8960_LOUT1); | ||
867 | wm8960_write(codec, WM8960_LOUT1, reg | 0x100); | ||
868 | reg = wm8960_read(codec, WM8960_ROUT1); | ||
869 | wm8960_write(codec, WM8960_ROUT1, reg | 0x100); | ||
870 | reg = wm8960_read(codec, WM8960_LOUT2); | ||
871 | wm8960_write(codec, WM8960_LOUT2, reg | 0x100); | ||
872 | reg = wm8960_read(codec, WM8960_ROUT2); | ||
873 | wm8960_write(codec, WM8960_ROUT2, reg | 0x100); | ||
874 | |||
875 | wm8960_codec = codec; | ||
876 | |||
877 | ret = snd_soc_register_codec(codec); | ||
878 | if (ret != 0) { | ||
879 | dev_err(codec->dev, "Failed to register codec: %d\n", ret); | ||
880 | return ret; | ||
881 | } | ||
882 | |||
883 | ret = snd_soc_register_dai(&wm8960_dai); | ||
884 | if (ret != 0) { | ||
885 | dev_err(codec->dev, "Failed to register DAI: %d\n", ret); | ||
886 | snd_soc_unregister_codec(codec); | ||
887 | return ret; | ||
888 | } | ||
889 | |||
890 | return 0; | ||
891 | } | ||
892 | |||
893 | static void wm8960_unregister(struct wm8960_priv *wm8960) | ||
894 | { | ||
895 | wm8960_set_bias_level(&wm8960->codec, SND_SOC_BIAS_OFF); | ||
896 | snd_soc_unregister_dai(&wm8960_dai); | ||
897 | snd_soc_unregister_codec(&wm8960->codec); | ||
898 | kfree(wm8960); | ||
899 | wm8960_codec = NULL; | ||
900 | } | ||
901 | |||
902 | static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, | ||
903 | const struct i2c_device_id *id) | ||
904 | { | ||
905 | struct wm8960_priv *wm8960; | ||
906 | struct snd_soc_codec *codec; | ||
907 | |||
908 | wm8960 = kzalloc(sizeof(struct wm8960_priv), GFP_KERNEL); | ||
909 | if (wm8960 == NULL) | ||
910 | return -ENOMEM; | ||
911 | |||
912 | codec = &wm8960->codec; | ||
913 | codec->hw_write = (hw_write_t)i2c_master_send; | ||
914 | |||
915 | i2c_set_clientdata(i2c, wm8960); | ||
916 | codec->control_data = i2c; | ||
917 | |||
918 | codec->dev = &i2c->dev; | ||
919 | |||
920 | return wm8960_register(wm8960); | ||
921 | } | ||
922 | |||
923 | static __devexit int wm8960_i2c_remove(struct i2c_client *client) | ||
924 | { | ||
925 | struct wm8960_priv *wm8960 = i2c_get_clientdata(client); | ||
926 | wm8960_unregister(wm8960); | ||
927 | return 0; | ||
928 | } | ||
929 | |||
930 | static const struct i2c_device_id wm8960_i2c_id[] = { | ||
931 | { "wm8960", 0 }, | ||
932 | { } | ||
933 | }; | ||
934 | MODULE_DEVICE_TABLE(i2c, wm8960_i2c_id); | ||
935 | |||
936 | static struct i2c_driver wm8960_i2c_driver = { | ||
937 | .driver = { | ||
938 | .name = "WM8960 I2C Codec", | ||
939 | .owner = THIS_MODULE, | ||
940 | }, | ||
941 | .probe = wm8960_i2c_probe, | ||
942 | .remove = __devexit_p(wm8960_i2c_remove), | ||
943 | .id_table = wm8960_i2c_id, | ||
944 | }; | ||
945 | |||
946 | static int __init wm8960_modinit(void) | ||
947 | { | ||
948 | int ret; | ||
949 | |||
950 | ret = i2c_add_driver(&wm8960_i2c_driver); | ||
951 | if (ret != 0) { | ||
952 | printk(KERN_ERR "Failed to register WM8960 I2C driver: %d\n", | ||
953 | ret); | ||
954 | } | ||
955 | |||
956 | return ret; | ||
957 | } | ||
958 | module_init(wm8960_modinit); | ||
959 | |||
960 | static void __exit wm8960_exit(void) | ||
961 | { | ||
962 | i2c_del_driver(&wm8960_i2c_driver); | ||
963 | } | ||
964 | module_exit(wm8960_exit); | ||
965 | |||
966 | |||
967 | MODULE_DESCRIPTION("ASoC WM8960 driver"); | ||
968 | MODULE_AUTHOR("Liam Girdwood"); | ||
969 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/codecs/wm8960.h b/sound/soc/codecs/wm8960.h new file mode 100644 index 000000000000..c9af56c9d9d4 --- /dev/null +++ b/sound/soc/codecs/wm8960.h | |||
@@ -0,0 +1,127 @@ | |||
1 | /* | ||
2 | * wm8960.h -- WM8960 Soc Audio driver | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | |||
9 | #ifndef _WM8960_H | ||
10 | #define _WM8960_H | ||
11 | |||
12 | /* WM8960 register space */ | ||
13 | |||
14 | |||
15 | #define WM8960_CACHEREGNUM 56 | ||
16 | |||
17 | #define WM8960_LINVOL 0x0 | ||
18 | #define WM8960_RINVOL 0x1 | ||
19 | #define WM8960_LOUT1 0x2 | ||
20 | #define WM8960_ROUT1 0x3 | ||
21 | #define WM8960_CLOCK1 0x4 | ||
22 | #define WM8960_DACCTL1 0x5 | ||
23 | #define WM8960_DACCTL2 0x6 | ||
24 | #define WM8960_IFACE1 0x7 | ||
25 | #define WM8960_CLOCK2 0x8 | ||
26 | #define WM8960_IFACE2 0x9 | ||
27 | #define WM8960_LDAC 0xa | ||
28 | #define WM8960_RDAC 0xb | ||
29 | |||
30 | #define WM8960_RESET 0xf | ||
31 | #define WM8960_3D 0x10 | ||
32 | #define WM8960_ALC1 0x11 | ||
33 | #define WM8960_ALC2 0x12 | ||
34 | #define WM8960_ALC3 0x13 | ||
35 | #define WM8960_NOISEG 0x14 | ||
36 | #define WM8960_LADC 0x15 | ||
37 | #define WM8960_RADC 0x16 | ||
38 | #define WM8960_ADDCTL1 0x17 | ||
39 | #define WM8960_ADDCTL2 0x18 | ||
40 | #define WM8960_POWER1 0x19 | ||
41 | #define WM8960_POWER2 0x1a | ||
42 | #define WM8960_ADDCTL3 0x1b | ||
43 | #define WM8960_APOP1 0x1c | ||
44 | #define WM8960_APOP2 0x1d | ||
45 | |||
46 | #define WM8960_LINPATH 0x20 | ||
47 | #define WM8960_RINPATH 0x21 | ||
48 | #define WM8960_LOUTMIX 0x22 | ||
49 | |||
50 | #define WM8960_ROUTMIX 0x25 | ||
51 | #define WM8960_MONOMIX1 0x26 | ||
52 | #define WM8960_MONOMIX2 0x27 | ||
53 | #define WM8960_LOUT2 0x28 | ||
54 | #define WM8960_ROUT2 0x29 | ||
55 | #define WM8960_MONO 0x2a | ||
56 | #define WM8960_INBMIX1 0x2b | ||
57 | #define WM8960_INBMIX2 0x2c | ||
58 | #define WM8960_BYPASS1 0x2d | ||
59 | #define WM8960_BYPASS2 0x2e | ||
60 | #define WM8960_POWER3 0x2f | ||
61 | #define WM8960_ADDCTL4 0x30 | ||
62 | #define WM8960_CLASSD1 0x31 | ||
63 | |||
64 | #define WM8960_CLASSD3 0x33 | ||
65 | #define WM8960_PLL1 0x34 | ||
66 | #define WM8960_PLL2 0x35 | ||
67 | #define WM8960_PLL3 0x36 | ||
68 | #define WM8960_PLL4 0x37 | ||
69 | |||
70 | |||
71 | /* | ||
72 | * WM8960 Clock dividers | ||
73 | */ | ||
74 | #define WM8960_SYSCLKDIV 0 | ||
75 | #define WM8960_DACDIV 1 | ||
76 | #define WM8960_OPCLKDIV 2 | ||
77 | #define WM8960_DCLKDIV 3 | ||
78 | #define WM8960_TOCLKSEL 4 | ||
79 | #define WM8960_SYSCLKSEL 5 | ||
80 | |||
81 | #define WM8960_SYSCLK_DIV_1 (0 << 1) | ||
82 | #define WM8960_SYSCLK_DIV_2 (2 << 1) | ||
83 | |||
84 | #define WM8960_SYSCLK_MCLK (0 << 0) | ||
85 | #define WM8960_SYSCLK_PLL (1 << 0) | ||
86 | |||
87 | #define WM8960_DAC_DIV_1 (0 << 3) | ||
88 | #define WM8960_DAC_DIV_1_5 (1 << 3) | ||
89 | #define WM8960_DAC_DIV_2 (2 << 3) | ||
90 | #define WM8960_DAC_DIV_3 (3 << 3) | ||
91 | #define WM8960_DAC_DIV_4 (4 << 3) | ||
92 | #define WM8960_DAC_DIV_5_5 (5 << 3) | ||
93 | #define WM8960_DAC_DIV_6 (6 << 3) | ||
94 | |||
95 | #define WM8960_DCLK_DIV_1_5 (0 << 6) | ||
96 | #define WM8960_DCLK_DIV_2 (1 << 6) | ||
97 | #define WM8960_DCLK_DIV_3 (2 << 6) | ||
98 | #define WM8960_DCLK_DIV_4 (3 << 6) | ||
99 | #define WM8960_DCLK_DIV_6 (4 << 6) | ||
100 | #define WM8960_DCLK_DIV_8 (5 << 6) | ||
101 | #define WM8960_DCLK_DIV_12 (6 << 6) | ||
102 | #define WM8960_DCLK_DIV_16 (7 << 6) | ||
103 | |||
104 | #define WM8960_TOCLK_F19 (0 << 1) | ||
105 | #define WM8960_TOCLK_F21 (1 << 1) | ||
106 | |||
107 | #define WM8960_OPCLK_DIV_1 (0 << 0) | ||
108 | #define WM8960_OPCLK_DIV_2 (1 << 0) | ||
109 | #define WM8960_OPCLK_DIV_3 (2 << 0) | ||
110 | #define WM8960_OPCLK_DIV_4 (3 << 0) | ||
111 | #define WM8960_OPCLK_DIV_5_5 (4 << 0) | ||
112 | #define WM8960_OPCLK_DIV_6 (5 << 0) | ||
113 | |||
114 | extern struct snd_soc_dai wm8960_dai; | ||
115 | extern struct snd_soc_codec_device soc_codec_dev_wm8960; | ||
116 | |||
117 | #define WM8960_DRES_400R 0 | ||
118 | #define WM8960_DRES_200R 1 | ||
119 | #define WM8960_DRES_600R 2 | ||
120 | #define WM8960_DRES_150R 3 | ||
121 | #define WM8960_DRES_MAX 3 | ||
122 | |||
123 | struct wm8960_data { | ||
124 | int dres; | ||
125 | }; | ||
126 | |||
127 | #endif | ||
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c new file mode 100644 index 000000000000..c05f71803aa8 --- /dev/null +++ b/sound/soc/codecs/wm8988.c | |||
@@ -0,0 +1,1097 @@ | |||
1 | /* | ||
2 | * wm8988.c -- WM8988 ALSA SoC audio driver | ||
3 | * | ||
4 | * Copyright 2009 Wolfson Microelectronics plc | ||
5 | * Copyright 2005 Openedhand Ltd. | ||
6 | * | ||
7 | * Author: Mark Brown <broonie@opensource.wolfsonmicro.com> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #include <linux/module.h> | ||
15 | #include <linux/moduleparam.h> | ||
16 | #include <linux/init.h> | ||
17 | #include <linux/delay.h> | ||
18 | #include <linux/pm.h> | ||
19 | #include <linux/i2c.h> | ||
20 | #include <linux/spi/spi.h> | ||
21 | #include <linux/platform_device.h> | ||
22 | #include <sound/core.h> | ||
23 | #include <sound/pcm.h> | ||
24 | #include <sound/pcm_params.h> | ||
25 | #include <sound/tlv.h> | ||
26 | #include <sound/soc.h> | ||
27 | #include <sound/soc-dapm.h> | ||
28 | #include <sound/initval.h> | ||
29 | |||
30 | #include "wm8988.h" | ||
31 | |||
32 | /* | ||
33 | * wm8988 register cache | ||
34 | * We can't read the WM8988 register space when we | ||
35 | * are using 2 wire for device control, so we cache them instead. | ||
36 | */ | ||
37 | static const u16 wm8988_reg[] = { | ||
38 | 0x0097, 0x0097, 0x0079, 0x0079, /* 0 */ | ||
39 | 0x0000, 0x0008, 0x0000, 0x000a, /* 4 */ | ||
40 | 0x0000, 0x0000, 0x00ff, 0x00ff, /* 8 */ | ||
41 | 0x000f, 0x000f, 0x0000, 0x0000, /* 12 */ | ||
42 | 0x0000, 0x007b, 0x0000, 0x0032, /* 16 */ | ||
43 | 0x0000, 0x00c3, 0x00c3, 0x00c0, /* 20 */ | ||
44 | 0x0000, 0x0000, 0x0000, 0x0000, /* 24 */ | ||
45 | 0x0000, 0x0000, 0x0000, 0x0000, /* 28 */ | ||
46 | 0x0000, 0x0000, 0x0050, 0x0050, /* 32 */ | ||
47 | 0x0050, 0x0050, 0x0050, 0x0050, /* 36 */ | ||
48 | 0x0079, 0x0079, 0x0079, /* 40 */ | ||
49 | }; | ||
50 | |||
51 | /* codec private data */ | ||
52 | struct wm8988_priv { | ||
53 | unsigned int sysclk; | ||
54 | struct snd_soc_codec codec; | ||
55 | struct snd_pcm_hw_constraint_list *sysclk_constraints; | ||
56 | u16 reg_cache[WM8988_NUM_REG]; | ||
57 | }; | ||
58 | |||
59 | |||
60 | /* | ||
61 | * read wm8988 register cache | ||
62 | */ | ||
63 | static inline unsigned int wm8988_read_reg_cache(struct snd_soc_codec *codec, | ||
64 | unsigned int reg) | ||
65 | { | ||
66 | u16 *cache = codec->reg_cache; | ||
67 | if (reg > WM8988_NUM_REG) | ||
68 | return -1; | ||
69 | return cache[reg]; | ||
70 | } | ||
71 | |||
72 | /* | ||
73 | * write wm8988 register cache | ||
74 | */ | ||
75 | static inline void wm8988_write_reg_cache(struct snd_soc_codec *codec, | ||
76 | unsigned int reg, unsigned int value) | ||
77 | { | ||
78 | u16 *cache = codec->reg_cache; | ||
79 | if (reg > WM8988_NUM_REG) | ||
80 | return; | ||
81 | cache[reg] = value; | ||
82 | } | ||
83 | |||
84 | static int wm8988_write(struct snd_soc_codec *codec, unsigned int reg, | ||
85 | unsigned int value) | ||
86 | { | ||
87 | u8 data[2]; | ||
88 | |||
89 | /* data is | ||
90 | * D15..D9 WM8753 register offset | ||
91 | * D8...D0 register data | ||
92 | */ | ||
93 | data[0] = (reg << 1) | ((value >> 8) & 0x0001); | ||
94 | data[1] = value & 0x00ff; | ||
95 | |||
96 | wm8988_write_reg_cache(codec, reg, value); | ||
97 | if (codec->hw_write(codec->control_data, data, 2) == 2) | ||
98 | return 0; | ||
99 | else | ||
100 | return -EIO; | ||
101 | } | ||
102 | |||
103 | #define wm8988_reset(c) wm8988_write(c, WM8988_RESET, 0) | ||
104 | |||
105 | /* | ||
106 | * WM8988 Controls | ||
107 | */ | ||
108 | |||
109 | static const char *bass_boost_txt[] = {"Linear Control", "Adaptive Boost"}; | ||
110 | static const struct soc_enum bass_boost = | ||
111 | SOC_ENUM_SINGLE(WM8988_BASS, 7, 2, bass_boost_txt); | ||
112 | |||
113 | static const char *bass_filter_txt[] = { "130Hz @ 48kHz", "200Hz @ 48kHz" }; | ||
114 | static const struct soc_enum bass_filter = | ||
115 | SOC_ENUM_SINGLE(WM8988_BASS, 6, 2, bass_filter_txt); | ||
116 | |||
117 | static const char *treble_txt[] = {"8kHz", "4kHz"}; | ||
118 | static const struct soc_enum treble = | ||
119 | SOC_ENUM_SINGLE(WM8988_TREBLE, 6, 2, treble_txt); | ||
120 | |||
121 | static const char *stereo_3d_lc_txt[] = {"200Hz", "500Hz"}; | ||
122 | static const struct soc_enum stereo_3d_lc = | ||
123 | SOC_ENUM_SINGLE(WM8988_3D, 5, 2, stereo_3d_lc_txt); | ||
124 | |||
125 | static const char *stereo_3d_uc_txt[] = {"2.2kHz", "1.5kHz"}; | ||
126 | static const struct soc_enum stereo_3d_uc = | ||
127 | SOC_ENUM_SINGLE(WM8988_3D, 6, 2, stereo_3d_uc_txt); | ||
128 | |||
129 | static const char *stereo_3d_func_txt[] = {"Capture", "Playback"}; | ||
130 | static const struct soc_enum stereo_3d_func = | ||
131 | SOC_ENUM_SINGLE(WM8988_3D, 7, 2, stereo_3d_func_txt); | ||
132 | |||
133 | static const char *alc_func_txt[] = {"Off", "Right", "Left", "Stereo"}; | ||
134 | static const struct soc_enum alc_func = | ||
135 | SOC_ENUM_SINGLE(WM8988_ALC1, 7, 4, alc_func_txt); | ||
136 | |||
137 | static const char *ng_type_txt[] = {"Constant PGA Gain", | ||
138 | "Mute ADC Output"}; | ||
139 | static const struct soc_enum ng_type = | ||
140 | SOC_ENUM_SINGLE(WM8988_NGATE, 1, 2, ng_type_txt); | ||
141 | |||
142 | static const char *deemph_txt[] = {"None", "32Khz", "44.1Khz", "48Khz"}; | ||
143 | static const struct soc_enum deemph = | ||
144 | SOC_ENUM_SINGLE(WM8988_ADCDAC, 1, 4, deemph_txt); | ||
145 | |||
146 | static const char *adcpol_txt[] = {"Normal", "L Invert", "R Invert", | ||
147 | "L + R Invert"}; | ||
148 | static const struct soc_enum adcpol = | ||
149 | SOC_ENUM_SINGLE(WM8988_ADCDAC, 5, 4, adcpol_txt); | ||
150 | |||
151 | static const DECLARE_TLV_DB_SCALE(pga_tlv, -1725, 75, 0); | ||
152 | static const DECLARE_TLV_DB_SCALE(adc_tlv, -9750, 50, 1); | ||
153 | static const DECLARE_TLV_DB_SCALE(dac_tlv, -12750, 50, 1); | ||
154 | static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1); | ||
155 | static const DECLARE_TLV_DB_SCALE(bypass_tlv, -1500, 300, 0); | ||
156 | |||
157 | static const struct snd_kcontrol_new wm8988_snd_controls[] = { | ||
158 | |||
159 | SOC_ENUM("Bass Boost", bass_boost), | ||
160 | SOC_ENUM("Bass Filter", bass_filter), | ||
161 | SOC_SINGLE("Bass Volume", WM8988_BASS, 0, 15, 1), | ||
162 | |||
163 | SOC_SINGLE("Treble Volume", WM8988_TREBLE, 0, 15, 0), | ||
164 | SOC_ENUM("Treble Cut-off", treble), | ||
165 | |||
166 | SOC_SINGLE("3D Switch", WM8988_3D, 0, 1, 0), | ||
167 | SOC_SINGLE("3D Volume", WM8988_3D, 1, 15, 0), | ||
168 | SOC_ENUM("3D Lower Cut-off", stereo_3d_lc), | ||
169 | SOC_ENUM("3D Upper Cut-off", stereo_3d_uc), | ||
170 | SOC_ENUM("3D Mode", stereo_3d_func), | ||
171 | |||
172 | SOC_SINGLE("ALC Capture Target Volume", WM8988_ALC1, 0, 7, 0), | ||
173 | SOC_SINGLE("ALC Capture Max Volume", WM8988_ALC1, 4, 7, 0), | ||
174 | SOC_ENUM("ALC Capture Function", alc_func), | ||
175 | SOC_SINGLE("ALC Capture ZC Switch", WM8988_ALC2, 7, 1, 0), | ||
176 | SOC_SINGLE("ALC Capture Hold Time", WM8988_ALC2, 0, 15, 0), | ||
177 | SOC_SINGLE("ALC Capture Decay Time", WM8988_ALC3, 4, 15, 0), | ||
178 | SOC_SINGLE("ALC Capture Attack Time", WM8988_ALC3, 0, 15, 0), | ||
179 | SOC_SINGLE("ALC Capture NG Threshold", WM8988_NGATE, 3, 31, 0), | ||
180 | SOC_ENUM("ALC Capture NG Type", ng_type), | ||
181 | SOC_SINGLE("ALC Capture NG Switch", WM8988_NGATE, 0, 1, 0), | ||
182 | |||
183 | SOC_SINGLE("ZC Timeout Switch", WM8988_ADCTL1, 0, 1, 0), | ||
184 | |||
185 | SOC_DOUBLE_R_TLV("Capture Digital Volume", WM8988_LADC, WM8988_RADC, | ||
186 | 0, 255, 0, adc_tlv), | ||
187 | SOC_DOUBLE_R_TLV("Capture Volume", WM8988_LINVOL, WM8988_RINVOL, | ||
188 | 0, 63, 0, pga_tlv), | ||
189 | SOC_DOUBLE_R("Capture ZC Switch", WM8988_LINVOL, WM8988_RINVOL, 6, 1, 0), | ||
190 | SOC_DOUBLE_R("Capture Switch", WM8988_LINVOL, WM8988_RINVOL, 7, 1, 1), | ||
191 | |||
192 | SOC_ENUM("Playback De-emphasis", deemph), | ||
193 | |||
194 | SOC_ENUM("Capture Polarity", adcpol), | ||
195 | SOC_SINGLE("Playback 6dB Attenuate", WM8988_ADCDAC, 7, 1, 0), | ||
196 | SOC_SINGLE("Capture 6dB Attenuate", WM8988_ADCDAC, 8, 1, 0), | ||
197 | |||
198 | SOC_DOUBLE_R_TLV("PCM Volume", WM8988_LDAC, WM8988_RDAC, 0, 255, 0, dac_tlv), | ||
199 | |||
200 | SOC_SINGLE_TLV("Left Mixer Left Bypass Volume", WM8988_LOUTM1, 4, 7, 1, | ||
201 | bypass_tlv), | ||
202 | SOC_SINGLE_TLV("Left Mixer Right Bypass Volume", WM8988_LOUTM2, 4, 7, 1, | ||
203 | bypass_tlv), | ||
204 | SOC_SINGLE_TLV("Right Mixer Left Bypass Volume", WM8988_ROUTM1, 4, 7, 1, | ||
205 | bypass_tlv), | ||
206 | SOC_SINGLE_TLV("Right Mixer Right Bypass Volume", WM8988_ROUTM2, 4, 7, 1, | ||
207 | bypass_tlv), | ||
208 | |||
209 | SOC_DOUBLE_R("Output 1 Playback ZC Switch", WM8988_LOUT1V, | ||
210 | WM8988_ROUT1V, 7, 1, 0), | ||
211 | SOC_DOUBLE_R_TLV("Output 1 Playback Volume", WM8988_LOUT1V, WM8988_ROUT1V, | ||
212 | 0, 127, 0, out_tlv), | ||
213 | |||
214 | SOC_DOUBLE_R("Output 2 Playback ZC Switch", WM8988_LOUT2V, | ||
215 | WM8988_ROUT2V, 7, 1, 0), | ||
216 | SOC_DOUBLE_R_TLV("Output 2 Playback Volume", WM8988_LOUT2V, WM8988_ROUT2V, | ||
217 | 0, 127, 0, out_tlv), | ||
218 | |||
219 | }; | ||
220 | |||
221 | /* | ||
222 | * DAPM Controls | ||
223 | */ | ||
224 | |||
225 | static int wm8988_lrc_control(struct snd_soc_dapm_widget *w, | ||
226 | struct snd_kcontrol *kcontrol, int event) | ||
227 | { | ||
228 | struct snd_soc_codec *codec = w->codec; | ||
229 | u16 adctl2 = wm8988_read_reg_cache(codec, WM8988_ADCTL2); | ||
230 | |||
231 | /* Use the DAC to gate LRC if active, otherwise use ADC */ | ||
232 | if (wm8988_read_reg_cache(codec, WM8988_PWR2) & 0x180) | ||
233 | adctl2 &= ~0x4; | ||
234 | else | ||
235 | adctl2 |= 0x4; | ||
236 | |||
237 | return wm8988_write(codec, WM8988_ADCTL2, adctl2); | ||
238 | } | ||
239 | |||
240 | static const char *wm8988_line_texts[] = { | ||
241 | "Line 1", "Line 2", "PGA", "Differential"}; | ||
242 | |||
243 | static const unsigned int wm8988_line_values[] = { | ||
244 | 0, 1, 3, 4}; | ||
245 | |||
246 | static const struct soc_enum wm8988_lline_enum = | ||
247 | SOC_VALUE_ENUM_SINGLE(WM8988_LOUTM1, 0, 7, | ||
248 | ARRAY_SIZE(wm8988_line_texts), | ||
249 | wm8988_line_texts, | ||
250 | wm8988_line_values); | ||
251 | static const struct snd_kcontrol_new wm8988_left_line_controls = | ||
252 | SOC_DAPM_VALUE_ENUM("Route", wm8988_lline_enum); | ||
253 | |||
254 | static const struct soc_enum wm8988_rline_enum = | ||
255 | SOC_VALUE_ENUM_SINGLE(WM8988_ROUTM1, 0, 7, | ||
256 | ARRAY_SIZE(wm8988_line_texts), | ||
257 | wm8988_line_texts, | ||
258 | wm8988_line_values); | ||
259 | static const struct snd_kcontrol_new wm8988_right_line_controls = | ||
260 | SOC_DAPM_VALUE_ENUM("Route", wm8988_lline_enum); | ||
261 | |||
262 | /* Left Mixer */ | ||
263 | static const struct snd_kcontrol_new wm8988_left_mixer_controls[] = { | ||
264 | SOC_DAPM_SINGLE("Playback Switch", WM8988_LOUTM1, 8, 1, 0), | ||
265 | SOC_DAPM_SINGLE("Left Bypass Switch", WM8988_LOUTM1, 7, 1, 0), | ||
266 | SOC_DAPM_SINGLE("Right Playback Switch", WM8988_LOUTM2, 8, 1, 0), | ||
267 | SOC_DAPM_SINGLE("Right Bypass Switch", WM8988_LOUTM2, 7, 1, 0), | ||
268 | }; | ||
269 | |||
270 | /* Right Mixer */ | ||
271 | static const struct snd_kcontrol_new wm8988_right_mixer_controls[] = { | ||
272 | SOC_DAPM_SINGLE("Left Playback Switch", WM8988_ROUTM1, 8, 1, 0), | ||
273 | SOC_DAPM_SINGLE("Left Bypass Switch", WM8988_ROUTM1, 7, 1, 0), | ||
274 | SOC_DAPM_SINGLE("Playback Switch", WM8988_ROUTM2, 8, 1, 0), | ||
275 | SOC_DAPM_SINGLE("Right Bypass Switch", WM8988_ROUTM2, 7, 1, 0), | ||
276 | }; | ||
277 | |||
278 | static const char *wm8988_pga_sel[] = {"Line 1", "Line 2", "Differential"}; | ||
279 | static const unsigned int wm8988_pga_val[] = { 0, 1, 3 }; | ||
280 | |||
281 | /* Left PGA Mux */ | ||
282 | static const struct soc_enum wm8988_lpga_enum = | ||
283 | SOC_VALUE_ENUM_SINGLE(WM8988_LADCIN, 6, 3, | ||
284 | ARRAY_SIZE(wm8988_pga_sel), | ||
285 | wm8988_pga_sel, | ||
286 | wm8988_pga_val); | ||
287 | static const struct snd_kcontrol_new wm8988_left_pga_controls = | ||
288 | SOC_DAPM_VALUE_ENUM("Route", wm8988_lpga_enum); | ||
289 | |||
290 | /* Right PGA Mux */ | ||
291 | static const struct soc_enum wm8988_rpga_enum = | ||
292 | SOC_VALUE_ENUM_SINGLE(WM8988_RADCIN, 6, 3, | ||
293 | ARRAY_SIZE(wm8988_pga_sel), | ||
294 | wm8988_pga_sel, | ||
295 | wm8988_pga_val); | ||
296 | static const struct snd_kcontrol_new wm8988_right_pga_controls = | ||
297 | SOC_DAPM_VALUE_ENUM("Route", wm8988_rpga_enum); | ||
298 | |||
299 | /* Differential Mux */ | ||
300 | static const char *wm8988_diff_sel[] = {"Line 1", "Line 2"}; | ||
301 | static const struct soc_enum diffmux = | ||
302 | SOC_ENUM_SINGLE(WM8988_ADCIN, 8, 2, wm8988_diff_sel); | ||
303 | static const struct snd_kcontrol_new wm8988_diffmux_controls = | ||
304 | SOC_DAPM_ENUM("Route", diffmux); | ||
305 | |||
306 | /* Mono ADC Mux */ | ||
307 | static const char *wm8988_mono_mux[] = {"Stereo", "Mono (Left)", | ||
308 | "Mono (Right)", "Digital Mono"}; | ||
309 | static const struct soc_enum monomux = | ||
310 | SOC_ENUM_SINGLE(WM8988_ADCIN, 6, 4, wm8988_mono_mux); | ||
311 | static const struct snd_kcontrol_new wm8988_monomux_controls = | ||
312 | SOC_DAPM_ENUM("Route", monomux); | ||
313 | |||
314 | static const struct snd_soc_dapm_widget wm8988_dapm_widgets[] = { | ||
315 | SND_SOC_DAPM_MICBIAS("Mic Bias", WM8988_PWR1, 1, 0), | ||
316 | |||
317 | SND_SOC_DAPM_MUX("Differential Mux", SND_SOC_NOPM, 0, 0, | ||
318 | &wm8988_diffmux_controls), | ||
319 | SND_SOC_DAPM_MUX("Left ADC Mux", SND_SOC_NOPM, 0, 0, | ||
320 | &wm8988_monomux_controls), | ||
321 | SND_SOC_DAPM_MUX("Right ADC Mux", SND_SOC_NOPM, 0, 0, | ||
322 | &wm8988_monomux_controls), | ||
323 | |||
324 | SND_SOC_DAPM_MUX("Left PGA Mux", WM8988_PWR1, 5, 0, | ||
325 | &wm8988_left_pga_controls), | ||
326 | SND_SOC_DAPM_MUX("Right PGA Mux", WM8988_PWR1, 4, 0, | ||
327 | &wm8988_right_pga_controls), | ||
328 | |||
329 | SND_SOC_DAPM_MUX("Left Line Mux", SND_SOC_NOPM, 0, 0, | ||
330 | &wm8988_left_line_controls), | ||
331 | SND_SOC_DAPM_MUX("Right Line Mux", SND_SOC_NOPM, 0, 0, | ||
332 | &wm8988_right_line_controls), | ||
333 | |||
334 | SND_SOC_DAPM_ADC("Right ADC", "Right Capture", WM8988_PWR1, 2, 0), | ||
335 | SND_SOC_DAPM_ADC("Left ADC", "Left Capture", WM8988_PWR1, 3, 0), | ||
336 | |||
337 | SND_SOC_DAPM_DAC("Right DAC", "Right Playback", WM8988_PWR2, 7, 0), | ||
338 | SND_SOC_DAPM_DAC("Left DAC", "Left Playback", WM8988_PWR2, 8, 0), | ||
339 | |||
340 | SND_SOC_DAPM_MIXER("Left Mixer", SND_SOC_NOPM, 0, 0, | ||
341 | &wm8988_left_mixer_controls[0], | ||
342 | ARRAY_SIZE(wm8988_left_mixer_controls)), | ||
343 | SND_SOC_DAPM_MIXER("Right Mixer", SND_SOC_NOPM, 0, 0, | ||
344 | &wm8988_right_mixer_controls[0], | ||
345 | ARRAY_SIZE(wm8988_right_mixer_controls)), | ||
346 | |||
347 | SND_SOC_DAPM_PGA("Right Out 2", WM8988_PWR2, 3, 0, NULL, 0), | ||
348 | SND_SOC_DAPM_PGA("Left Out 2", WM8988_PWR2, 4, 0, NULL, 0), | ||
349 | SND_SOC_DAPM_PGA("Right Out 1", WM8988_PWR2, 5, 0, NULL, 0), | ||
350 | SND_SOC_DAPM_PGA("Left Out 1", WM8988_PWR2, 6, 0, NULL, 0), | ||
351 | |||
352 | SND_SOC_DAPM_POST("LRC control", wm8988_lrc_control), | ||
353 | |||
354 | SND_SOC_DAPM_OUTPUT("LOUT1"), | ||
355 | SND_SOC_DAPM_OUTPUT("ROUT1"), | ||
356 | SND_SOC_DAPM_OUTPUT("LOUT2"), | ||
357 | SND_SOC_DAPM_OUTPUT("ROUT2"), | ||
358 | SND_SOC_DAPM_OUTPUT("VREF"), | ||
359 | |||
360 | SND_SOC_DAPM_INPUT("LINPUT1"), | ||
361 | SND_SOC_DAPM_INPUT("LINPUT2"), | ||
362 | SND_SOC_DAPM_INPUT("RINPUT1"), | ||
363 | SND_SOC_DAPM_INPUT("RINPUT2"), | ||
364 | }; | ||
365 | |||
366 | static const struct snd_soc_dapm_route audio_map[] = { | ||
367 | |||
368 | { "Left Line Mux", "Line 1", "LINPUT1" }, | ||
369 | { "Left Line Mux", "Line 2", "LINPUT2" }, | ||
370 | { "Left Line Mux", "PGA", "Left PGA Mux" }, | ||
371 | { "Left Line Mux", "Differential", "Differential Mux" }, | ||
372 | |||
373 | { "Right Line Mux", "Line 1", "RINPUT1" }, | ||
374 | { "Right Line Mux", "Line 2", "RINPUT2" }, | ||
375 | { "Right Line Mux", "PGA", "Right PGA Mux" }, | ||
376 | { "Right Line Mux", "Differential", "Differential Mux" }, | ||
377 | |||
378 | { "Left PGA Mux", "Line 1", "LINPUT1" }, | ||
379 | { "Left PGA Mux", "Line 2", "LINPUT2" }, | ||
380 | { "Left PGA Mux", "Differential", "Differential Mux" }, | ||
381 | |||
382 | { "Right PGA Mux", "Line 1", "RINPUT1" }, | ||
383 | { "Right PGA Mux", "Line 2", "RINPUT2" }, | ||
384 | { "Right PGA Mux", "Differential", "Differential Mux" }, | ||
385 | |||
386 | { "Differential Mux", "Line 1", "LINPUT1" }, | ||
387 | { "Differential Mux", "Line 1", "RINPUT1" }, | ||
388 | { "Differential Mux", "Line 2", "LINPUT2" }, | ||
389 | { "Differential Mux", "Line 2", "RINPUT2" }, | ||
390 | |||
391 | { "Left ADC Mux", "Stereo", "Left PGA Mux" }, | ||
392 | { "Left ADC Mux", "Mono (Left)", "Left PGA Mux" }, | ||
393 | { "Left ADC Mux", "Digital Mono", "Left PGA Mux" }, | ||
394 | |||
395 | { "Right ADC Mux", "Stereo", "Right PGA Mux" }, | ||
396 | { "Right ADC Mux", "Mono (Right)", "Right PGA Mux" }, | ||
397 | { "Right ADC Mux", "Digital Mono", "Right PGA Mux" }, | ||
398 | |||
399 | { "Left ADC", NULL, "Left ADC Mux" }, | ||
400 | { "Right ADC", NULL, "Right ADC Mux" }, | ||
401 | |||
402 | { "Left Line Mux", "Line 1", "LINPUT1" }, | ||
403 | { "Left Line Mux", "Line 2", "LINPUT2" }, | ||
404 | { "Left Line Mux", "PGA", "Left PGA Mux" }, | ||
405 | { "Left Line Mux", "Differential", "Differential Mux" }, | ||
406 | |||
407 | { "Right Line Mux", "Line 1", "RINPUT1" }, | ||
408 | { "Right Line Mux", "Line 2", "RINPUT2" }, | ||
409 | { "Right Line Mux", "PGA", "Right PGA Mux" }, | ||
410 | { "Right Line Mux", "Differential", "Differential Mux" }, | ||
411 | |||
412 | { "Left Mixer", "Playback Switch", "Left DAC" }, | ||
413 | { "Left Mixer", "Left Bypass Switch", "Left Line Mux" }, | ||
414 | { "Left Mixer", "Right Playback Switch", "Right DAC" }, | ||
415 | { "Left Mixer", "Right Bypass Switch", "Right Line Mux" }, | ||
416 | |||
417 | { "Right Mixer", "Left Playback Switch", "Left DAC" }, | ||
418 | { "Right Mixer", "Left Bypass Switch", "Left Line Mux" }, | ||
419 | { "Right Mixer", "Playback Switch", "Right DAC" }, | ||
420 | { "Right Mixer", "Right Bypass Switch", "Right Line Mux" }, | ||
421 | |||
422 | { "Left Out 1", NULL, "Left Mixer" }, | ||
423 | { "LOUT1", NULL, "Left Out 1" }, | ||
424 | { "Right Out 1", NULL, "Right Mixer" }, | ||
425 | { "ROUT1", NULL, "Right Out 1" }, | ||
426 | |||
427 | { "Left Out 2", NULL, "Left Mixer" }, | ||
428 | { "LOUT2", NULL, "Left Out 2" }, | ||
429 | { "Right Out 2", NULL, "Right Mixer" }, | ||
430 | { "ROUT2", NULL, "Right Out 2" }, | ||
431 | }; | ||
432 | |||
433 | struct _coeff_div { | ||
434 | u32 mclk; | ||
435 | u32 rate; | ||
436 | u16 fs; | ||
437 | u8 sr:5; | ||
438 | u8 usb:1; | ||
439 | }; | ||
440 | |||
441 | /* codec hifi mclk clock divider coefficients */ | ||
442 | static const struct _coeff_div coeff_div[] = { | ||
443 | /* 8k */ | ||
444 | {12288000, 8000, 1536, 0x6, 0x0}, | ||
445 | {11289600, 8000, 1408, 0x16, 0x0}, | ||
446 | {18432000, 8000, 2304, 0x7, 0x0}, | ||
447 | {16934400, 8000, 2112, 0x17, 0x0}, | ||
448 | {12000000, 8000, 1500, 0x6, 0x1}, | ||
449 | |||
450 | /* 11.025k */ | ||
451 | {11289600, 11025, 1024, 0x18, 0x0}, | ||
452 | {16934400, 11025, 1536, 0x19, 0x0}, | ||
453 | {12000000, 11025, 1088, 0x19, 0x1}, | ||
454 | |||
455 | /* 16k */ | ||
456 | {12288000, 16000, 768, 0xa, 0x0}, | ||
457 | {18432000, 16000, 1152, 0xb, 0x0}, | ||
458 | {12000000, 16000, 750, 0xa, 0x1}, | ||
459 | |||
460 | /* 22.05k */ | ||
461 | {11289600, 22050, 512, 0x1a, 0x0}, | ||
462 | {16934400, 22050, 768, 0x1b, 0x0}, | ||
463 | {12000000, 22050, 544, 0x1b, 0x1}, | ||
464 | |||
465 | /* 32k */ | ||
466 | {12288000, 32000, 384, 0xc, 0x0}, | ||
467 | {18432000, 32000, 576, 0xd, 0x0}, | ||
468 | {12000000, 32000, 375, 0xa, 0x1}, | ||
469 | |||
470 | /* 44.1k */ | ||
471 | {11289600, 44100, 256, 0x10, 0x0}, | ||
472 | {16934400, 44100, 384, 0x11, 0x0}, | ||
473 | {12000000, 44100, 272, 0x11, 0x1}, | ||
474 | |||
475 | /* 48k */ | ||
476 | {12288000, 48000, 256, 0x0, 0x0}, | ||
477 | {18432000, 48000, 384, 0x1, 0x0}, | ||
478 | {12000000, 48000, 250, 0x0, 0x1}, | ||
479 | |||
480 | /* 88.2k */ | ||
481 | {11289600, 88200, 128, 0x1e, 0x0}, | ||
482 | {16934400, 88200, 192, 0x1f, 0x0}, | ||
483 | {12000000, 88200, 136, 0x1f, 0x1}, | ||
484 | |||
485 | /* 96k */ | ||
486 | {12288000, 96000, 128, 0xe, 0x0}, | ||
487 | {18432000, 96000, 192, 0xf, 0x0}, | ||
488 | {12000000, 96000, 125, 0xe, 0x1}, | ||
489 | }; | ||
490 | |||
491 | static inline int get_coeff(int mclk, int rate) | ||
492 | { | ||
493 | int i; | ||
494 | |||
495 | for (i = 0; i < ARRAY_SIZE(coeff_div); i++) { | ||
496 | if (coeff_div[i].rate == rate && coeff_div[i].mclk == mclk) | ||
497 | return i; | ||
498 | } | ||
499 | |||
500 | return -EINVAL; | ||
501 | } | ||
502 | |||
503 | /* The set of rates we can generate from the above for each SYSCLK */ | ||
504 | |||
505 | static unsigned int rates_12288[] = { | ||
506 | 8000, 12000, 16000, 24000, 24000, 32000, 48000, 96000, | ||
507 | }; | ||
508 | |||
509 | static struct snd_pcm_hw_constraint_list constraints_12288 = { | ||
510 | .count = ARRAY_SIZE(rates_12288), | ||
511 | .list = rates_12288, | ||
512 | }; | ||
513 | |||
514 | static unsigned int rates_112896[] = { | ||
515 | 8000, 11025, 22050, 44100, | ||
516 | }; | ||
517 | |||
518 | static struct snd_pcm_hw_constraint_list constraints_112896 = { | ||
519 | .count = ARRAY_SIZE(rates_112896), | ||
520 | .list = rates_112896, | ||
521 | }; | ||
522 | |||
523 | static unsigned int rates_12[] = { | ||
524 | 8000, 11025, 12000, 16000, 22050, 2400, 32000, 41100, 48000, | ||
525 | 48000, 88235, 96000, | ||
526 | }; | ||
527 | |||
528 | static struct snd_pcm_hw_constraint_list constraints_12 = { | ||
529 | .count = ARRAY_SIZE(rates_12), | ||
530 | .list = rates_12, | ||
531 | }; | ||
532 | |||
533 | /* | ||
534 | * Note that this should be called from init rather than from hw_params. | ||
535 | */ | ||
536 | static int wm8988_set_dai_sysclk(struct snd_soc_dai *codec_dai, | ||
537 | int clk_id, unsigned int freq, int dir) | ||
538 | { | ||
539 | struct snd_soc_codec *codec = codec_dai->codec; | ||
540 | struct wm8988_priv *wm8988 = codec->private_data; | ||
541 | |||
542 | switch (freq) { | ||
543 | case 11289600: | ||
544 | case 18432000: | ||
545 | case 22579200: | ||
546 | case 36864000: | ||
547 | wm8988->sysclk_constraints = &constraints_112896; | ||
548 | wm8988->sysclk = freq; | ||
549 | return 0; | ||
550 | |||
551 | case 12288000: | ||
552 | case 16934400: | ||
553 | case 24576000: | ||
554 | case 33868800: | ||
555 | wm8988->sysclk_constraints = &constraints_12288; | ||
556 | wm8988->sysclk = freq; | ||
557 | return 0; | ||
558 | |||
559 | case 12000000: | ||
560 | case 24000000: | ||
561 | wm8988->sysclk_constraints = &constraints_12; | ||
562 | wm8988->sysclk = freq; | ||
563 | return 0; | ||
564 | } | ||
565 | return -EINVAL; | ||
566 | } | ||
567 | |||
568 | static int wm8988_set_dai_fmt(struct snd_soc_dai *codec_dai, | ||
569 | unsigned int fmt) | ||
570 | { | ||
571 | struct snd_soc_codec *codec = codec_dai->codec; | ||
572 | u16 iface = 0; | ||
573 | |||
574 | /* set master/slave audio interface */ | ||
575 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | ||
576 | case SND_SOC_DAIFMT_CBM_CFM: | ||
577 | iface = 0x0040; | ||
578 | break; | ||
579 | case SND_SOC_DAIFMT_CBS_CFS: | ||
580 | break; | ||
581 | default: | ||
582 | return -EINVAL; | ||
583 | } | ||
584 | |||
585 | /* interface format */ | ||
586 | switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { | ||
587 | case SND_SOC_DAIFMT_I2S: | ||
588 | iface |= 0x0002; | ||
589 | break; | ||
590 | case SND_SOC_DAIFMT_RIGHT_J: | ||
591 | break; | ||
592 | case SND_SOC_DAIFMT_LEFT_J: | ||
593 | iface |= 0x0001; | ||
594 | break; | ||
595 | case SND_SOC_DAIFMT_DSP_A: | ||
596 | iface |= 0x0003; | ||
597 | break; | ||
598 | case SND_SOC_DAIFMT_DSP_B: | ||
599 | iface |= 0x0013; | ||
600 | break; | ||
601 | default: | ||
602 | return -EINVAL; | ||
603 | } | ||
604 | |||
605 | /* clock inversion */ | ||
606 | switch (fmt & SND_SOC_DAIFMT_INV_MASK) { | ||
607 | case SND_SOC_DAIFMT_NB_NF: | ||
608 | break; | ||
609 | case SND_SOC_DAIFMT_IB_IF: | ||
610 | iface |= 0x0090; | ||
611 | break; | ||
612 | case SND_SOC_DAIFMT_IB_NF: | ||
613 | iface |= 0x0080; | ||
614 | break; | ||
615 | case SND_SOC_DAIFMT_NB_IF: | ||
616 | iface |= 0x0010; | ||
617 | break; | ||
618 | default: | ||
619 | return -EINVAL; | ||
620 | } | ||
621 | |||
622 | wm8988_write(codec, WM8988_IFACE, iface); | ||
623 | return 0; | ||
624 | } | ||
625 | |||
626 | static int wm8988_pcm_startup(struct snd_pcm_substream *substream, | ||
627 | struct snd_soc_dai *dai) | ||
628 | { | ||
629 | struct snd_soc_codec *codec = dai->codec; | ||
630 | struct wm8988_priv *wm8988 = codec->private_data; | ||
631 | |||
632 | /* The set of sample rates that can be supported depends on the | ||
633 | * MCLK supplied to the CODEC - enforce this. | ||
634 | */ | ||
635 | if (!wm8988->sysclk) { | ||
636 | dev_err(codec->dev, | ||
637 | "No MCLK configured, call set_sysclk() on init\n"); | ||
638 | return -EINVAL; | ||
639 | } | ||
640 | |||
641 | snd_pcm_hw_constraint_list(substream->runtime, 0, | ||
642 | SNDRV_PCM_HW_PARAM_RATE, | ||
643 | wm8988->sysclk_constraints); | ||
644 | |||
645 | return 0; | ||
646 | } | ||
647 | |||
648 | static int wm8988_pcm_hw_params(struct snd_pcm_substream *substream, | ||
649 | struct snd_pcm_hw_params *params, | ||
650 | struct snd_soc_dai *dai) | ||
651 | { | ||
652 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
653 | struct snd_soc_device *socdev = rtd->socdev; | ||
654 | struct snd_soc_codec *codec = socdev->card->codec; | ||
655 | struct wm8988_priv *wm8988 = codec->private_data; | ||
656 | u16 iface = wm8988_read_reg_cache(codec, WM8988_IFACE) & 0x1f3; | ||
657 | u16 srate = wm8988_read_reg_cache(codec, WM8988_SRATE) & 0x180; | ||
658 | int coeff; | ||
659 | |||
660 | coeff = get_coeff(wm8988->sysclk, params_rate(params)); | ||
661 | if (coeff < 0) { | ||
662 | coeff = get_coeff(wm8988->sysclk / 2, params_rate(params)); | ||
663 | srate |= 0x40; | ||
664 | } | ||
665 | if (coeff < 0) { | ||
666 | dev_err(codec->dev, | ||
667 | "Unable to configure sample rate %dHz with %dHz MCLK\n", | ||
668 | params_rate(params), wm8988->sysclk); | ||
669 | return coeff; | ||
670 | } | ||
671 | |||
672 | /* bit size */ | ||
673 | switch (params_format(params)) { | ||
674 | case SNDRV_PCM_FORMAT_S16_LE: | ||
675 | break; | ||
676 | case SNDRV_PCM_FORMAT_S20_3LE: | ||
677 | iface |= 0x0004; | ||
678 | break; | ||
679 | case SNDRV_PCM_FORMAT_S24_LE: | ||
680 | iface |= 0x0008; | ||
681 | break; | ||
682 | case SNDRV_PCM_FORMAT_S32_LE: | ||
683 | iface |= 0x000c; | ||
684 | break; | ||
685 | } | ||
686 | |||
687 | /* set iface & srate */ | ||
688 | wm8988_write(codec, WM8988_IFACE, iface); | ||
689 | if (coeff >= 0) | ||
690 | wm8988_write(codec, WM8988_SRATE, srate | | ||
691 | (coeff_div[coeff].sr << 1) | coeff_div[coeff].usb); | ||
692 | |||
693 | return 0; | ||
694 | } | ||
695 | |||
696 | static int wm8988_mute(struct snd_soc_dai *dai, int mute) | ||
697 | { | ||
698 | struct snd_soc_codec *codec = dai->codec; | ||
699 | u16 mute_reg = wm8988_read_reg_cache(codec, WM8988_ADCDAC) & 0xfff7; | ||
700 | |||
701 | if (mute) | ||
702 | wm8988_write(codec, WM8988_ADCDAC, mute_reg | 0x8); | ||
703 | else | ||
704 | wm8988_write(codec, WM8988_ADCDAC, mute_reg); | ||
705 | return 0; | ||
706 | } | ||
707 | |||
708 | static int wm8988_set_bias_level(struct snd_soc_codec *codec, | ||
709 | enum snd_soc_bias_level level) | ||
710 | { | ||
711 | u16 pwr_reg = wm8988_read_reg_cache(codec, WM8988_PWR1) & ~0x1c1; | ||
712 | |||
713 | switch (level) { | ||
714 | case SND_SOC_BIAS_ON: | ||
715 | break; | ||
716 | |||
717 | case SND_SOC_BIAS_PREPARE: | ||
718 | /* VREF, VMID=2x50k, digital enabled */ | ||
719 | wm8988_write(codec, WM8988_PWR1, pwr_reg | 0x00c0); | ||
720 | break; | ||
721 | |||
722 | case SND_SOC_BIAS_STANDBY: | ||
723 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | ||
724 | /* VREF, VMID=2x5k */ | ||
725 | wm8988_write(codec, WM8988_PWR1, pwr_reg | 0x1c1); | ||
726 | |||
727 | /* Charge caps */ | ||
728 | msleep(100); | ||
729 | } | ||
730 | |||
731 | /* VREF, VMID=2*500k, digital stopped */ | ||
732 | wm8988_write(codec, WM8988_PWR1, pwr_reg | 0x0141); | ||
733 | break; | ||
734 | |||
735 | case SND_SOC_BIAS_OFF: | ||
736 | wm8988_write(codec, WM8988_PWR1, 0x0000); | ||
737 | break; | ||
738 | } | ||
739 | codec->bias_level = level; | ||
740 | return 0; | ||
741 | } | ||
742 | |||
743 | #define WM8988_RATES SNDRV_PCM_RATE_8000_96000 | ||
744 | |||
745 | #define WM8988_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ | ||
746 | SNDRV_PCM_FMTBIT_S24_LE) | ||
747 | |||
748 | static struct snd_soc_dai_ops wm8988_ops = { | ||
749 | .startup = wm8988_pcm_startup, | ||
750 | .hw_params = wm8988_pcm_hw_params, | ||
751 | .set_fmt = wm8988_set_dai_fmt, | ||
752 | .set_sysclk = wm8988_set_dai_sysclk, | ||
753 | .digital_mute = wm8988_mute, | ||
754 | }; | ||
755 | |||
756 | struct snd_soc_dai wm8988_dai = { | ||
757 | .name = "WM8988", | ||
758 | .playback = { | ||
759 | .stream_name = "Playback", | ||
760 | .channels_min = 1, | ||
761 | .channels_max = 2, | ||
762 | .rates = WM8988_RATES, | ||
763 | .formats = WM8988_FORMATS, | ||
764 | }, | ||
765 | .capture = { | ||
766 | .stream_name = "Capture", | ||
767 | .channels_min = 1, | ||
768 | .channels_max = 2, | ||
769 | .rates = WM8988_RATES, | ||
770 | .formats = WM8988_FORMATS, | ||
771 | }, | ||
772 | .ops = &wm8988_ops, | ||
773 | .symmetric_rates = 1, | ||
774 | }; | ||
775 | EXPORT_SYMBOL_GPL(wm8988_dai); | ||
776 | |||
777 | static int wm8988_suspend(struct platform_device *pdev, pm_message_t state) | ||
778 | { | ||
779 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
780 | struct snd_soc_codec *codec = socdev->card->codec; | ||
781 | |||
782 | wm8988_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
783 | return 0; | ||
784 | } | ||
785 | |||
786 | static int wm8988_resume(struct platform_device *pdev) | ||
787 | { | ||
788 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
789 | struct snd_soc_codec *codec = socdev->card->codec; | ||
790 | int i; | ||
791 | u8 data[2]; | ||
792 | u16 *cache = codec->reg_cache; | ||
793 | |||
794 | /* Sync reg_cache with the hardware */ | ||
795 | for (i = 0; i < WM8988_NUM_REG; i++) { | ||
796 | if (i == WM8988_RESET) | ||
797 | continue; | ||
798 | data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); | ||
799 | data[1] = cache[i] & 0x00ff; | ||
800 | codec->hw_write(codec->control_data, data, 2); | ||
801 | } | ||
802 | |||
803 | wm8988_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
804 | |||
805 | return 0; | ||
806 | } | ||
807 | |||
808 | static struct snd_soc_codec *wm8988_codec; | ||
809 | |||
810 | static int wm8988_probe(struct platform_device *pdev) | ||
811 | { | ||
812 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
813 | struct snd_soc_codec *codec; | ||
814 | int ret = 0; | ||
815 | |||
816 | if (wm8988_codec == NULL) { | ||
817 | dev_err(&pdev->dev, "Codec device not registered\n"); | ||
818 | return -ENODEV; | ||
819 | } | ||
820 | |||
821 | socdev->card->codec = wm8988_codec; | ||
822 | codec = wm8988_codec; | ||
823 | |||
824 | /* register pcms */ | ||
825 | ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); | ||
826 | if (ret < 0) { | ||
827 | dev_err(codec->dev, "failed to create pcms: %d\n", ret); | ||
828 | goto pcm_err; | ||
829 | } | ||
830 | |||
831 | snd_soc_add_controls(codec, wm8988_snd_controls, | ||
832 | ARRAY_SIZE(wm8988_snd_controls)); | ||
833 | snd_soc_dapm_new_controls(codec, wm8988_dapm_widgets, | ||
834 | ARRAY_SIZE(wm8988_dapm_widgets)); | ||
835 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | ||
836 | snd_soc_dapm_new_widgets(codec); | ||
837 | |||
838 | ret = snd_soc_init_card(socdev); | ||
839 | if (ret < 0) { | ||
840 | dev_err(codec->dev, "failed to register card: %d\n", ret); | ||
841 | goto card_err; | ||
842 | } | ||
843 | |||
844 | return ret; | ||
845 | |||
846 | card_err: | ||
847 | snd_soc_free_pcms(socdev); | ||
848 | snd_soc_dapm_free(socdev); | ||
849 | pcm_err: | ||
850 | return ret; | ||
851 | } | ||
852 | |||
853 | static int wm8988_remove(struct platform_device *pdev) | ||
854 | { | ||
855 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
856 | |||
857 | snd_soc_free_pcms(socdev); | ||
858 | snd_soc_dapm_free(socdev); | ||
859 | |||
860 | return 0; | ||
861 | } | ||
862 | |||
863 | struct snd_soc_codec_device soc_codec_dev_wm8988 = { | ||
864 | .probe = wm8988_probe, | ||
865 | .remove = wm8988_remove, | ||
866 | .suspend = wm8988_suspend, | ||
867 | .resume = wm8988_resume, | ||
868 | }; | ||
869 | EXPORT_SYMBOL_GPL(soc_codec_dev_wm8988); | ||
870 | |||
871 | static int wm8988_register(struct wm8988_priv *wm8988) | ||
872 | { | ||
873 | struct snd_soc_codec *codec = &wm8988->codec; | ||
874 | int ret; | ||
875 | u16 reg; | ||
876 | |||
877 | if (wm8988_codec) { | ||
878 | dev_err(codec->dev, "Another WM8988 is registered\n"); | ||
879 | ret = -EINVAL; | ||
880 | goto err; | ||
881 | } | ||
882 | |||
883 | mutex_init(&codec->mutex); | ||
884 | INIT_LIST_HEAD(&codec->dapm_widgets); | ||
885 | INIT_LIST_HEAD(&codec->dapm_paths); | ||
886 | |||
887 | codec->private_data = wm8988; | ||
888 | codec->name = "WM8988"; | ||
889 | codec->owner = THIS_MODULE; | ||
890 | codec->read = wm8988_read_reg_cache; | ||
891 | codec->write = wm8988_write; | ||
892 | codec->dai = &wm8988_dai; | ||
893 | codec->num_dai = 1; | ||
894 | codec->reg_cache_size = ARRAY_SIZE(wm8988->reg_cache); | ||
895 | codec->reg_cache = &wm8988->reg_cache; | ||
896 | codec->bias_level = SND_SOC_BIAS_OFF; | ||
897 | codec->set_bias_level = wm8988_set_bias_level; | ||
898 | |||
899 | memcpy(codec->reg_cache, wm8988_reg, | ||
900 | sizeof(wm8988_reg)); | ||
901 | |||
902 | ret = wm8988_reset(codec); | ||
903 | if (ret < 0) { | ||
904 | dev_err(codec->dev, "Failed to issue reset\n"); | ||
905 | return ret; | ||
906 | } | ||
907 | |||
908 | /* set the update bits (we always update left then right) */ | ||
909 | reg = wm8988_read_reg_cache(codec, WM8988_RADC); | ||
910 | wm8988_write(codec, WM8988_RADC, reg | 0x100); | ||
911 | reg = wm8988_read_reg_cache(codec, WM8988_RDAC); | ||
912 | wm8988_write(codec, WM8988_RDAC, reg | 0x0100); | ||
913 | reg = wm8988_read_reg_cache(codec, WM8988_ROUT1V); | ||
914 | wm8988_write(codec, WM8988_ROUT1V, reg | 0x0100); | ||
915 | reg = wm8988_read_reg_cache(codec, WM8988_ROUT2V); | ||
916 | wm8988_write(codec, WM8988_ROUT2V, reg | 0x0100); | ||
917 | reg = wm8988_read_reg_cache(codec, WM8988_RINVOL); | ||
918 | wm8988_write(codec, WM8988_RINVOL, reg | 0x0100); | ||
919 | |||
920 | wm8988_set_bias_level(&wm8988->codec, SND_SOC_BIAS_STANDBY); | ||
921 | |||
922 | wm8988_dai.dev = codec->dev; | ||
923 | |||
924 | wm8988_codec = codec; | ||
925 | |||
926 | ret = snd_soc_register_codec(codec); | ||
927 | if (ret != 0) { | ||
928 | dev_err(codec->dev, "Failed to register codec: %d\n", ret); | ||
929 | return ret; | ||
930 | } | ||
931 | |||
932 | ret = snd_soc_register_dai(&wm8988_dai); | ||
933 | if (ret != 0) { | ||
934 | dev_err(codec->dev, "Failed to register DAI: %d\n", ret); | ||
935 | snd_soc_unregister_codec(codec); | ||
936 | return ret; | ||
937 | } | ||
938 | |||
939 | return 0; | ||
940 | |||
941 | err: | ||
942 | kfree(wm8988); | ||
943 | return ret; | ||
944 | } | ||
945 | |||
946 | static void wm8988_unregister(struct wm8988_priv *wm8988) | ||
947 | { | ||
948 | wm8988_set_bias_level(&wm8988->codec, SND_SOC_BIAS_OFF); | ||
949 | snd_soc_unregister_dai(&wm8988_dai); | ||
950 | snd_soc_unregister_codec(&wm8988->codec); | ||
951 | kfree(wm8988); | ||
952 | wm8988_codec = NULL; | ||
953 | } | ||
954 | |||
955 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | ||
956 | static int wm8988_i2c_probe(struct i2c_client *i2c, | ||
957 | const struct i2c_device_id *id) | ||
958 | { | ||
959 | struct wm8988_priv *wm8988; | ||
960 | struct snd_soc_codec *codec; | ||
961 | |||
962 | wm8988 = kzalloc(sizeof(struct wm8988_priv), GFP_KERNEL); | ||
963 | if (wm8988 == NULL) | ||
964 | return -ENOMEM; | ||
965 | |||
966 | codec = &wm8988->codec; | ||
967 | codec->hw_write = (hw_write_t)i2c_master_send; | ||
968 | |||
969 | i2c_set_clientdata(i2c, wm8988); | ||
970 | codec->control_data = i2c; | ||
971 | |||
972 | codec->dev = &i2c->dev; | ||
973 | |||
974 | return wm8988_register(wm8988); | ||
975 | } | ||
976 | |||
977 | static int wm8988_i2c_remove(struct i2c_client *client) | ||
978 | { | ||
979 | struct wm8988_priv *wm8988 = i2c_get_clientdata(client); | ||
980 | wm8988_unregister(wm8988); | ||
981 | return 0; | ||
982 | } | ||
983 | |||
984 | static const struct i2c_device_id wm8988_i2c_id[] = { | ||
985 | { "wm8988", 0 }, | ||
986 | { } | ||
987 | }; | ||
988 | MODULE_DEVICE_TABLE(i2c, wm8988_i2c_id); | ||
989 | |||
990 | static struct i2c_driver wm8988_i2c_driver = { | ||
991 | .driver = { | ||
992 | .name = "WM8988", | ||
993 | .owner = THIS_MODULE, | ||
994 | }, | ||
995 | .probe = wm8988_i2c_probe, | ||
996 | .remove = wm8988_i2c_remove, | ||
997 | .id_table = wm8988_i2c_id, | ||
998 | }; | ||
999 | #endif | ||
1000 | |||
1001 | #if defined(CONFIG_SPI_MASTER) | ||
1002 | static int wm8988_spi_write(struct spi_device *spi, const char *data, int len) | ||
1003 | { | ||
1004 | struct spi_transfer t; | ||
1005 | struct spi_message m; | ||
1006 | u8 msg[2]; | ||
1007 | |||
1008 | if (len <= 0) | ||
1009 | return 0; | ||
1010 | |||
1011 | msg[0] = data[0]; | ||
1012 | msg[1] = data[1]; | ||
1013 | |||
1014 | spi_message_init(&m); | ||
1015 | memset(&t, 0, (sizeof t)); | ||
1016 | |||
1017 | t.tx_buf = &msg[0]; | ||
1018 | t.len = len; | ||
1019 | |||
1020 | spi_message_add_tail(&t, &m); | ||
1021 | spi_sync(spi, &m); | ||
1022 | |||
1023 | return len; | ||
1024 | } | ||
1025 | |||
1026 | static int __devinit wm8988_spi_probe(struct spi_device *spi) | ||
1027 | { | ||
1028 | struct wm8988_priv *wm8988; | ||
1029 | struct snd_soc_codec *codec; | ||
1030 | |||
1031 | wm8988 = kzalloc(sizeof(struct wm8988_priv), GFP_KERNEL); | ||
1032 | if (wm8988 == NULL) | ||
1033 | return -ENOMEM; | ||
1034 | |||
1035 | codec = &wm8988->codec; | ||
1036 | codec->hw_write = (hw_write_t)wm8988_spi_write; | ||
1037 | codec->control_data = spi; | ||
1038 | codec->dev = &spi->dev; | ||
1039 | |||
1040 | spi->dev.driver_data = wm8988; | ||
1041 | |||
1042 | return wm8988_register(wm8988); | ||
1043 | } | ||
1044 | |||
1045 | static int __devexit wm8988_spi_remove(struct spi_device *spi) | ||
1046 | { | ||
1047 | struct wm8988_priv *wm8988 = spi->dev.driver_data; | ||
1048 | |||
1049 | wm8988_unregister(wm8988); | ||
1050 | |||
1051 | return 0; | ||
1052 | } | ||
1053 | |||
1054 | static struct spi_driver wm8988_spi_driver = { | ||
1055 | .driver = { | ||
1056 | .name = "wm8988", | ||
1057 | .bus = &spi_bus_type, | ||
1058 | .owner = THIS_MODULE, | ||
1059 | }, | ||
1060 | .probe = wm8988_spi_probe, | ||
1061 | .remove = __devexit_p(wm8988_spi_remove), | ||
1062 | }; | ||
1063 | #endif | ||
1064 | |||
1065 | static int __init wm8988_modinit(void) | ||
1066 | { | ||
1067 | int ret; | ||
1068 | |||
1069 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | ||
1070 | ret = i2c_add_driver(&wm8988_i2c_driver); | ||
1071 | if (ret != 0) | ||
1072 | pr_err("WM8988: Unable to register I2C driver: %d\n", ret); | ||
1073 | #endif | ||
1074 | #if defined(CONFIG_SPI_MASTER) | ||
1075 | ret = spi_register_driver(&wm8988_spi_driver); | ||
1076 | if (ret != 0) | ||
1077 | pr_err("WM8988: Unable to register SPI driver: %d\n", ret); | ||
1078 | #endif | ||
1079 | return ret; | ||
1080 | } | ||
1081 | module_init(wm8988_modinit); | ||
1082 | |||
1083 | static void __exit wm8988_exit(void) | ||
1084 | { | ||
1085 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | ||
1086 | i2c_del_driver(&wm8988_i2c_driver); | ||
1087 | #endif | ||
1088 | #if defined(CONFIG_SPI_MASTER) | ||
1089 | spi_unregister_driver(&wm8988_spi_driver); | ||
1090 | #endif | ||
1091 | } | ||
1092 | module_exit(wm8988_exit); | ||
1093 | |||
1094 | |||
1095 | MODULE_DESCRIPTION("ASoC WM8988 driver"); | ||
1096 | MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>"); | ||
1097 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/codecs/wm8988.h b/sound/soc/codecs/wm8988.h new file mode 100644 index 000000000000..4552d37fdd41 --- /dev/null +++ b/sound/soc/codecs/wm8988.h | |||
@@ -0,0 +1,60 @@ | |||
1 | /* | ||
2 | * Copyright 2005 Openedhand Ltd. | ||
3 | * | ||
4 | * Author: Richard Purdie <richard@openedhand.com> | ||
5 | * | ||
6 | * Based on WM8753.h | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #ifndef _WM8988_H | ||
15 | #define _WM8988_H | ||
16 | |||
17 | /* WM8988 register space */ | ||
18 | |||
19 | #define WM8988_LINVOL 0x00 | ||
20 | #define WM8988_RINVOL 0x01 | ||
21 | #define WM8988_LOUT1V 0x02 | ||
22 | #define WM8988_ROUT1V 0x03 | ||
23 | #define WM8988_ADCDAC 0x05 | ||
24 | #define WM8988_IFACE 0x07 | ||
25 | #define WM8988_SRATE 0x08 | ||
26 | #define WM8988_LDAC 0x0a | ||
27 | #define WM8988_RDAC 0x0b | ||
28 | #define WM8988_BASS 0x0c | ||
29 | #define WM8988_TREBLE 0x0d | ||
30 | #define WM8988_RESET 0x0f | ||
31 | #define WM8988_3D 0x10 | ||
32 | #define WM8988_ALC1 0x11 | ||
33 | #define WM8988_ALC2 0x12 | ||
34 | #define WM8988_ALC3 0x13 | ||
35 | #define WM8988_NGATE 0x14 | ||
36 | #define WM8988_LADC 0x15 | ||
37 | #define WM8988_RADC 0x16 | ||
38 | #define WM8988_ADCTL1 0x17 | ||
39 | #define WM8988_ADCTL2 0x18 | ||
40 | #define WM8988_PWR1 0x19 | ||
41 | #define WM8988_PWR2 0x1a | ||
42 | #define WM8988_ADCTL3 0x1b | ||
43 | #define WM8988_ADCIN 0x1f | ||
44 | #define WM8988_LADCIN 0x20 | ||
45 | #define WM8988_RADCIN 0x21 | ||
46 | #define WM8988_LOUTM1 0x22 | ||
47 | #define WM8988_LOUTM2 0x23 | ||
48 | #define WM8988_ROUTM1 0x24 | ||
49 | #define WM8988_ROUTM2 0x25 | ||
50 | #define WM8988_LOUT2V 0x28 | ||
51 | #define WM8988_ROUT2V 0x29 | ||
52 | #define WM8988_LPPB 0x43 | ||
53 | #define WM8988_NUM_REG 0x44 | ||
54 | |||
55 | #define WM8988_SYSCLK 0 | ||
56 | |||
57 | extern struct snd_soc_dai wm8988_dai; | ||
58 | extern struct snd_soc_codec_device soc_codec_dev_wm8988; | ||
59 | |||
60 | #endif | ||
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 40cd274eb1ef..d029818350e9 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
@@ -998,7 +998,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target, | |||
998 | 998 | ||
999 | if ((Ndiv < 6) || (Ndiv > 12)) | 999 | if ((Ndiv < 6) || (Ndiv > 12)) |
1000 | printk(KERN_WARNING | 1000 | printk(KERN_WARNING |
1001 | "WM8990 N value outwith recommended range! N = %d\n", Ndiv); | 1001 | "WM8990 N value outwith recommended range! N = %u\n", Ndiv); |
1002 | 1002 | ||
1003 | pll_div->n = Ndiv; | 1003 | pll_div->n = Ndiv; |
1004 | Nmod = target % source; | 1004 | Nmod = target % source; |
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c new file mode 100644 index 000000000000..86fc57e25f97 --- /dev/null +++ b/sound/soc/codecs/wm9081.c | |||
@@ -0,0 +1,1534 @@ | |||
1 | /* | ||
2 | * wm9081.c -- WM9081 ALSA SoC Audio driver | ||
3 | * | ||
4 | * Author: Mark Brown | ||
5 | * | ||
6 | * Copyright 2009 Wolfson Microelectronics plc | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #include <linux/module.h> | ||
15 | #include <linux/moduleparam.h> | ||
16 | #include <linux/init.h> | ||
17 | #include <linux/delay.h> | ||
18 | #include <linux/pm.h> | ||
19 | #include <linux/i2c.h> | ||
20 | #include <linux/platform_device.h> | ||
21 | #include <sound/core.h> | ||
22 | #include <sound/pcm.h> | ||
23 | #include <sound/pcm_params.h> | ||
24 | #include <sound/soc.h> | ||
25 | #include <sound/soc-dapm.h> | ||
26 | #include <sound/initval.h> | ||
27 | #include <sound/tlv.h> | ||
28 | |||
29 | #include <sound/wm9081.h> | ||
30 | #include "wm9081.h" | ||
31 | |||
32 | static u16 wm9081_reg_defaults[] = { | ||
33 | 0x0000, /* R0 - Software Reset */ | ||
34 | 0x0000, /* R1 */ | ||
35 | 0x00B9, /* R2 - Analogue Lineout */ | ||
36 | 0x00B9, /* R3 - Analogue Speaker PGA */ | ||
37 | 0x0001, /* R4 - VMID Control */ | ||
38 | 0x0068, /* R5 - Bias Control 1 */ | ||
39 | 0x0000, /* R6 */ | ||
40 | 0x0000, /* R7 - Analogue Mixer */ | ||
41 | 0x0000, /* R8 - Anti Pop Control */ | ||
42 | 0x01DB, /* R9 - Analogue Speaker 1 */ | ||
43 | 0x0018, /* R10 - Analogue Speaker 2 */ | ||
44 | 0x0180, /* R11 - Power Management */ | ||
45 | 0x0000, /* R12 - Clock Control 1 */ | ||
46 | 0x0038, /* R13 - Clock Control 2 */ | ||
47 | 0x4000, /* R14 - Clock Control 3 */ | ||
48 | 0x0000, /* R15 */ | ||
49 | 0x0000, /* R16 - FLL Control 1 */ | ||
50 | 0x0200, /* R17 - FLL Control 2 */ | ||
51 | 0x0000, /* R18 - FLL Control 3 */ | ||
52 | 0x0204, /* R19 - FLL Control 4 */ | ||
53 | 0x0000, /* R20 - FLL Control 5 */ | ||
54 | 0x0000, /* R21 */ | ||
55 | 0x0000, /* R22 - Audio Interface 1 */ | ||
56 | 0x0002, /* R23 - Audio Interface 2 */ | ||
57 | 0x0008, /* R24 - Audio Interface 3 */ | ||
58 | 0x0022, /* R25 - Audio Interface 4 */ | ||
59 | 0x0000, /* R26 - Interrupt Status */ | ||
60 | 0x0006, /* R27 - Interrupt Status Mask */ | ||
61 | 0x0000, /* R28 - Interrupt Polarity */ | ||
62 | 0x0000, /* R29 - Interrupt Control */ | ||
63 | 0x00C0, /* R30 - DAC Digital 1 */ | ||
64 | 0x0008, /* R31 - DAC Digital 2 */ | ||
65 | 0x09AF, /* R32 - DRC 1 */ | ||
66 | 0x4201, /* R33 - DRC 2 */ | ||
67 | 0x0000, /* R34 - DRC 3 */ | ||
68 | 0x0000, /* R35 - DRC 4 */ | ||
69 | 0x0000, /* R36 */ | ||
70 | 0x0000, /* R37 */ | ||
71 | 0x0000, /* R38 - Write Sequencer 1 */ | ||
72 | 0x0000, /* R39 - Write Sequencer 2 */ | ||
73 | 0x0002, /* R40 - MW Slave 1 */ | ||
74 | 0x0000, /* R41 */ | ||
75 | 0x0000, /* R42 - EQ 1 */ | ||
76 | 0x0000, /* R43 - EQ 2 */ | ||
77 | 0x0FCA, /* R44 - EQ 3 */ | ||
78 | 0x0400, /* R45 - EQ 4 */ | ||
79 | 0x00B8, /* R46 - EQ 5 */ | ||
80 | 0x1EB5, /* R47 - EQ 6 */ | ||
81 | 0xF145, /* R48 - EQ 7 */ | ||
82 | 0x0B75, /* R49 - EQ 8 */ | ||
83 | 0x01C5, /* R50 - EQ 9 */ | ||
84 | 0x169E, /* R51 - EQ 10 */ | ||
85 | 0xF829, /* R52 - EQ 11 */ | ||
86 | 0x07AD, /* R53 - EQ 12 */ | ||
87 | 0x1103, /* R54 - EQ 13 */ | ||
88 | 0x1C58, /* R55 - EQ 14 */ | ||
89 | 0xF373, /* R56 - EQ 15 */ | ||
90 | 0x0A54, /* R57 - EQ 16 */ | ||
91 | 0x0558, /* R58 - EQ 17 */ | ||
92 | 0x0564, /* R59 - EQ 18 */ | ||
93 | 0x0559, /* R60 - EQ 19 */ | ||
94 | 0x4000, /* R61 - EQ 20 */ | ||
95 | }; | ||
96 | |||
97 | static struct { | ||
98 | int ratio; | ||
99 | int clk_sys_rate; | ||
100 | } clk_sys_rates[] = { | ||
101 | { 64, 0 }, | ||
102 | { 128, 1 }, | ||
103 | { 192, 2 }, | ||
104 | { 256, 3 }, | ||
105 | { 384, 4 }, | ||
106 | { 512, 5 }, | ||
107 | { 768, 6 }, | ||
108 | { 1024, 7 }, | ||
109 | { 1408, 8 }, | ||
110 | { 1536, 9 }, | ||
111 | }; | ||
112 | |||
113 | static struct { | ||
114 | int rate; | ||
115 | int sample_rate; | ||
116 | } sample_rates[] = { | ||
117 | { 8000, 0 }, | ||
118 | { 11025, 1 }, | ||
119 | { 12000, 2 }, | ||
120 | { 16000, 3 }, | ||
121 | { 22050, 4 }, | ||
122 | { 24000, 5 }, | ||
123 | { 32000, 6 }, | ||
124 | { 44100, 7 }, | ||
125 | { 48000, 8 }, | ||
126 | { 88200, 9 }, | ||
127 | { 96000, 10 }, | ||
128 | }; | ||
129 | |||
130 | static struct { | ||
131 | int div; /* *10 due to .5s */ | ||
132 | int bclk_div; | ||
133 | } bclk_divs[] = { | ||
134 | { 10, 0 }, | ||
135 | { 15, 1 }, | ||
136 | { 20, 2 }, | ||
137 | { 30, 3 }, | ||
138 | { 40, 4 }, | ||
139 | { 50, 5 }, | ||
140 | { 55, 6 }, | ||
141 | { 60, 7 }, | ||
142 | { 80, 8 }, | ||
143 | { 100, 9 }, | ||
144 | { 110, 10 }, | ||
145 | { 120, 11 }, | ||
146 | { 160, 12 }, | ||
147 | { 200, 13 }, | ||
148 | { 220, 14 }, | ||
149 | { 240, 15 }, | ||
150 | { 250, 16 }, | ||
151 | { 300, 17 }, | ||
152 | { 320, 18 }, | ||
153 | { 440, 19 }, | ||
154 | { 480, 20 }, | ||
155 | }; | ||
156 | |||
157 | struct wm9081_priv { | ||
158 | struct snd_soc_codec codec; | ||
159 | u16 reg_cache[WM9081_MAX_REGISTER + 1]; | ||
160 | int sysclk_source; | ||
161 | int mclk_rate; | ||
162 | int sysclk_rate; | ||
163 | int fs; | ||
164 | int bclk; | ||
165 | int master; | ||
166 | int fll_fref; | ||
167 | int fll_fout; | ||
168 | struct wm9081_retune_mobile_config *retune; | ||
169 | }; | ||
170 | |||
171 | static int wm9081_reg_is_volatile(int reg) | ||
172 | { | ||
173 | switch (reg) { | ||
174 | default: | ||
175 | return 0; | ||
176 | } | ||
177 | } | ||
178 | |||
179 | static unsigned int wm9081_read_reg_cache(struct snd_soc_codec *codec, | ||
180 | unsigned int reg) | ||
181 | { | ||
182 | u16 *cache = codec->reg_cache; | ||
183 | BUG_ON(reg > WM9081_MAX_REGISTER); | ||
184 | return cache[reg]; | ||
185 | } | ||
186 | |||
187 | static unsigned int wm9081_read_hw(struct snd_soc_codec *codec, u8 reg) | ||
188 | { | ||
189 | struct i2c_msg xfer[2]; | ||
190 | u16 data; | ||
191 | int ret; | ||
192 | struct i2c_client *client = codec->control_data; | ||
193 | |||
194 | BUG_ON(reg > WM9081_MAX_REGISTER); | ||
195 | |||
196 | /* Write register */ | ||
197 | xfer[0].addr = client->addr; | ||
198 | xfer[0].flags = 0; | ||
199 | xfer[0].len = 1; | ||
200 | xfer[0].buf = ® | ||
201 | |||
202 | /* Read data */ | ||
203 | xfer[1].addr = client->addr; | ||
204 | xfer[1].flags = I2C_M_RD; | ||
205 | xfer[1].len = 2; | ||
206 | xfer[1].buf = (u8 *)&data; | ||
207 | |||
208 | ret = i2c_transfer(client->adapter, xfer, 2); | ||
209 | if (ret != 2) { | ||
210 | dev_err(&client->dev, "i2c_transfer() returned %d\n", ret); | ||
211 | return 0; | ||
212 | } | ||
213 | |||
214 | return (data >> 8) | ((data & 0xff) << 8); | ||
215 | } | ||
216 | |||
217 | static unsigned int wm9081_read(struct snd_soc_codec *codec, unsigned int reg) | ||
218 | { | ||
219 | if (wm9081_reg_is_volatile(reg)) | ||
220 | return wm9081_read_hw(codec, reg); | ||
221 | else | ||
222 | return wm9081_read_reg_cache(codec, reg); | ||
223 | } | ||
224 | |||
225 | static int wm9081_write(struct snd_soc_codec *codec, unsigned int reg, | ||
226 | unsigned int value) | ||
227 | { | ||
228 | u16 *cache = codec->reg_cache; | ||
229 | u8 data[3]; | ||
230 | |||
231 | BUG_ON(reg > WM9081_MAX_REGISTER); | ||
232 | |||
233 | if (!wm9081_reg_is_volatile(reg)) | ||
234 | cache[reg] = value; | ||
235 | |||
236 | data[0] = reg; | ||
237 | data[1] = value >> 8; | ||
238 | data[2] = value & 0x00ff; | ||
239 | |||
240 | if (codec->hw_write(codec->control_data, data, 3) == 3) | ||
241 | return 0; | ||
242 | else | ||
243 | return -EIO; | ||
244 | } | ||
245 | |||
246 | static int wm9081_reset(struct snd_soc_codec *codec) | ||
247 | { | ||
248 | return wm9081_write(codec, WM9081_SOFTWARE_RESET, 0); | ||
249 | } | ||
250 | |||
251 | static const DECLARE_TLV_DB_SCALE(drc_in_tlv, -4500, 75, 0); | ||
252 | static const DECLARE_TLV_DB_SCALE(drc_out_tlv, -2250, 75, 0); | ||
253 | static const DECLARE_TLV_DB_SCALE(drc_min_tlv, -1800, 600, 0); | ||
254 | static unsigned int drc_max_tlv[] = { | ||
255 | TLV_DB_RANGE_HEAD(4), | ||
256 | 0, 0, TLV_DB_SCALE_ITEM(1200, 0, 0), | ||
257 | 1, 1, TLV_DB_SCALE_ITEM(1800, 0, 0), | ||
258 | 2, 2, TLV_DB_SCALE_ITEM(2400, 0, 0), | ||
259 | 3, 3, TLV_DB_SCALE_ITEM(3600, 0, 0), | ||
260 | }; | ||
261 | static const DECLARE_TLV_DB_SCALE(drc_qr_tlv, 1200, 600, 0); | ||
262 | static const DECLARE_TLV_DB_SCALE(drc_startup_tlv, -300, 50, 0); | ||
263 | |||
264 | static const DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); | ||
265 | |||
266 | static const DECLARE_TLV_DB_SCALE(in_tlv, -600, 600, 0); | ||
267 | static const DECLARE_TLV_DB_SCALE(dac_tlv, -7200, 75, 1); | ||
268 | static const DECLARE_TLV_DB_SCALE(out_tlv, -5700, 100, 0); | ||
269 | |||
270 | static const char *drc_high_text[] = { | ||
271 | "1", | ||
272 | "1/2", | ||
273 | "1/4", | ||
274 | "1/8", | ||
275 | "1/16", | ||
276 | "0", | ||
277 | }; | ||
278 | |||
279 | static const struct soc_enum drc_high = | ||
280 | SOC_ENUM_SINGLE(WM9081_DRC_3, 3, 6, drc_high_text); | ||
281 | |||
282 | static const char *drc_low_text[] = { | ||
283 | "1", | ||
284 | "1/2", | ||
285 | "1/4", | ||
286 | "1/8", | ||
287 | "0", | ||
288 | }; | ||
289 | |||
290 | static const struct soc_enum drc_low = | ||
291 | SOC_ENUM_SINGLE(WM9081_DRC_3, 0, 5, drc_low_text); | ||
292 | |||
293 | static const char *drc_atk_text[] = { | ||
294 | "181us", | ||
295 | "181us", | ||
296 | "363us", | ||
297 | "726us", | ||
298 | "1.45ms", | ||
299 | "2.9ms", | ||
300 | "5.8ms", | ||
301 | "11.6ms", | ||
302 | "23.2ms", | ||
303 | "46.4ms", | ||
304 | "92.8ms", | ||
305 | "185.6ms", | ||
306 | }; | ||
307 | |||
308 | static const struct soc_enum drc_atk = | ||
309 | SOC_ENUM_SINGLE(WM9081_DRC_2, 12, 12, drc_atk_text); | ||
310 | |||
311 | static const char *drc_dcy_text[] = { | ||
312 | "186ms", | ||
313 | "372ms", | ||
314 | "743ms", | ||
315 | "1.49s", | ||
316 | "2.97s", | ||
317 | "5.94s", | ||
318 | "11.89s", | ||
319 | "23.78s", | ||
320 | "47.56s", | ||
321 | }; | ||
322 | |||
323 | static const struct soc_enum drc_dcy = | ||
324 | SOC_ENUM_SINGLE(WM9081_DRC_2, 8, 9, drc_dcy_text); | ||
325 | |||
326 | static const char *drc_qr_dcy_text[] = { | ||
327 | "0.725ms", | ||
328 | "1.45ms", | ||
329 | "5.8ms", | ||
330 | }; | ||
331 | |||
332 | static const struct soc_enum drc_qr_dcy = | ||
333 | SOC_ENUM_SINGLE(WM9081_DRC_2, 4, 3, drc_qr_dcy_text); | ||
334 | |||
335 | static const char *dac_deemph_text[] = { | ||
336 | "None", | ||
337 | "32kHz", | ||
338 | "44.1kHz", | ||
339 | "48kHz", | ||
340 | }; | ||
341 | |||
342 | static const struct soc_enum dac_deemph = | ||
343 | SOC_ENUM_SINGLE(WM9081_DAC_DIGITAL_2, 1, 4, dac_deemph_text); | ||
344 | |||
345 | static const char *speaker_mode_text[] = { | ||
346 | "Class D", | ||
347 | "Class AB", | ||
348 | }; | ||
349 | |||
350 | static const struct soc_enum speaker_mode = | ||
351 | SOC_ENUM_SINGLE(WM9081_ANALOGUE_SPEAKER_2, 6, 2, speaker_mode_text); | ||
352 | |||
353 | static int speaker_mode_get(struct snd_kcontrol *kcontrol, | ||
354 | struct snd_ctl_elem_value *ucontrol) | ||
355 | { | ||
356 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | ||
357 | unsigned int reg; | ||
358 | |||
359 | reg = wm9081_read(codec, WM9081_ANALOGUE_SPEAKER_2); | ||
360 | if (reg & WM9081_SPK_MODE) | ||
361 | ucontrol->value.integer.value[0] = 1; | ||
362 | else | ||
363 | ucontrol->value.integer.value[0] = 0; | ||
364 | |||
365 | return 0; | ||
366 | } | ||
367 | |||
368 | /* | ||
369 | * Stop any attempts to change speaker mode while the speaker is enabled. | ||
370 | * | ||
371 | * We also have some special anti-pop controls dependant on speaker | ||
372 | * mode which must be changed along with the mode. | ||
373 | */ | ||
374 | static int speaker_mode_put(struct snd_kcontrol *kcontrol, | ||
375 | struct snd_ctl_elem_value *ucontrol) | ||
376 | { | ||
377 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | ||
378 | unsigned int reg_pwr = wm9081_read(codec, WM9081_POWER_MANAGEMENT); | ||
379 | unsigned int reg2 = wm9081_read(codec, WM9081_ANALOGUE_SPEAKER_2); | ||
380 | |||
381 | /* Are we changing anything? */ | ||
382 | if (ucontrol->value.integer.value[0] == | ||
383 | ((reg2 & WM9081_SPK_MODE) != 0)) | ||
384 | return 0; | ||
385 | |||
386 | /* Don't try to change modes while enabled */ | ||
387 | if (reg_pwr & WM9081_SPK_ENA) | ||
388 | return -EINVAL; | ||
389 | |||
390 | if (ucontrol->value.integer.value[0]) { | ||
391 | /* Class AB */ | ||
392 | reg2 &= ~(WM9081_SPK_INV_MUTE | WM9081_OUT_SPK_CTRL); | ||
393 | reg2 |= WM9081_SPK_MODE; | ||
394 | } else { | ||
395 | /* Class D */ | ||
396 | reg2 |= WM9081_SPK_INV_MUTE | WM9081_OUT_SPK_CTRL; | ||
397 | reg2 &= ~WM9081_SPK_MODE; | ||
398 | } | ||
399 | |||
400 | wm9081_write(codec, WM9081_ANALOGUE_SPEAKER_2, reg2); | ||
401 | |||
402 | return 0; | ||
403 | } | ||
404 | |||
405 | static const struct snd_kcontrol_new wm9081_snd_controls[] = { | ||
406 | SOC_SINGLE_TLV("IN1 Volume", WM9081_ANALOGUE_MIXER, 1, 1, 1, in_tlv), | ||
407 | SOC_SINGLE_TLV("IN2 Volume", WM9081_ANALOGUE_MIXER, 3, 1, 1, in_tlv), | ||
408 | |||
409 | SOC_SINGLE_TLV("Playback Volume", WM9081_DAC_DIGITAL_1, 1, 96, 0, dac_tlv), | ||
410 | |||
411 | SOC_SINGLE("LINEOUT Switch", WM9081_ANALOGUE_LINEOUT, 7, 1, 1), | ||
412 | SOC_SINGLE("LINEOUT ZC Switch", WM9081_ANALOGUE_LINEOUT, 6, 1, 0), | ||
413 | SOC_SINGLE_TLV("LINEOUT Volume", WM9081_ANALOGUE_LINEOUT, 0, 63, 0, out_tlv), | ||
414 | |||
415 | SOC_SINGLE("DRC Switch", WM9081_DRC_1, 15, 1, 0), | ||
416 | SOC_ENUM("DRC High Slope", drc_high), | ||
417 | SOC_ENUM("DRC Low Slope", drc_low), | ||
418 | SOC_SINGLE_TLV("DRC Input Volume", WM9081_DRC_4, 5, 60, 1, drc_in_tlv), | ||
419 | SOC_SINGLE_TLV("DRC Output Volume", WM9081_DRC_4, 0, 30, 1, drc_out_tlv), | ||
420 | SOC_SINGLE_TLV("DRC Minimum Volume", WM9081_DRC_2, 2, 3, 1, drc_min_tlv), | ||
421 | SOC_SINGLE_TLV("DRC Maximum Volume", WM9081_DRC_2, 0, 3, 0, drc_max_tlv), | ||
422 | SOC_ENUM("DRC Attack", drc_atk), | ||
423 | SOC_ENUM("DRC Decay", drc_dcy), | ||
424 | SOC_SINGLE("DRC Quick Release Switch", WM9081_DRC_1, 2, 1, 0), | ||
425 | SOC_SINGLE_TLV("DRC Quick Release Volume", WM9081_DRC_2, 6, 3, 0, drc_qr_tlv), | ||
426 | SOC_ENUM("DRC Quick Release Decay", drc_qr_dcy), | ||
427 | SOC_SINGLE_TLV("DRC Startup Volume", WM9081_DRC_1, 6, 18, 0, drc_startup_tlv), | ||
428 | |||
429 | SOC_SINGLE("EQ Switch", WM9081_EQ_1, 0, 1, 0), | ||
430 | |||
431 | SOC_SINGLE("Speaker DC Volume", WM9081_ANALOGUE_SPEAKER_1, 3, 5, 0), | ||
432 | SOC_SINGLE("Speaker AC Volume", WM9081_ANALOGUE_SPEAKER_1, 0, 5, 0), | ||
433 | SOC_SINGLE("Speaker Switch", WM9081_ANALOGUE_SPEAKER_PGA, 7, 1, 1), | ||
434 | SOC_SINGLE("Speaker ZC Switch", WM9081_ANALOGUE_SPEAKER_PGA, 6, 1, 0), | ||
435 | SOC_SINGLE_TLV("Speaker Volume", WM9081_ANALOGUE_SPEAKER_PGA, 0, 63, 0, | ||
436 | out_tlv), | ||
437 | SOC_ENUM("DAC Deemphasis", dac_deemph), | ||
438 | SOC_ENUM_EXT("Speaker Mode", speaker_mode, speaker_mode_get, speaker_mode_put), | ||
439 | }; | ||
440 | |||
441 | static const struct snd_kcontrol_new wm9081_eq_controls[] = { | ||
442 | SOC_SINGLE_TLV("EQ1 Volume", WM9081_EQ_1, 11, 24, 0, eq_tlv), | ||
443 | SOC_SINGLE_TLV("EQ2 Volume", WM9081_EQ_1, 6, 24, 0, eq_tlv), | ||
444 | SOC_SINGLE_TLV("EQ3 Volume", WM9081_EQ_1, 1, 24, 0, eq_tlv), | ||
445 | SOC_SINGLE_TLV("EQ4 Volume", WM9081_EQ_2, 11, 24, 0, eq_tlv), | ||
446 | SOC_SINGLE_TLV("EQ5 Volume", WM9081_EQ_2, 6, 24, 0, eq_tlv), | ||
447 | }; | ||
448 | |||
449 | static const struct snd_kcontrol_new mixer[] = { | ||
450 | SOC_DAPM_SINGLE("IN1 Switch", WM9081_ANALOGUE_MIXER, 0, 1, 0), | ||
451 | SOC_DAPM_SINGLE("IN2 Switch", WM9081_ANALOGUE_MIXER, 2, 1, 0), | ||
452 | SOC_DAPM_SINGLE("Playback Switch", WM9081_ANALOGUE_MIXER, 4, 1, 0), | ||
453 | }; | ||
454 | |||
455 | static int speaker_event(struct snd_soc_dapm_widget *w, | ||
456 | struct snd_kcontrol *kcontrol, int event) | ||
457 | { | ||
458 | struct snd_soc_codec *codec = w->codec; | ||
459 | unsigned int reg = wm9081_read(codec, WM9081_POWER_MANAGEMENT); | ||
460 | |||
461 | switch (event) { | ||
462 | case SND_SOC_DAPM_POST_PMU: | ||
463 | reg |= WM9081_SPK_ENA; | ||
464 | break; | ||
465 | |||
466 | case SND_SOC_DAPM_PRE_PMD: | ||
467 | reg &= ~WM9081_SPK_ENA; | ||
468 | break; | ||
469 | } | ||
470 | |||
471 | wm9081_write(codec, WM9081_POWER_MANAGEMENT, reg); | ||
472 | |||
473 | return 0; | ||
474 | } | ||
475 | |||
476 | struct _fll_div { | ||
477 | u16 fll_fratio; | ||
478 | u16 fll_outdiv; | ||
479 | u16 fll_clk_ref_div; | ||
480 | u16 n; | ||
481 | u16 k; | ||
482 | }; | ||
483 | |||
484 | /* The size in bits of the FLL divide multiplied by 10 | ||
485 | * to allow rounding later */ | ||
486 | #define FIXED_FLL_SIZE ((1 << 16) * 10) | ||
487 | |||
488 | static struct { | ||
489 | unsigned int min; | ||
490 | unsigned int max; | ||
491 | u16 fll_fratio; | ||
492 | int ratio; | ||
493 | } fll_fratios[] = { | ||
494 | { 0, 64000, 4, 16 }, | ||
495 | { 64000, 128000, 3, 8 }, | ||
496 | { 128000, 256000, 2, 4 }, | ||
497 | { 256000, 1000000, 1, 2 }, | ||
498 | { 1000000, 13500000, 0, 1 }, | ||
499 | }; | ||
500 | |||
501 | static int fll_factors(struct _fll_div *fll_div, unsigned int Fref, | ||
502 | unsigned int Fout) | ||
503 | { | ||
504 | u64 Kpart; | ||
505 | unsigned int K, Ndiv, Nmod, target; | ||
506 | unsigned int div; | ||
507 | int i; | ||
508 | |||
509 | /* Fref must be <=13.5MHz */ | ||
510 | div = 1; | ||
511 | while ((Fref / div) > 13500000) { | ||
512 | div *= 2; | ||
513 | |||
514 | if (div > 8) { | ||
515 | pr_err("Can't scale %dMHz input down to <=13.5MHz\n", | ||
516 | Fref); | ||
517 | return -EINVAL; | ||
518 | } | ||
519 | } | ||
520 | fll_div->fll_clk_ref_div = div / 2; | ||
521 | |||
522 | pr_debug("Fref=%u Fout=%u\n", Fref, Fout); | ||
523 | |||
524 | /* Apply the division for our remaining calculations */ | ||
525 | Fref /= div; | ||
526 | |||
527 | /* Fvco should be 90-100MHz; don't check the upper bound */ | ||
528 | div = 0; | ||
529 | target = Fout * 2; | ||
530 | while (target < 90000000) { | ||
531 | div++; | ||
532 | target *= 2; | ||
533 | if (div > 7) { | ||
534 | pr_err("Unable to find FLL_OUTDIV for Fout=%uHz\n", | ||
535 | Fout); | ||
536 | return -EINVAL; | ||
537 | } | ||
538 | } | ||
539 | fll_div->fll_outdiv = div; | ||
540 | |||
541 | pr_debug("Fvco=%dHz\n", target); | ||
542 | |||
543 | /* Find an appropraite FLL_FRATIO and factor it out of the target */ | ||
544 | for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) { | ||
545 | if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) { | ||
546 | fll_div->fll_fratio = fll_fratios[i].fll_fratio; | ||
547 | target /= fll_fratios[i].ratio; | ||
548 | break; | ||
549 | } | ||
550 | } | ||
551 | if (i == ARRAY_SIZE(fll_fratios)) { | ||
552 | pr_err("Unable to find FLL_FRATIO for Fref=%uHz\n", Fref); | ||
553 | return -EINVAL; | ||
554 | } | ||
555 | |||
556 | /* Now, calculate N.K */ | ||
557 | Ndiv = target / Fref; | ||
558 | |||
559 | fll_div->n = Ndiv; | ||
560 | Nmod = target % Fref; | ||
561 | pr_debug("Nmod=%d\n", Nmod); | ||
562 | |||
563 | /* Calculate fractional part - scale up so we can round. */ | ||
564 | Kpart = FIXED_FLL_SIZE * (long long)Nmod; | ||
565 | |||
566 | do_div(Kpart, Fref); | ||
567 | |||
568 | K = Kpart & 0xFFFFFFFF; | ||
569 | |||
570 | if ((K % 10) >= 5) | ||
571 | K += 5; | ||
572 | |||
573 | /* Move down to proper range now rounding is done */ | ||
574 | fll_div->k = K / 10; | ||
575 | |||
576 | pr_debug("N=%x K=%x FLL_FRATIO=%x FLL_OUTDIV=%x FLL_CLK_REF_DIV=%x\n", | ||
577 | fll_div->n, fll_div->k, | ||
578 | fll_div->fll_fratio, fll_div->fll_outdiv, | ||
579 | fll_div->fll_clk_ref_div); | ||
580 | |||
581 | return 0; | ||
582 | } | ||
583 | |||
584 | static int wm9081_set_fll(struct snd_soc_codec *codec, int fll_id, | ||
585 | unsigned int Fref, unsigned int Fout) | ||
586 | { | ||
587 | struct wm9081_priv *wm9081 = codec->private_data; | ||
588 | u16 reg1, reg4, reg5; | ||
589 | struct _fll_div fll_div; | ||
590 | int ret; | ||
591 | int clk_sys_reg; | ||
592 | |||
593 | /* Any change? */ | ||
594 | if (Fref == wm9081->fll_fref && Fout == wm9081->fll_fout) | ||
595 | return 0; | ||
596 | |||
597 | /* Disable the FLL */ | ||
598 | if (Fout == 0) { | ||
599 | dev_dbg(codec->dev, "FLL disabled\n"); | ||
600 | wm9081->fll_fref = 0; | ||
601 | wm9081->fll_fout = 0; | ||
602 | |||
603 | return 0; | ||
604 | } | ||
605 | |||
606 | ret = fll_factors(&fll_div, Fref, Fout); | ||
607 | if (ret != 0) | ||
608 | return ret; | ||
609 | |||
610 | reg5 = wm9081_read(codec, WM9081_FLL_CONTROL_5); | ||
611 | reg5 &= ~WM9081_FLL_CLK_SRC_MASK; | ||
612 | |||
613 | switch (fll_id) { | ||
614 | case WM9081_SYSCLK_FLL_MCLK: | ||
615 | reg5 |= 0x1; | ||
616 | break; | ||
617 | |||
618 | default: | ||
619 | dev_err(codec->dev, "Unknown FLL ID %d\n", fll_id); | ||
620 | return -EINVAL; | ||
621 | } | ||
622 | |||
623 | /* Disable CLK_SYS while we reconfigure */ | ||
624 | clk_sys_reg = wm9081_read(codec, WM9081_CLOCK_CONTROL_3); | ||
625 | if (clk_sys_reg & WM9081_CLK_SYS_ENA) | ||
626 | wm9081_write(codec, WM9081_CLOCK_CONTROL_3, | ||
627 | clk_sys_reg & ~WM9081_CLK_SYS_ENA); | ||
628 | |||
629 | /* Any FLL configuration change requires that the FLL be | ||
630 | * disabled first. */ | ||
631 | reg1 = wm9081_read(codec, WM9081_FLL_CONTROL_1); | ||
632 | reg1 &= ~WM9081_FLL_ENA; | ||
633 | wm9081_write(codec, WM9081_FLL_CONTROL_1, reg1); | ||
634 | |||
635 | /* Apply the configuration */ | ||
636 | if (fll_div.k) | ||
637 | reg1 |= WM9081_FLL_FRAC_MASK; | ||
638 | else | ||
639 | reg1 &= ~WM9081_FLL_FRAC_MASK; | ||
640 | wm9081_write(codec, WM9081_FLL_CONTROL_1, reg1); | ||
641 | |||
642 | wm9081_write(codec, WM9081_FLL_CONTROL_2, | ||
643 | (fll_div.fll_outdiv << WM9081_FLL_OUTDIV_SHIFT) | | ||
644 | (fll_div.fll_fratio << WM9081_FLL_FRATIO_SHIFT)); | ||
645 | wm9081_write(codec, WM9081_FLL_CONTROL_3, fll_div.k); | ||
646 | |||
647 | reg4 = wm9081_read(codec, WM9081_FLL_CONTROL_4); | ||
648 | reg4 &= ~WM9081_FLL_N_MASK; | ||
649 | reg4 |= fll_div.n << WM9081_FLL_N_SHIFT; | ||
650 | wm9081_write(codec, WM9081_FLL_CONTROL_4, reg4); | ||
651 | |||
652 | reg5 &= ~WM9081_FLL_CLK_REF_DIV_MASK; | ||
653 | reg5 |= fll_div.fll_clk_ref_div << WM9081_FLL_CLK_REF_DIV_SHIFT; | ||
654 | wm9081_write(codec, WM9081_FLL_CONTROL_5, reg5); | ||
655 | |||
656 | /* Enable the FLL */ | ||
657 | wm9081_write(codec, WM9081_FLL_CONTROL_1, reg1 | WM9081_FLL_ENA); | ||
658 | |||
659 | /* Then bring CLK_SYS up again if it was disabled */ | ||
660 | if (clk_sys_reg & WM9081_CLK_SYS_ENA) | ||
661 | wm9081_write(codec, WM9081_CLOCK_CONTROL_3, clk_sys_reg); | ||
662 | |||
663 | dev_dbg(codec->dev, "FLL enabled at %dHz->%dHz\n", Fref, Fout); | ||
664 | |||
665 | wm9081->fll_fref = Fref; | ||
666 | wm9081->fll_fout = Fout; | ||
667 | |||
668 | return 0; | ||
669 | } | ||
670 | |||
671 | static int configure_clock(struct snd_soc_codec *codec) | ||
672 | { | ||
673 | struct wm9081_priv *wm9081 = codec->private_data; | ||
674 | int new_sysclk, i, target; | ||
675 | unsigned int reg; | ||
676 | int ret = 0; | ||
677 | int mclkdiv = 0; | ||
678 | int fll = 0; | ||
679 | |||
680 | switch (wm9081->sysclk_source) { | ||
681 | case WM9081_SYSCLK_MCLK: | ||
682 | if (wm9081->mclk_rate > 12225000) { | ||
683 | mclkdiv = 1; | ||
684 | wm9081->sysclk_rate = wm9081->mclk_rate / 2; | ||
685 | } else { | ||
686 | wm9081->sysclk_rate = wm9081->mclk_rate; | ||
687 | } | ||
688 | wm9081_set_fll(codec, WM9081_SYSCLK_FLL_MCLK, 0, 0); | ||
689 | break; | ||
690 | |||
691 | case WM9081_SYSCLK_FLL_MCLK: | ||
692 | /* If we have a sample rate calculate a CLK_SYS that | ||
693 | * gives us a suitable DAC configuration, plus BCLK. | ||
694 | * Ideally we would check to see if we can clock | ||
695 | * directly from MCLK and only use the FLL if this is | ||
696 | * not the case, though care must be taken with free | ||
697 | * running mode. | ||
698 | */ | ||
699 | if (wm9081->master && wm9081->bclk) { | ||
700 | /* Make sure we can generate CLK_SYS and BCLK | ||
701 | * and that we've got 3MHz for optimal | ||
702 | * performance. */ | ||
703 | for (i = 0; i < ARRAY_SIZE(clk_sys_rates); i++) { | ||
704 | target = wm9081->fs * clk_sys_rates[i].ratio; | ||
705 | new_sysclk = target; | ||
706 | if (target >= wm9081->bclk && | ||
707 | target > 3000000) | ||
708 | break; | ||
709 | } | ||
710 | } else if (wm9081->fs) { | ||
711 | for (i = 0; i < ARRAY_SIZE(clk_sys_rates); i++) { | ||
712 | new_sysclk = clk_sys_rates[i].ratio | ||
713 | * wm9081->fs; | ||
714 | if (new_sysclk > 3000000) | ||
715 | break; | ||
716 | } | ||
717 | } else { | ||
718 | new_sysclk = 12288000; | ||
719 | } | ||
720 | |||
721 | ret = wm9081_set_fll(codec, WM9081_SYSCLK_FLL_MCLK, | ||
722 | wm9081->mclk_rate, new_sysclk); | ||
723 | if (ret == 0) { | ||
724 | wm9081->sysclk_rate = new_sysclk; | ||
725 | |||
726 | /* Switch SYSCLK over to FLL */ | ||
727 | fll = 1; | ||
728 | } else { | ||
729 | wm9081->sysclk_rate = wm9081->mclk_rate; | ||
730 | } | ||
731 | break; | ||
732 | |||
733 | default: | ||
734 | return -EINVAL; | ||
735 | } | ||
736 | |||
737 | reg = wm9081_read(codec, WM9081_CLOCK_CONTROL_1); | ||
738 | if (mclkdiv) | ||
739 | reg |= WM9081_MCLKDIV2; | ||
740 | else | ||
741 | reg &= ~WM9081_MCLKDIV2; | ||
742 | wm9081_write(codec, WM9081_CLOCK_CONTROL_1, reg); | ||
743 | |||
744 | reg = wm9081_read(codec, WM9081_CLOCK_CONTROL_3); | ||
745 | if (fll) | ||
746 | reg |= WM9081_CLK_SRC_SEL; | ||
747 | else | ||
748 | reg &= ~WM9081_CLK_SRC_SEL; | ||
749 | wm9081_write(codec, WM9081_CLOCK_CONTROL_3, reg); | ||
750 | |||
751 | dev_dbg(codec->dev, "CLK_SYS is %dHz\n", wm9081->sysclk_rate); | ||
752 | |||
753 | return ret; | ||
754 | } | ||
755 | |||
756 | static int clk_sys_event(struct snd_soc_dapm_widget *w, | ||
757 | struct snd_kcontrol *kcontrol, int event) | ||
758 | { | ||
759 | struct snd_soc_codec *codec = w->codec; | ||
760 | struct wm9081_priv *wm9081 = codec->private_data; | ||
761 | |||
762 | /* This should be done on init() for bypass paths */ | ||
763 | switch (wm9081->sysclk_source) { | ||
764 | case WM9081_SYSCLK_MCLK: | ||
765 | dev_dbg(codec->dev, "Using %dHz MCLK\n", wm9081->mclk_rate); | ||
766 | break; | ||
767 | case WM9081_SYSCLK_FLL_MCLK: | ||
768 | dev_dbg(codec->dev, "Using %dHz MCLK with FLL\n", | ||
769 | wm9081->mclk_rate); | ||
770 | break; | ||
771 | default: | ||
772 | dev_err(codec->dev, "System clock not configured\n"); | ||
773 | return -EINVAL; | ||
774 | } | ||
775 | |||
776 | switch (event) { | ||
777 | case SND_SOC_DAPM_PRE_PMU: | ||
778 | configure_clock(codec); | ||
779 | break; | ||
780 | |||
781 | case SND_SOC_DAPM_POST_PMD: | ||
782 | /* Disable the FLL if it's running */ | ||
783 | wm9081_set_fll(codec, 0, 0, 0); | ||
784 | break; | ||
785 | } | ||
786 | |||
787 | return 0; | ||
788 | } | ||
789 | |||
790 | static const struct snd_soc_dapm_widget wm9081_dapm_widgets[] = { | ||
791 | SND_SOC_DAPM_INPUT("IN1"), | ||
792 | SND_SOC_DAPM_INPUT("IN2"), | ||
793 | |||
794 | SND_SOC_DAPM_DAC("DAC", "HiFi Playback", WM9081_POWER_MANAGEMENT, 0, 0), | ||
795 | |||
796 | SND_SOC_DAPM_MIXER_NAMED_CTL("Mixer", SND_SOC_NOPM, 0, 0, | ||
797 | mixer, ARRAY_SIZE(mixer)), | ||
798 | |||
799 | SND_SOC_DAPM_PGA("LINEOUT PGA", WM9081_POWER_MANAGEMENT, 4, 0, NULL, 0), | ||
800 | |||
801 | SND_SOC_DAPM_PGA_E("Speaker PGA", WM9081_POWER_MANAGEMENT, 2, 0, NULL, 0, | ||
802 | speaker_event, | ||
803 | SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), | ||
804 | |||
805 | SND_SOC_DAPM_OUTPUT("LINEOUT"), | ||
806 | SND_SOC_DAPM_OUTPUT("SPKN"), | ||
807 | SND_SOC_DAPM_OUTPUT("SPKP"), | ||
808 | |||
809 | SND_SOC_DAPM_SUPPLY("CLK_SYS", WM9081_CLOCK_CONTROL_3, 0, 0, clk_sys_event, | ||
810 | SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), | ||
811 | SND_SOC_DAPM_SUPPLY("CLK_DSP", WM9081_CLOCK_CONTROL_3, 1, 0, NULL, 0), | ||
812 | SND_SOC_DAPM_SUPPLY("TOCLK", WM9081_CLOCK_CONTROL_3, 2, 0, NULL, 0), | ||
813 | }; | ||
814 | |||
815 | |||
816 | static const struct snd_soc_dapm_route audio_paths[] = { | ||
817 | { "DAC", NULL, "CLK_SYS" }, | ||
818 | { "DAC", NULL, "CLK_DSP" }, | ||
819 | |||
820 | { "Mixer", "IN1 Switch", "IN1" }, | ||
821 | { "Mixer", "IN2 Switch", "IN2" }, | ||
822 | { "Mixer", "Playback Switch", "DAC" }, | ||
823 | |||
824 | { "LINEOUT PGA", NULL, "Mixer" }, | ||
825 | { "LINEOUT PGA", NULL, "TOCLK" }, | ||
826 | { "LINEOUT PGA", NULL, "CLK_SYS" }, | ||
827 | |||
828 | { "LINEOUT", NULL, "LINEOUT PGA" }, | ||
829 | |||
830 | { "Speaker PGA", NULL, "Mixer" }, | ||
831 | { "Speaker PGA", NULL, "TOCLK" }, | ||
832 | { "Speaker PGA", NULL, "CLK_SYS" }, | ||
833 | |||
834 | { "SPKN", NULL, "Speaker PGA" }, | ||
835 | { "SPKP", NULL, "Speaker PGA" }, | ||
836 | }; | ||
837 | |||
838 | static int wm9081_set_bias_level(struct snd_soc_codec *codec, | ||
839 | enum snd_soc_bias_level level) | ||
840 | { | ||
841 | u16 reg; | ||
842 | |||
843 | switch (level) { | ||
844 | case SND_SOC_BIAS_ON: | ||
845 | break; | ||
846 | |||
847 | case SND_SOC_BIAS_PREPARE: | ||
848 | /* VMID=2*40k */ | ||
849 | reg = wm9081_read(codec, WM9081_VMID_CONTROL); | ||
850 | reg &= ~WM9081_VMID_SEL_MASK; | ||
851 | reg |= 0x2; | ||
852 | wm9081_write(codec, WM9081_VMID_CONTROL, reg); | ||
853 | |||
854 | /* Normal bias current */ | ||
855 | reg = wm9081_read(codec, WM9081_BIAS_CONTROL_1); | ||
856 | reg &= ~WM9081_STBY_BIAS_ENA; | ||
857 | wm9081_write(codec, WM9081_BIAS_CONTROL_1, reg); | ||
858 | break; | ||
859 | |||
860 | case SND_SOC_BIAS_STANDBY: | ||
861 | /* Initial cold start */ | ||
862 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | ||
863 | /* Disable LINEOUT discharge */ | ||
864 | reg = wm9081_read(codec, WM9081_ANTI_POP_CONTROL); | ||
865 | reg &= ~WM9081_LINEOUT_DISCH; | ||
866 | wm9081_write(codec, WM9081_ANTI_POP_CONTROL, reg); | ||
867 | |||
868 | /* Select startup bias source */ | ||
869 | reg = wm9081_read(codec, WM9081_BIAS_CONTROL_1); | ||
870 | reg |= WM9081_BIAS_SRC | WM9081_BIAS_ENA; | ||
871 | wm9081_write(codec, WM9081_BIAS_CONTROL_1, reg); | ||
872 | |||
873 | /* VMID 2*4k; Soft VMID ramp enable */ | ||
874 | reg = wm9081_read(codec, WM9081_VMID_CONTROL); | ||
875 | reg |= WM9081_VMID_RAMP | 0x6; | ||
876 | wm9081_write(codec, WM9081_VMID_CONTROL, reg); | ||
877 | |||
878 | mdelay(100); | ||
879 | |||
880 | /* Normal bias enable & soft start off */ | ||
881 | reg |= WM9081_BIAS_ENA; | ||
882 | reg &= ~WM9081_VMID_RAMP; | ||
883 | wm9081_write(codec, WM9081_VMID_CONTROL, reg); | ||
884 | |||
885 | /* Standard bias source */ | ||
886 | reg = wm9081_read(codec, WM9081_BIAS_CONTROL_1); | ||
887 | reg &= ~WM9081_BIAS_SRC; | ||
888 | wm9081_write(codec, WM9081_BIAS_CONTROL_1, reg); | ||
889 | } | ||
890 | |||
891 | /* VMID 2*240k */ | ||
892 | reg = wm9081_read(codec, WM9081_BIAS_CONTROL_1); | ||
893 | reg &= ~WM9081_VMID_SEL_MASK; | ||
894 | reg |= 0x40; | ||
895 | wm9081_write(codec, WM9081_VMID_CONTROL, reg); | ||
896 | |||
897 | /* Standby bias current on */ | ||
898 | reg = wm9081_read(codec, WM9081_BIAS_CONTROL_1); | ||
899 | reg |= WM9081_STBY_BIAS_ENA; | ||
900 | wm9081_write(codec, WM9081_BIAS_CONTROL_1, reg); | ||
901 | break; | ||
902 | |||
903 | case SND_SOC_BIAS_OFF: | ||
904 | /* Startup bias source */ | ||
905 | reg = wm9081_read(codec, WM9081_BIAS_CONTROL_1); | ||
906 | reg |= WM9081_BIAS_SRC; | ||
907 | wm9081_write(codec, WM9081_BIAS_CONTROL_1, reg); | ||
908 | |||
909 | /* Disable VMID and biases with soft ramping */ | ||
910 | reg = wm9081_read(codec, WM9081_VMID_CONTROL); | ||
911 | reg &= ~(WM9081_VMID_SEL_MASK | WM9081_BIAS_ENA); | ||
912 | reg |= WM9081_VMID_RAMP; | ||
913 | wm9081_write(codec, WM9081_VMID_CONTROL, reg); | ||
914 | |||
915 | /* Actively discharge LINEOUT */ | ||
916 | reg = wm9081_read(codec, WM9081_ANTI_POP_CONTROL); | ||
917 | reg |= WM9081_LINEOUT_DISCH; | ||
918 | wm9081_write(codec, WM9081_ANTI_POP_CONTROL, reg); | ||
919 | break; | ||
920 | } | ||
921 | |||
922 | codec->bias_level = level; | ||
923 | |||
924 | return 0; | ||
925 | } | ||
926 | |||
927 | static int wm9081_set_dai_fmt(struct snd_soc_dai *dai, | ||
928 | unsigned int fmt) | ||
929 | { | ||
930 | struct snd_soc_codec *codec = dai->codec; | ||
931 | struct wm9081_priv *wm9081 = codec->private_data; | ||
932 | unsigned int aif2 = wm9081_read(codec, WM9081_AUDIO_INTERFACE_2); | ||
933 | |||
934 | aif2 &= ~(WM9081_AIF_BCLK_INV | WM9081_AIF_LRCLK_INV | | ||
935 | WM9081_BCLK_DIR | WM9081_LRCLK_DIR | WM9081_AIF_FMT_MASK); | ||
936 | |||
937 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | ||
938 | case SND_SOC_DAIFMT_CBS_CFS: | ||
939 | wm9081->master = 0; | ||
940 | break; | ||
941 | case SND_SOC_DAIFMT_CBS_CFM: | ||
942 | aif2 |= WM9081_LRCLK_DIR; | ||
943 | wm9081->master = 1; | ||
944 | break; | ||
945 | case SND_SOC_DAIFMT_CBM_CFS: | ||
946 | aif2 |= WM9081_BCLK_DIR; | ||
947 | wm9081->master = 1; | ||
948 | break; | ||
949 | case SND_SOC_DAIFMT_CBM_CFM: | ||
950 | aif2 |= WM9081_LRCLK_DIR | WM9081_BCLK_DIR; | ||
951 | wm9081->master = 1; | ||
952 | break; | ||
953 | default: | ||
954 | return -EINVAL; | ||
955 | } | ||
956 | |||
957 | switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { | ||
958 | case SND_SOC_DAIFMT_DSP_B: | ||
959 | aif2 |= WM9081_AIF_LRCLK_INV; | ||
960 | case SND_SOC_DAIFMT_DSP_A: | ||
961 | aif2 |= 0x3; | ||
962 | break; | ||
963 | case SND_SOC_DAIFMT_I2S: | ||
964 | aif2 |= 0x2; | ||
965 | break; | ||
966 | case SND_SOC_DAIFMT_RIGHT_J: | ||
967 | break; | ||
968 | case SND_SOC_DAIFMT_LEFT_J: | ||
969 | aif2 |= 0x1; | ||
970 | break; | ||
971 | default: | ||
972 | return -EINVAL; | ||
973 | } | ||
974 | |||
975 | switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { | ||
976 | case SND_SOC_DAIFMT_DSP_A: | ||
977 | case SND_SOC_DAIFMT_DSP_B: | ||
978 | /* frame inversion not valid for DSP modes */ | ||
979 | switch (fmt & SND_SOC_DAIFMT_INV_MASK) { | ||
980 | case SND_SOC_DAIFMT_NB_NF: | ||
981 | break; | ||
982 | case SND_SOC_DAIFMT_IB_NF: | ||
983 | aif2 |= WM9081_AIF_BCLK_INV; | ||
984 | break; | ||
985 | default: | ||
986 | return -EINVAL; | ||
987 | } | ||
988 | break; | ||
989 | |||
990 | case SND_SOC_DAIFMT_I2S: | ||
991 | case SND_SOC_DAIFMT_RIGHT_J: | ||
992 | case SND_SOC_DAIFMT_LEFT_J: | ||
993 | switch (fmt & SND_SOC_DAIFMT_INV_MASK) { | ||
994 | case SND_SOC_DAIFMT_NB_NF: | ||
995 | break; | ||
996 | case SND_SOC_DAIFMT_IB_IF: | ||
997 | aif2 |= WM9081_AIF_BCLK_INV | WM9081_AIF_LRCLK_INV; | ||
998 | break; | ||
999 | case SND_SOC_DAIFMT_IB_NF: | ||
1000 | aif2 |= WM9081_AIF_BCLK_INV; | ||
1001 | break; | ||
1002 | case SND_SOC_DAIFMT_NB_IF: | ||
1003 | aif2 |= WM9081_AIF_LRCLK_INV; | ||
1004 | break; | ||
1005 | default: | ||
1006 | return -EINVAL; | ||
1007 | } | ||
1008 | break; | ||
1009 | default: | ||
1010 | return -EINVAL; | ||
1011 | } | ||
1012 | |||
1013 | wm9081_write(codec, WM9081_AUDIO_INTERFACE_2, aif2); | ||
1014 | |||
1015 | return 0; | ||
1016 | } | ||
1017 | |||
1018 | static int wm9081_hw_params(struct snd_pcm_substream *substream, | ||
1019 | struct snd_pcm_hw_params *params, | ||
1020 | struct snd_soc_dai *dai) | ||
1021 | { | ||
1022 | struct snd_soc_codec *codec = dai->codec; | ||
1023 | struct wm9081_priv *wm9081 = codec->private_data; | ||
1024 | int ret, i, best, best_val, cur_val; | ||
1025 | unsigned int clk_ctrl2, aif1, aif2, aif3, aif4; | ||
1026 | |||
1027 | clk_ctrl2 = wm9081_read(codec, WM9081_CLOCK_CONTROL_2); | ||
1028 | clk_ctrl2 &= ~(WM9081_CLK_SYS_RATE_MASK | WM9081_SAMPLE_RATE_MASK); | ||
1029 | |||
1030 | aif1 = wm9081_read(codec, WM9081_AUDIO_INTERFACE_1); | ||
1031 | |||
1032 | aif2 = wm9081_read(codec, WM9081_AUDIO_INTERFACE_2); | ||
1033 | aif2 &= ~WM9081_AIF_WL_MASK; | ||
1034 | |||
1035 | aif3 = wm9081_read(codec, WM9081_AUDIO_INTERFACE_3); | ||
1036 | aif3 &= ~WM9081_BCLK_DIV_MASK; | ||
1037 | |||
1038 | aif4 = wm9081_read(codec, WM9081_AUDIO_INTERFACE_4); | ||
1039 | aif4 &= ~WM9081_LRCLK_RATE_MASK; | ||
1040 | |||
1041 | /* What BCLK do we need? */ | ||
1042 | wm9081->fs = params_rate(params); | ||
1043 | wm9081->bclk = 2 * wm9081->fs; | ||
1044 | switch (params_format(params)) { | ||
1045 | case SNDRV_PCM_FORMAT_S16_LE: | ||
1046 | wm9081->bclk *= 16; | ||
1047 | break; | ||
1048 | case SNDRV_PCM_FORMAT_S20_3LE: | ||
1049 | wm9081->bclk *= 20; | ||
1050 | aif2 |= 0x4; | ||
1051 | break; | ||
1052 | case SNDRV_PCM_FORMAT_S24_LE: | ||
1053 | wm9081->bclk *= 24; | ||
1054 | aif2 |= 0x8; | ||
1055 | break; | ||
1056 | case SNDRV_PCM_FORMAT_S32_LE: | ||
1057 | wm9081->bclk *= 32; | ||
1058 | aif2 |= 0xc; | ||
1059 | break; | ||
1060 | default: | ||
1061 | return -EINVAL; | ||
1062 | } | ||
1063 | |||
1064 | if (aif1 & WM9081_AIFDAC_TDM_MODE_MASK) { | ||
1065 | int slots = ((aif1 & WM9081_AIFDAC_TDM_MODE_MASK) >> | ||
1066 | WM9081_AIFDAC_TDM_MODE_SHIFT) + 1; | ||
1067 | wm9081->bclk *= slots; | ||
1068 | } | ||
1069 | |||
1070 | dev_dbg(codec->dev, "Target BCLK is %dHz\n", wm9081->bclk); | ||
1071 | |||
1072 | ret = configure_clock(codec); | ||
1073 | if (ret != 0) | ||
1074 | return ret; | ||
1075 | |||
1076 | /* Select nearest CLK_SYS_RATE */ | ||
1077 | best = 0; | ||
1078 | best_val = abs((wm9081->sysclk_rate / clk_sys_rates[0].ratio) | ||
1079 | - wm9081->fs); | ||
1080 | for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { | ||
1081 | cur_val = abs((wm9081->sysclk_rate / | ||
1082 | clk_sys_rates[i].ratio) - wm9081->fs);; | ||
1083 | if (cur_val < best_val) { | ||
1084 | best = i; | ||
1085 | best_val = cur_val; | ||
1086 | } | ||
1087 | } | ||
1088 | dev_dbg(codec->dev, "Selected CLK_SYS_RATIO of %d\n", | ||
1089 | clk_sys_rates[best].ratio); | ||
1090 | clk_ctrl2 |= (clk_sys_rates[best].clk_sys_rate | ||
1091 | << WM9081_CLK_SYS_RATE_SHIFT); | ||
1092 | |||
1093 | /* SAMPLE_RATE */ | ||
1094 | best = 0; | ||
1095 | best_val = abs(wm9081->fs - sample_rates[0].rate); | ||
1096 | for (i = 1; i < ARRAY_SIZE(sample_rates); i++) { | ||
1097 | /* Closest match */ | ||
1098 | cur_val = abs(wm9081->fs - sample_rates[i].rate); | ||
1099 | if (cur_val < best_val) { | ||
1100 | best = i; | ||
1101 | best_val = cur_val; | ||
1102 | } | ||
1103 | } | ||
1104 | dev_dbg(codec->dev, "Selected SAMPLE_RATE of %dHz\n", | ||
1105 | sample_rates[best].rate); | ||
1106 | clk_ctrl2 |= (sample_rates[best].sample_rate | ||
1107 | << WM9081_SAMPLE_RATE_SHIFT); | ||
1108 | |||
1109 | /* BCLK_DIV */ | ||
1110 | best = 0; | ||
1111 | best_val = INT_MAX; | ||
1112 | for (i = 0; i < ARRAY_SIZE(bclk_divs); i++) { | ||
1113 | cur_val = ((wm9081->sysclk_rate * 10) / bclk_divs[i].div) | ||
1114 | - wm9081->bclk; | ||
1115 | if (cur_val < 0) /* Table is sorted */ | ||
1116 | break; | ||
1117 | if (cur_val < best_val) { | ||
1118 | best = i; | ||
1119 | best_val = cur_val; | ||
1120 | } | ||
1121 | } | ||
1122 | wm9081->bclk = (wm9081->sysclk_rate * 10) / bclk_divs[best].div; | ||
1123 | dev_dbg(codec->dev, "Selected BCLK_DIV of %d for %dHz BCLK\n", | ||
1124 | bclk_divs[best].div, wm9081->bclk); | ||
1125 | aif3 |= bclk_divs[best].bclk_div; | ||
1126 | |||
1127 | /* LRCLK is a simple fraction of BCLK */ | ||
1128 | dev_dbg(codec->dev, "LRCLK_RATE is %d\n", wm9081->bclk / wm9081->fs); | ||
1129 | aif4 |= wm9081->bclk / wm9081->fs; | ||
1130 | |||
1131 | /* Apply a ReTune Mobile configuration if it's in use */ | ||
1132 | if (wm9081->retune) { | ||
1133 | struct wm9081_retune_mobile_config *retune = wm9081->retune; | ||
1134 | struct wm9081_retune_mobile_setting *s; | ||
1135 | int eq1; | ||
1136 | |||
1137 | best = 0; | ||
1138 | best_val = abs(retune->configs[0].rate - wm9081->fs); | ||
1139 | for (i = 0; i < retune->num_configs; i++) { | ||
1140 | cur_val = abs(retune->configs[i].rate - wm9081->fs); | ||
1141 | if (cur_val < best_val) { | ||
1142 | best_val = cur_val; | ||
1143 | best = i; | ||
1144 | } | ||
1145 | } | ||
1146 | s = &retune->configs[best]; | ||
1147 | |||
1148 | dev_dbg(codec->dev, "ReTune Mobile %s tuned for %dHz\n", | ||
1149 | s->name, s->rate); | ||
1150 | |||
1151 | /* If the EQ is enabled then disable it while we write out */ | ||
1152 | eq1 = wm9081_read(codec, WM9081_EQ_1) & WM9081_EQ_ENA; | ||
1153 | if (eq1 & WM9081_EQ_ENA) | ||
1154 | wm9081_write(codec, WM9081_EQ_1, 0); | ||
1155 | |||
1156 | /* Write out the other values */ | ||
1157 | for (i = 1; i < ARRAY_SIZE(s->config); i++) | ||
1158 | wm9081_write(codec, WM9081_EQ_1 + i, s->config[i]); | ||
1159 | |||
1160 | eq1 |= (s->config[0] & ~WM9081_EQ_ENA); | ||
1161 | wm9081_write(codec, WM9081_EQ_1, eq1); | ||
1162 | } | ||
1163 | |||
1164 | wm9081_write(codec, WM9081_CLOCK_CONTROL_2, clk_ctrl2); | ||
1165 | wm9081_write(codec, WM9081_AUDIO_INTERFACE_2, aif2); | ||
1166 | wm9081_write(codec, WM9081_AUDIO_INTERFACE_3, aif3); | ||
1167 | wm9081_write(codec, WM9081_AUDIO_INTERFACE_4, aif4); | ||
1168 | |||
1169 | return 0; | ||
1170 | } | ||
1171 | |||
1172 | static int wm9081_digital_mute(struct snd_soc_dai *codec_dai, int mute) | ||
1173 | { | ||
1174 | struct snd_soc_codec *codec = codec_dai->codec; | ||
1175 | unsigned int reg; | ||
1176 | |||
1177 | reg = wm9081_read(codec, WM9081_DAC_DIGITAL_2); | ||
1178 | |||
1179 | if (mute) | ||
1180 | reg |= WM9081_DAC_MUTE; | ||
1181 | else | ||
1182 | reg &= ~WM9081_DAC_MUTE; | ||
1183 | |||
1184 | wm9081_write(codec, WM9081_DAC_DIGITAL_2, reg); | ||
1185 | |||
1186 | return 0; | ||
1187 | } | ||
1188 | |||
1189 | static int wm9081_set_sysclk(struct snd_soc_dai *codec_dai, | ||
1190 | int clk_id, unsigned int freq, int dir) | ||
1191 | { | ||
1192 | struct snd_soc_codec *codec = codec_dai->codec; | ||
1193 | struct wm9081_priv *wm9081 = codec->private_data; | ||
1194 | |||
1195 | switch (clk_id) { | ||
1196 | case WM9081_SYSCLK_MCLK: | ||
1197 | case WM9081_SYSCLK_FLL_MCLK: | ||
1198 | wm9081->sysclk_source = clk_id; | ||
1199 | wm9081->mclk_rate = freq; | ||
1200 | break; | ||
1201 | |||
1202 | default: | ||
1203 | return -EINVAL; | ||
1204 | } | ||
1205 | |||
1206 | return 0; | ||
1207 | } | ||
1208 | |||
1209 | static int wm9081_set_tdm_slot(struct snd_soc_dai *dai, | ||
1210 | unsigned int mask, int slots) | ||
1211 | { | ||
1212 | struct snd_soc_codec *codec = dai->codec; | ||
1213 | unsigned int aif1 = wm9081_read(codec, WM9081_AUDIO_INTERFACE_1); | ||
1214 | |||
1215 | aif1 &= ~(WM9081_AIFDAC_TDM_SLOT_MASK | WM9081_AIFDAC_TDM_MODE_MASK); | ||
1216 | |||
1217 | if (slots < 1 || slots > 4) | ||
1218 | return -EINVAL; | ||
1219 | |||
1220 | aif1 |= (slots - 1) << WM9081_AIFDAC_TDM_MODE_SHIFT; | ||
1221 | |||
1222 | switch (mask) { | ||
1223 | case 1: | ||
1224 | break; | ||
1225 | case 2: | ||
1226 | aif1 |= 0x10; | ||
1227 | break; | ||
1228 | case 4: | ||
1229 | aif1 |= 0x20; | ||
1230 | break; | ||
1231 | case 8: | ||
1232 | aif1 |= 0x30; | ||
1233 | break; | ||
1234 | default: | ||
1235 | return -EINVAL; | ||
1236 | } | ||
1237 | |||
1238 | wm9081_write(codec, WM9081_AUDIO_INTERFACE_1, aif1); | ||
1239 | |||
1240 | return 0; | ||
1241 | } | ||
1242 | |||
1243 | #define WM9081_RATES SNDRV_PCM_RATE_8000_96000 | ||
1244 | |||
1245 | #define WM9081_FORMATS \ | ||
1246 | (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ | ||
1247 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) | ||
1248 | |||
1249 | static struct snd_soc_dai_ops wm9081_dai_ops = { | ||
1250 | .hw_params = wm9081_hw_params, | ||
1251 | .set_sysclk = wm9081_set_sysclk, | ||
1252 | .set_fmt = wm9081_set_dai_fmt, | ||
1253 | .digital_mute = wm9081_digital_mute, | ||
1254 | .set_tdm_slot = wm9081_set_tdm_slot, | ||
1255 | }; | ||
1256 | |||
1257 | /* We report two channels because the CODEC processes a stereo signal, even | ||
1258 | * though it is only capable of handling a mono output. | ||
1259 | */ | ||
1260 | struct snd_soc_dai wm9081_dai = { | ||
1261 | .name = "WM9081", | ||
1262 | .playback = { | ||
1263 | .stream_name = "HiFi Playback", | ||
1264 | .channels_min = 1, | ||
1265 | .channels_max = 2, | ||
1266 | .rates = WM9081_RATES, | ||
1267 | .formats = WM9081_FORMATS, | ||
1268 | }, | ||
1269 | .ops = &wm9081_dai_ops, | ||
1270 | }; | ||
1271 | EXPORT_SYMBOL_GPL(wm9081_dai); | ||
1272 | |||
1273 | |||
1274 | static struct snd_soc_codec *wm9081_codec; | ||
1275 | |||
1276 | static int wm9081_probe(struct platform_device *pdev) | ||
1277 | { | ||
1278 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
1279 | struct snd_soc_codec *codec; | ||
1280 | struct wm9081_priv *wm9081; | ||
1281 | int ret = 0; | ||
1282 | |||
1283 | if (wm9081_codec == NULL) { | ||
1284 | dev_err(&pdev->dev, "Codec device not registered\n"); | ||
1285 | return -ENODEV; | ||
1286 | } | ||
1287 | |||
1288 | socdev->card->codec = wm9081_codec; | ||
1289 | codec = wm9081_codec; | ||
1290 | wm9081 = codec->private_data; | ||
1291 | |||
1292 | /* register pcms */ | ||
1293 | ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); | ||
1294 | if (ret < 0) { | ||
1295 | dev_err(codec->dev, "failed to create pcms: %d\n", ret); | ||
1296 | goto pcm_err; | ||
1297 | } | ||
1298 | |||
1299 | snd_soc_add_controls(codec, wm9081_snd_controls, | ||
1300 | ARRAY_SIZE(wm9081_snd_controls)); | ||
1301 | if (!wm9081->retune) { | ||
1302 | dev_dbg(codec->dev, | ||
1303 | "No ReTune Mobile data, using normal EQ\n"); | ||
1304 | snd_soc_add_controls(codec, wm9081_eq_controls, | ||
1305 | ARRAY_SIZE(wm9081_eq_controls)); | ||
1306 | } | ||
1307 | |||
1308 | snd_soc_dapm_new_controls(codec, wm9081_dapm_widgets, | ||
1309 | ARRAY_SIZE(wm9081_dapm_widgets)); | ||
1310 | snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths)); | ||
1311 | snd_soc_dapm_new_widgets(codec); | ||
1312 | |||
1313 | ret = snd_soc_init_card(socdev); | ||
1314 | if (ret < 0) { | ||
1315 | dev_err(codec->dev, "failed to register card: %d\n", ret); | ||
1316 | goto card_err; | ||
1317 | } | ||
1318 | |||
1319 | return ret; | ||
1320 | |||
1321 | card_err: | ||
1322 | snd_soc_free_pcms(socdev); | ||
1323 | snd_soc_dapm_free(socdev); | ||
1324 | pcm_err: | ||
1325 | return ret; | ||
1326 | } | ||
1327 | |||
1328 | static int wm9081_remove(struct platform_device *pdev) | ||
1329 | { | ||
1330 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
1331 | |||
1332 | snd_soc_free_pcms(socdev); | ||
1333 | snd_soc_dapm_free(socdev); | ||
1334 | |||
1335 | return 0; | ||
1336 | } | ||
1337 | |||
1338 | #ifdef CONFIG_PM | ||
1339 | static int wm9081_suspend(struct platform_device *pdev, pm_message_t state) | ||
1340 | { | ||
1341 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
1342 | struct snd_soc_codec *codec = socdev->card->codec; | ||
1343 | |||
1344 | wm9081_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
1345 | |||
1346 | return 0; | ||
1347 | } | ||
1348 | |||
1349 | static int wm9081_resume(struct platform_device *pdev) | ||
1350 | { | ||
1351 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
1352 | struct snd_soc_codec *codec = socdev->card->codec; | ||
1353 | u16 *reg_cache = codec->reg_cache; | ||
1354 | int i; | ||
1355 | |||
1356 | for (i = 0; i < codec->reg_cache_size; i++) { | ||
1357 | if (i == WM9081_SOFTWARE_RESET) | ||
1358 | continue; | ||
1359 | |||
1360 | wm9081_write(codec, i, reg_cache[i]); | ||
1361 | } | ||
1362 | |||
1363 | wm9081_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
1364 | |||
1365 | return 0; | ||
1366 | } | ||
1367 | #else | ||
1368 | #define wm9081_suspend NULL | ||
1369 | #define wm9081_resume NULL | ||
1370 | #endif | ||
1371 | |||
1372 | struct snd_soc_codec_device soc_codec_dev_wm9081 = { | ||
1373 | .probe = wm9081_probe, | ||
1374 | .remove = wm9081_remove, | ||
1375 | .suspend = wm9081_suspend, | ||
1376 | .resume = wm9081_resume, | ||
1377 | }; | ||
1378 | EXPORT_SYMBOL_GPL(soc_codec_dev_wm9081); | ||
1379 | |||
1380 | static int wm9081_register(struct wm9081_priv *wm9081) | ||
1381 | { | ||
1382 | struct snd_soc_codec *codec = &wm9081->codec; | ||
1383 | int ret; | ||
1384 | u16 reg; | ||
1385 | |||
1386 | if (wm9081_codec) { | ||
1387 | dev_err(codec->dev, "Another WM9081 is registered\n"); | ||
1388 | ret = -EINVAL; | ||
1389 | goto err; | ||
1390 | } | ||
1391 | |||
1392 | mutex_init(&codec->mutex); | ||
1393 | INIT_LIST_HEAD(&codec->dapm_widgets); | ||
1394 | INIT_LIST_HEAD(&codec->dapm_paths); | ||
1395 | |||
1396 | codec->private_data = wm9081; | ||
1397 | codec->name = "WM9081"; | ||
1398 | codec->owner = THIS_MODULE; | ||
1399 | codec->read = wm9081_read; | ||
1400 | codec->write = wm9081_write; | ||
1401 | codec->dai = &wm9081_dai; | ||
1402 | codec->num_dai = 1; | ||
1403 | codec->reg_cache_size = ARRAY_SIZE(wm9081->reg_cache); | ||
1404 | codec->reg_cache = &wm9081->reg_cache; | ||
1405 | codec->bias_level = SND_SOC_BIAS_OFF; | ||
1406 | codec->set_bias_level = wm9081_set_bias_level; | ||
1407 | |||
1408 | memcpy(codec->reg_cache, wm9081_reg_defaults, | ||
1409 | sizeof(wm9081_reg_defaults)); | ||
1410 | |||
1411 | reg = wm9081_read_hw(codec, WM9081_SOFTWARE_RESET); | ||
1412 | if (reg != 0x9081) { | ||
1413 | dev_err(codec->dev, "Device is not a WM9081: ID=0x%x\n", reg); | ||
1414 | ret = -EINVAL; | ||
1415 | goto err; | ||
1416 | } | ||
1417 | |||
1418 | ret = wm9081_reset(codec); | ||
1419 | if (ret < 0) { | ||
1420 | dev_err(codec->dev, "Failed to issue reset\n"); | ||
1421 | return ret; | ||
1422 | } | ||
1423 | |||
1424 | wm9081_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
1425 | |||
1426 | /* Enable zero cross by default */ | ||
1427 | reg = wm9081_read(codec, WM9081_ANALOGUE_LINEOUT); | ||
1428 | wm9081_write(codec, WM9081_ANALOGUE_LINEOUT, reg | WM9081_LINEOUTZC); | ||
1429 | reg = wm9081_read(codec, WM9081_ANALOGUE_SPEAKER_PGA); | ||
1430 | wm9081_write(codec, WM9081_ANALOGUE_SPEAKER_PGA, | ||
1431 | reg | WM9081_SPKPGAZC); | ||
1432 | |||
1433 | wm9081_dai.dev = codec->dev; | ||
1434 | |||
1435 | wm9081_codec = codec; | ||
1436 | |||
1437 | ret = snd_soc_register_codec(codec); | ||
1438 | if (ret != 0) { | ||
1439 | dev_err(codec->dev, "Failed to register codec: %d\n", ret); | ||
1440 | return ret; | ||
1441 | } | ||
1442 | |||
1443 | ret = snd_soc_register_dai(&wm9081_dai); | ||
1444 | if (ret != 0) { | ||
1445 | dev_err(codec->dev, "Failed to register DAI: %d\n", ret); | ||
1446 | snd_soc_unregister_codec(codec); | ||
1447 | return ret; | ||
1448 | } | ||
1449 | |||
1450 | return 0; | ||
1451 | |||
1452 | err: | ||
1453 | kfree(wm9081); | ||
1454 | return ret; | ||
1455 | } | ||
1456 | |||
1457 | static void wm9081_unregister(struct wm9081_priv *wm9081) | ||
1458 | { | ||
1459 | wm9081_set_bias_level(&wm9081->codec, SND_SOC_BIAS_OFF); | ||
1460 | snd_soc_unregister_dai(&wm9081_dai); | ||
1461 | snd_soc_unregister_codec(&wm9081->codec); | ||
1462 | kfree(wm9081); | ||
1463 | wm9081_codec = NULL; | ||
1464 | } | ||
1465 | |||
1466 | static __devinit int wm9081_i2c_probe(struct i2c_client *i2c, | ||
1467 | const struct i2c_device_id *id) | ||
1468 | { | ||
1469 | struct wm9081_priv *wm9081; | ||
1470 | struct snd_soc_codec *codec; | ||
1471 | |||
1472 | wm9081 = kzalloc(sizeof(struct wm9081_priv), GFP_KERNEL); | ||
1473 | if (wm9081 == NULL) | ||
1474 | return -ENOMEM; | ||
1475 | |||
1476 | codec = &wm9081->codec; | ||
1477 | codec->hw_write = (hw_write_t)i2c_master_send; | ||
1478 | wm9081->retune = i2c->dev.platform_data; | ||
1479 | |||
1480 | i2c_set_clientdata(i2c, wm9081); | ||
1481 | codec->control_data = i2c; | ||
1482 | |||
1483 | codec->dev = &i2c->dev; | ||
1484 | |||
1485 | return wm9081_register(wm9081); | ||
1486 | } | ||
1487 | |||
1488 | static __devexit int wm9081_i2c_remove(struct i2c_client *client) | ||
1489 | { | ||
1490 | struct wm9081_priv *wm9081 = i2c_get_clientdata(client); | ||
1491 | wm9081_unregister(wm9081); | ||
1492 | return 0; | ||
1493 | } | ||
1494 | |||
1495 | static const struct i2c_device_id wm9081_i2c_id[] = { | ||
1496 | { "wm9081", 0 }, | ||
1497 | { } | ||
1498 | }; | ||
1499 | MODULE_DEVICE_TABLE(i2c, wm9081_i2c_id); | ||
1500 | |||
1501 | static struct i2c_driver wm9081_i2c_driver = { | ||
1502 | .driver = { | ||
1503 | .name = "wm9081", | ||
1504 | .owner = THIS_MODULE, | ||
1505 | }, | ||
1506 | .probe = wm9081_i2c_probe, | ||
1507 | .remove = __devexit_p(wm9081_i2c_remove), | ||
1508 | .id_table = wm9081_i2c_id, | ||
1509 | }; | ||
1510 | |||
1511 | static int __init wm9081_modinit(void) | ||
1512 | { | ||
1513 | int ret; | ||
1514 | |||
1515 | ret = i2c_add_driver(&wm9081_i2c_driver); | ||
1516 | if (ret != 0) { | ||
1517 | printk(KERN_ERR "Failed to register WM9081 I2C driver: %d\n", | ||
1518 | ret); | ||
1519 | } | ||
1520 | |||
1521 | return ret; | ||
1522 | } | ||
1523 | module_init(wm9081_modinit); | ||
1524 | |||
1525 | static void __exit wm9081_exit(void) | ||
1526 | { | ||
1527 | i2c_del_driver(&wm9081_i2c_driver); | ||
1528 | } | ||
1529 | module_exit(wm9081_exit); | ||
1530 | |||
1531 | |||
1532 | MODULE_DESCRIPTION("ASoC WM9081 driver"); | ||
1533 | MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>"); | ||
1534 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/codecs/wm9081.h b/sound/soc/codecs/wm9081.h new file mode 100644 index 000000000000..42d3bc757021 --- /dev/null +++ b/sound/soc/codecs/wm9081.h | |||
@@ -0,0 +1,787 @@ | |||
1 | #ifndef WM9081_H | ||
2 | #define WM9081_H | ||
3 | |||
4 | /* | ||
5 | * wm9081.c -- WM9081 ALSA SoC Audio driver | ||
6 | * | ||
7 | * Author: Mark Brown | ||
8 | * | ||
9 | * Copyright 2009 Wolfson Microelectronics plc | ||
10 | * | ||
11 | * This program is free software; you can redistribute it and/or modify | ||
12 | * it under the terms of the GNU General Public License version 2 as | ||
13 | * published by the Free Software Foundation. | ||
14 | */ | ||
15 | |||
16 | #include <sound/soc.h> | ||
17 | |||
18 | extern struct snd_soc_dai wm9081_dai; | ||
19 | extern struct snd_soc_codec_device soc_codec_dev_wm9081; | ||
20 | |||
21 | /* | ||
22 | * SYSCLK sources | ||
23 | */ | ||
24 | #define WM9081_SYSCLK_MCLK 1 /* Use MCLK without FLL */ | ||
25 | #define WM9081_SYSCLK_FLL_MCLK 2 /* Use MCLK, enabling FLL if required */ | ||
26 | |||
27 | /* | ||
28 | * Register values. | ||
29 | */ | ||
30 | #define WM9081_SOFTWARE_RESET 0x00 | ||
31 | #define WM9081_ANALOGUE_LINEOUT 0x02 | ||
32 | #define WM9081_ANALOGUE_SPEAKER_PGA 0x03 | ||
33 | #define WM9081_VMID_CONTROL 0x04 | ||
34 | #define WM9081_BIAS_CONTROL_1 0x05 | ||
35 | #define WM9081_ANALOGUE_MIXER 0x07 | ||
36 | #define WM9081_ANTI_POP_CONTROL 0x08 | ||
37 | #define WM9081_ANALOGUE_SPEAKER_1 0x09 | ||
38 | #define WM9081_ANALOGUE_SPEAKER_2 0x0A | ||
39 | #define WM9081_POWER_MANAGEMENT 0x0B | ||
40 | #define WM9081_CLOCK_CONTROL_1 0x0C | ||
41 | #define WM9081_CLOCK_CONTROL_2 0x0D | ||
42 | #define WM9081_CLOCK_CONTROL_3 0x0E | ||
43 | #define WM9081_FLL_CONTROL_1 0x10 | ||
44 | #define WM9081_FLL_CONTROL_2 0x11 | ||
45 | #define WM9081_FLL_CONTROL_3 0x12 | ||
46 | #define WM9081_FLL_CONTROL_4 0x13 | ||
47 | #define WM9081_FLL_CONTROL_5 0x14 | ||
48 | #define WM9081_AUDIO_INTERFACE_1 0x16 | ||
49 | #define WM9081_AUDIO_INTERFACE_2 0x17 | ||
50 | #define WM9081_AUDIO_INTERFACE_3 0x18 | ||
51 | #define WM9081_AUDIO_INTERFACE_4 0x19 | ||
52 | #define WM9081_INTERRUPT_STATUS 0x1A | ||
53 | #define WM9081_INTERRUPT_STATUS_MASK 0x1B | ||
54 | #define WM9081_INTERRUPT_POLARITY 0x1C | ||
55 | #define WM9081_INTERRUPT_CONTROL 0x1D | ||
56 | #define WM9081_DAC_DIGITAL_1 0x1E | ||
57 | #define WM9081_DAC_DIGITAL_2 0x1F | ||
58 | #define WM9081_DRC_1 0x20 | ||
59 | #define WM9081_DRC_2 0x21 | ||
60 | #define WM9081_DRC_3 0x22 | ||
61 | #define WM9081_DRC_4 0x23 | ||
62 | #define WM9081_WRITE_SEQUENCER_1 0x26 | ||
63 | #define WM9081_WRITE_SEQUENCER_2 0x27 | ||
64 | #define WM9081_MW_SLAVE_1 0x28 | ||
65 | #define WM9081_EQ_1 0x2A | ||
66 | #define WM9081_EQ_2 0x2B | ||
67 | #define WM9081_EQ_3 0x2C | ||
68 | #define WM9081_EQ_4 0x2D | ||
69 | #define WM9081_EQ_5 0x2E | ||
70 | #define WM9081_EQ_6 0x2F | ||
71 | #define WM9081_EQ_7 0x30 | ||
72 | #define WM9081_EQ_8 0x31 | ||
73 | #define WM9081_EQ_9 0x32 | ||
74 | #define WM9081_EQ_10 0x33 | ||
75 | #define WM9081_EQ_11 0x34 | ||
76 | #define WM9081_EQ_12 0x35 | ||
77 | #define WM9081_EQ_13 0x36 | ||
78 | #define WM9081_EQ_14 0x37 | ||
79 | #define WM9081_EQ_15 0x38 | ||
80 | #define WM9081_EQ_16 0x39 | ||
81 | #define WM9081_EQ_17 0x3A | ||
82 | #define WM9081_EQ_18 0x3B | ||
83 | #define WM9081_EQ_19 0x3C | ||
84 | #define WM9081_EQ_20 0x3D | ||
85 | |||
86 | #define WM9081_REGISTER_COUNT 55 | ||
87 | #define WM9081_MAX_REGISTER 0x3D | ||
88 | |||
89 | /* | ||
90 | * Field Definitions. | ||
91 | */ | ||
92 | |||
93 | /* | ||
94 | * R0 (0x00) - Software Reset | ||
95 | */ | ||
96 | #define WM9081_SW_RST_DEV_ID1_MASK 0xFFFF /* SW_RST_DEV_ID1 - [15:0] */ | ||
97 | #define WM9081_SW_RST_DEV_ID1_SHIFT 0 /* SW_RST_DEV_ID1 - [15:0] */ | ||
98 | #define WM9081_SW_RST_DEV_ID1_WIDTH 16 /* SW_RST_DEV_ID1 - [15:0] */ | ||
99 | |||
100 | /* | ||
101 | * R2 (0x02) - Analogue Lineout | ||
102 | */ | ||
103 | #define WM9081_LINEOUT_MUTE 0x0080 /* LINEOUT_MUTE */ | ||
104 | #define WM9081_LINEOUT_MUTE_MASK 0x0080 /* LINEOUT_MUTE */ | ||
105 | #define WM9081_LINEOUT_MUTE_SHIFT 7 /* LINEOUT_MUTE */ | ||
106 | #define WM9081_LINEOUT_MUTE_WIDTH 1 /* LINEOUT_MUTE */ | ||
107 | #define WM9081_LINEOUTZC 0x0040 /* LINEOUTZC */ | ||
108 | #define WM9081_LINEOUTZC_MASK 0x0040 /* LINEOUTZC */ | ||
109 | #define WM9081_LINEOUTZC_SHIFT 6 /* LINEOUTZC */ | ||
110 | #define WM9081_LINEOUTZC_WIDTH 1 /* LINEOUTZC */ | ||
111 | #define WM9081_LINEOUT_VOL_MASK 0x003F /* LINEOUT_VOL - [5:0] */ | ||
112 | #define WM9081_LINEOUT_VOL_SHIFT 0 /* LINEOUT_VOL - [5:0] */ | ||
113 | #define WM9081_LINEOUT_VOL_WIDTH 6 /* LINEOUT_VOL - [5:0] */ | ||
114 | |||
115 | /* | ||
116 | * R3 (0x03) - Analogue Speaker PGA | ||
117 | */ | ||
118 | #define WM9081_SPKPGA_MUTE 0x0080 /* SPKPGA_MUTE */ | ||
119 | #define WM9081_SPKPGA_MUTE_MASK 0x0080 /* SPKPGA_MUTE */ | ||
120 | #define WM9081_SPKPGA_MUTE_SHIFT 7 /* SPKPGA_MUTE */ | ||
121 | #define WM9081_SPKPGA_MUTE_WIDTH 1 /* SPKPGA_MUTE */ | ||
122 | #define WM9081_SPKPGAZC 0x0040 /* SPKPGAZC */ | ||
123 | #define WM9081_SPKPGAZC_MASK 0x0040 /* SPKPGAZC */ | ||
124 | #define WM9081_SPKPGAZC_SHIFT 6 /* SPKPGAZC */ | ||
125 | #define WM9081_SPKPGAZC_WIDTH 1 /* SPKPGAZC */ | ||
126 | #define WM9081_SPKPGA_VOL_MASK 0x003F /* SPKPGA_VOL - [5:0] */ | ||
127 | #define WM9081_SPKPGA_VOL_SHIFT 0 /* SPKPGA_VOL - [5:0] */ | ||
128 | #define WM9081_SPKPGA_VOL_WIDTH 6 /* SPKPGA_VOL - [5:0] */ | ||
129 | |||
130 | /* | ||
131 | * R4 (0x04) - VMID Control | ||
132 | */ | ||
133 | #define WM9081_VMID_BUF_ENA 0x0020 /* VMID_BUF_ENA */ | ||
134 | #define WM9081_VMID_BUF_ENA_MASK 0x0020 /* VMID_BUF_ENA */ | ||
135 | #define WM9081_VMID_BUF_ENA_SHIFT 5 /* VMID_BUF_ENA */ | ||
136 | #define WM9081_VMID_BUF_ENA_WIDTH 1 /* VMID_BUF_ENA */ | ||
137 | #define WM9081_VMID_RAMP 0x0008 /* VMID_RAMP */ | ||
138 | #define WM9081_VMID_RAMP_MASK 0x0008 /* VMID_RAMP */ | ||
139 | #define WM9081_VMID_RAMP_SHIFT 3 /* VMID_RAMP */ | ||
140 | #define WM9081_VMID_RAMP_WIDTH 1 /* VMID_RAMP */ | ||
141 | #define WM9081_VMID_SEL_MASK 0x0006 /* VMID_SEL - [2:1] */ | ||
142 | #define WM9081_VMID_SEL_SHIFT 1 /* VMID_SEL - [2:1] */ | ||
143 | #define WM9081_VMID_SEL_WIDTH 2 /* VMID_SEL - [2:1] */ | ||
144 | #define WM9081_VMID_FAST_ST 0x0001 /* VMID_FAST_ST */ | ||
145 | #define WM9081_VMID_FAST_ST_MASK 0x0001 /* VMID_FAST_ST */ | ||
146 | #define WM9081_VMID_FAST_ST_SHIFT 0 /* VMID_FAST_ST */ | ||
147 | #define WM9081_VMID_FAST_ST_WIDTH 1 /* VMID_FAST_ST */ | ||
148 | |||
149 | /* | ||
150 | * R5 (0x05) - Bias Control 1 | ||
151 | */ | ||
152 | #define WM9081_BIAS_SRC 0x0040 /* BIAS_SRC */ | ||
153 | #define WM9081_BIAS_SRC_MASK 0x0040 /* BIAS_SRC */ | ||
154 | #define WM9081_BIAS_SRC_SHIFT 6 /* BIAS_SRC */ | ||
155 | #define WM9081_BIAS_SRC_WIDTH 1 /* BIAS_SRC */ | ||
156 | #define WM9081_STBY_BIAS_LVL 0x0020 /* STBY_BIAS_LVL */ | ||
157 | #define WM9081_STBY_BIAS_LVL_MASK 0x0020 /* STBY_BIAS_LVL */ | ||
158 | #define WM9081_STBY_BIAS_LVL_SHIFT 5 /* STBY_BIAS_LVL */ | ||
159 | #define WM9081_STBY_BIAS_LVL_WIDTH 1 /* STBY_BIAS_LVL */ | ||
160 | #define WM9081_STBY_BIAS_ENA 0x0010 /* STBY_BIAS_ENA */ | ||
161 | #define WM9081_STBY_BIAS_ENA_MASK 0x0010 /* STBY_BIAS_ENA */ | ||
162 | #define WM9081_STBY_BIAS_ENA_SHIFT 4 /* STBY_BIAS_ENA */ | ||
163 | #define WM9081_STBY_BIAS_ENA_WIDTH 1 /* STBY_BIAS_ENA */ | ||
164 | #define WM9081_BIAS_LVL_MASK 0x000C /* BIAS_LVL - [3:2] */ | ||
165 | #define WM9081_BIAS_LVL_SHIFT 2 /* BIAS_LVL - [3:2] */ | ||
166 | #define WM9081_BIAS_LVL_WIDTH 2 /* BIAS_LVL - [3:2] */ | ||
167 | #define WM9081_BIAS_ENA 0x0002 /* BIAS_ENA */ | ||
168 | #define WM9081_BIAS_ENA_MASK 0x0002 /* BIAS_ENA */ | ||
169 | #define WM9081_BIAS_ENA_SHIFT 1 /* BIAS_ENA */ | ||
170 | #define WM9081_BIAS_ENA_WIDTH 1 /* BIAS_ENA */ | ||
171 | #define WM9081_STARTUP_BIAS_ENA 0x0001 /* STARTUP_BIAS_ENA */ | ||
172 | #define WM9081_STARTUP_BIAS_ENA_MASK 0x0001 /* STARTUP_BIAS_ENA */ | ||
173 | #define WM9081_STARTUP_BIAS_ENA_SHIFT 0 /* STARTUP_BIAS_ENA */ | ||
174 | #define WM9081_STARTUP_BIAS_ENA_WIDTH 1 /* STARTUP_BIAS_ENA */ | ||
175 | |||
176 | /* | ||
177 | * R7 (0x07) - Analogue Mixer | ||
178 | */ | ||
179 | #define WM9081_DAC_SEL 0x0010 /* DAC_SEL */ | ||
180 | #define WM9081_DAC_SEL_MASK 0x0010 /* DAC_SEL */ | ||
181 | #define WM9081_DAC_SEL_SHIFT 4 /* DAC_SEL */ | ||
182 | #define WM9081_DAC_SEL_WIDTH 1 /* DAC_SEL */ | ||
183 | #define WM9081_IN2_VOL 0x0008 /* IN2_VOL */ | ||
184 | #define WM9081_IN2_VOL_MASK 0x0008 /* IN2_VOL */ | ||
185 | #define WM9081_IN2_VOL_SHIFT 3 /* IN2_VOL */ | ||
186 | #define WM9081_IN2_VOL_WIDTH 1 /* IN2_VOL */ | ||
187 | #define WM9081_IN2_ENA 0x0004 /* IN2_ENA */ | ||
188 | #define WM9081_IN2_ENA_MASK 0x0004 /* IN2_ENA */ | ||
189 | #define WM9081_IN2_ENA_SHIFT 2 /* IN2_ENA */ | ||
190 | #define WM9081_IN2_ENA_WIDTH 1 /* IN2_ENA */ | ||
191 | #define WM9081_IN1_VOL 0x0002 /* IN1_VOL */ | ||
192 | #define WM9081_IN1_VOL_MASK 0x0002 /* IN1_VOL */ | ||
193 | #define WM9081_IN1_VOL_SHIFT 1 /* IN1_VOL */ | ||
194 | #define WM9081_IN1_VOL_WIDTH 1 /* IN1_VOL */ | ||
195 | #define WM9081_IN1_ENA 0x0001 /* IN1_ENA */ | ||
196 | #define WM9081_IN1_ENA_MASK 0x0001 /* IN1_ENA */ | ||
197 | #define WM9081_IN1_ENA_SHIFT 0 /* IN1_ENA */ | ||
198 | #define WM9081_IN1_ENA_WIDTH 1 /* IN1_ENA */ | ||
199 | |||
200 | /* | ||
201 | * R8 (0x08) - Anti Pop Control | ||
202 | */ | ||
203 | #define WM9081_LINEOUT_DISCH 0x0004 /* LINEOUT_DISCH */ | ||
204 | #define WM9081_LINEOUT_DISCH_MASK 0x0004 /* LINEOUT_DISCH */ | ||
205 | #define WM9081_LINEOUT_DISCH_SHIFT 2 /* LINEOUT_DISCH */ | ||
206 | #define WM9081_LINEOUT_DISCH_WIDTH 1 /* LINEOUT_DISCH */ | ||
207 | #define WM9081_LINEOUT_VROI 0x0002 /* LINEOUT_VROI */ | ||
208 | #define WM9081_LINEOUT_VROI_MASK 0x0002 /* LINEOUT_VROI */ | ||
209 | #define WM9081_LINEOUT_VROI_SHIFT 1 /* LINEOUT_VROI */ | ||
210 | #define WM9081_LINEOUT_VROI_WIDTH 1 /* LINEOUT_VROI */ | ||
211 | #define WM9081_LINEOUT_CLAMP 0x0001 /* LINEOUT_CLAMP */ | ||
212 | #define WM9081_LINEOUT_CLAMP_MASK 0x0001 /* LINEOUT_CLAMP */ | ||
213 | #define WM9081_LINEOUT_CLAMP_SHIFT 0 /* LINEOUT_CLAMP */ | ||
214 | #define WM9081_LINEOUT_CLAMP_WIDTH 1 /* LINEOUT_CLAMP */ | ||
215 | |||
216 | /* | ||
217 | * R9 (0x09) - Analogue Speaker 1 | ||
218 | */ | ||
219 | #define WM9081_SPK_DCGAIN_MASK 0x0038 /* SPK_DCGAIN - [5:3] */ | ||
220 | #define WM9081_SPK_DCGAIN_SHIFT 3 /* SPK_DCGAIN - [5:3] */ | ||
221 | #define WM9081_SPK_DCGAIN_WIDTH 3 /* SPK_DCGAIN - [5:3] */ | ||
222 | #define WM9081_SPK_ACGAIN_MASK 0x0007 /* SPK_ACGAIN - [2:0] */ | ||
223 | #define WM9081_SPK_ACGAIN_SHIFT 0 /* SPK_ACGAIN - [2:0] */ | ||
224 | #define WM9081_SPK_ACGAIN_WIDTH 3 /* SPK_ACGAIN - [2:0] */ | ||
225 | |||
226 | /* | ||
227 | * R10 (0x0A) - Analogue Speaker 2 | ||
228 | */ | ||
229 | #define WM9081_SPK_MODE 0x0040 /* SPK_MODE */ | ||
230 | #define WM9081_SPK_MODE_MASK 0x0040 /* SPK_MODE */ | ||
231 | #define WM9081_SPK_MODE_SHIFT 6 /* SPK_MODE */ | ||
232 | #define WM9081_SPK_MODE_WIDTH 1 /* SPK_MODE */ | ||
233 | #define WM9081_SPK_INV_MUTE 0x0010 /* SPK_INV_MUTE */ | ||
234 | #define WM9081_SPK_INV_MUTE_MASK 0x0010 /* SPK_INV_MUTE */ | ||
235 | #define WM9081_SPK_INV_MUTE_SHIFT 4 /* SPK_INV_MUTE */ | ||
236 | #define WM9081_SPK_INV_MUTE_WIDTH 1 /* SPK_INV_MUTE */ | ||
237 | #define WM9081_OUT_SPK_CTRL 0x0008 /* OUT_SPK_CTRL */ | ||
238 | #define WM9081_OUT_SPK_CTRL_MASK 0x0008 /* OUT_SPK_CTRL */ | ||
239 | #define WM9081_OUT_SPK_CTRL_SHIFT 3 /* OUT_SPK_CTRL */ | ||
240 | #define WM9081_OUT_SPK_CTRL_WIDTH 1 /* OUT_SPK_CTRL */ | ||
241 | |||
242 | /* | ||
243 | * R11 (0x0B) - Power Management | ||
244 | */ | ||
245 | #define WM9081_TSHUT_ENA 0x0100 /* TSHUT_ENA */ | ||
246 | #define WM9081_TSHUT_ENA_MASK 0x0100 /* TSHUT_ENA */ | ||
247 | #define WM9081_TSHUT_ENA_SHIFT 8 /* TSHUT_ENA */ | ||
248 | #define WM9081_TSHUT_ENA_WIDTH 1 /* TSHUT_ENA */ | ||
249 | #define WM9081_TSENSE_ENA 0x0080 /* TSENSE_ENA */ | ||
250 | #define WM9081_TSENSE_ENA_MASK 0x0080 /* TSENSE_ENA */ | ||
251 | #define WM9081_TSENSE_ENA_SHIFT 7 /* TSENSE_ENA */ | ||
252 | #define WM9081_TSENSE_ENA_WIDTH 1 /* TSENSE_ENA */ | ||
253 | #define WM9081_TEMP_SHUT 0x0040 /* TEMP_SHUT */ | ||
254 | #define WM9081_TEMP_SHUT_MASK 0x0040 /* TEMP_SHUT */ | ||
255 | #define WM9081_TEMP_SHUT_SHIFT 6 /* TEMP_SHUT */ | ||
256 | #define WM9081_TEMP_SHUT_WIDTH 1 /* TEMP_SHUT */ | ||
257 | #define WM9081_LINEOUT_ENA 0x0010 /* LINEOUT_ENA */ | ||
258 | #define WM9081_LINEOUT_ENA_MASK 0x0010 /* LINEOUT_ENA */ | ||
259 | #define WM9081_LINEOUT_ENA_SHIFT 4 /* LINEOUT_ENA */ | ||
260 | #define WM9081_LINEOUT_ENA_WIDTH 1 /* LINEOUT_ENA */ | ||
261 | #define WM9081_SPKPGA_ENA 0x0004 /* SPKPGA_ENA */ | ||
262 | #define WM9081_SPKPGA_ENA_MASK 0x0004 /* SPKPGA_ENA */ | ||
263 | #define WM9081_SPKPGA_ENA_SHIFT 2 /* SPKPGA_ENA */ | ||
264 | #define WM9081_SPKPGA_ENA_WIDTH 1 /* SPKPGA_ENA */ | ||
265 | #define WM9081_SPK_ENA 0x0002 /* SPK_ENA */ | ||
266 | #define WM9081_SPK_ENA_MASK 0x0002 /* SPK_ENA */ | ||
267 | #define WM9081_SPK_ENA_SHIFT 1 /* SPK_ENA */ | ||
268 | #define WM9081_SPK_ENA_WIDTH 1 /* SPK_ENA */ | ||
269 | #define WM9081_DAC_ENA 0x0001 /* DAC_ENA */ | ||
270 | #define WM9081_DAC_ENA_MASK 0x0001 /* DAC_ENA */ | ||
271 | #define WM9081_DAC_ENA_SHIFT 0 /* DAC_ENA */ | ||
272 | #define WM9081_DAC_ENA_WIDTH 1 /* DAC_ENA */ | ||
273 | |||
274 | /* | ||
275 | * R12 (0x0C) - Clock Control 1 | ||
276 | */ | ||
277 | #define WM9081_CLK_OP_DIV_MASK 0x1C00 /* CLK_OP_DIV - [12:10] */ | ||
278 | #define WM9081_CLK_OP_DIV_SHIFT 10 /* CLK_OP_DIV - [12:10] */ | ||
279 | #define WM9081_CLK_OP_DIV_WIDTH 3 /* CLK_OP_DIV - [12:10] */ | ||
280 | #define WM9081_CLK_TO_DIV_MASK 0x0300 /* CLK_TO_DIV - [9:8] */ | ||
281 | #define WM9081_CLK_TO_DIV_SHIFT 8 /* CLK_TO_DIV - [9:8] */ | ||
282 | #define WM9081_CLK_TO_DIV_WIDTH 2 /* CLK_TO_DIV - [9:8] */ | ||
283 | #define WM9081_MCLKDIV2 0x0080 /* MCLKDIV2 */ | ||
284 | #define WM9081_MCLKDIV2_MASK 0x0080 /* MCLKDIV2 */ | ||
285 | #define WM9081_MCLKDIV2_SHIFT 7 /* MCLKDIV2 */ | ||
286 | #define WM9081_MCLKDIV2_WIDTH 1 /* MCLKDIV2 */ | ||
287 | |||
288 | /* | ||
289 | * R13 (0x0D) - Clock Control 2 | ||
290 | */ | ||
291 | #define WM9081_CLK_SYS_RATE_MASK 0x00F0 /* CLK_SYS_RATE - [7:4] */ | ||
292 | #define WM9081_CLK_SYS_RATE_SHIFT 4 /* CLK_SYS_RATE - [7:4] */ | ||
293 | #define WM9081_CLK_SYS_RATE_WIDTH 4 /* CLK_SYS_RATE - [7:4] */ | ||
294 | #define WM9081_SAMPLE_RATE_MASK 0x000F /* SAMPLE_RATE - [3:0] */ | ||
295 | #define WM9081_SAMPLE_RATE_SHIFT 0 /* SAMPLE_RATE - [3:0] */ | ||
296 | #define WM9081_SAMPLE_RATE_WIDTH 4 /* SAMPLE_RATE - [3:0] */ | ||
297 | |||
298 | /* | ||
299 | * R14 (0x0E) - Clock Control 3 | ||
300 | */ | ||
301 | #define WM9081_CLK_SRC_SEL 0x2000 /* CLK_SRC_SEL */ | ||
302 | #define WM9081_CLK_SRC_SEL_MASK 0x2000 /* CLK_SRC_SEL */ | ||
303 | #define WM9081_CLK_SRC_SEL_SHIFT 13 /* CLK_SRC_SEL */ | ||
304 | #define WM9081_CLK_SRC_SEL_WIDTH 1 /* CLK_SRC_SEL */ | ||
305 | #define WM9081_CLK_OP_ENA 0x0020 /* CLK_OP_ENA */ | ||
306 | #define WM9081_CLK_OP_ENA_MASK 0x0020 /* CLK_OP_ENA */ | ||
307 | #define WM9081_CLK_OP_ENA_SHIFT 5 /* CLK_OP_ENA */ | ||
308 | #define WM9081_CLK_OP_ENA_WIDTH 1 /* CLK_OP_ENA */ | ||
309 | #define WM9081_CLK_TO_ENA 0x0004 /* CLK_TO_ENA */ | ||
310 | #define WM9081_CLK_TO_ENA_MASK 0x0004 /* CLK_TO_ENA */ | ||
311 | #define WM9081_CLK_TO_ENA_SHIFT 2 /* CLK_TO_ENA */ | ||
312 | #define WM9081_CLK_TO_ENA_WIDTH 1 /* CLK_TO_ENA */ | ||
313 | #define WM9081_CLK_DSP_ENA 0x0002 /* CLK_DSP_ENA */ | ||
314 | #define WM9081_CLK_DSP_ENA_MASK 0x0002 /* CLK_DSP_ENA */ | ||
315 | #define WM9081_CLK_DSP_ENA_SHIFT 1 /* CLK_DSP_ENA */ | ||
316 | #define WM9081_CLK_DSP_ENA_WIDTH 1 /* CLK_DSP_ENA */ | ||
317 | #define WM9081_CLK_SYS_ENA 0x0001 /* CLK_SYS_ENA */ | ||
318 | #define WM9081_CLK_SYS_ENA_MASK 0x0001 /* CLK_SYS_ENA */ | ||
319 | #define WM9081_CLK_SYS_ENA_SHIFT 0 /* CLK_SYS_ENA */ | ||
320 | #define WM9081_CLK_SYS_ENA_WIDTH 1 /* CLK_SYS_ENA */ | ||
321 | |||
322 | /* | ||
323 | * R16 (0x10) - FLL Control 1 | ||
324 | */ | ||
325 | #define WM9081_FLL_HOLD 0x0008 /* FLL_HOLD */ | ||
326 | #define WM9081_FLL_HOLD_MASK 0x0008 /* FLL_HOLD */ | ||
327 | #define WM9081_FLL_HOLD_SHIFT 3 /* FLL_HOLD */ | ||
328 | #define WM9081_FLL_HOLD_WIDTH 1 /* FLL_HOLD */ | ||
329 | #define WM9081_FLL_FRAC 0x0004 /* FLL_FRAC */ | ||
330 | #define WM9081_FLL_FRAC_MASK 0x0004 /* FLL_FRAC */ | ||
331 | #define WM9081_FLL_FRAC_SHIFT 2 /* FLL_FRAC */ | ||
332 | #define WM9081_FLL_FRAC_WIDTH 1 /* FLL_FRAC */ | ||
333 | #define WM9081_FLL_ENA 0x0001 /* FLL_ENA */ | ||
334 | #define WM9081_FLL_ENA_MASK 0x0001 /* FLL_ENA */ | ||
335 | #define WM9081_FLL_ENA_SHIFT 0 /* FLL_ENA */ | ||
336 | #define WM9081_FLL_ENA_WIDTH 1 /* FLL_ENA */ | ||
337 | |||
338 | /* | ||
339 | * R17 (0x11) - FLL Control 2 | ||
340 | */ | ||
341 | #define WM9081_FLL_OUTDIV_MASK 0x0700 /* FLL_OUTDIV - [10:8] */ | ||
342 | #define WM9081_FLL_OUTDIV_SHIFT 8 /* FLL_OUTDIV - [10:8] */ | ||
343 | #define WM9081_FLL_OUTDIV_WIDTH 3 /* FLL_OUTDIV - [10:8] */ | ||
344 | #define WM9081_FLL_CTRL_RATE_MASK 0x0070 /* FLL_CTRL_RATE - [6:4] */ | ||
345 | #define WM9081_FLL_CTRL_RATE_SHIFT 4 /* FLL_CTRL_RATE - [6:4] */ | ||
346 | #define WM9081_FLL_CTRL_RATE_WIDTH 3 /* FLL_CTRL_RATE - [6:4] */ | ||
347 | #define WM9081_FLL_FRATIO_MASK 0x0007 /* FLL_FRATIO - [2:0] */ | ||
348 | #define WM9081_FLL_FRATIO_SHIFT 0 /* FLL_FRATIO - [2:0] */ | ||
349 | #define WM9081_FLL_FRATIO_WIDTH 3 /* FLL_FRATIO - [2:0] */ | ||
350 | |||
351 | /* | ||
352 | * R18 (0x12) - FLL Control 3 | ||
353 | */ | ||
354 | #define WM9081_FLL_K_MASK 0xFFFF /* FLL_K - [15:0] */ | ||
355 | #define WM9081_FLL_K_SHIFT 0 /* FLL_K - [15:0] */ | ||
356 | #define WM9081_FLL_K_WIDTH 16 /* FLL_K - [15:0] */ | ||
357 | |||
358 | /* | ||
359 | * R19 (0x13) - FLL Control 4 | ||
360 | */ | ||
361 | #define WM9081_FLL_N_MASK 0x7FE0 /* FLL_N - [14:5] */ | ||
362 | #define WM9081_FLL_N_SHIFT 5 /* FLL_N - [14:5] */ | ||
363 | #define WM9081_FLL_N_WIDTH 10 /* FLL_N - [14:5] */ | ||
364 | #define WM9081_FLL_GAIN_MASK 0x000F /* FLL_GAIN - [3:0] */ | ||
365 | #define WM9081_FLL_GAIN_SHIFT 0 /* FLL_GAIN - [3:0] */ | ||
366 | #define WM9081_FLL_GAIN_WIDTH 4 /* FLL_GAIN - [3:0] */ | ||
367 | |||
368 | /* | ||
369 | * R20 (0x14) - FLL Control 5 | ||
370 | */ | ||
371 | #define WM9081_FLL_CLK_REF_DIV_MASK 0x0018 /* FLL_CLK_REF_DIV - [4:3] */ | ||
372 | #define WM9081_FLL_CLK_REF_DIV_SHIFT 3 /* FLL_CLK_REF_DIV - [4:3] */ | ||
373 | #define WM9081_FLL_CLK_REF_DIV_WIDTH 2 /* FLL_CLK_REF_DIV - [4:3] */ | ||
374 | #define WM9081_FLL_CLK_SRC_MASK 0x0003 /* FLL_CLK_SRC - [1:0] */ | ||
375 | #define WM9081_FLL_CLK_SRC_SHIFT 0 /* FLL_CLK_SRC - [1:0] */ | ||
376 | #define WM9081_FLL_CLK_SRC_WIDTH 2 /* FLL_CLK_SRC - [1:0] */ | ||
377 | |||
378 | /* | ||
379 | * R22 (0x16) - Audio Interface 1 | ||
380 | */ | ||
381 | #define WM9081_AIFDAC_CHAN 0x0040 /* AIFDAC_CHAN */ | ||
382 | #define WM9081_AIFDAC_CHAN_MASK 0x0040 /* AIFDAC_CHAN */ | ||
383 | #define WM9081_AIFDAC_CHAN_SHIFT 6 /* AIFDAC_CHAN */ | ||
384 | #define WM9081_AIFDAC_CHAN_WIDTH 1 /* AIFDAC_CHAN */ | ||
385 | #define WM9081_AIFDAC_TDM_SLOT_MASK 0x0030 /* AIFDAC_TDM_SLOT - [5:4] */ | ||
386 | #define WM9081_AIFDAC_TDM_SLOT_SHIFT 4 /* AIFDAC_TDM_SLOT - [5:4] */ | ||
387 | #define WM9081_AIFDAC_TDM_SLOT_WIDTH 2 /* AIFDAC_TDM_SLOT - [5:4] */ | ||
388 | #define WM9081_AIFDAC_TDM_MODE_MASK 0x000C /* AIFDAC_TDM_MODE - [3:2] */ | ||
389 | #define WM9081_AIFDAC_TDM_MODE_SHIFT 2 /* AIFDAC_TDM_MODE - [3:2] */ | ||
390 | #define WM9081_AIFDAC_TDM_MODE_WIDTH 2 /* AIFDAC_TDM_MODE - [3:2] */ | ||
391 | #define WM9081_DAC_COMP 0x0002 /* DAC_COMP */ | ||
392 | #define WM9081_DAC_COMP_MASK 0x0002 /* DAC_COMP */ | ||
393 | #define WM9081_DAC_COMP_SHIFT 1 /* DAC_COMP */ | ||
394 | #define WM9081_DAC_COMP_WIDTH 1 /* DAC_COMP */ | ||
395 | #define WM9081_DAC_COMPMODE 0x0001 /* DAC_COMPMODE */ | ||
396 | #define WM9081_DAC_COMPMODE_MASK 0x0001 /* DAC_COMPMODE */ | ||
397 | #define WM9081_DAC_COMPMODE_SHIFT 0 /* DAC_COMPMODE */ | ||
398 | #define WM9081_DAC_COMPMODE_WIDTH 1 /* DAC_COMPMODE */ | ||
399 | |||
400 | /* | ||
401 | * R23 (0x17) - Audio Interface 2 | ||
402 | */ | ||
403 | #define WM9081_AIF_TRIS 0x0200 /* AIF_TRIS */ | ||
404 | #define WM9081_AIF_TRIS_MASK 0x0200 /* AIF_TRIS */ | ||
405 | #define WM9081_AIF_TRIS_SHIFT 9 /* AIF_TRIS */ | ||
406 | #define WM9081_AIF_TRIS_WIDTH 1 /* AIF_TRIS */ | ||
407 | #define WM9081_DAC_DAT_INV 0x0100 /* DAC_DAT_INV */ | ||
408 | #define WM9081_DAC_DAT_INV_MASK 0x0100 /* DAC_DAT_INV */ | ||
409 | #define WM9081_DAC_DAT_INV_SHIFT 8 /* DAC_DAT_INV */ | ||
410 | #define WM9081_DAC_DAT_INV_WIDTH 1 /* DAC_DAT_INV */ | ||
411 | #define WM9081_AIF_BCLK_INV 0x0080 /* AIF_BCLK_INV */ | ||
412 | #define WM9081_AIF_BCLK_INV_MASK 0x0080 /* AIF_BCLK_INV */ | ||
413 | #define WM9081_AIF_BCLK_INV_SHIFT 7 /* AIF_BCLK_INV */ | ||
414 | #define WM9081_AIF_BCLK_INV_WIDTH 1 /* AIF_BCLK_INV */ | ||
415 | #define WM9081_BCLK_DIR 0x0040 /* BCLK_DIR */ | ||
416 | #define WM9081_BCLK_DIR_MASK 0x0040 /* BCLK_DIR */ | ||
417 | #define WM9081_BCLK_DIR_SHIFT 6 /* BCLK_DIR */ | ||
418 | #define WM9081_BCLK_DIR_WIDTH 1 /* BCLK_DIR */ | ||
419 | #define WM9081_LRCLK_DIR 0x0020 /* LRCLK_DIR */ | ||
420 | #define WM9081_LRCLK_DIR_MASK 0x0020 /* LRCLK_DIR */ | ||
421 | #define WM9081_LRCLK_DIR_SHIFT 5 /* LRCLK_DIR */ | ||
422 | #define WM9081_LRCLK_DIR_WIDTH 1 /* LRCLK_DIR */ | ||
423 | #define WM9081_AIF_LRCLK_INV 0x0010 /* AIF_LRCLK_INV */ | ||
424 | #define WM9081_AIF_LRCLK_INV_MASK 0x0010 /* AIF_LRCLK_INV */ | ||
425 | #define WM9081_AIF_LRCLK_INV_SHIFT 4 /* AIF_LRCLK_INV */ | ||
426 | #define WM9081_AIF_LRCLK_INV_WIDTH 1 /* AIF_LRCLK_INV */ | ||
427 | #define WM9081_AIF_WL_MASK 0x000C /* AIF_WL - [3:2] */ | ||
428 | #define WM9081_AIF_WL_SHIFT 2 /* AIF_WL - [3:2] */ | ||
429 | #define WM9081_AIF_WL_WIDTH 2 /* AIF_WL - [3:2] */ | ||
430 | #define WM9081_AIF_FMT_MASK 0x0003 /* AIF_FMT - [1:0] */ | ||
431 | #define WM9081_AIF_FMT_SHIFT 0 /* AIF_FMT - [1:0] */ | ||
432 | #define WM9081_AIF_FMT_WIDTH 2 /* AIF_FMT - [1:0] */ | ||
433 | |||
434 | /* | ||
435 | * R24 (0x18) - Audio Interface 3 | ||
436 | */ | ||
437 | #define WM9081_BCLK_DIV_MASK 0x001F /* BCLK_DIV - [4:0] */ | ||
438 | #define WM9081_BCLK_DIV_SHIFT 0 /* BCLK_DIV - [4:0] */ | ||
439 | #define WM9081_BCLK_DIV_WIDTH 5 /* BCLK_DIV - [4:0] */ | ||
440 | |||
441 | /* | ||
442 | * R25 (0x19) - Audio Interface 4 | ||
443 | */ | ||
444 | #define WM9081_LRCLK_RATE_MASK 0x07FF /* LRCLK_RATE - [10:0] */ | ||
445 | #define WM9081_LRCLK_RATE_SHIFT 0 /* LRCLK_RATE - [10:0] */ | ||
446 | #define WM9081_LRCLK_RATE_WIDTH 11 /* LRCLK_RATE - [10:0] */ | ||
447 | |||
448 | /* | ||
449 | * R26 (0x1A) - Interrupt Status | ||
450 | */ | ||
451 | #define WM9081_WSEQ_BUSY_EINT 0x0004 /* WSEQ_BUSY_EINT */ | ||
452 | #define WM9081_WSEQ_BUSY_EINT_MASK 0x0004 /* WSEQ_BUSY_EINT */ | ||
453 | #define WM9081_WSEQ_BUSY_EINT_SHIFT 2 /* WSEQ_BUSY_EINT */ | ||
454 | #define WM9081_WSEQ_BUSY_EINT_WIDTH 1 /* WSEQ_BUSY_EINT */ | ||
455 | #define WM9081_TSHUT_EINT 0x0001 /* TSHUT_EINT */ | ||
456 | #define WM9081_TSHUT_EINT_MASK 0x0001 /* TSHUT_EINT */ | ||
457 | #define WM9081_TSHUT_EINT_SHIFT 0 /* TSHUT_EINT */ | ||
458 | #define WM9081_TSHUT_EINT_WIDTH 1 /* TSHUT_EINT */ | ||
459 | |||
460 | /* | ||
461 | * R27 (0x1B) - Interrupt Status Mask | ||
462 | */ | ||
463 | #define WM9081_IM_WSEQ_BUSY_EINT 0x0004 /* IM_WSEQ_BUSY_EINT */ | ||
464 | #define WM9081_IM_WSEQ_BUSY_EINT_MASK 0x0004 /* IM_WSEQ_BUSY_EINT */ | ||
465 | #define WM9081_IM_WSEQ_BUSY_EINT_SHIFT 2 /* IM_WSEQ_BUSY_EINT */ | ||
466 | #define WM9081_IM_WSEQ_BUSY_EINT_WIDTH 1 /* IM_WSEQ_BUSY_EINT */ | ||
467 | #define WM9081_IM_TSHUT_EINT 0x0001 /* IM_TSHUT_EINT */ | ||
468 | #define WM9081_IM_TSHUT_EINT_MASK 0x0001 /* IM_TSHUT_EINT */ | ||
469 | #define WM9081_IM_TSHUT_EINT_SHIFT 0 /* IM_TSHUT_EINT */ | ||
470 | #define WM9081_IM_TSHUT_EINT_WIDTH 1 /* IM_TSHUT_EINT */ | ||
471 | |||
472 | /* | ||
473 | * R28 (0x1C) - Interrupt Polarity | ||
474 | */ | ||
475 | #define WM9081_TSHUT_INV 0x0001 /* TSHUT_INV */ | ||
476 | #define WM9081_TSHUT_INV_MASK 0x0001 /* TSHUT_INV */ | ||
477 | #define WM9081_TSHUT_INV_SHIFT 0 /* TSHUT_INV */ | ||
478 | #define WM9081_TSHUT_INV_WIDTH 1 /* TSHUT_INV */ | ||
479 | |||
480 | /* | ||
481 | * R29 (0x1D) - Interrupt Control | ||
482 | */ | ||
483 | #define WM9081_IRQ_POL 0x8000 /* IRQ_POL */ | ||
484 | #define WM9081_IRQ_POL_MASK 0x8000 /* IRQ_POL */ | ||
485 | #define WM9081_IRQ_POL_SHIFT 15 /* IRQ_POL */ | ||
486 | #define WM9081_IRQ_POL_WIDTH 1 /* IRQ_POL */ | ||
487 | #define WM9081_IRQ_OP_CTRL 0x0001 /* IRQ_OP_CTRL */ | ||
488 | #define WM9081_IRQ_OP_CTRL_MASK 0x0001 /* IRQ_OP_CTRL */ | ||
489 | #define WM9081_IRQ_OP_CTRL_SHIFT 0 /* IRQ_OP_CTRL */ | ||
490 | #define WM9081_IRQ_OP_CTRL_WIDTH 1 /* IRQ_OP_CTRL */ | ||
491 | |||
492 | /* | ||
493 | * R30 (0x1E) - DAC Digital 1 | ||
494 | */ | ||
495 | #define WM9081_DAC_VOL_MASK 0x00FF /* DAC_VOL - [7:0] */ | ||
496 | #define WM9081_DAC_VOL_SHIFT 0 /* DAC_VOL - [7:0] */ | ||
497 | #define WM9081_DAC_VOL_WIDTH 8 /* DAC_VOL - [7:0] */ | ||
498 | |||
499 | /* | ||
500 | * R31 (0x1F) - DAC Digital 2 | ||
501 | */ | ||
502 | #define WM9081_DAC_MUTERATE 0x0400 /* DAC_MUTERATE */ | ||
503 | #define WM9081_DAC_MUTERATE_MASK 0x0400 /* DAC_MUTERATE */ | ||
504 | #define WM9081_DAC_MUTERATE_SHIFT 10 /* DAC_MUTERATE */ | ||
505 | #define WM9081_DAC_MUTERATE_WIDTH 1 /* DAC_MUTERATE */ | ||
506 | #define WM9081_DAC_MUTEMODE 0x0200 /* DAC_MUTEMODE */ | ||
507 | #define WM9081_DAC_MUTEMODE_MASK 0x0200 /* DAC_MUTEMODE */ | ||
508 | #define WM9081_DAC_MUTEMODE_SHIFT 9 /* DAC_MUTEMODE */ | ||
509 | #define WM9081_DAC_MUTEMODE_WIDTH 1 /* DAC_MUTEMODE */ | ||
510 | #define WM9081_DAC_MUTE 0x0008 /* DAC_MUTE */ | ||
511 | #define WM9081_DAC_MUTE_MASK 0x0008 /* DAC_MUTE */ | ||
512 | #define WM9081_DAC_MUTE_SHIFT 3 /* DAC_MUTE */ | ||
513 | #define WM9081_DAC_MUTE_WIDTH 1 /* DAC_MUTE */ | ||
514 | #define WM9081_DEEMPH_MASK 0x0006 /* DEEMPH - [2:1] */ | ||
515 | #define WM9081_DEEMPH_SHIFT 1 /* DEEMPH - [2:1] */ | ||
516 | #define WM9081_DEEMPH_WIDTH 2 /* DEEMPH - [2:1] */ | ||
517 | |||
518 | /* | ||
519 | * R32 (0x20) - DRC 1 | ||
520 | */ | ||
521 | #define WM9081_DRC_ENA 0x8000 /* DRC_ENA */ | ||
522 | #define WM9081_DRC_ENA_MASK 0x8000 /* DRC_ENA */ | ||
523 | #define WM9081_DRC_ENA_SHIFT 15 /* DRC_ENA */ | ||
524 | #define WM9081_DRC_ENA_WIDTH 1 /* DRC_ENA */ | ||
525 | #define WM9081_DRC_STARTUP_GAIN_MASK 0x07C0 /* DRC_STARTUP_GAIN - [10:6] */ | ||
526 | #define WM9081_DRC_STARTUP_GAIN_SHIFT 6 /* DRC_STARTUP_GAIN - [10:6] */ | ||
527 | #define WM9081_DRC_STARTUP_GAIN_WIDTH 5 /* DRC_STARTUP_GAIN - [10:6] */ | ||
528 | #define WM9081_DRC_FF_DLY 0x0020 /* DRC_FF_DLY */ | ||
529 | #define WM9081_DRC_FF_DLY_MASK 0x0020 /* DRC_FF_DLY */ | ||
530 | #define WM9081_DRC_FF_DLY_SHIFT 5 /* DRC_FF_DLY */ | ||
531 | #define WM9081_DRC_FF_DLY_WIDTH 1 /* DRC_FF_DLY */ | ||
532 | #define WM9081_DRC_QR 0x0004 /* DRC_QR */ | ||
533 | #define WM9081_DRC_QR_MASK 0x0004 /* DRC_QR */ | ||
534 | #define WM9081_DRC_QR_SHIFT 2 /* DRC_QR */ | ||
535 | #define WM9081_DRC_QR_WIDTH 1 /* DRC_QR */ | ||
536 | #define WM9081_DRC_ANTICLIP 0x0002 /* DRC_ANTICLIP */ | ||
537 | #define WM9081_DRC_ANTICLIP_MASK 0x0002 /* DRC_ANTICLIP */ | ||
538 | #define WM9081_DRC_ANTICLIP_SHIFT 1 /* DRC_ANTICLIP */ | ||
539 | #define WM9081_DRC_ANTICLIP_WIDTH 1 /* DRC_ANTICLIP */ | ||
540 | |||
541 | /* | ||
542 | * R33 (0x21) - DRC 2 | ||
543 | */ | ||
544 | #define WM9081_DRC_ATK_MASK 0xF000 /* DRC_ATK - [15:12] */ | ||
545 | #define WM9081_DRC_ATK_SHIFT 12 /* DRC_ATK - [15:12] */ | ||
546 | #define WM9081_DRC_ATK_WIDTH 4 /* DRC_ATK - [15:12] */ | ||
547 | #define WM9081_DRC_DCY_MASK 0x0F00 /* DRC_DCY - [11:8] */ | ||
548 | #define WM9081_DRC_DCY_SHIFT 8 /* DRC_DCY - [11:8] */ | ||
549 | #define WM9081_DRC_DCY_WIDTH 4 /* DRC_DCY - [11:8] */ | ||
550 | #define WM9081_DRC_QR_THR_MASK 0x00C0 /* DRC_QR_THR - [7:6] */ | ||
551 | #define WM9081_DRC_QR_THR_SHIFT 6 /* DRC_QR_THR - [7:6] */ | ||
552 | #define WM9081_DRC_QR_THR_WIDTH 2 /* DRC_QR_THR - [7:6] */ | ||
553 | #define WM9081_DRC_QR_DCY_MASK 0x0030 /* DRC_QR_DCY - [5:4] */ | ||
554 | #define WM9081_DRC_QR_DCY_SHIFT 4 /* DRC_QR_DCY - [5:4] */ | ||
555 | #define WM9081_DRC_QR_DCY_WIDTH 2 /* DRC_QR_DCY - [5:4] */ | ||
556 | #define WM9081_DRC_MINGAIN_MASK 0x000C /* DRC_MINGAIN - [3:2] */ | ||
557 | #define WM9081_DRC_MINGAIN_SHIFT 2 /* DRC_MINGAIN - [3:2] */ | ||
558 | #define WM9081_DRC_MINGAIN_WIDTH 2 /* DRC_MINGAIN - [3:2] */ | ||
559 | #define WM9081_DRC_MAXGAIN_MASK 0x0003 /* DRC_MAXGAIN - [1:0] */ | ||
560 | #define WM9081_DRC_MAXGAIN_SHIFT 0 /* DRC_MAXGAIN - [1:0] */ | ||
561 | #define WM9081_DRC_MAXGAIN_WIDTH 2 /* DRC_MAXGAIN - [1:0] */ | ||
562 | |||
563 | /* | ||
564 | * R34 (0x22) - DRC 3 | ||
565 | */ | ||
566 | #define WM9081_DRC_HI_COMP_MASK 0x0038 /* DRC_HI_COMP - [5:3] */ | ||
567 | #define WM9081_DRC_HI_COMP_SHIFT 3 /* DRC_HI_COMP - [5:3] */ | ||
568 | #define WM9081_DRC_HI_COMP_WIDTH 3 /* DRC_HI_COMP - [5:3] */ | ||
569 | #define WM9081_DRC_LO_COMP_MASK 0x0007 /* DRC_LO_COMP - [2:0] */ | ||
570 | #define WM9081_DRC_LO_COMP_SHIFT 0 /* DRC_LO_COMP - [2:0] */ | ||
571 | #define WM9081_DRC_LO_COMP_WIDTH 3 /* DRC_LO_COMP - [2:0] */ | ||
572 | |||
573 | /* | ||
574 | * R35 (0x23) - DRC 4 | ||
575 | */ | ||
576 | #define WM9081_DRC_KNEE_IP_MASK 0x07E0 /* DRC_KNEE_IP - [10:5] */ | ||
577 | #define WM9081_DRC_KNEE_IP_SHIFT 5 /* DRC_KNEE_IP - [10:5] */ | ||
578 | #define WM9081_DRC_KNEE_IP_WIDTH 6 /* DRC_KNEE_IP - [10:5] */ | ||
579 | #define WM9081_DRC_KNEE_OP_MASK 0x001F /* DRC_KNEE_OP - [4:0] */ | ||
580 | #define WM9081_DRC_KNEE_OP_SHIFT 0 /* DRC_KNEE_OP - [4:0] */ | ||
581 | #define WM9081_DRC_KNEE_OP_WIDTH 5 /* DRC_KNEE_OP - [4:0] */ | ||
582 | |||
583 | /* | ||
584 | * R38 (0x26) - Write Sequencer 1 | ||
585 | */ | ||
586 | #define WM9081_WSEQ_ENA 0x8000 /* WSEQ_ENA */ | ||
587 | #define WM9081_WSEQ_ENA_MASK 0x8000 /* WSEQ_ENA */ | ||
588 | #define WM9081_WSEQ_ENA_SHIFT 15 /* WSEQ_ENA */ | ||
589 | #define WM9081_WSEQ_ENA_WIDTH 1 /* WSEQ_ENA */ | ||
590 | #define WM9081_WSEQ_ABORT 0x0200 /* WSEQ_ABORT */ | ||
591 | #define WM9081_WSEQ_ABORT_MASK 0x0200 /* WSEQ_ABORT */ | ||
592 | #define WM9081_WSEQ_ABORT_SHIFT 9 /* WSEQ_ABORT */ | ||
593 | #define WM9081_WSEQ_ABORT_WIDTH 1 /* WSEQ_ABORT */ | ||
594 | #define WM9081_WSEQ_START 0x0100 /* WSEQ_START */ | ||
595 | #define WM9081_WSEQ_START_MASK 0x0100 /* WSEQ_START */ | ||
596 | #define WM9081_WSEQ_START_SHIFT 8 /* WSEQ_START */ | ||
597 | #define WM9081_WSEQ_START_WIDTH 1 /* WSEQ_START */ | ||
598 | #define WM9081_WSEQ_START_INDEX_MASK 0x007F /* WSEQ_START_INDEX - [6:0] */ | ||
599 | #define WM9081_WSEQ_START_INDEX_SHIFT 0 /* WSEQ_START_INDEX - [6:0] */ | ||
600 | #define WM9081_WSEQ_START_INDEX_WIDTH 7 /* WSEQ_START_INDEX - [6:0] */ | ||
601 | |||
602 | /* | ||
603 | * R39 (0x27) - Write Sequencer 2 | ||
604 | */ | ||
605 | #define WM9081_WSEQ_CURRENT_INDEX_MASK 0x07F0 /* WSEQ_CURRENT_INDEX - [10:4] */ | ||
606 | #define WM9081_WSEQ_CURRENT_INDEX_SHIFT 4 /* WSEQ_CURRENT_INDEX - [10:4] */ | ||
607 | #define WM9081_WSEQ_CURRENT_INDEX_WIDTH 7 /* WSEQ_CURRENT_INDEX - [10:4] */ | ||
608 | #define WM9081_WSEQ_BUSY 0x0001 /* WSEQ_BUSY */ | ||
609 | #define WM9081_WSEQ_BUSY_MASK 0x0001 /* WSEQ_BUSY */ | ||
610 | #define WM9081_WSEQ_BUSY_SHIFT 0 /* WSEQ_BUSY */ | ||
611 | #define WM9081_WSEQ_BUSY_WIDTH 1 /* WSEQ_BUSY */ | ||
612 | |||
613 | /* | ||
614 | * R40 (0x28) - MW Slave 1 | ||
615 | */ | ||
616 | #define WM9081_SPI_CFG 0x0020 /* SPI_CFG */ | ||
617 | #define WM9081_SPI_CFG_MASK 0x0020 /* SPI_CFG */ | ||
618 | #define WM9081_SPI_CFG_SHIFT 5 /* SPI_CFG */ | ||
619 | #define WM9081_SPI_CFG_WIDTH 1 /* SPI_CFG */ | ||
620 | #define WM9081_SPI_4WIRE 0x0010 /* SPI_4WIRE */ | ||
621 | #define WM9081_SPI_4WIRE_MASK 0x0010 /* SPI_4WIRE */ | ||
622 | #define WM9081_SPI_4WIRE_SHIFT 4 /* SPI_4WIRE */ | ||
623 | #define WM9081_SPI_4WIRE_WIDTH 1 /* SPI_4WIRE */ | ||
624 | #define WM9081_ARA_ENA 0x0008 /* ARA_ENA */ | ||
625 | #define WM9081_ARA_ENA_MASK 0x0008 /* ARA_ENA */ | ||
626 | #define WM9081_ARA_ENA_SHIFT 3 /* ARA_ENA */ | ||
627 | #define WM9081_ARA_ENA_WIDTH 1 /* ARA_ENA */ | ||
628 | #define WM9081_AUTO_INC 0x0002 /* AUTO_INC */ | ||
629 | #define WM9081_AUTO_INC_MASK 0x0002 /* AUTO_INC */ | ||
630 | #define WM9081_AUTO_INC_SHIFT 1 /* AUTO_INC */ | ||
631 | #define WM9081_AUTO_INC_WIDTH 1 /* AUTO_INC */ | ||
632 | |||
633 | /* | ||
634 | * R42 (0x2A) - EQ 1 | ||
635 | */ | ||
636 | #define WM9081_EQ_B1_GAIN_MASK 0xF800 /* EQ_B1_GAIN - [15:11] */ | ||
637 | #define WM9081_EQ_B1_GAIN_SHIFT 11 /* EQ_B1_GAIN - [15:11] */ | ||
638 | #define WM9081_EQ_B1_GAIN_WIDTH 5 /* EQ_B1_GAIN - [15:11] */ | ||
639 | #define WM9081_EQ_B2_GAIN_MASK 0x07C0 /* EQ_B2_GAIN - [10:6] */ | ||
640 | #define WM9081_EQ_B2_GAIN_SHIFT 6 /* EQ_B2_GAIN - [10:6] */ | ||
641 | #define WM9081_EQ_B2_GAIN_WIDTH 5 /* EQ_B2_GAIN - [10:6] */ | ||
642 | #define WM9081_EQ_B4_GAIN_MASK 0x003E /* EQ_B4_GAIN - [5:1] */ | ||
643 | #define WM9081_EQ_B4_GAIN_SHIFT 1 /* EQ_B4_GAIN - [5:1] */ | ||
644 | #define WM9081_EQ_B4_GAIN_WIDTH 5 /* EQ_B4_GAIN - [5:1] */ | ||
645 | #define WM9081_EQ_ENA 0x0001 /* EQ_ENA */ | ||
646 | #define WM9081_EQ_ENA_MASK 0x0001 /* EQ_ENA */ | ||
647 | #define WM9081_EQ_ENA_SHIFT 0 /* EQ_ENA */ | ||
648 | #define WM9081_EQ_ENA_WIDTH 1 /* EQ_ENA */ | ||
649 | |||
650 | /* | ||
651 | * R43 (0x2B) - EQ 2 | ||
652 | */ | ||
653 | #define WM9081_EQ_B3_GAIN_MASK 0xF800 /* EQ_B3_GAIN - [15:11] */ | ||
654 | #define WM9081_EQ_B3_GAIN_SHIFT 11 /* EQ_B3_GAIN - [15:11] */ | ||
655 | #define WM9081_EQ_B3_GAIN_WIDTH 5 /* EQ_B3_GAIN - [15:11] */ | ||
656 | #define WM9081_EQ_B5_GAIN_MASK 0x07C0 /* EQ_B5_GAIN - [10:6] */ | ||
657 | #define WM9081_EQ_B5_GAIN_SHIFT 6 /* EQ_B5_GAIN - [10:6] */ | ||
658 | #define WM9081_EQ_B5_GAIN_WIDTH 5 /* EQ_B5_GAIN - [10:6] */ | ||
659 | |||
660 | /* | ||
661 | * R44 (0x2C) - EQ 3 | ||
662 | */ | ||
663 | #define WM9081_EQ_B1_A_MASK 0xFFFF /* EQ_B1_A - [15:0] */ | ||
664 | #define WM9081_EQ_B1_A_SHIFT 0 /* EQ_B1_A - [15:0] */ | ||
665 | #define WM9081_EQ_B1_A_WIDTH 16 /* EQ_B1_A - [15:0] */ | ||
666 | |||
667 | /* | ||
668 | * R45 (0x2D) - EQ 4 | ||
669 | */ | ||
670 | #define WM9081_EQ_B1_B_MASK 0xFFFF /* EQ_B1_B - [15:0] */ | ||
671 | #define WM9081_EQ_B1_B_SHIFT 0 /* EQ_B1_B - [15:0] */ | ||
672 | #define WM9081_EQ_B1_B_WIDTH 16 /* EQ_B1_B - [15:0] */ | ||
673 | |||
674 | /* | ||
675 | * R46 (0x2E) - EQ 5 | ||
676 | */ | ||
677 | #define WM9081_EQ_B1_PG_MASK 0xFFFF /* EQ_B1_PG - [15:0] */ | ||
678 | #define WM9081_EQ_B1_PG_SHIFT 0 /* EQ_B1_PG - [15:0] */ | ||
679 | #define WM9081_EQ_B1_PG_WIDTH 16 /* EQ_B1_PG - [15:0] */ | ||
680 | |||
681 | /* | ||
682 | * R47 (0x2F) - EQ 6 | ||
683 | */ | ||
684 | #define WM9081_EQ_B2_A_MASK 0xFFFF /* EQ_B2_A - [15:0] */ | ||
685 | #define WM9081_EQ_B2_A_SHIFT 0 /* EQ_B2_A - [15:0] */ | ||
686 | #define WM9081_EQ_B2_A_WIDTH 16 /* EQ_B2_A - [15:0] */ | ||
687 | |||
688 | /* | ||
689 | * R48 (0x30) - EQ 7 | ||
690 | */ | ||
691 | #define WM9081_EQ_B2_B_MASK 0xFFFF /* EQ_B2_B - [15:0] */ | ||
692 | #define WM9081_EQ_B2_B_SHIFT 0 /* EQ_B2_B - [15:0] */ | ||
693 | #define WM9081_EQ_B2_B_WIDTH 16 /* EQ_B2_B - [15:0] */ | ||
694 | |||
695 | /* | ||
696 | * R49 (0x31) - EQ 8 | ||
697 | */ | ||
698 | #define WM9081_EQ_B2_C_MASK 0xFFFF /* EQ_B2_C - [15:0] */ | ||
699 | #define WM9081_EQ_B2_C_SHIFT 0 /* EQ_B2_C - [15:0] */ | ||
700 | #define WM9081_EQ_B2_C_WIDTH 16 /* EQ_B2_C - [15:0] */ | ||
701 | |||
702 | /* | ||
703 | * R50 (0x32) - EQ 9 | ||
704 | */ | ||
705 | #define WM9081_EQ_B2_PG_MASK 0xFFFF /* EQ_B2_PG - [15:0] */ | ||
706 | #define WM9081_EQ_B2_PG_SHIFT 0 /* EQ_B2_PG - [15:0] */ | ||
707 | #define WM9081_EQ_B2_PG_WIDTH 16 /* EQ_B2_PG - [15:0] */ | ||
708 | |||
709 | /* | ||
710 | * R51 (0x33) - EQ 10 | ||
711 | */ | ||
712 | #define WM9081_EQ_B4_A_MASK 0xFFFF /* EQ_B4_A - [15:0] */ | ||
713 | #define WM9081_EQ_B4_A_SHIFT 0 /* EQ_B4_A - [15:0] */ | ||
714 | #define WM9081_EQ_B4_A_WIDTH 16 /* EQ_B4_A - [15:0] */ | ||
715 | |||
716 | /* | ||
717 | * R52 (0x34) - EQ 11 | ||
718 | */ | ||
719 | #define WM9081_EQ_B4_B_MASK 0xFFFF /* EQ_B4_B - [15:0] */ | ||
720 | #define WM9081_EQ_B4_B_SHIFT 0 /* EQ_B4_B - [15:0] */ | ||
721 | #define WM9081_EQ_B4_B_WIDTH 16 /* EQ_B4_B - [15:0] */ | ||
722 | |||
723 | /* | ||
724 | * R53 (0x35) - EQ 12 | ||
725 | */ | ||
726 | #define WM9081_EQ_B4_C_MASK 0xFFFF /* EQ_B4_C - [15:0] */ | ||
727 | #define WM9081_EQ_B4_C_SHIFT 0 /* EQ_B4_C - [15:0] */ | ||
728 | #define WM9081_EQ_B4_C_WIDTH 16 /* EQ_B4_C - [15:0] */ | ||
729 | |||
730 | /* | ||
731 | * R54 (0x36) - EQ 13 | ||
732 | */ | ||
733 | #define WM9081_EQ_B4_PG_MASK 0xFFFF /* EQ_B4_PG - [15:0] */ | ||
734 | #define WM9081_EQ_B4_PG_SHIFT 0 /* EQ_B4_PG - [15:0] */ | ||
735 | #define WM9081_EQ_B4_PG_WIDTH 16 /* EQ_B4_PG - [15:0] */ | ||
736 | |||
737 | /* | ||
738 | * R55 (0x37) - EQ 14 | ||
739 | */ | ||
740 | #define WM9081_EQ_B3_A_MASK 0xFFFF /* EQ_B3_A - [15:0] */ | ||
741 | #define WM9081_EQ_B3_A_SHIFT 0 /* EQ_B3_A - [15:0] */ | ||
742 | #define WM9081_EQ_B3_A_WIDTH 16 /* EQ_B3_A - [15:0] */ | ||
743 | |||
744 | /* | ||
745 | * R56 (0x38) - EQ 15 | ||
746 | */ | ||
747 | #define WM9081_EQ_B3_B_MASK 0xFFFF /* EQ_B3_B - [15:0] */ | ||
748 | #define WM9081_EQ_B3_B_SHIFT 0 /* EQ_B3_B - [15:0] */ | ||
749 | #define WM9081_EQ_B3_B_WIDTH 16 /* EQ_B3_B - [15:0] */ | ||
750 | |||
751 | /* | ||
752 | * R57 (0x39) - EQ 16 | ||
753 | */ | ||
754 | #define WM9081_EQ_B3_C_MASK 0xFFFF /* EQ_B3_C - [15:0] */ | ||
755 | #define WM9081_EQ_B3_C_SHIFT 0 /* EQ_B3_C - [15:0] */ | ||
756 | #define WM9081_EQ_B3_C_WIDTH 16 /* EQ_B3_C - [15:0] */ | ||
757 | |||
758 | /* | ||
759 | * R58 (0x3A) - EQ 17 | ||
760 | */ | ||
761 | #define WM9081_EQ_B3_PG_MASK 0xFFFF /* EQ_B3_PG - [15:0] */ | ||
762 | #define WM9081_EQ_B3_PG_SHIFT 0 /* EQ_B3_PG - [15:0] */ | ||
763 | #define WM9081_EQ_B3_PG_WIDTH 16 /* EQ_B3_PG - [15:0] */ | ||
764 | |||
765 | /* | ||
766 | * R59 (0x3B) - EQ 18 | ||
767 | */ | ||
768 | #define WM9081_EQ_B5_A_MASK 0xFFFF /* EQ_B5_A - [15:0] */ | ||
769 | #define WM9081_EQ_B5_A_SHIFT 0 /* EQ_B5_A - [15:0] */ | ||
770 | #define WM9081_EQ_B5_A_WIDTH 16 /* EQ_B5_A - [15:0] */ | ||
771 | |||
772 | /* | ||
773 | * R60 (0x3C) - EQ 19 | ||
774 | */ | ||
775 | #define WM9081_EQ_B5_B_MASK 0xFFFF /* EQ_B5_B - [15:0] */ | ||
776 | #define WM9081_EQ_B5_B_SHIFT 0 /* EQ_B5_B - [15:0] */ | ||
777 | #define WM9081_EQ_B5_B_WIDTH 16 /* EQ_B5_B - [15:0] */ | ||
778 | |||
779 | /* | ||
780 | * R61 (0x3D) - EQ 20 | ||
781 | */ | ||
782 | #define WM9081_EQ_B5_PG_MASK 0xFFFF /* EQ_B5_PG - [15:0] */ | ||
783 | #define WM9081_EQ_B5_PG_SHIFT 0 /* EQ_B5_PG - [15:0] */ | ||
784 | #define WM9081_EQ_B5_PG_WIDTH 16 /* EQ_B5_PG - [15:0] */ | ||
785 | |||
786 | |||
787 | #endif | ||
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index c2d1a7a18fa3..fa88b463e71f 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c | |||
@@ -282,14 +282,14 @@ struct snd_soc_dai wm9705_dai[] = { | |||
282 | .channels_min = 1, | 282 | .channels_min = 1, |
283 | .channels_max = 2, | 283 | .channels_max = 2, |
284 | .rates = WM9705_AC97_RATES, | 284 | .rates = WM9705_AC97_RATES, |
285 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 285 | .formats = SND_SOC_STD_AC97_FMTS, |
286 | }, | 286 | }, |
287 | .capture = { | 287 | .capture = { |
288 | .stream_name = "HiFi Capture", | 288 | .stream_name = "HiFi Capture", |
289 | .channels_min = 1, | 289 | .channels_min = 1, |
290 | .channels_max = 2, | 290 | .channels_max = 2, |
291 | .rates = WM9705_AC97_RATES, | 291 | .rates = WM9705_AC97_RATES, |
292 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 292 | .formats = SND_SOC_STD_AC97_FMTS, |
293 | }, | 293 | }, |
294 | .ops = &wm9705_dai_ops, | 294 | .ops = &wm9705_dai_ops, |
295 | }, | 295 | }, |
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 765cf1e7369e..1fd4e88f50cf 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c | |||
@@ -534,13 +534,13 @@ struct snd_soc_dai wm9712_dai[] = { | |||
534 | .channels_min = 1, | 534 | .channels_min = 1, |
535 | .channels_max = 2, | 535 | .channels_max = 2, |
536 | .rates = WM9712_AC97_RATES, | 536 | .rates = WM9712_AC97_RATES, |
537 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 537 | .formats = SND_SOC_STD_AC97_FMTS,}, |
538 | .capture = { | 538 | .capture = { |
539 | .stream_name = "HiFi Capture", | 539 | .stream_name = "HiFi Capture", |
540 | .channels_min = 1, | 540 | .channels_min = 1, |
541 | .channels_max = 2, | 541 | .channels_max = 2, |
542 | .rates = WM9712_AC97_RATES, | 542 | .rates = WM9712_AC97_RATES, |
543 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 543 | .formats = SND_SOC_STD_AC97_FMTS,}, |
544 | .ops = &wm9712_dai_ops_hifi, | 544 | .ops = &wm9712_dai_ops_hifi, |
545 | }, | 545 | }, |
546 | { | 546 | { |
@@ -550,7 +550,7 @@ struct snd_soc_dai wm9712_dai[] = { | |||
550 | .channels_min = 1, | 550 | .channels_min = 1, |
551 | .channels_max = 1, | 551 | .channels_max = 1, |
552 | .rates = WM9712_AC97_RATES, | 552 | .rates = WM9712_AC97_RATES, |
553 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 553 | .formats = SND_SOC_STD_AC97_FMTS,}, |
554 | .ops = &wm9712_dai_ops_aux, | 554 | .ops = &wm9712_dai_ops_aux, |
555 | } | 555 | } |
556 | }; | 556 | }; |
@@ -585,6 +585,8 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm) | |||
585 | } | 585 | } |
586 | 586 | ||
587 | soc_ac97_ops.reset(codec->ac97); | 587 | soc_ac97_ops.reset(codec->ac97); |
588 | if (soc_ac97_ops.warm_reset) | ||
589 | soc_ac97_ops.warm_reset(codec->ac97); | ||
588 | if (ac97_read(codec, 0) != wm9712_reg[0]) | 590 | if (ac97_read(codec, 0) != wm9712_reg[0]) |
589 | goto err; | 591 | goto err; |
590 | return 0; | 592 | return 0; |
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 523bad077fa0..abed37acf787 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c | |||
@@ -189,6 +189,26 @@ SOC_SINGLE("3D Lower Cut-off Switch", AC97_REC_GAIN_MIC, 4, 1, 0), | |||
189 | SOC_SINGLE("3D Depth", AC97_REC_GAIN_MIC, 0, 15, 1), | 189 | SOC_SINGLE("3D Depth", AC97_REC_GAIN_MIC, 0, 15, 1), |
190 | }; | 190 | }; |
191 | 191 | ||
192 | static int wm9713_voice_shutdown(struct snd_soc_dapm_widget *w, | ||
193 | struct snd_kcontrol *kcontrol, int event) | ||
194 | { | ||
195 | struct snd_soc_codec *codec = w->codec; | ||
196 | u16 status, rate; | ||
197 | |||
198 | BUG_ON(event != SND_SOC_DAPM_PRE_PMD); | ||
199 | |||
200 | /* Gracefully shut down the voice interface. */ | ||
201 | status = ac97_read(codec, AC97_EXTENDED_MID) | 0x1000; | ||
202 | rate = ac97_read(codec, AC97_HANDSET_RATE) & 0xF0FF; | ||
203 | ac97_write(codec, AC97_HANDSET_RATE, rate | 0x0200); | ||
204 | schedule_timeout_interruptible(msecs_to_jiffies(1)); | ||
205 | ac97_write(codec, AC97_HANDSET_RATE, rate | 0x0F00); | ||
206 | ac97_write(codec, AC97_EXTENDED_MID, status); | ||
207 | |||
208 | return 0; | ||
209 | } | ||
210 | |||
211 | |||
192 | /* We have to create a fake left and right HP mixers because | 212 | /* We have to create a fake left and right HP mixers because |
193 | * the codec only has a single control that is shared by both channels. | 213 | * the codec only has a single control that is shared by both channels. |
194 | * This makes it impossible to determine the audio path using the current | 214 | * This makes it impossible to determine the audio path using the current |
@@ -400,7 +420,8 @@ SND_SOC_DAPM_MIXER("AC97 Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), | |||
400 | SND_SOC_DAPM_MIXER("HP Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), | 420 | SND_SOC_DAPM_MIXER("HP Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), |
401 | SND_SOC_DAPM_MIXER("Line Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), | 421 | SND_SOC_DAPM_MIXER("Line Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), |
402 | SND_SOC_DAPM_MIXER("Capture Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), | 422 | SND_SOC_DAPM_MIXER("Capture Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), |
403 | SND_SOC_DAPM_DAC("Voice DAC", "Voice Playback", AC97_EXTENDED_MID, 12, 1), | 423 | SND_SOC_DAPM_DAC_E("Voice DAC", "Voice Playback", AC97_EXTENDED_MID, 12, 1, |
424 | wm9713_voice_shutdown, SND_SOC_DAPM_PRE_PMD), | ||
404 | SND_SOC_DAPM_DAC("Aux DAC", "Aux Playback", AC97_EXTENDED_MID, 11, 1), | 425 | SND_SOC_DAPM_DAC("Aux DAC", "Aux Playback", AC97_EXTENDED_MID, 11, 1), |
405 | SND_SOC_DAPM_PGA("Left ADC", AC97_EXTENDED_MID, 5, 1, NULL, 0), | 426 | SND_SOC_DAPM_PGA("Left ADC", AC97_EXTENDED_MID, 5, 1, NULL, 0), |
406 | SND_SOC_DAPM_PGA("Right ADC", AC97_EXTENDED_MID, 4, 1, NULL, 0), | 427 | SND_SOC_DAPM_PGA("Right ADC", AC97_EXTENDED_MID, 4, 1, NULL, 0), |
@@ -689,7 +710,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int source) | |||
689 | Ndiv = target / source; | 710 | Ndiv = target / source; |
690 | if ((Ndiv < 5) || (Ndiv > 12)) | 711 | if ((Ndiv < 5) || (Ndiv > 12)) |
691 | printk(KERN_WARNING | 712 | printk(KERN_WARNING |
692 | "WM9713 PLL N value %d out of recommended range!\n", | 713 | "WM9713 PLL N value %u out of recommended range!\n", |
693 | Ndiv); | 714 | Ndiv); |
694 | 715 | ||
695 | pll_div->n = Ndiv; | 716 | pll_div->n = Ndiv; |
@@ -936,21 +957,6 @@ static int wm9713_pcm_hw_params(struct snd_pcm_substream *substream, | |||
936 | return 0; | 957 | return 0; |
937 | } | 958 | } |
938 | 959 | ||
939 | static void wm9713_voiceshutdown(struct snd_pcm_substream *substream, | ||
940 | struct snd_soc_dai *dai) | ||
941 | { | ||
942 | struct snd_soc_codec *codec = dai->codec; | ||
943 | u16 status, rate; | ||
944 | |||
945 | /* Gracefully shut down the voice interface. */ | ||
946 | status = ac97_read(codec, AC97_EXTENDED_STATUS) | 0x1000; | ||
947 | rate = ac97_read(codec, AC97_HANDSET_RATE) & 0xF0FF; | ||
948 | ac97_write(codec, AC97_HANDSET_RATE, rate | 0x0200); | ||
949 | schedule_timeout_interruptible(msecs_to_jiffies(1)); | ||
950 | ac97_write(codec, AC97_HANDSET_RATE, rate | 0x0F00); | ||
951 | ac97_write(codec, AC97_EXTENDED_MID, status); | ||
952 | } | ||
953 | |||
954 | static int ac97_hifi_prepare(struct snd_pcm_substream *substream, | 960 | static int ac97_hifi_prepare(struct snd_pcm_substream *substream, |
955 | struct snd_soc_dai *dai) | 961 | struct snd_soc_dai *dai) |
956 | { | 962 | { |
@@ -1019,7 +1025,6 @@ static struct snd_soc_dai_ops wm9713_dai_ops_aux = { | |||
1019 | 1025 | ||
1020 | static struct snd_soc_dai_ops wm9713_dai_ops_voice = { | 1026 | static struct snd_soc_dai_ops wm9713_dai_ops_voice = { |
1021 | .hw_params = wm9713_pcm_hw_params, | 1027 | .hw_params = wm9713_pcm_hw_params, |
1022 | .shutdown = wm9713_voiceshutdown, | ||
1023 | .set_clkdiv = wm9713_set_dai_clkdiv, | 1028 | .set_clkdiv = wm9713_set_dai_clkdiv, |
1024 | .set_pll = wm9713_set_dai_pll, | 1029 | .set_pll = wm9713_set_dai_pll, |
1025 | .set_fmt = wm9713_set_dai_fmt, | 1030 | .set_fmt = wm9713_set_dai_fmt, |
@@ -1035,13 +1040,13 @@ struct snd_soc_dai wm9713_dai[] = { | |||
1035 | .channels_min = 1, | 1040 | .channels_min = 1, |
1036 | .channels_max = 2, | 1041 | .channels_max = 2, |
1037 | .rates = WM9713_RATES, | 1042 | .rates = WM9713_RATES, |
1038 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 1043 | .formats = SND_SOC_STD_AC97_FMTS,}, |
1039 | .capture = { | 1044 | .capture = { |
1040 | .stream_name = "HiFi Capture", | 1045 | .stream_name = "HiFi Capture", |
1041 | .channels_min = 1, | 1046 | .channels_min = 1, |
1042 | .channels_max = 2, | 1047 | .channels_max = 2, |
1043 | .rates = WM9713_RATES, | 1048 | .rates = WM9713_RATES, |
1044 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 1049 | .formats = SND_SOC_STD_AC97_FMTS,}, |
1045 | .ops = &wm9713_dai_ops_hifi, | 1050 | .ops = &wm9713_dai_ops_hifi, |
1046 | }, | 1051 | }, |
1047 | { | 1052 | { |
@@ -1051,7 +1056,7 @@ struct snd_soc_dai wm9713_dai[] = { | |||
1051 | .channels_min = 1, | 1056 | .channels_min = 1, |
1052 | .channels_max = 1, | 1057 | .channels_max = 1, |
1053 | .rates = WM9713_RATES, | 1058 | .rates = WM9713_RATES, |
1054 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 1059 | .formats = SND_SOC_STD_AC97_FMTS,}, |
1055 | .ops = &wm9713_dai_ops_aux, | 1060 | .ops = &wm9713_dai_ops_aux, |
1056 | }, | 1061 | }, |
1057 | { | 1062 | { |
@@ -1069,6 +1074,7 @@ struct snd_soc_dai wm9713_dai[] = { | |||
1069 | .rates = WM9713_PCM_RATES, | 1074 | .rates = WM9713_PCM_RATES, |
1070 | .formats = WM9713_PCM_FORMATS,}, | 1075 | .formats = WM9713_PCM_FORMATS,}, |
1071 | .ops = &wm9713_dai_ops_voice, | 1076 | .ops = &wm9713_dai_ops_voice, |
1077 | .symmetric_rates = 1, | ||
1072 | }, | 1078 | }, |
1073 | }; | 1079 | }; |
1074 | EXPORT_SYMBOL_GPL(wm9713_dai); | 1080 | EXPORT_SYMBOL_GPL(wm9713_dai); |
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 9fc908283371..5dbebf82249c 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig | |||
@@ -1,5 +1,8 @@ | |||
1 | config SND_SOC_OF_SIMPLE | 1 | config SND_SOC_OF_SIMPLE |
2 | tristate | 2 | tristate |
3 | |||
4 | config SND_MPC52xx_DMA | ||
5 | tristate | ||
3 | 6 | ||
4 | # ASoC platform support for the Freescale MPC8610 SOC. This compiles drivers | 7 | # ASoC platform support for the Freescale MPC8610 SOC. This compiles drivers |
5 | # for the SSI and the Elo DMA controller. You will still need to select | 8 | # for the SSI and the Elo DMA controller. You will still need to select |
@@ -22,7 +25,34 @@ config SND_SOC_MPC8610_HPCD | |||
22 | config SND_SOC_MPC5200_I2S | 25 | config SND_SOC_MPC5200_I2S |
23 | tristate "Freescale MPC5200 PSC in I2S mode driver" | 26 | tristate "Freescale MPC5200 PSC in I2S mode driver" |
24 | depends on PPC_MPC52xx && PPC_BESTCOMM | 27 | depends on PPC_MPC52xx && PPC_BESTCOMM |
25 | select SND_SOC_OF_SIMPLE | 28 | select SND_MPC52xx_DMA |
26 | select PPC_BESTCOMM_GEN_BD | 29 | select PPC_BESTCOMM_GEN_BD |
27 | help | 30 | help |
28 | Say Y here to support the MPC5200 PSCs in I2S mode. | 31 | Say Y here to support the MPC5200 PSCs in I2S mode. |
32 | |||
33 | config SND_SOC_MPC5200_AC97 | ||
34 | tristate "Freescale MPC5200 PSC in AC97 mode driver" | ||
35 | depends on PPC_MPC52xx && PPC_BESTCOMM | ||
36 | select AC97_BUS | ||
37 | select SND_MPC52xx_DMA | ||
38 | select PPC_BESTCOMM_GEN_BD | ||
39 | help | ||
40 | Say Y here to support the MPC5200 PSCs in AC97 mode. | ||
41 | |||
42 | config SND_MPC52xx_SOC_PCM030 | ||
43 | tristate "SoC AC97 Audio support for Phytec pcm030 and WM9712" | ||
44 | depends on PPC_MPC5200_SIMPLE && BROKEN | ||
45 | select SND_SOC_MPC5200_AC97 | ||
46 | select SND_SOC_WM9712 | ||
47 | help | ||
48 | Say Y if you want to add support for sound on the Phytec pcm030 | ||
49 | baseboard. | ||
50 | |||
51 | config SND_MPC52xx_SOC_EFIKA | ||
52 | tristate "SoC AC97 Audio support for bbplan Efika and STAC9766" | ||
53 | depends on PPC_EFIKA && BROKEN | ||
54 | select SND_SOC_MPC5200_AC97 | ||
55 | select SND_SOC_STAC9766 | ||
56 | help | ||
57 | Say Y if you want to add support for sound on the Efika. | ||
58 | |||
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index f85134c86387..a83a73967ec6 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile | |||
@@ -10,5 +10,12 @@ snd-soc-fsl-ssi-objs := fsl_ssi.o | |||
10 | snd-soc-fsl-dma-objs := fsl_dma.o | 10 | snd-soc-fsl-dma-objs := fsl_dma.o |
11 | obj-$(CONFIG_SND_SOC_MPC8610) += snd-soc-fsl-ssi.o snd-soc-fsl-dma.o | 11 | obj-$(CONFIG_SND_SOC_MPC8610) += snd-soc-fsl-ssi.o snd-soc-fsl-dma.o |
12 | 12 | ||
13 | # MPC5200 Platform Support | ||
14 | obj-$(CONFIG_SND_MPC52xx_DMA) += mpc5200_dma.o | ||
13 | obj-$(CONFIG_SND_SOC_MPC5200_I2S) += mpc5200_psc_i2s.o | 15 | obj-$(CONFIG_SND_SOC_MPC5200_I2S) += mpc5200_psc_i2s.o |
16 | obj-$(CONFIG_SND_SOC_MPC5200_AC97) += mpc5200_psc_ac97.o | ||
17 | |||
18 | # MPC5200 Machine Support | ||
19 | obj-$(CONFIG_SND_MPC52xx_SOC_PCM030) += pcm030-audio-fabric.o | ||
20 | obj-$(CONFIG_SND_MPC52xx_SOC_EFIKA) += efika-audio-fabric.o | ||
14 | 21 | ||
diff --git a/sound/soc/fsl/efika-audio-fabric.c b/sound/soc/fsl/efika-audio-fabric.c new file mode 100644 index 000000000000..85b0e7569504 --- /dev/null +++ b/sound/soc/fsl/efika-audio-fabric.c | |||
@@ -0,0 +1,90 @@ | |||
1 | /* | ||
2 | * Efika driver for the PSC of the Freescale MPC52xx | ||
3 | * configured as AC97 interface | ||
4 | * | ||
5 | * Copyright 2008 Jon Smirl, Digispeaker | ||
6 | * Author: Jon Smirl <jonsmirl@gmail.com> | ||
7 | * | ||
8 | * This file is licensed under the terms of the GNU General Public License | ||
9 | * version 2. This program is licensed "as is" without any warranty of any | ||
10 | * kind, whether express or implied. | ||
11 | */ | ||
12 | |||
13 | #include <linux/init.h> | ||
14 | #include <linux/module.h> | ||
15 | #include <linux/interrupt.h> | ||
16 | #include <linux/device.h> | ||
17 | #include <linux/delay.h> | ||
18 | #include <linux/of_device.h> | ||
19 | #include <linux/of_platform.h> | ||
20 | #include <linux/dma-mapping.h> | ||
21 | |||
22 | #include <sound/core.h> | ||
23 | #include <sound/pcm.h> | ||
24 | #include <sound/pcm_params.h> | ||
25 | #include <sound/initval.h> | ||
26 | #include <sound/soc.h> | ||
27 | #include <sound/soc-of-simple.h> | ||
28 | |||
29 | #include "mpc5200_dma.h" | ||
30 | #include "mpc5200_psc_ac97.h" | ||
31 | #include "../codecs/stac9766.h" | ||
32 | |||
33 | static struct snd_soc_device device; | ||
34 | static struct snd_soc_card card; | ||
35 | |||
36 | static struct snd_soc_dai_link efika_fabric_dai[] = { | ||
37 | { | ||
38 | .name = "AC97", | ||
39 | .stream_name = "AC97 Analog", | ||
40 | .codec_dai = &stac9766_dai[STAC9766_DAI_AC97_ANALOG], | ||
41 | .cpu_dai = &psc_ac97_dai[MPC5200_AC97_NORMAL], | ||
42 | }, | ||
43 | { | ||
44 | .name = "AC97", | ||
45 | .stream_name = "AC97 IEC958", | ||
46 | .codec_dai = &stac9766_dai[STAC9766_DAI_AC97_DIGITAL], | ||
47 | .cpu_dai = &psc_ac97_dai[MPC5200_AC97_SPDIF], | ||
48 | }, | ||
49 | }; | ||
50 | |||
51 | static __init int efika_fabric_init(void) | ||
52 | { | ||
53 | struct platform_device *pdev; | ||
54 | int rc; | ||
55 | |||
56 | if (!machine_is_compatible("bplan,efika")) | ||
57 | return -ENODEV; | ||
58 | |||
59 | card.platform = &mpc5200_audio_dma_platform; | ||
60 | card.name = "Efika"; | ||
61 | card.dai_link = efika_fabric_dai; | ||
62 | card.num_links = ARRAY_SIZE(efika_fabric_dai); | ||
63 | |||
64 | device.card = &card; | ||
65 | device.codec_dev = &soc_codec_dev_stac9766; | ||
66 | |||
67 | pdev = platform_device_alloc("soc-audio", 1); | ||
68 | if (!pdev) { | ||
69 | pr_err("efika_fabric_init: platform_device_alloc() failed\n"); | ||
70 | return -ENODEV; | ||
71 | } | ||
72 | |||
73 | platform_set_drvdata(pdev, &device); | ||
74 | device.dev = &pdev->dev; | ||
75 | |||
76 | rc = platform_device_add(pdev); | ||
77 | if (rc) { | ||
78 | pr_err("efika_fabric_init: platform_device_add() failed\n"); | ||
79 | return -ENODEV; | ||
80 | } | ||
81 | return 0; | ||
82 | } | ||
83 | |||
84 | module_init(efika_fabric_init); | ||
85 | |||
86 | |||
87 | MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>"); | ||
88 | MODULE_DESCRIPTION(DRV_NAME ": mpc5200 Efika fabric driver"); | ||
89 | MODULE_LICENSE("GPL"); | ||
90 | |||
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 3711d8454d96..93f0f38a32c9 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c | |||
@@ -375,18 +375,14 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream, | |||
375 | struct snd_pcm_runtime *first_runtime = | 375 | struct snd_pcm_runtime *first_runtime = |
376 | ssi_private->first_stream->runtime; | 376 | ssi_private->first_stream->runtime; |
377 | 377 | ||
378 | if (!first_runtime->rate || !first_runtime->sample_bits) { | 378 | if (!first_runtime->sample_bits) { |
379 | dev_err(substream->pcm->card->dev, | 379 | dev_err(substream->pcm->card->dev, |
380 | "set sample rate and size in %s stream first\n", | 380 | "set sample size in %s stream first\n", |
381 | substream->stream == SNDRV_PCM_STREAM_PLAYBACK | 381 | substream->stream == SNDRV_PCM_STREAM_PLAYBACK |
382 | ? "capture" : "playback"); | 382 | ? "capture" : "playback"); |
383 | return -EAGAIN; | 383 | return -EAGAIN; |
384 | } | 384 | } |
385 | 385 | ||
386 | snd_pcm_hw_constraint_minmax(substream->runtime, | ||
387 | SNDRV_PCM_HW_PARAM_RATE, | ||
388 | first_runtime->rate, first_runtime->rate); | ||
389 | |||
390 | /* If we're in synchronous mode, then we need to constrain | 386 | /* If we're in synchronous mode, then we need to constrain |
391 | * the sample size as well. We don't support independent sample | 387 | * the sample size as well. We don't support independent sample |
392 | * rates in asynchronous mode. | 388 | * rates in asynchronous mode. |
@@ -674,7 +670,7 @@ struct snd_soc_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info) | |||
674 | ssi_private->dev = ssi_info->dev; | 670 | ssi_private->dev = ssi_info->dev; |
675 | ssi_private->asynchronous = ssi_info->asynchronous; | 671 | ssi_private->asynchronous = ssi_info->asynchronous; |
676 | 672 | ||
677 | ssi_private->dev->driver_data = fsl_ssi_dai; | 673 | dev_set_drvdata(ssi_private->dev, fsl_ssi_dai); |
678 | 674 | ||
679 | /* Initialize the the device_attribute structure */ | 675 | /* Initialize the the device_attribute structure */ |
680 | dev_attr->attr.name = "ssi-stats"; | 676 | dev_attr->attr.name = "ssi-stats"; |
@@ -693,6 +689,7 @@ struct snd_soc_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info) | |||
693 | fsl_ssi_dai->name = ssi_private->name; | 689 | fsl_ssi_dai->name = ssi_private->name; |
694 | fsl_ssi_dai->id = ssi_info->id; | 690 | fsl_ssi_dai->id = ssi_info->id; |
695 | fsl_ssi_dai->dev = ssi_info->dev; | 691 | fsl_ssi_dai->dev = ssi_info->dev; |
692 | fsl_ssi_dai->symmetric_rates = 1; | ||
696 | 693 | ||
697 | ret = snd_soc_register_dai(fsl_ssi_dai); | 694 | ret = snd_soc_register_dai(fsl_ssi_dai); |
698 | if (ret != 0) { | 695 | if (ret != 0) { |
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c new file mode 100644 index 000000000000..efec33a1c5bd --- /dev/null +++ b/sound/soc/fsl/mpc5200_dma.c | |||
@@ -0,0 +1,564 @@ | |||
1 | /* | ||
2 | * Freescale MPC5200 PSC DMA | ||
3 | * ALSA SoC Platform driver | ||
4 | * | ||
5 | * Copyright (C) 2008 Secret Lab Technologies Ltd. | ||
6 | * Copyright (C) 2009 Jon Smirl, Digispeaker | ||
7 | */ | ||
8 | |||
9 | #include <linux/module.h> | ||
10 | #include <linux/of_device.h> | ||
11 | |||
12 | #include <sound/soc.h> | ||
13 | |||
14 | #include <sysdev/bestcomm/bestcomm.h> | ||
15 | #include <sysdev/bestcomm/gen_bd.h> | ||
16 | #include <asm/mpc52xx_psc.h> | ||
17 | |||
18 | #include "mpc5200_dma.h" | ||
19 | |||
20 | /* | ||
21 | * Interrupt handlers | ||
22 | */ | ||
23 | static irqreturn_t psc_dma_status_irq(int irq, void *_psc_dma) | ||
24 | { | ||
25 | struct psc_dma *psc_dma = _psc_dma; | ||
26 | struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; | ||
27 | u16 isr; | ||
28 | |||
29 | isr = in_be16(®s->mpc52xx_psc_isr); | ||
30 | |||
31 | /* Playback underrun error */ | ||
32 | if (psc_dma->playback.active && (isr & MPC52xx_PSC_IMR_TXEMP)) | ||
33 | psc_dma->stats.underrun_count++; | ||
34 | |||
35 | /* Capture overrun error */ | ||
36 | if (psc_dma->capture.active && (isr & MPC52xx_PSC_IMR_ORERR)) | ||
37 | psc_dma->stats.overrun_count++; | ||
38 | |||
39 | out_8(®s->command, MPC52xx_PSC_RST_ERR_STAT); | ||
40 | |||
41 | return IRQ_HANDLED; | ||
42 | } | ||
43 | |||
44 | /** | ||
45 | * psc_dma_bcom_enqueue_next_buffer - Enqueue another audio buffer | ||
46 | * @s: pointer to stream private data structure | ||
47 | * | ||
48 | * Enqueues another audio period buffer into the bestcomm queue. | ||
49 | * | ||
50 | * Note: The routine must only be called when there is space available in | ||
51 | * the queue. Otherwise the enqueue will fail and the audio ring buffer | ||
52 | * will get out of sync | ||
53 | */ | ||
54 | static void psc_dma_bcom_enqueue_next_buffer(struct psc_dma_stream *s) | ||
55 | { | ||
56 | struct bcom_bd *bd; | ||
57 | |||
58 | /* Prepare and enqueue the next buffer descriptor */ | ||
59 | bd = bcom_prepare_next_buffer(s->bcom_task); | ||
60 | bd->status = s->period_bytes; | ||
61 | bd->data[0] = s->period_next_pt; | ||
62 | bcom_submit_next_buffer(s->bcom_task, NULL); | ||
63 | |||
64 | /* Update for next period */ | ||
65 | s->period_next_pt += s->period_bytes; | ||
66 | if (s->period_next_pt >= s->period_end) | ||
67 | s->period_next_pt = s->period_start; | ||
68 | } | ||
69 | |||
70 | static void psc_dma_bcom_enqueue_tx(struct psc_dma_stream *s) | ||
71 | { | ||
72 | while (s->appl_ptr < s->runtime->control->appl_ptr) { | ||
73 | |||
74 | if (bcom_queue_full(s->bcom_task)) | ||
75 | return; | ||
76 | |||
77 | s->appl_ptr += s->period_size; | ||
78 | |||
79 | psc_dma_bcom_enqueue_next_buffer(s); | ||
80 | } | ||
81 | } | ||
82 | |||
83 | /* Bestcomm DMA irq handler */ | ||
84 | static irqreturn_t psc_dma_bcom_irq_tx(int irq, void *_psc_dma_stream) | ||
85 | { | ||
86 | struct psc_dma_stream *s = _psc_dma_stream; | ||
87 | |||
88 | spin_lock(&s->psc_dma->lock); | ||
89 | /* For each finished period, dequeue the completed period buffer | ||
90 | * and enqueue a new one in it's place. */ | ||
91 | while (bcom_buffer_done(s->bcom_task)) { | ||
92 | bcom_retrieve_buffer(s->bcom_task, NULL, NULL); | ||
93 | |||
94 | s->period_current_pt += s->period_bytes; | ||
95 | if (s->period_current_pt >= s->period_end) | ||
96 | s->period_current_pt = s->period_start; | ||
97 | } | ||
98 | psc_dma_bcom_enqueue_tx(s); | ||
99 | spin_unlock(&s->psc_dma->lock); | ||
100 | |||
101 | /* If the stream is active, then also inform the PCM middle layer | ||
102 | * of the period finished event. */ | ||
103 | if (s->active) | ||
104 | snd_pcm_period_elapsed(s->stream); | ||
105 | |||
106 | return IRQ_HANDLED; | ||
107 | } | ||
108 | |||
109 | static irqreturn_t psc_dma_bcom_irq_rx(int irq, void *_psc_dma_stream) | ||
110 | { | ||
111 | struct psc_dma_stream *s = _psc_dma_stream; | ||
112 | |||
113 | spin_lock(&s->psc_dma->lock); | ||
114 | /* For each finished period, dequeue the completed period buffer | ||
115 | * and enqueue a new one in it's place. */ | ||
116 | while (bcom_buffer_done(s->bcom_task)) { | ||
117 | bcom_retrieve_buffer(s->bcom_task, NULL, NULL); | ||
118 | |||
119 | s->period_current_pt += s->period_bytes; | ||
120 | if (s->period_current_pt >= s->period_end) | ||
121 | s->period_current_pt = s->period_start; | ||
122 | |||
123 | psc_dma_bcom_enqueue_next_buffer(s); | ||
124 | } | ||
125 | spin_unlock(&s->psc_dma->lock); | ||
126 | |||
127 | /* If the stream is active, then also inform the PCM middle layer | ||
128 | * of the period finished event. */ | ||
129 | if (s->active) | ||
130 | snd_pcm_period_elapsed(s->stream); | ||
131 | |||
132 | return IRQ_HANDLED; | ||
133 | } | ||
134 | |||
135 | static int psc_dma_hw_free(struct snd_pcm_substream *substream) | ||
136 | { | ||
137 | snd_pcm_set_runtime_buffer(substream, NULL); | ||
138 | return 0; | ||
139 | } | ||
140 | |||
141 | /** | ||
142 | * psc_dma_trigger: start and stop the DMA transfer. | ||
143 | * | ||
144 | * This function is called by ALSA to start, stop, pause, and resume the DMA | ||
145 | * transfer of data. | ||
146 | */ | ||
147 | static int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd) | ||
148 | { | ||
149 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
150 | struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; | ||
151 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
152 | struct psc_dma_stream *s; | ||
153 | struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; | ||
154 | u16 imr; | ||
155 | unsigned long flags; | ||
156 | int i; | ||
157 | |||
158 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
159 | s = &psc_dma->capture; | ||
160 | else | ||
161 | s = &psc_dma->playback; | ||
162 | |||
163 | dev_dbg(psc_dma->dev, "psc_dma_trigger(substream=%p, cmd=%i)" | ||
164 | " stream_id=%i\n", | ||
165 | substream, cmd, substream->pstr->stream); | ||
166 | |||
167 | switch (cmd) { | ||
168 | case SNDRV_PCM_TRIGGER_START: | ||
169 | s->period_bytes = frames_to_bytes(runtime, | ||
170 | runtime->period_size); | ||
171 | s->period_start = virt_to_phys(runtime->dma_area); | ||
172 | s->period_end = s->period_start + | ||
173 | (s->period_bytes * runtime->periods); | ||
174 | s->period_next_pt = s->period_start; | ||
175 | s->period_current_pt = s->period_start; | ||
176 | s->period_size = runtime->period_size; | ||
177 | s->active = 1; | ||
178 | |||
179 | /* track appl_ptr so that we have a better chance of detecting | ||
180 | * end of stream and not over running it. | ||
181 | */ | ||
182 | s->runtime = runtime; | ||
183 | s->appl_ptr = s->runtime->control->appl_ptr - | ||
184 | (runtime->period_size * runtime->periods); | ||
185 | |||
186 | /* Fill up the bestcomm bd queue and enable DMA. | ||
187 | * This will begin filling the PSC's fifo. | ||
188 | */ | ||
189 | spin_lock_irqsave(&psc_dma->lock, flags); | ||
190 | |||
191 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) { | ||
192 | bcom_gen_bd_rx_reset(s->bcom_task); | ||
193 | for (i = 0; i < runtime->periods; i++) | ||
194 | if (!bcom_queue_full(s->bcom_task)) | ||
195 | psc_dma_bcom_enqueue_next_buffer(s); | ||
196 | } else { | ||
197 | bcom_gen_bd_tx_reset(s->bcom_task); | ||
198 | psc_dma_bcom_enqueue_tx(s); | ||
199 | } | ||
200 | |||
201 | bcom_enable(s->bcom_task); | ||
202 | spin_unlock_irqrestore(&psc_dma->lock, flags); | ||
203 | |||
204 | out_8(®s->command, MPC52xx_PSC_RST_ERR_STAT); | ||
205 | |||
206 | break; | ||
207 | |||
208 | case SNDRV_PCM_TRIGGER_STOP: | ||
209 | s->active = 0; | ||
210 | |||
211 | spin_lock_irqsave(&psc_dma->lock, flags); | ||
212 | bcom_disable(s->bcom_task); | ||
213 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
214 | bcom_gen_bd_rx_reset(s->bcom_task); | ||
215 | else | ||
216 | bcom_gen_bd_tx_reset(s->bcom_task); | ||
217 | spin_unlock_irqrestore(&psc_dma->lock, flags); | ||
218 | |||
219 | break; | ||
220 | |||
221 | default: | ||
222 | dev_dbg(psc_dma->dev, "invalid command\n"); | ||
223 | return -EINVAL; | ||
224 | } | ||
225 | |||
226 | /* Update interrupt enable settings */ | ||
227 | imr = 0; | ||
228 | if (psc_dma->playback.active) | ||
229 | imr |= MPC52xx_PSC_IMR_TXEMP; | ||
230 | if (psc_dma->capture.active) | ||
231 | imr |= MPC52xx_PSC_IMR_ORERR; | ||
232 | out_be16(®s->isr_imr.imr, psc_dma->imr | imr); | ||
233 | |||
234 | return 0; | ||
235 | } | ||
236 | |||
237 | |||
238 | /* --------------------------------------------------------------------- | ||
239 | * The PSC DMA 'ASoC platform' driver | ||
240 | * | ||
241 | * Can be referenced by an 'ASoC machine' driver | ||
242 | * This driver only deals with the audio bus; it doesn't have any | ||
243 | * interaction with the attached codec | ||
244 | */ | ||
245 | |||
246 | static const struct snd_pcm_hardware psc_dma_hardware = { | ||
247 | .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | | ||
248 | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | | ||
249 | SNDRV_PCM_INFO_BATCH, | ||
250 | .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | | ||
251 | SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE, | ||
252 | .rate_min = 8000, | ||
253 | .rate_max = 48000, | ||
254 | .channels_min = 1, | ||
255 | .channels_max = 2, | ||
256 | .period_bytes_max = 1024 * 1024, | ||
257 | .period_bytes_min = 32, | ||
258 | .periods_min = 2, | ||
259 | .periods_max = 256, | ||
260 | .buffer_bytes_max = 2 * 1024 * 1024, | ||
261 | .fifo_size = 512, | ||
262 | }; | ||
263 | |||
264 | static int psc_dma_open(struct snd_pcm_substream *substream) | ||
265 | { | ||
266 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
267 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
268 | struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; | ||
269 | struct psc_dma_stream *s; | ||
270 | int rc; | ||
271 | |||
272 | dev_dbg(psc_dma->dev, "psc_dma_open(substream=%p)\n", substream); | ||
273 | |||
274 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
275 | s = &psc_dma->capture; | ||
276 | else | ||
277 | s = &psc_dma->playback; | ||
278 | |||
279 | snd_soc_set_runtime_hwparams(substream, &psc_dma_hardware); | ||
280 | |||
281 | rc = snd_pcm_hw_constraint_integer(runtime, | ||
282 | SNDRV_PCM_HW_PARAM_PERIODS); | ||
283 | if (rc < 0) { | ||
284 | dev_err(substream->pcm->card->dev, "invalid buffer size\n"); | ||
285 | return rc; | ||
286 | } | ||
287 | |||
288 | s->stream = substream; | ||
289 | return 0; | ||
290 | } | ||
291 | |||
292 | static int psc_dma_close(struct snd_pcm_substream *substream) | ||
293 | { | ||
294 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
295 | struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; | ||
296 | struct psc_dma_stream *s; | ||
297 | |||
298 | dev_dbg(psc_dma->dev, "psc_dma_close(substream=%p)\n", substream); | ||
299 | |||
300 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
301 | s = &psc_dma->capture; | ||
302 | else | ||
303 | s = &psc_dma->playback; | ||
304 | |||
305 | if (!psc_dma->playback.active && | ||
306 | !psc_dma->capture.active) { | ||
307 | |||
308 | /* Disable all interrupts and reset the PSC */ | ||
309 | out_be16(&psc_dma->psc_regs->isr_imr.imr, psc_dma->imr); | ||
310 | out_8(&psc_dma->psc_regs->command, 4 << 4); /* reset error */ | ||
311 | } | ||
312 | s->stream = NULL; | ||
313 | return 0; | ||
314 | } | ||
315 | |||
316 | static snd_pcm_uframes_t | ||
317 | psc_dma_pointer(struct snd_pcm_substream *substream) | ||
318 | { | ||
319 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
320 | struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; | ||
321 | struct psc_dma_stream *s; | ||
322 | dma_addr_t count; | ||
323 | |||
324 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
325 | s = &psc_dma->capture; | ||
326 | else | ||
327 | s = &psc_dma->playback; | ||
328 | |||
329 | count = s->period_current_pt - s->period_start; | ||
330 | |||
331 | return bytes_to_frames(substream->runtime, count); | ||
332 | } | ||
333 | |||
334 | static int | ||
335 | psc_dma_hw_params(struct snd_pcm_substream *substream, | ||
336 | struct snd_pcm_hw_params *params) | ||
337 | { | ||
338 | snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); | ||
339 | |||
340 | return 0; | ||
341 | } | ||
342 | |||
343 | static struct snd_pcm_ops psc_dma_ops = { | ||
344 | .open = psc_dma_open, | ||
345 | .close = psc_dma_close, | ||
346 | .hw_free = psc_dma_hw_free, | ||
347 | .ioctl = snd_pcm_lib_ioctl, | ||
348 | .pointer = psc_dma_pointer, | ||
349 | .trigger = psc_dma_trigger, | ||
350 | .hw_params = psc_dma_hw_params, | ||
351 | }; | ||
352 | |||
353 | static u64 psc_dma_dmamask = 0xffffffff; | ||
354 | static int psc_dma_new(struct snd_card *card, struct snd_soc_dai *dai, | ||
355 | struct snd_pcm *pcm) | ||
356 | { | ||
357 | struct snd_soc_pcm_runtime *rtd = pcm->private_data; | ||
358 | struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; | ||
359 | size_t size = psc_dma_hardware.buffer_bytes_max; | ||
360 | int rc = 0; | ||
361 | |||
362 | dev_dbg(rtd->socdev->dev, "psc_dma_new(card=%p, dai=%p, pcm=%p)\n", | ||
363 | card, dai, pcm); | ||
364 | |||
365 | if (!card->dev->dma_mask) | ||
366 | card->dev->dma_mask = &psc_dma_dmamask; | ||
367 | if (!card->dev->coherent_dma_mask) | ||
368 | card->dev->coherent_dma_mask = 0xffffffff; | ||
369 | |||
370 | if (pcm->streams[0].substream) { | ||
371 | rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->card->dev, | ||
372 | size, &pcm->streams[0].substream->dma_buffer); | ||
373 | if (rc) | ||
374 | goto playback_alloc_err; | ||
375 | } | ||
376 | |||
377 | if (pcm->streams[1].substream) { | ||
378 | rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->card->dev, | ||
379 | size, &pcm->streams[1].substream->dma_buffer); | ||
380 | if (rc) | ||
381 | goto capture_alloc_err; | ||
382 | } | ||
383 | |||
384 | if (rtd->socdev->card->codec->ac97) | ||
385 | rtd->socdev->card->codec->ac97->private_data = psc_dma; | ||
386 | |||
387 | return 0; | ||
388 | |||
389 | capture_alloc_err: | ||
390 | if (pcm->streams[0].substream) | ||
391 | snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer); | ||
392 | |||
393 | playback_alloc_err: | ||
394 | dev_err(card->dev, "Cannot allocate buffer(s)\n"); | ||
395 | |||
396 | return -ENOMEM; | ||
397 | } | ||
398 | |||
399 | static void psc_dma_free(struct snd_pcm *pcm) | ||
400 | { | ||
401 | struct snd_soc_pcm_runtime *rtd = pcm->private_data; | ||
402 | struct snd_pcm_substream *substream; | ||
403 | int stream; | ||
404 | |||
405 | dev_dbg(rtd->socdev->dev, "psc_dma_free(pcm=%p)\n", pcm); | ||
406 | |||
407 | for (stream = 0; stream < 2; stream++) { | ||
408 | substream = pcm->streams[stream].substream; | ||
409 | if (substream) { | ||
410 | snd_dma_free_pages(&substream->dma_buffer); | ||
411 | substream->dma_buffer.area = NULL; | ||
412 | substream->dma_buffer.addr = 0; | ||
413 | } | ||
414 | } | ||
415 | } | ||
416 | |||
417 | struct snd_soc_platform mpc5200_audio_dma_platform = { | ||
418 | .name = "mpc5200-psc-audio", | ||
419 | .pcm_ops = &psc_dma_ops, | ||
420 | .pcm_new = &psc_dma_new, | ||
421 | .pcm_free = &psc_dma_free, | ||
422 | }; | ||
423 | EXPORT_SYMBOL_GPL(mpc5200_audio_dma_platform); | ||
424 | |||
425 | int mpc5200_audio_dma_create(struct of_device *op) | ||
426 | { | ||
427 | phys_addr_t fifo; | ||
428 | struct psc_dma *psc_dma; | ||
429 | struct resource res; | ||
430 | int size, irq, rc; | ||
431 | const __be32 *prop; | ||
432 | void __iomem *regs; | ||
433 | |||
434 | /* Fetch the registers and IRQ of the PSC */ | ||
435 | irq = irq_of_parse_and_map(op->node, 0); | ||
436 | if (of_address_to_resource(op->node, 0, &res)) { | ||
437 | dev_err(&op->dev, "Missing reg property\n"); | ||
438 | return -ENODEV; | ||
439 | } | ||
440 | regs = ioremap(res.start, 1 + res.end - res.start); | ||
441 | if (!regs) { | ||
442 | dev_err(&op->dev, "Could not map registers\n"); | ||
443 | return -ENODEV; | ||
444 | } | ||
445 | |||
446 | /* Allocate and initialize the driver private data */ | ||
447 | psc_dma = kzalloc(sizeof *psc_dma, GFP_KERNEL); | ||
448 | if (!psc_dma) { | ||
449 | iounmap(regs); | ||
450 | return -ENOMEM; | ||
451 | } | ||
452 | |||
453 | /* Get the PSC ID */ | ||
454 | prop = of_get_property(op->node, "cell-index", &size); | ||
455 | if (!prop || size < sizeof *prop) | ||
456 | return -ENODEV; | ||
457 | |||
458 | spin_lock_init(&psc_dma->lock); | ||
459 | psc_dma->id = be32_to_cpu(*prop); | ||
460 | psc_dma->irq = irq; | ||
461 | psc_dma->psc_regs = regs; | ||
462 | psc_dma->fifo_regs = regs + sizeof *psc_dma->psc_regs; | ||
463 | psc_dma->dev = &op->dev; | ||
464 | psc_dma->playback.psc_dma = psc_dma; | ||
465 | psc_dma->capture.psc_dma = psc_dma; | ||
466 | snprintf(psc_dma->name, sizeof psc_dma->name, "PSC%u", psc_dma->id); | ||
467 | |||
468 | /* Find the address of the fifo data registers and setup the | ||
469 | * DMA tasks */ | ||
470 | fifo = res.start + offsetof(struct mpc52xx_psc, buffer.buffer_32); | ||
471 | psc_dma->capture.bcom_task = | ||
472 | bcom_psc_gen_bd_rx_init(psc_dma->id, 10, fifo, 512); | ||
473 | psc_dma->playback.bcom_task = | ||
474 | bcom_psc_gen_bd_tx_init(psc_dma->id, 10, fifo); | ||
475 | if (!psc_dma->capture.bcom_task || | ||
476 | !psc_dma->playback.bcom_task) { | ||
477 | dev_err(&op->dev, "Could not allocate bestcomm tasks\n"); | ||
478 | iounmap(regs); | ||
479 | kfree(psc_dma); | ||
480 | return -ENODEV; | ||
481 | } | ||
482 | |||
483 | /* Disable all interrupts and reset the PSC */ | ||
484 | out_be16(&psc_dma->psc_regs->isr_imr.imr, psc_dma->imr); | ||
485 | /* reset receiver */ | ||
486 | out_8(&psc_dma->psc_regs->command, MPC52xx_PSC_RST_RX); | ||
487 | /* reset transmitter */ | ||
488 | out_8(&psc_dma->psc_regs->command, MPC52xx_PSC_RST_TX); | ||
489 | /* reset error */ | ||
490 | out_8(&psc_dma->psc_regs->command, MPC52xx_PSC_RST_ERR_STAT); | ||
491 | /* reset mode */ | ||
492 | out_8(&psc_dma->psc_regs->command, MPC52xx_PSC_SEL_MODE_REG_1); | ||
493 | |||
494 | /* Set up mode register; | ||
495 | * First write: RxRdy (FIFO Alarm) generates rx FIFO irq | ||
496 | * Second write: register Normal mode for non loopback | ||
497 | */ | ||
498 | out_8(&psc_dma->psc_regs->mode, 0); | ||
499 | out_8(&psc_dma->psc_regs->mode, 0); | ||
500 | |||
501 | /* Set the TX and RX fifo alarm thresholds */ | ||
502 | out_be16(&psc_dma->fifo_regs->rfalarm, 0x100); | ||
503 | out_8(&psc_dma->fifo_regs->rfcntl, 0x4); | ||
504 | out_be16(&psc_dma->fifo_regs->tfalarm, 0x100); | ||
505 | out_8(&psc_dma->fifo_regs->tfcntl, 0x7); | ||
506 | |||
507 | /* Lookup the IRQ numbers */ | ||
508 | psc_dma->playback.irq = | ||
509 | bcom_get_task_irq(psc_dma->playback.bcom_task); | ||
510 | psc_dma->capture.irq = | ||
511 | bcom_get_task_irq(psc_dma->capture.bcom_task); | ||
512 | |||
513 | rc = request_irq(psc_dma->irq, &psc_dma_status_irq, IRQF_SHARED, | ||
514 | "psc-dma-status", psc_dma); | ||
515 | rc |= request_irq(psc_dma->capture.irq, | ||
516 | &psc_dma_bcom_irq_rx, IRQF_SHARED, | ||
517 | "psc-dma-capture", &psc_dma->capture); | ||
518 | rc |= request_irq(psc_dma->playback.irq, | ||
519 | &psc_dma_bcom_irq_tx, IRQF_SHARED, | ||
520 | "psc-dma-playback", &psc_dma->playback); | ||
521 | if (rc) { | ||
522 | free_irq(psc_dma->irq, psc_dma); | ||
523 | free_irq(psc_dma->capture.irq, | ||
524 | &psc_dma->capture); | ||
525 | free_irq(psc_dma->playback.irq, | ||
526 | &psc_dma->playback); | ||
527 | return -ENODEV; | ||
528 | } | ||
529 | |||
530 | /* Save what we've done so it can be found again later */ | ||
531 | dev_set_drvdata(&op->dev, psc_dma); | ||
532 | |||
533 | /* Tell the ASoC OF helpers about it */ | ||
534 | return snd_soc_register_platform(&mpc5200_audio_dma_platform); | ||
535 | } | ||
536 | EXPORT_SYMBOL_GPL(mpc5200_audio_dma_create); | ||
537 | |||
538 | int mpc5200_audio_dma_destroy(struct of_device *op) | ||
539 | { | ||
540 | struct psc_dma *psc_dma = dev_get_drvdata(&op->dev); | ||
541 | |||
542 | dev_dbg(&op->dev, "mpc5200_audio_dma_destroy()\n"); | ||
543 | |||
544 | snd_soc_unregister_platform(&mpc5200_audio_dma_platform); | ||
545 | |||
546 | bcom_gen_bd_rx_release(psc_dma->capture.bcom_task); | ||
547 | bcom_gen_bd_tx_release(psc_dma->playback.bcom_task); | ||
548 | |||
549 | /* Release irqs */ | ||
550 | free_irq(psc_dma->irq, psc_dma); | ||
551 | free_irq(psc_dma->capture.irq, &psc_dma->capture); | ||
552 | free_irq(psc_dma->playback.irq, &psc_dma->playback); | ||
553 | |||
554 | iounmap(psc_dma->psc_regs); | ||
555 | kfree(psc_dma); | ||
556 | dev_set_drvdata(&op->dev, NULL); | ||
557 | |||
558 | return 0; | ||
559 | } | ||
560 | EXPORT_SYMBOL_GPL(mpc5200_audio_dma_destroy); | ||
561 | |||
562 | MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>"); | ||
563 | MODULE_DESCRIPTION("Freescale MPC5200 PSC in DMA mode ASoC Driver"); | ||
564 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/fsl/mpc5200_dma.h b/sound/soc/fsl/mpc5200_dma.h new file mode 100644 index 000000000000..2000803f06a7 --- /dev/null +++ b/sound/soc/fsl/mpc5200_dma.h | |||
@@ -0,0 +1,80 @@ | |||
1 | /* | ||
2 | * Freescale MPC5200 Audio DMA driver | ||
3 | */ | ||
4 | |||
5 | #ifndef __SOUND_SOC_FSL_MPC5200_DMA_H__ | ||
6 | #define __SOUND_SOC_FSL_MPC5200_DMA_H__ | ||
7 | |||
8 | #define PSC_STREAM_NAME_LEN 32 | ||
9 | |||
10 | /** | ||
11 | * psc_ac97_stream - Data specific to a single stream (playback or capture) | ||
12 | * @active: flag indicating if the stream is active | ||
13 | * @psc_dma: pointer back to parent psc_dma data structure | ||
14 | * @bcom_task: bestcomm task structure | ||
15 | * @irq: irq number for bestcomm task | ||
16 | * @period_start: physical address of start of DMA region | ||
17 | * @period_end: physical address of end of DMA region | ||
18 | * @period_next_pt: physical address of next DMA buffer to enqueue | ||
19 | * @period_bytes: size of DMA period in bytes | ||
20 | */ | ||
21 | struct psc_dma_stream { | ||
22 | struct snd_pcm_runtime *runtime; | ||
23 | snd_pcm_uframes_t appl_ptr; | ||
24 | |||
25 | int active; | ||
26 | struct psc_dma *psc_dma; | ||
27 | struct bcom_task *bcom_task; | ||
28 | int irq; | ||
29 | struct snd_pcm_substream *stream; | ||
30 | dma_addr_t period_start; | ||
31 | dma_addr_t period_end; | ||
32 | dma_addr_t period_next_pt; | ||
33 | dma_addr_t period_current_pt; | ||
34 | int period_bytes; | ||
35 | int period_size; | ||
36 | }; | ||
37 | |||
38 | /** | ||
39 | * psc_dma - Private driver data | ||
40 | * @name: short name for this device ("PSC0", "PSC1", etc) | ||
41 | * @psc_regs: pointer to the PSC's registers | ||
42 | * @fifo_regs: pointer to the PSC's FIFO registers | ||
43 | * @irq: IRQ of this PSC | ||
44 | * @dev: struct device pointer | ||
45 | * @dai: the CPU DAI for this device | ||
46 | * @sicr: Base value used in serial interface control register; mode is ORed | ||
47 | * with this value. | ||
48 | * @playback: Playback stream context data | ||
49 | * @capture: Capture stream context data | ||
50 | */ | ||
51 | struct psc_dma { | ||
52 | char name[32]; | ||
53 | struct mpc52xx_psc __iomem *psc_regs; | ||
54 | struct mpc52xx_psc_fifo __iomem *fifo_regs; | ||
55 | unsigned int irq; | ||
56 | struct device *dev; | ||
57 | spinlock_t lock; | ||
58 | u32 sicr; | ||
59 | uint sysclk; | ||
60 | int imr; | ||
61 | int id; | ||
62 | unsigned int slots; | ||
63 | |||
64 | /* per-stream data */ | ||
65 | struct psc_dma_stream playback; | ||
66 | struct psc_dma_stream capture; | ||
67 | |||
68 | /* Statistics */ | ||
69 | struct { | ||
70 | unsigned long overrun_count; | ||
71 | unsigned long underrun_count; | ||
72 | } stats; | ||
73 | }; | ||
74 | |||
75 | int mpc5200_audio_dma_create(struct of_device *op); | ||
76 | int mpc5200_audio_dma_destroy(struct of_device *op); | ||
77 | |||
78 | extern struct snd_soc_platform mpc5200_audio_dma_platform; | ||
79 | |||
80 | #endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */ | ||
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c new file mode 100644 index 000000000000..794a247b3eb5 --- /dev/null +++ b/sound/soc/fsl/mpc5200_psc_ac97.c | |||
@@ -0,0 +1,329 @@ | |||
1 | /* | ||
2 | * linux/sound/mpc5200-ac97.c -- AC97 support for the Freescale MPC52xx chip. | ||
3 | * | ||
4 | * Copyright (C) 2009 Jon Smirl, Digispeaker | ||
5 | * Author: Jon Smirl <jonsmirl@gmail.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #include <linux/module.h> | ||
13 | #include <linux/of_device.h> | ||
14 | #include <linux/of_platform.h> | ||
15 | |||
16 | #include <sound/pcm.h> | ||
17 | #include <sound/pcm_params.h> | ||
18 | #include <sound/soc.h> | ||
19 | |||
20 | #include <asm/time.h> | ||
21 | #include <asm/delay.h> | ||
22 | #include <asm/mpc52xx_psc.h> | ||
23 | |||
24 | #include "mpc5200_dma.h" | ||
25 | #include "mpc5200_psc_ac97.h" | ||
26 | |||
27 | #define DRV_NAME "mpc5200-psc-ac97" | ||
28 | |||
29 | /* ALSA only supports a single AC97 device so static is recommend here */ | ||
30 | static struct psc_dma *psc_dma; | ||
31 | |||
32 | static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) | ||
33 | { | ||
34 | int status; | ||
35 | unsigned int val; | ||
36 | |||
37 | /* Wait for command send status zero = ready */ | ||
38 | status = spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & | ||
39 | MPC52xx_PSC_SR_CMDSEND), 100, 0); | ||
40 | if (status == 0) { | ||
41 | pr_err("timeout on ac97 bus (rdy)\n"); | ||
42 | return -ENODEV; | ||
43 | } | ||
44 | /* Send the read */ | ||
45 | out_be32(&psc_dma->psc_regs->ac97_cmd, (1<<31) | ((reg & 0x7f) << 24)); | ||
46 | |||
47 | /* Wait for the answer */ | ||
48 | status = spin_event_timeout((in_be16(&psc_dma->psc_regs->sr_csr.status) & | ||
49 | MPC52xx_PSC_SR_DATA_VAL), 100, 0); | ||
50 | if (status == 0) { | ||
51 | pr_err("timeout on ac97 read (val) %x\n", | ||
52 | in_be16(&psc_dma->psc_regs->sr_csr.status)); | ||
53 | return -ENODEV; | ||
54 | } | ||
55 | /* Get the data */ | ||
56 | val = in_be32(&psc_dma->psc_regs->ac97_data); | ||
57 | if (((val >> 24) & 0x7f) != reg) { | ||
58 | pr_err("reg echo error on ac97 read\n"); | ||
59 | return -ENODEV; | ||
60 | } | ||
61 | val = (val >> 8) & 0xffff; | ||
62 | |||
63 | return (unsigned short) val; | ||
64 | } | ||
65 | |||
66 | static void psc_ac97_write(struct snd_ac97 *ac97, | ||
67 | unsigned short reg, unsigned short val) | ||
68 | { | ||
69 | int status; | ||
70 | |||
71 | /* Wait for command status zero = ready */ | ||
72 | status = spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & | ||
73 | MPC52xx_PSC_SR_CMDSEND), 100, 0); | ||
74 | if (status == 0) { | ||
75 | pr_err("timeout on ac97 bus (write)\n"); | ||
76 | return; | ||
77 | } | ||
78 | /* Write data */ | ||
79 | out_be32(&psc_dma->psc_regs->ac97_cmd, | ||
80 | ((reg & 0x7f) << 24) | (val << 8)); | ||
81 | } | ||
82 | |||
83 | static void psc_ac97_warm_reset(struct snd_ac97 *ac97) | ||
84 | { | ||
85 | struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; | ||
86 | |||
87 | out_be32(®s->sicr, psc_dma->sicr | MPC52xx_PSC_SICR_AWR); | ||
88 | udelay(3); | ||
89 | out_be32(®s->sicr, psc_dma->sicr); | ||
90 | } | ||
91 | |||
92 | static void psc_ac97_cold_reset(struct snd_ac97 *ac97) | ||
93 | { | ||
94 | struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; | ||
95 | |||
96 | /* Do a cold reset */ | ||
97 | out_8(®s->op1, MPC52xx_PSC_OP_RES); | ||
98 | udelay(10); | ||
99 | out_8(®s->op0, MPC52xx_PSC_OP_RES); | ||
100 | udelay(50); | ||
101 | psc_ac97_warm_reset(ac97); | ||
102 | } | ||
103 | |||
104 | struct snd_ac97_bus_ops soc_ac97_ops = { | ||
105 | .read = psc_ac97_read, | ||
106 | .write = psc_ac97_write, | ||
107 | .reset = psc_ac97_cold_reset, | ||
108 | .warm_reset = psc_ac97_warm_reset, | ||
109 | }; | ||
110 | EXPORT_SYMBOL_GPL(soc_ac97_ops); | ||
111 | |||
112 | static int psc_ac97_hw_analog_params(struct snd_pcm_substream *substream, | ||
113 | struct snd_pcm_hw_params *params, | ||
114 | struct snd_soc_dai *cpu_dai) | ||
115 | { | ||
116 | struct psc_dma *psc_dma = cpu_dai->private_data; | ||
117 | |||
118 | dev_dbg(psc_dma->dev, "%s(substream=%p) p_size=%i p_bytes=%i" | ||
119 | " periods=%i buffer_size=%i buffer_bytes=%i channels=%i" | ||
120 | " rate=%i format=%i\n", | ||
121 | __func__, substream, params_period_size(params), | ||
122 | params_period_bytes(params), params_periods(params), | ||
123 | params_buffer_size(params), params_buffer_bytes(params), | ||
124 | params_channels(params), params_rate(params), | ||
125 | params_format(params)); | ||
126 | |||
127 | |||
128 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) { | ||
129 | if (params_channels(params) == 1) | ||
130 | psc_dma->slots |= 0x00000100; | ||
131 | else | ||
132 | psc_dma->slots |= 0x00000300; | ||
133 | } else { | ||
134 | if (params_channels(params) == 1) | ||
135 | psc_dma->slots |= 0x01000000; | ||
136 | else | ||
137 | psc_dma->slots |= 0x03000000; | ||
138 | } | ||
139 | out_be32(&psc_dma->psc_regs->ac97_slots, psc_dma->slots); | ||
140 | |||
141 | return 0; | ||
142 | } | ||
143 | |||
144 | static int psc_ac97_hw_digital_params(struct snd_pcm_substream *substream, | ||
145 | struct snd_pcm_hw_params *params, | ||
146 | struct snd_soc_dai *cpu_dai) | ||
147 | { | ||
148 | struct psc_dma *psc_dma = cpu_dai->private_data; | ||
149 | |||
150 | if (params_channels(params) == 1) | ||
151 | out_be32(&psc_dma->psc_regs->ac97_slots, 0x01000000); | ||
152 | else | ||
153 | out_be32(&psc_dma->psc_regs->ac97_slots, 0x03000000); | ||
154 | |||
155 | return 0; | ||
156 | } | ||
157 | |||
158 | static int psc_ac97_trigger(struct snd_pcm_substream *substream, int cmd, | ||
159 | struct snd_soc_dai *dai) | ||
160 | { | ||
161 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
162 | struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; | ||
163 | |||
164 | switch (cmd) { | ||
165 | case SNDRV_PCM_TRIGGER_STOP: | ||
166 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
167 | psc_dma->slots &= 0xFFFF0000; | ||
168 | else | ||
169 | psc_dma->slots &= 0x0000FFFF; | ||
170 | |||
171 | out_be32(&psc_dma->psc_regs->ac97_slots, psc_dma->slots); | ||
172 | break; | ||
173 | } | ||
174 | return 0; | ||
175 | } | ||
176 | |||
177 | static int psc_ac97_probe(struct platform_device *pdev, | ||
178 | struct snd_soc_dai *cpu_dai) | ||
179 | { | ||
180 | struct psc_dma *psc_dma = cpu_dai->private_data; | ||
181 | struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; | ||
182 | |||
183 | /* Go */ | ||
184 | out_8(®s->command, MPC52xx_PSC_TX_ENABLE | MPC52xx_PSC_RX_ENABLE); | ||
185 | return 0; | ||
186 | } | ||
187 | |||
188 | /* --------------------------------------------------------------------- | ||
189 | * ALSA SoC Bindings | ||
190 | * | ||
191 | * - Digital Audio Interface (DAI) template | ||
192 | * - create/destroy dai hooks | ||
193 | */ | ||
194 | |||
195 | /** | ||
196 | * psc_ac97_dai_template: template CPU Digital Audio Interface | ||
197 | */ | ||
198 | static struct snd_soc_dai_ops psc_ac97_analog_ops = { | ||
199 | .hw_params = psc_ac97_hw_analog_params, | ||
200 | .trigger = psc_ac97_trigger, | ||
201 | }; | ||
202 | |||
203 | static struct snd_soc_dai_ops psc_ac97_digital_ops = { | ||
204 | .hw_params = psc_ac97_hw_digital_params, | ||
205 | }; | ||
206 | |||
207 | struct snd_soc_dai psc_ac97_dai[] = { | ||
208 | { | ||
209 | .name = "AC97", | ||
210 | .ac97_control = 1, | ||
211 | .probe = psc_ac97_probe, | ||
212 | .playback = { | ||
213 | .channels_min = 1, | ||
214 | .channels_max = 6, | ||
215 | .rates = SNDRV_PCM_RATE_8000_48000, | ||
216 | .formats = SNDRV_PCM_FMTBIT_S32_BE, | ||
217 | }, | ||
218 | .capture = { | ||
219 | .channels_min = 1, | ||
220 | .channels_max = 2, | ||
221 | .rates = SNDRV_PCM_RATE_8000_48000, | ||
222 | .formats = SNDRV_PCM_FMTBIT_S32_BE, | ||
223 | }, | ||
224 | .ops = &psc_ac97_analog_ops, | ||
225 | }, | ||
226 | { | ||
227 | .name = "SPDIF", | ||
228 | .ac97_control = 1, | ||
229 | .playback = { | ||
230 | .channels_min = 1, | ||
231 | .channels_max = 2, | ||
232 | .rates = SNDRV_PCM_RATE_32000 | \ | ||
233 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, | ||
234 | .formats = SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_BE, | ||
235 | }, | ||
236 | .ops = &psc_ac97_digital_ops, | ||
237 | } }; | ||
238 | EXPORT_SYMBOL_GPL(psc_ac97_dai); | ||
239 | |||
240 | |||
241 | |||
242 | /* --------------------------------------------------------------------- | ||
243 | * OF platform bus binding code: | ||
244 | * - Probe/remove operations | ||
245 | * - OF device match table | ||
246 | */ | ||
247 | static int __devinit psc_ac97_of_probe(struct of_device *op, | ||
248 | const struct of_device_id *match) | ||
249 | { | ||
250 | int rc, i; | ||
251 | struct snd_ac97 ac97; | ||
252 | struct mpc52xx_psc __iomem *regs; | ||
253 | |||
254 | rc = mpc5200_audio_dma_create(op); | ||
255 | if (rc != 0) | ||
256 | return rc; | ||
257 | |||
258 | for (i = 0; i < ARRAY_SIZE(psc_ac97_dai); i++) | ||
259 | psc_ac97_dai[i].dev = &op->dev; | ||
260 | |||
261 | rc = snd_soc_register_dais(psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai)); | ||
262 | if (rc != 0) { | ||
263 | dev_err(&op->dev, "Failed to register DAI\n"); | ||
264 | return rc; | ||
265 | } | ||
266 | |||
267 | psc_dma = dev_get_drvdata(&op->dev); | ||
268 | regs = psc_dma->psc_regs; | ||
269 | ac97.private_data = psc_dma; | ||
270 | |||
271 | for (i = 0; i < ARRAY_SIZE(psc_ac97_dai); i++) | ||
272 | psc_ac97_dai[i].private_data = psc_dma; | ||
273 | |||
274 | psc_dma->imr = 0; | ||
275 | out_be16(&psc_dma->psc_regs->isr_imr.imr, psc_dma->imr); | ||
276 | |||
277 | /* Configure the serial interface mode to AC97 */ | ||
278 | psc_dma->sicr = MPC52xx_PSC_SICR_SIM_AC97 | MPC52xx_PSC_SICR_ENAC97; | ||
279 | out_be32(®s->sicr, psc_dma->sicr); | ||
280 | |||
281 | /* No slots active */ | ||
282 | out_be32(®s->ac97_slots, 0x00000000); | ||
283 | |||
284 | return 0; | ||
285 | } | ||
286 | |||
287 | static int __devexit psc_ac97_of_remove(struct of_device *op) | ||
288 | { | ||
289 | return mpc5200_audio_dma_destroy(op); | ||
290 | } | ||
291 | |||
292 | /* Match table for of_platform binding */ | ||
293 | static struct of_device_id psc_ac97_match[] __devinitdata = { | ||
294 | { .compatible = "fsl,mpc5200-psc-ac97", }, | ||
295 | { .compatible = "fsl,mpc5200b-psc-ac97", }, | ||
296 | {} | ||
297 | }; | ||
298 | MODULE_DEVICE_TABLE(of, psc_ac97_match); | ||
299 | |||
300 | static struct of_platform_driver psc_ac97_driver = { | ||
301 | .match_table = psc_ac97_match, | ||
302 | .probe = psc_ac97_of_probe, | ||
303 | .remove = __devexit_p(psc_ac97_of_remove), | ||
304 | .driver = { | ||
305 | .name = "mpc5200-psc-ac97", | ||
306 | .owner = THIS_MODULE, | ||
307 | }, | ||
308 | }; | ||
309 | |||
310 | /* --------------------------------------------------------------------- | ||
311 | * Module setup and teardown; simply register the of_platform driver | ||
312 | * for the PSC in AC97 mode. | ||
313 | */ | ||
314 | static int __init psc_ac97_init(void) | ||
315 | { | ||
316 | return of_register_platform_driver(&psc_ac97_driver); | ||
317 | } | ||
318 | module_init(psc_ac97_init); | ||
319 | |||
320 | static void __exit psc_ac97_exit(void) | ||
321 | { | ||
322 | of_unregister_platform_driver(&psc_ac97_driver); | ||
323 | } | ||
324 | module_exit(psc_ac97_exit); | ||
325 | |||
326 | MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>"); | ||
327 | MODULE_DESCRIPTION("mpc5200 AC97 module"); | ||
328 | MODULE_LICENSE("GPL"); | ||
329 | |||
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.h b/sound/soc/fsl/mpc5200_psc_ac97.h new file mode 100644 index 000000000000..4bc18c35c369 --- /dev/null +++ b/sound/soc/fsl/mpc5200_psc_ac97.h | |||
@@ -0,0 +1,15 @@ | |||
1 | /* | ||
2 | * Freescale MPC5200 PSC in AC97 mode | ||
3 | * ALSA SoC Digital Audio Interface (DAI) driver | ||
4 | * | ||
5 | */ | ||
6 | |||
7 | #ifndef __SOUND_SOC_FSL_MPC52xx_PSC_AC97_H__ | ||
8 | #define __SOUND_SOC_FSL_MPC52xx_PSC_AC97_H__ | ||
9 | |||
10 | extern struct snd_soc_dai psc_ac97_dai[]; | ||
11 | |||
12 | #define MPC5200_AC97_NORMAL 0 | ||
13 | #define MPC5200_AC97_SPDIF 1 | ||
14 | |||
15 | #endif /* __SOUND_SOC_FSL_MPC52xx_PSC_AC97_H__ */ | ||
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index 1111c710118a..ce8de90fb94a 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c | |||
@@ -3,31 +3,21 @@ | |||
3 | * ALSA SoC Digital Audio Interface (DAI) driver | 3 | * ALSA SoC Digital Audio Interface (DAI) driver |
4 | * | 4 | * |
5 | * Copyright (C) 2008 Secret Lab Technologies Ltd. | 5 | * Copyright (C) 2008 Secret Lab Technologies Ltd. |
6 | * Copyright (C) 2009 Jon Smirl, Digispeaker | ||
6 | */ | 7 | */ |
7 | 8 | ||
8 | #include <linux/init.h> | ||
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include <linux/interrupt.h> | ||
11 | #include <linux/device.h> | ||
12 | #include <linux/delay.h> | ||
13 | #include <linux/of_device.h> | 10 | #include <linux/of_device.h> |
14 | #include <linux/of_platform.h> | 11 | #include <linux/of_platform.h> |
15 | #include <linux/dma-mapping.h> | ||
16 | 12 | ||
17 | #include <sound/core.h> | ||
18 | #include <sound/pcm.h> | 13 | #include <sound/pcm.h> |
19 | #include <sound/pcm_params.h> | 14 | #include <sound/pcm_params.h> |
20 | #include <sound/initval.h> | ||
21 | #include <sound/soc.h> | 15 | #include <sound/soc.h> |
22 | #include <sound/soc-of-simple.h> | ||
23 | 16 | ||
24 | #include <sysdev/bestcomm/bestcomm.h> | ||
25 | #include <sysdev/bestcomm/gen_bd.h> | ||
26 | #include <asm/mpc52xx_psc.h> | 17 | #include <asm/mpc52xx_psc.h> |
27 | 18 | ||
28 | MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>"); | 19 | #include "mpc5200_psc_i2s.h" |
29 | MODULE_DESCRIPTION("Freescale MPC5200 PSC in I2S mode ASoC Driver"); | 20 | #include "mpc5200_dma.h" |
30 | MODULE_LICENSE("GPL"); | ||
31 | 21 | ||
32 | /** | 22 | /** |
33 | * PSC_I2S_RATES: sample rates supported by the I2S | 23 | * PSC_I2S_RATES: sample rates supported by the I2S |
@@ -44,191 +34,17 @@ MODULE_LICENSE("GPL"); | |||
44 | * PSC_I2S_FORMATS: audio formats supported by the PSC I2S mode | 34 | * PSC_I2S_FORMATS: audio formats supported by the PSC I2S mode |
45 | */ | 35 | */ |
46 | #define PSC_I2S_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | \ | 36 | #define PSC_I2S_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | \ |
47 | SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S24_BE | \ | 37 | SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE) |
48 | SNDRV_PCM_FMTBIT_S32_BE) | ||
49 | |||
50 | /** | ||
51 | * psc_i2s_stream - Data specific to a single stream (playback or capture) | ||
52 | * @active: flag indicating if the stream is active | ||
53 | * @psc_i2s: pointer back to parent psc_i2s data structure | ||
54 | * @bcom_task: bestcomm task structure | ||
55 | * @irq: irq number for bestcomm task | ||
56 | * @period_start: physical address of start of DMA region | ||
57 | * @period_end: physical address of end of DMA region | ||
58 | * @period_next_pt: physical address of next DMA buffer to enqueue | ||
59 | * @period_bytes: size of DMA period in bytes | ||
60 | */ | ||
61 | struct psc_i2s_stream { | ||
62 | int active; | ||
63 | struct psc_i2s *psc_i2s; | ||
64 | struct bcom_task *bcom_task; | ||
65 | int irq; | ||
66 | struct snd_pcm_substream *stream; | ||
67 | dma_addr_t period_start; | ||
68 | dma_addr_t period_end; | ||
69 | dma_addr_t period_next_pt; | ||
70 | dma_addr_t period_current_pt; | ||
71 | int period_bytes; | ||
72 | }; | ||
73 | |||
74 | /** | ||
75 | * psc_i2s - Private driver data | ||
76 | * @name: short name for this device ("PSC0", "PSC1", etc) | ||
77 | * @psc_regs: pointer to the PSC's registers | ||
78 | * @fifo_regs: pointer to the PSC's FIFO registers | ||
79 | * @irq: IRQ of this PSC | ||
80 | * @dev: struct device pointer | ||
81 | * @dai: the CPU DAI for this device | ||
82 | * @sicr: Base value used in serial interface control register; mode is ORed | ||
83 | * with this value. | ||
84 | * @playback: Playback stream context data | ||
85 | * @capture: Capture stream context data | ||
86 | */ | ||
87 | struct psc_i2s { | ||
88 | char name[32]; | ||
89 | struct mpc52xx_psc __iomem *psc_regs; | ||
90 | struct mpc52xx_psc_fifo __iomem *fifo_regs; | ||
91 | unsigned int irq; | ||
92 | struct device *dev; | ||
93 | struct snd_soc_dai dai; | ||
94 | spinlock_t lock; | ||
95 | u32 sicr; | ||
96 | |||
97 | /* per-stream data */ | ||
98 | struct psc_i2s_stream playback; | ||
99 | struct psc_i2s_stream capture; | ||
100 | |||
101 | /* Statistics */ | ||
102 | struct { | ||
103 | int overrun_count; | ||
104 | int underrun_count; | ||
105 | } stats; | ||
106 | }; | ||
107 | |||
108 | /* | ||
109 | * Interrupt handlers | ||
110 | */ | ||
111 | static irqreturn_t psc_i2s_status_irq(int irq, void *_psc_i2s) | ||
112 | { | ||
113 | struct psc_i2s *psc_i2s = _psc_i2s; | ||
114 | struct mpc52xx_psc __iomem *regs = psc_i2s->psc_regs; | ||
115 | u16 isr; | ||
116 | |||
117 | isr = in_be16(®s->mpc52xx_psc_isr); | ||
118 | |||
119 | /* Playback underrun error */ | ||
120 | if (psc_i2s->playback.active && (isr & MPC52xx_PSC_IMR_TXEMP)) | ||
121 | psc_i2s->stats.underrun_count++; | ||
122 | |||
123 | /* Capture overrun error */ | ||
124 | if (psc_i2s->capture.active && (isr & MPC52xx_PSC_IMR_ORERR)) | ||
125 | psc_i2s->stats.overrun_count++; | ||
126 | |||
127 | out_8(®s->command, 4 << 4); /* reset the error status */ | ||
128 | |||
129 | return IRQ_HANDLED; | ||
130 | } | ||
131 | |||
132 | /** | ||
133 | * psc_i2s_bcom_enqueue_next_buffer - Enqueue another audio buffer | ||
134 | * @s: pointer to stream private data structure | ||
135 | * | ||
136 | * Enqueues another audio period buffer into the bestcomm queue. | ||
137 | * | ||
138 | * Note: The routine must only be called when there is space available in | ||
139 | * the queue. Otherwise the enqueue will fail and the audio ring buffer | ||
140 | * will get out of sync | ||
141 | */ | ||
142 | static void psc_i2s_bcom_enqueue_next_buffer(struct psc_i2s_stream *s) | ||
143 | { | ||
144 | struct bcom_bd *bd; | ||
145 | |||
146 | /* Prepare and enqueue the next buffer descriptor */ | ||
147 | bd = bcom_prepare_next_buffer(s->bcom_task); | ||
148 | bd->status = s->period_bytes; | ||
149 | bd->data[0] = s->period_next_pt; | ||
150 | bcom_submit_next_buffer(s->bcom_task, NULL); | ||
151 | |||
152 | /* Update for next period */ | ||
153 | s->period_next_pt += s->period_bytes; | ||
154 | if (s->period_next_pt >= s->period_end) | ||
155 | s->period_next_pt = s->period_start; | ||
156 | } | ||
157 | |||
158 | /* Bestcomm DMA irq handler */ | ||
159 | static irqreturn_t psc_i2s_bcom_irq(int irq, void *_psc_i2s_stream) | ||
160 | { | ||
161 | struct psc_i2s_stream *s = _psc_i2s_stream; | ||
162 | |||
163 | /* For each finished period, dequeue the completed period buffer | ||
164 | * and enqueue a new one in it's place. */ | ||
165 | while (bcom_buffer_done(s->bcom_task)) { | ||
166 | bcom_retrieve_buffer(s->bcom_task, NULL, NULL); | ||
167 | s->period_current_pt += s->period_bytes; | ||
168 | if (s->period_current_pt >= s->period_end) | ||
169 | s->period_current_pt = s->period_start; | ||
170 | psc_i2s_bcom_enqueue_next_buffer(s); | ||
171 | bcom_enable(s->bcom_task); | ||
172 | } | ||
173 | |||
174 | /* If the stream is active, then also inform the PCM middle layer | ||
175 | * of the period finished event. */ | ||
176 | if (s->active) | ||
177 | snd_pcm_period_elapsed(s->stream); | ||
178 | |||
179 | return IRQ_HANDLED; | ||
180 | } | ||
181 | |||
182 | /** | ||
183 | * psc_i2s_startup: create a new substream | ||
184 | * | ||
185 | * This is the first function called when a stream is opened. | ||
186 | * | ||
187 | * If this is the first stream open, then grab the IRQ and program most of | ||
188 | * the PSC registers. | ||
189 | */ | ||
190 | static int psc_i2s_startup(struct snd_pcm_substream *substream, | ||
191 | struct snd_soc_dai *dai) | ||
192 | { | ||
193 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
194 | struct psc_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; | ||
195 | int rc; | ||
196 | |||
197 | dev_dbg(psc_i2s->dev, "psc_i2s_startup(substream=%p)\n", substream); | ||
198 | |||
199 | if (!psc_i2s->playback.active && | ||
200 | !psc_i2s->capture.active) { | ||
201 | /* Setup the IRQs */ | ||
202 | rc = request_irq(psc_i2s->irq, &psc_i2s_status_irq, IRQF_SHARED, | ||
203 | "psc-i2s-status", psc_i2s); | ||
204 | rc |= request_irq(psc_i2s->capture.irq, | ||
205 | &psc_i2s_bcom_irq, IRQF_SHARED, | ||
206 | "psc-i2s-capture", &psc_i2s->capture); | ||
207 | rc |= request_irq(psc_i2s->playback.irq, | ||
208 | &psc_i2s_bcom_irq, IRQF_SHARED, | ||
209 | "psc-i2s-playback", &psc_i2s->playback); | ||
210 | if (rc) { | ||
211 | free_irq(psc_i2s->irq, psc_i2s); | ||
212 | free_irq(psc_i2s->capture.irq, | ||
213 | &psc_i2s->capture); | ||
214 | free_irq(psc_i2s->playback.irq, | ||
215 | &psc_i2s->playback); | ||
216 | return -ENODEV; | ||
217 | } | ||
218 | } | ||
219 | |||
220 | return 0; | ||
221 | } | ||
222 | 38 | ||
223 | static int psc_i2s_hw_params(struct snd_pcm_substream *substream, | 39 | static int psc_i2s_hw_params(struct snd_pcm_substream *substream, |
224 | struct snd_pcm_hw_params *params, | 40 | struct snd_pcm_hw_params *params, |
225 | struct snd_soc_dai *dai) | 41 | struct snd_soc_dai *dai) |
226 | { | 42 | { |
227 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 43 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
228 | struct psc_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; | 44 | struct psc_dma *psc_dma = rtd->dai->cpu_dai->private_data; |
229 | u32 mode; | 45 | u32 mode; |
230 | 46 | ||
231 | dev_dbg(psc_i2s->dev, "%s(substream=%p) p_size=%i p_bytes=%i" | 47 | dev_dbg(psc_dma->dev, "%s(substream=%p) p_size=%i p_bytes=%i" |
232 | " periods=%i buffer_size=%i buffer_bytes=%i\n", | 48 | " periods=%i buffer_size=%i buffer_bytes=%i\n", |
233 | __func__, substream, params_period_size(params), | 49 | __func__, substream, params_period_size(params), |
234 | params_period_bytes(params), params_periods(params), | 50 | params_period_bytes(params), params_periods(params), |
@@ -248,175 +64,15 @@ static int psc_i2s_hw_params(struct snd_pcm_substream *substream, | |||
248 | mode = MPC52xx_PSC_SICR_SIM_CODEC_32; | 64 | mode = MPC52xx_PSC_SICR_SIM_CODEC_32; |
249 | break; | 65 | break; |
250 | default: | 66 | default: |
251 | dev_dbg(psc_i2s->dev, "invalid format\n"); | 67 | dev_dbg(psc_dma->dev, "invalid format\n"); |
252 | return -EINVAL; | ||
253 | } | ||
254 | out_be32(&psc_i2s->psc_regs->sicr, psc_i2s->sicr | mode); | ||
255 | |||
256 | snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); | ||
257 | |||
258 | return 0; | ||
259 | } | ||
260 | |||
261 | static int psc_i2s_hw_free(struct snd_pcm_substream *substream, | ||
262 | struct snd_soc_dai *dai) | ||
263 | { | ||
264 | snd_pcm_set_runtime_buffer(substream, NULL); | ||
265 | return 0; | ||
266 | } | ||
267 | |||
268 | /** | ||
269 | * psc_i2s_trigger: start and stop the DMA transfer. | ||
270 | * | ||
271 | * This function is called by ALSA to start, stop, pause, and resume the DMA | ||
272 | * transfer of data. | ||
273 | */ | ||
274 | static int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, | ||
275 | struct snd_soc_dai *dai) | ||
276 | { | ||
277 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
278 | struct psc_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; | ||
279 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
280 | struct psc_i2s_stream *s; | ||
281 | struct mpc52xx_psc __iomem *regs = psc_i2s->psc_regs; | ||
282 | u16 imr; | ||
283 | u8 psc_cmd; | ||
284 | unsigned long flags; | ||
285 | |||
286 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
287 | s = &psc_i2s->capture; | ||
288 | else | ||
289 | s = &psc_i2s->playback; | ||
290 | |||
291 | dev_dbg(psc_i2s->dev, "psc_i2s_trigger(substream=%p, cmd=%i)" | ||
292 | " stream_id=%i\n", | ||
293 | substream, cmd, substream->pstr->stream); | ||
294 | |||
295 | switch (cmd) { | ||
296 | case SNDRV_PCM_TRIGGER_START: | ||
297 | s->period_bytes = frames_to_bytes(runtime, | ||
298 | runtime->period_size); | ||
299 | s->period_start = virt_to_phys(runtime->dma_area); | ||
300 | s->period_end = s->period_start + | ||
301 | (s->period_bytes * runtime->periods); | ||
302 | s->period_next_pt = s->period_start; | ||
303 | s->period_current_pt = s->period_start; | ||
304 | s->active = 1; | ||
305 | |||
306 | /* First; reset everything */ | ||
307 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) { | ||
308 | out_8(®s->command, MPC52xx_PSC_RST_RX); | ||
309 | out_8(®s->command, MPC52xx_PSC_RST_ERR_STAT); | ||
310 | } else { | ||
311 | out_8(®s->command, MPC52xx_PSC_RST_TX); | ||
312 | out_8(®s->command, MPC52xx_PSC_RST_ERR_STAT); | ||
313 | } | ||
314 | |||
315 | /* Next, fill up the bestcomm bd queue and enable DMA. | ||
316 | * This will begin filling the PSC's fifo. */ | ||
317 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
318 | bcom_gen_bd_rx_reset(s->bcom_task); | ||
319 | else | ||
320 | bcom_gen_bd_tx_reset(s->bcom_task); | ||
321 | while (!bcom_queue_full(s->bcom_task)) | ||
322 | psc_i2s_bcom_enqueue_next_buffer(s); | ||
323 | bcom_enable(s->bcom_task); | ||
324 | |||
325 | /* Due to errata in the i2s mode; need to line up enabling | ||
326 | * the transmitter with a transition on the frame sync | ||
327 | * line */ | ||
328 | |||
329 | spin_lock_irqsave(&psc_i2s->lock, flags); | ||
330 | /* first make sure it is low */ | ||
331 | while ((in_8(®s->ipcr_acr.ipcr) & 0x80) != 0) | ||
332 | ; | ||
333 | /* then wait for the transition to high */ | ||
334 | while ((in_8(®s->ipcr_acr.ipcr) & 0x80) == 0) | ||
335 | ; | ||
336 | /* Finally, enable the PSC. | ||
337 | * Receiver must always be enabled; even when we only want | ||
338 | * transmit. (see 15.3.2.3 of MPC5200B User's Guide) */ | ||
339 | psc_cmd = MPC52xx_PSC_RX_ENABLE; | ||
340 | if (substream->pstr->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
341 | psc_cmd |= MPC52xx_PSC_TX_ENABLE; | ||
342 | out_8(®s->command, psc_cmd); | ||
343 | spin_unlock_irqrestore(&psc_i2s->lock, flags); | ||
344 | |||
345 | break; | ||
346 | |||
347 | case SNDRV_PCM_TRIGGER_STOP: | ||
348 | /* Turn off the PSC */ | ||
349 | s->active = 0; | ||
350 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) { | ||
351 | if (!psc_i2s->playback.active) { | ||
352 | out_8(®s->command, 2 << 4); /* reset rx */ | ||
353 | out_8(®s->command, 3 << 4); /* reset tx */ | ||
354 | out_8(®s->command, 4 << 4); /* reset err */ | ||
355 | } | ||
356 | } else { | ||
357 | out_8(®s->command, 3 << 4); /* reset tx */ | ||
358 | out_8(®s->command, 4 << 4); /* reset err */ | ||
359 | if (!psc_i2s->capture.active) | ||
360 | out_8(®s->command, 2 << 4); /* reset rx */ | ||
361 | } | ||
362 | |||
363 | bcom_disable(s->bcom_task); | ||
364 | while (!bcom_queue_empty(s->bcom_task)) | ||
365 | bcom_retrieve_buffer(s->bcom_task, NULL, NULL); | ||
366 | |||
367 | break; | ||
368 | |||
369 | default: | ||
370 | dev_dbg(psc_i2s->dev, "invalid command\n"); | ||
371 | return -EINVAL; | 68 | return -EINVAL; |
372 | } | 69 | } |
373 | 70 | out_be32(&psc_dma->psc_regs->sicr, psc_dma->sicr | mode); | |
374 | /* Update interrupt enable settings */ | ||
375 | imr = 0; | ||
376 | if (psc_i2s->playback.active) | ||
377 | imr |= MPC52xx_PSC_IMR_TXEMP; | ||
378 | if (psc_i2s->capture.active) | ||
379 | imr |= MPC52xx_PSC_IMR_ORERR; | ||
380 | out_be16(®s->isr_imr.imr, imr); | ||
381 | 71 | ||
382 | return 0; | 72 | return 0; |
383 | } | 73 | } |
384 | 74 | ||
385 | /** | 75 | /** |
386 | * psc_i2s_shutdown: shutdown the data transfer on a stream | ||
387 | * | ||
388 | * Shutdown the PSC if there are no other substreams open. | ||
389 | */ | ||
390 | static void psc_i2s_shutdown(struct snd_pcm_substream *substream, | ||
391 | struct snd_soc_dai *dai) | ||
392 | { | ||
393 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
394 | struct psc_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; | ||
395 | |||
396 | dev_dbg(psc_i2s->dev, "psc_i2s_shutdown(substream=%p)\n", substream); | ||
397 | |||
398 | /* | ||
399 | * If this is the last active substream, disable the PSC and release | ||
400 | * the IRQ. | ||
401 | */ | ||
402 | if (!psc_i2s->playback.active && | ||
403 | !psc_i2s->capture.active) { | ||
404 | |||
405 | /* Disable all interrupts and reset the PSC */ | ||
406 | out_be16(&psc_i2s->psc_regs->isr_imr.imr, 0); | ||
407 | out_8(&psc_i2s->psc_regs->command, 3 << 4); /* reset tx */ | ||
408 | out_8(&psc_i2s->psc_regs->command, 2 << 4); /* reset rx */ | ||
409 | out_8(&psc_i2s->psc_regs->command, 1 << 4); /* reset mode */ | ||
410 | out_8(&psc_i2s->psc_regs->command, 4 << 4); /* reset error */ | ||
411 | |||
412 | /* Release irqs */ | ||
413 | free_irq(psc_i2s->irq, psc_i2s); | ||
414 | free_irq(psc_i2s->capture.irq, &psc_i2s->capture); | ||
415 | free_irq(psc_i2s->playback.irq, &psc_i2s->playback); | ||
416 | } | ||
417 | } | ||
418 | |||
419 | /** | ||
420 | * psc_i2s_set_sysclk: set the clock frequency and direction | 76 | * psc_i2s_set_sysclk: set the clock frequency and direction |
421 | * | 77 | * |
422 | * This function is called by the machine driver to tell us what the clock | 78 | * This function is called by the machine driver to tell us what the clock |
@@ -433,8 +89,8 @@ static void psc_i2s_shutdown(struct snd_pcm_substream *substream, | |||
433 | static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, | 89 | static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, |
434 | int clk_id, unsigned int freq, int dir) | 90 | int clk_id, unsigned int freq, int dir) |
435 | { | 91 | { |
436 | struct psc_i2s *psc_i2s = cpu_dai->private_data; | 92 | struct psc_dma *psc_dma = cpu_dai->private_data; |
437 | dev_dbg(psc_i2s->dev, "psc_i2s_set_sysclk(cpu_dai=%p, dir=%i)\n", | 93 | dev_dbg(psc_dma->dev, "psc_i2s_set_sysclk(cpu_dai=%p, dir=%i)\n", |
438 | cpu_dai, dir); | 94 | cpu_dai, dir); |
439 | return (dir == SND_SOC_CLOCK_IN) ? 0 : -EINVAL; | 95 | return (dir == SND_SOC_CLOCK_IN) ? 0 : -EINVAL; |
440 | } | 96 | } |
@@ -452,8 +108,8 @@ static int psc_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, | |||
452 | */ | 108 | */ |
453 | static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format) | 109 | static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format) |
454 | { | 110 | { |
455 | struct psc_i2s *psc_i2s = cpu_dai->private_data; | 111 | struct psc_dma *psc_dma = cpu_dai->private_data; |
456 | dev_dbg(psc_i2s->dev, "psc_i2s_set_fmt(cpu_dai=%p, format=%i)\n", | 112 | dev_dbg(psc_dma->dev, "psc_i2s_set_fmt(cpu_dai=%p, format=%i)\n", |
457 | cpu_dai, format); | 113 | cpu_dai, format); |
458 | return (format == SND_SOC_DAIFMT_I2S) ? 0 : -EINVAL; | 114 | return (format == SND_SOC_DAIFMT_I2S) ? 0 : -EINVAL; |
459 | } | 115 | } |
@@ -469,16 +125,13 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format) | |||
469 | * psc_i2s_dai_template: template CPU Digital Audio Interface | 125 | * psc_i2s_dai_template: template CPU Digital Audio Interface |
470 | */ | 126 | */ |
471 | static struct snd_soc_dai_ops psc_i2s_dai_ops = { | 127 | static struct snd_soc_dai_ops psc_i2s_dai_ops = { |
472 | .startup = psc_i2s_startup, | ||
473 | .hw_params = psc_i2s_hw_params, | 128 | .hw_params = psc_i2s_hw_params, |
474 | .hw_free = psc_i2s_hw_free, | ||
475 | .shutdown = psc_i2s_shutdown, | ||
476 | .trigger = psc_i2s_trigger, | ||
477 | .set_sysclk = psc_i2s_set_sysclk, | 129 | .set_sysclk = psc_i2s_set_sysclk, |
478 | .set_fmt = psc_i2s_set_fmt, | 130 | .set_fmt = psc_i2s_set_fmt, |
479 | }; | 131 | }; |
480 | 132 | ||
481 | static struct snd_soc_dai psc_i2s_dai_template = { | 133 | struct snd_soc_dai psc_i2s_dai[] = {{ |
134 | .name = "I2S", | ||
482 | .playback = { | 135 | .playback = { |
483 | .channels_min = 2, | 136 | .channels_min = 2, |
484 | .channels_max = 2, | 137 | .channels_max = 2, |
@@ -492,223 +145,8 @@ static struct snd_soc_dai psc_i2s_dai_template = { | |||
492 | .formats = PSC_I2S_FORMATS, | 145 | .formats = PSC_I2S_FORMATS, |
493 | }, | 146 | }, |
494 | .ops = &psc_i2s_dai_ops, | 147 | .ops = &psc_i2s_dai_ops, |
495 | }; | 148 | } }; |
496 | 149 | EXPORT_SYMBOL_GPL(psc_i2s_dai); | |
497 | /* --------------------------------------------------------------------- | ||
498 | * The PSC I2S 'ASoC platform' driver | ||
499 | * | ||
500 | * Can be referenced by an 'ASoC machine' driver | ||
501 | * This driver only deals with the audio bus; it doesn't have any | ||
502 | * interaction with the attached codec | ||
503 | */ | ||
504 | |||
505 | static const struct snd_pcm_hardware psc_i2s_pcm_hardware = { | ||
506 | .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | | ||
507 | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | | ||
508 | SNDRV_PCM_INFO_BATCH, | ||
509 | .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | | ||
510 | SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE, | ||
511 | .rate_min = 8000, | ||
512 | .rate_max = 48000, | ||
513 | .channels_min = 2, | ||
514 | .channels_max = 2, | ||
515 | .period_bytes_max = 1024 * 1024, | ||
516 | .period_bytes_min = 32, | ||
517 | .periods_min = 2, | ||
518 | .periods_max = 256, | ||
519 | .buffer_bytes_max = 2 * 1024 * 1024, | ||
520 | .fifo_size = 0, | ||
521 | }; | ||
522 | |||
523 | static int psc_i2s_pcm_open(struct snd_pcm_substream *substream) | ||
524 | { | ||
525 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
526 | struct psc_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; | ||
527 | struct psc_i2s_stream *s; | ||
528 | |||
529 | dev_dbg(psc_i2s->dev, "psc_i2s_pcm_open(substream=%p)\n", substream); | ||
530 | |||
531 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
532 | s = &psc_i2s->capture; | ||
533 | else | ||
534 | s = &psc_i2s->playback; | ||
535 | |||
536 | snd_soc_set_runtime_hwparams(substream, &psc_i2s_pcm_hardware); | ||
537 | |||
538 | s->stream = substream; | ||
539 | return 0; | ||
540 | } | ||
541 | |||
542 | static int psc_i2s_pcm_close(struct snd_pcm_substream *substream) | ||
543 | { | ||
544 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
545 | struct psc_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; | ||
546 | struct psc_i2s_stream *s; | ||
547 | |||
548 | dev_dbg(psc_i2s->dev, "psc_i2s_pcm_close(substream=%p)\n", substream); | ||
549 | |||
550 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
551 | s = &psc_i2s->capture; | ||
552 | else | ||
553 | s = &psc_i2s->playback; | ||
554 | |||
555 | s->stream = NULL; | ||
556 | return 0; | ||
557 | } | ||
558 | |||
559 | static snd_pcm_uframes_t | ||
560 | psc_i2s_pcm_pointer(struct snd_pcm_substream *substream) | ||
561 | { | ||
562 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
563 | struct psc_i2s *psc_i2s = rtd->dai->cpu_dai->private_data; | ||
564 | struct psc_i2s_stream *s; | ||
565 | dma_addr_t count; | ||
566 | |||
567 | if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE) | ||
568 | s = &psc_i2s->capture; | ||
569 | else | ||
570 | s = &psc_i2s->playback; | ||
571 | |||
572 | count = s->period_current_pt - s->period_start; | ||
573 | |||
574 | return bytes_to_frames(substream->runtime, count); | ||
575 | } | ||
576 | |||
577 | static struct snd_pcm_ops psc_i2s_pcm_ops = { | ||
578 | .open = psc_i2s_pcm_open, | ||
579 | .close = psc_i2s_pcm_close, | ||
580 | .ioctl = snd_pcm_lib_ioctl, | ||
581 | .pointer = psc_i2s_pcm_pointer, | ||
582 | }; | ||
583 | |||
584 | static u64 psc_i2s_pcm_dmamask = 0xffffffff; | ||
585 | static int psc_i2s_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | ||
586 | struct snd_pcm *pcm) | ||
587 | { | ||
588 | struct snd_soc_pcm_runtime *rtd = pcm->private_data; | ||
589 | size_t size = psc_i2s_pcm_hardware.buffer_bytes_max; | ||
590 | int rc = 0; | ||
591 | |||
592 | dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_new(card=%p, dai=%p, pcm=%p)\n", | ||
593 | card, dai, pcm); | ||
594 | |||
595 | if (!card->dev->dma_mask) | ||
596 | card->dev->dma_mask = &psc_i2s_pcm_dmamask; | ||
597 | if (!card->dev->coherent_dma_mask) | ||
598 | card->dev->coherent_dma_mask = 0xffffffff; | ||
599 | |||
600 | if (pcm->streams[0].substream) { | ||
601 | rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->dev, size, | ||
602 | &pcm->streams[0].substream->dma_buffer); | ||
603 | if (rc) | ||
604 | goto playback_alloc_err; | ||
605 | } | ||
606 | |||
607 | if (pcm->streams[1].substream) { | ||
608 | rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->dev, size, | ||
609 | &pcm->streams[1].substream->dma_buffer); | ||
610 | if (rc) | ||
611 | goto capture_alloc_err; | ||
612 | } | ||
613 | |||
614 | return 0; | ||
615 | |||
616 | capture_alloc_err: | ||
617 | if (pcm->streams[0].substream) | ||
618 | snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer); | ||
619 | playback_alloc_err: | ||
620 | dev_err(card->dev, "Cannot allocate buffer(s)\n"); | ||
621 | return -ENOMEM; | ||
622 | } | ||
623 | |||
624 | static void psc_i2s_pcm_free(struct snd_pcm *pcm) | ||
625 | { | ||
626 | struct snd_soc_pcm_runtime *rtd = pcm->private_data; | ||
627 | struct snd_pcm_substream *substream; | ||
628 | int stream; | ||
629 | |||
630 | dev_dbg(rtd->socdev->dev, "psc_i2s_pcm_free(pcm=%p)\n", pcm); | ||
631 | |||
632 | for (stream = 0; stream < 2; stream++) { | ||
633 | substream = pcm->streams[stream].substream; | ||
634 | if (substream) { | ||
635 | snd_dma_free_pages(&substream->dma_buffer); | ||
636 | substream->dma_buffer.area = NULL; | ||
637 | substream->dma_buffer.addr = 0; | ||
638 | } | ||
639 | } | ||
640 | } | ||
641 | |||
642 | struct snd_soc_platform psc_i2s_pcm_soc_platform = { | ||
643 | .name = "mpc5200-psc-audio", | ||
644 | .pcm_ops = &psc_i2s_pcm_ops, | ||
645 | .pcm_new = &psc_i2s_pcm_new, | ||
646 | .pcm_free = &psc_i2s_pcm_free, | ||
647 | }; | ||
648 | |||
649 | /* --------------------------------------------------------------------- | ||
650 | * Sysfs attributes for debugging | ||
651 | */ | ||
652 | |||
653 | static ssize_t psc_i2s_status_show(struct device *dev, | ||
654 | struct device_attribute *attr, char *buf) | ||
655 | { | ||
656 | struct psc_i2s *psc_i2s = dev_get_drvdata(dev); | ||
657 | |||
658 | return sprintf(buf, "status=%.4x sicr=%.8x rfnum=%i rfstat=0x%.4x " | ||
659 | "tfnum=%i tfstat=0x%.4x\n", | ||
660 | in_be16(&psc_i2s->psc_regs->sr_csr.status), | ||
661 | in_be32(&psc_i2s->psc_regs->sicr), | ||
662 | in_be16(&psc_i2s->fifo_regs->rfnum) & 0x1ff, | ||
663 | in_be16(&psc_i2s->fifo_regs->rfstat), | ||
664 | in_be16(&psc_i2s->fifo_regs->tfnum) & 0x1ff, | ||
665 | in_be16(&psc_i2s->fifo_regs->tfstat)); | ||
666 | } | ||
667 | |||
668 | static int *psc_i2s_get_stat_attr(struct psc_i2s *psc_i2s, const char *name) | ||
669 | { | ||
670 | if (strcmp(name, "playback_underrun") == 0) | ||
671 | return &psc_i2s->stats.underrun_count; | ||
672 | if (strcmp(name, "capture_overrun") == 0) | ||
673 | return &psc_i2s->stats.overrun_count; | ||
674 | |||
675 | return NULL; | ||
676 | } | ||
677 | |||
678 | static ssize_t psc_i2s_stat_show(struct device *dev, | ||
679 | struct device_attribute *attr, char *buf) | ||
680 | { | ||
681 | struct psc_i2s *psc_i2s = dev_get_drvdata(dev); | ||
682 | int *attrib; | ||
683 | |||
684 | attrib = psc_i2s_get_stat_attr(psc_i2s, attr->attr.name); | ||
685 | if (!attrib) | ||
686 | return 0; | ||
687 | |||
688 | return sprintf(buf, "%i\n", *attrib); | ||
689 | } | ||
690 | |||
691 | static ssize_t psc_i2s_stat_store(struct device *dev, | ||
692 | struct device_attribute *attr, | ||
693 | const char *buf, | ||
694 | size_t count) | ||
695 | { | ||
696 | struct psc_i2s *psc_i2s = dev_get_drvdata(dev); | ||
697 | int *attrib; | ||
698 | |||
699 | attrib = psc_i2s_get_stat_attr(psc_i2s, attr->attr.name); | ||
700 | if (!attrib) | ||
701 | return 0; | ||
702 | |||
703 | *attrib = simple_strtoul(buf, NULL, 0); | ||
704 | return count; | ||
705 | } | ||
706 | |||
707 | static DEVICE_ATTR(status, 0644, psc_i2s_status_show, NULL); | ||
708 | static DEVICE_ATTR(playback_underrun, 0644, psc_i2s_stat_show, | ||
709 | psc_i2s_stat_store); | ||
710 | static DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show, | ||
711 | psc_i2s_stat_store); | ||
712 | 150 | ||
713 | /* --------------------------------------------------------------------- | 151 | /* --------------------------------------------------------------------- |
714 | * OF platform bus binding code: | 152 | * OF platform bus binding code: |
@@ -718,150 +156,65 @@ static DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show, | |||
718 | static int __devinit psc_i2s_of_probe(struct of_device *op, | 156 | static int __devinit psc_i2s_of_probe(struct of_device *op, |
719 | const struct of_device_id *match) | 157 | const struct of_device_id *match) |
720 | { | 158 | { |
721 | phys_addr_t fifo; | 159 | int rc; |
722 | struct psc_i2s *psc_i2s; | 160 | struct psc_dma *psc_dma; |
723 | struct resource res; | 161 | struct mpc52xx_psc __iomem *regs; |
724 | int size, psc_id, irq, rc; | ||
725 | const __be32 *prop; | ||
726 | void __iomem *regs; | ||
727 | |||
728 | dev_dbg(&op->dev, "probing psc i2s device\n"); | ||
729 | |||
730 | /* Get the PSC ID */ | ||
731 | prop = of_get_property(op->node, "cell-index", &size); | ||
732 | if (!prop || size < sizeof *prop) | ||
733 | return -ENODEV; | ||
734 | psc_id = be32_to_cpu(*prop); | ||
735 | |||
736 | /* Fetch the registers and IRQ of the PSC */ | ||
737 | irq = irq_of_parse_and_map(op->node, 0); | ||
738 | if (of_address_to_resource(op->node, 0, &res)) { | ||
739 | dev_err(&op->dev, "Missing reg property\n"); | ||
740 | return -ENODEV; | ||
741 | } | ||
742 | regs = ioremap(res.start, 1 + res.end - res.start); | ||
743 | if (!regs) { | ||
744 | dev_err(&op->dev, "Could not map registers\n"); | ||
745 | return -ENODEV; | ||
746 | } | ||
747 | 162 | ||
748 | /* Allocate and initialize the driver private data */ | 163 | rc = mpc5200_audio_dma_create(op); |
749 | psc_i2s = kzalloc(sizeof *psc_i2s, GFP_KERNEL); | 164 | if (rc != 0) |
750 | if (!psc_i2s) { | 165 | return rc; |
751 | iounmap(regs); | 166 | |
752 | return -ENOMEM; | 167 | rc = snd_soc_register_dais(psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); |
753 | } | 168 | if (rc != 0) { |
754 | spin_lock_init(&psc_i2s->lock); | 169 | pr_err("Failed to register DAI\n"); |
755 | psc_i2s->irq = irq; | 170 | return 0; |
756 | psc_i2s->psc_regs = regs; | ||
757 | psc_i2s->fifo_regs = regs + sizeof *psc_i2s->psc_regs; | ||
758 | psc_i2s->dev = &op->dev; | ||
759 | psc_i2s->playback.psc_i2s = psc_i2s; | ||
760 | psc_i2s->capture.psc_i2s = psc_i2s; | ||
761 | snprintf(psc_i2s->name, sizeof psc_i2s->name, "PSC%u", psc_id+1); | ||
762 | |||
763 | /* Fill out the CPU DAI structure */ | ||
764 | memcpy(&psc_i2s->dai, &psc_i2s_dai_template, sizeof psc_i2s->dai); | ||
765 | psc_i2s->dai.private_data = psc_i2s; | ||
766 | psc_i2s->dai.name = psc_i2s->name; | ||
767 | psc_i2s->dai.id = psc_id; | ||
768 | |||
769 | /* Find the address of the fifo data registers and setup the | ||
770 | * DMA tasks */ | ||
771 | fifo = res.start + offsetof(struct mpc52xx_psc, buffer.buffer_32); | ||
772 | psc_i2s->capture.bcom_task = | ||
773 | bcom_psc_gen_bd_rx_init(psc_id, 10, fifo, 512); | ||
774 | psc_i2s->playback.bcom_task = | ||
775 | bcom_psc_gen_bd_tx_init(psc_id, 10, fifo); | ||
776 | if (!psc_i2s->capture.bcom_task || | ||
777 | !psc_i2s->playback.bcom_task) { | ||
778 | dev_err(&op->dev, "Could not allocate bestcomm tasks\n"); | ||
779 | iounmap(regs); | ||
780 | kfree(psc_i2s); | ||
781 | return -ENODEV; | ||
782 | } | 171 | } |
783 | 172 | ||
784 | /* Disable all interrupts and reset the PSC */ | 173 | psc_dma = dev_get_drvdata(&op->dev); |
785 | out_be16(&psc_i2s->psc_regs->isr_imr.imr, 0); | 174 | regs = psc_dma->psc_regs; |
786 | out_8(&psc_i2s->psc_regs->command, 3 << 4); /* reset transmitter */ | ||
787 | out_8(&psc_i2s->psc_regs->command, 2 << 4); /* reset receiver */ | ||
788 | out_8(&psc_i2s->psc_regs->command, 1 << 4); /* reset mode */ | ||
789 | out_8(&psc_i2s->psc_regs->command, 4 << 4); /* reset error */ | ||
790 | 175 | ||
791 | /* Configure the serial interface mode; defaulting to CODEC8 mode */ | 176 | /* Configure the serial interface mode; defaulting to CODEC8 mode */ |
792 | psc_i2s->sicr = MPC52xx_PSC_SICR_DTS1 | MPC52xx_PSC_SICR_I2S | | 177 | psc_dma->sicr = MPC52xx_PSC_SICR_DTS1 | MPC52xx_PSC_SICR_I2S | |
793 | MPC52xx_PSC_SICR_CLKPOL; | 178 | MPC52xx_PSC_SICR_CLKPOL; |
794 | if (of_get_property(op->node, "fsl,cellslave", NULL)) | 179 | out_be32(&psc_dma->psc_regs->sicr, |
795 | psc_i2s->sicr |= MPC52xx_PSC_SICR_CELLSLAVE | | 180 | psc_dma->sicr | MPC52xx_PSC_SICR_SIM_CODEC_8); |
796 | MPC52xx_PSC_SICR_GENCLK; | ||
797 | out_be32(&psc_i2s->psc_regs->sicr, | ||
798 | psc_i2s->sicr | MPC52xx_PSC_SICR_SIM_CODEC_8); | ||
799 | 181 | ||
800 | /* Check for the codec handle. If it is not present then we | 182 | /* Check for the codec handle. If it is not present then we |
801 | * are done */ | 183 | * are done */ |
802 | if (!of_get_property(op->node, "codec-handle", NULL)) | 184 | if (!of_get_property(op->node, "codec-handle", NULL)) |
803 | return 0; | 185 | return 0; |
804 | 186 | ||
805 | /* Set up mode register; | 187 | /* Due to errata in the dma mode; need to line up enabling |
806 | * First write: RxRdy (FIFO Alarm) generates rx FIFO irq | 188 | * the transmitter with a transition on the frame sync |
807 | * Second write: register Normal mode for non loopback | 189 | * line */ |
808 | */ | 190 | |
809 | out_8(&psc_i2s->psc_regs->mode, 0); | 191 | /* first make sure it is low */ |
810 | out_8(&psc_i2s->psc_regs->mode, 0); | 192 | while ((in_8(®s->ipcr_acr.ipcr) & 0x80) != 0) |
811 | 193 | ; | |
812 | /* Set the TX and RX fifo alarm thresholds */ | 194 | /* then wait for the transition to high */ |
813 | out_be16(&psc_i2s->fifo_regs->rfalarm, 0x100); | 195 | while ((in_8(®s->ipcr_acr.ipcr) & 0x80) == 0) |
814 | out_8(&psc_i2s->fifo_regs->rfcntl, 0x4); | 196 | ; |
815 | out_be16(&psc_i2s->fifo_regs->tfalarm, 0x100); | 197 | /* Finally, enable the PSC. |
816 | out_8(&psc_i2s->fifo_regs->tfcntl, 0x7); | 198 | * Receiver must always be enabled; even when we only want |
817 | 199 | * transmit. (see 15.3.2.3 of MPC5200B User's Guide) */ | |
818 | /* Lookup the IRQ numbers */ | 200 | |
819 | psc_i2s->playback.irq = | 201 | /* Go */ |
820 | bcom_get_task_irq(psc_i2s->playback.bcom_task); | 202 | out_8(&psc_dma->psc_regs->command, |
821 | psc_i2s->capture.irq = | 203 | MPC52xx_PSC_TX_ENABLE | MPC52xx_PSC_RX_ENABLE); |
822 | bcom_get_task_irq(psc_i2s->capture.bcom_task); | ||
823 | |||
824 | /* Save what we've done so it can be found again later */ | ||
825 | dev_set_drvdata(&op->dev, psc_i2s); | ||
826 | |||
827 | /* Register the SYSFS files */ | ||
828 | rc = device_create_file(psc_i2s->dev, &dev_attr_status); | ||
829 | rc |= device_create_file(psc_i2s->dev, &dev_attr_capture_overrun); | ||
830 | rc |= device_create_file(psc_i2s->dev, &dev_attr_playback_underrun); | ||
831 | if (rc) | ||
832 | dev_info(psc_i2s->dev, "error creating sysfs files\n"); | ||
833 | |||
834 | snd_soc_register_platform(&psc_i2s_pcm_soc_platform); | ||
835 | |||
836 | /* Tell the ASoC OF helpers about it */ | ||
837 | of_snd_soc_register_platform(&psc_i2s_pcm_soc_platform, op->node, | ||
838 | &psc_i2s->dai); | ||
839 | 204 | ||
840 | return 0; | 205 | return 0; |
206 | |||
841 | } | 207 | } |
842 | 208 | ||
843 | static int __devexit psc_i2s_of_remove(struct of_device *op) | 209 | static int __devexit psc_i2s_of_remove(struct of_device *op) |
844 | { | 210 | { |
845 | struct psc_i2s *psc_i2s = dev_get_drvdata(&op->dev); | 211 | return mpc5200_audio_dma_destroy(op); |
846 | |||
847 | dev_dbg(&op->dev, "psc_i2s_remove()\n"); | ||
848 | |||
849 | snd_soc_unregister_platform(&psc_i2s_pcm_soc_platform); | ||
850 | |||
851 | bcom_gen_bd_rx_release(psc_i2s->capture.bcom_task); | ||
852 | bcom_gen_bd_tx_release(psc_i2s->playback.bcom_task); | ||
853 | |||
854 | iounmap(psc_i2s->psc_regs); | ||
855 | iounmap(psc_i2s->fifo_regs); | ||
856 | kfree(psc_i2s); | ||
857 | dev_set_drvdata(&op->dev, NULL); | ||
858 | |||
859 | return 0; | ||
860 | } | 212 | } |
861 | 213 | ||
862 | /* Match table for of_platform binding */ | 214 | /* Match table for of_platform binding */ |
863 | static struct of_device_id psc_i2s_match[] __devinitdata = { | 215 | static struct of_device_id psc_i2s_match[] __devinitdata = { |
864 | { .compatible = "fsl,mpc5200-psc-i2s", }, | 216 | { .compatible = "fsl,mpc5200-psc-i2s", }, |
217 | { .compatible = "fsl,mpc5200b-psc-i2s", }, | ||
865 | {} | 218 | {} |
866 | }; | 219 | }; |
867 | MODULE_DEVICE_TABLE(of, psc_i2s_match); | 220 | MODULE_DEVICE_TABLE(of, psc_i2s_match); |
@@ -892,4 +245,7 @@ static void __exit psc_i2s_exit(void) | |||
892 | } | 245 | } |
893 | module_exit(psc_i2s_exit); | 246 | module_exit(psc_i2s_exit); |
894 | 247 | ||
248 | MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>"); | ||
249 | MODULE_DESCRIPTION("Freescale MPC5200 PSC in I2S mode ASoC Driver"); | ||
250 | MODULE_LICENSE("GPL"); | ||
895 | 251 | ||
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.h b/sound/soc/fsl/mpc5200_psc_i2s.h new file mode 100644 index 000000000000..ce55e070fdf3 --- /dev/null +++ b/sound/soc/fsl/mpc5200_psc_i2s.h | |||
@@ -0,0 +1,12 @@ | |||
1 | /* | ||
2 | * Freescale MPC5200 PSC in I2S mode | ||
3 | * ALSA SoC Digital Audio Interface (DAI) driver | ||
4 | * | ||
5 | */ | ||
6 | |||
7 | #ifndef __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__ | ||
8 | #define __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__ | ||
9 | |||
10 | extern struct snd_soc_dai psc_i2s_dai[]; | ||
11 | |||
12 | #endif /* __SOUND_SOC_FSL_MPC52xx_PSC_I2S_H__ */ | ||
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c new file mode 100644 index 000000000000..8766f7a3893d --- /dev/null +++ b/sound/soc/fsl/pcm030-audio-fabric.c | |||
@@ -0,0 +1,90 @@ | |||
1 | /* | ||
2 | * Phytec pcm030 driver for the PSC of the Freescale MPC52xx | ||
3 | * configured as AC97 interface | ||
4 | * | ||
5 | * Copyright 2008 Jon Smirl, Digispeaker | ||
6 | * Author: Jon Smirl <jonsmirl@gmail.com> | ||
7 | * | ||
8 | * This file is licensed under the terms of the GNU General Public License | ||
9 | * version 2. This program is licensed "as is" without any warranty of any | ||
10 | * kind, whether express or implied. | ||
11 | */ | ||
12 | |||
13 | #include <linux/init.h> | ||
14 | #include <linux/module.h> | ||
15 | #include <linux/interrupt.h> | ||
16 | #include <linux/device.h> | ||
17 | #include <linux/delay.h> | ||
18 | #include <linux/of_device.h> | ||
19 | #include <linux/of_platform.h> | ||
20 | #include <linux/dma-mapping.h> | ||
21 | |||
22 | #include <sound/core.h> | ||
23 | #include <sound/pcm.h> | ||
24 | #include <sound/pcm_params.h> | ||
25 | #include <sound/initval.h> | ||
26 | #include <sound/soc.h> | ||
27 | #include <sound/soc-of-simple.h> | ||
28 | |||
29 | #include "mpc5200_dma.h" | ||
30 | #include "mpc5200_psc_ac97.h" | ||
31 | #include "../codecs/wm9712.h" | ||
32 | |||
33 | static struct snd_soc_device device; | ||
34 | static struct snd_soc_card card; | ||
35 | |||
36 | static struct snd_soc_dai_link pcm030_fabric_dai[] = { | ||
37 | { | ||
38 | .name = "AC97", | ||
39 | .stream_name = "AC97 Analog", | ||
40 | .codec_dai = &wm9712_dai[WM9712_DAI_AC97_HIFI], | ||
41 | .cpu_dai = &psc_ac97_dai[MPC5200_AC97_NORMAL], | ||
42 | }, | ||
43 | { | ||
44 | .name = "AC97", | ||
45 | .stream_name = "AC97 IEC958", | ||
46 | .codec_dai = &wm9712_dai[WM9712_DAI_AC97_AUX], | ||
47 | .cpu_dai = &psc_ac97_dai[MPC5200_AC97_SPDIF], | ||
48 | }, | ||
49 | }; | ||
50 | |||
51 | static __init int pcm030_fabric_init(void) | ||
52 | { | ||
53 | struct platform_device *pdev; | ||
54 | int rc; | ||
55 | |||
56 | if (!machine_is_compatible("phytec,pcm030")) | ||
57 | return -ENODEV; | ||
58 | |||
59 | card.platform = &mpc5200_audio_dma_platform; | ||
60 | card.name = "pcm030"; | ||
61 | card.dai_link = pcm030_fabric_dai; | ||
62 | card.num_links = ARRAY_SIZE(pcm030_fabric_dai); | ||
63 | |||
64 | device.card = &card; | ||
65 | device.codec_dev = &soc_codec_dev_wm9712; | ||
66 | |||
67 | pdev = platform_device_alloc("soc-audio", 1); | ||
68 | if (!pdev) { | ||
69 | pr_err("pcm030_fabric_init: platform_device_alloc() failed\n"); | ||
70 | return -ENODEV; | ||
71 | } | ||
72 | |||
73 | platform_set_drvdata(pdev, &device); | ||
74 | device.dev = &pdev->dev; | ||
75 | |||
76 | rc = platform_device_add(pdev); | ||
77 | if (rc) { | ||
78 | pr_err("pcm030_fabric_init: platform_device_add() failed\n"); | ||
79 | return -ENODEV; | ||
80 | } | ||
81 | return 0; | ||
82 | } | ||
83 | |||
84 | module_init(pcm030_fabric_init); | ||
85 | |||
86 | |||
87 | MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>"); | ||
88 | MODULE_DESCRIPTION(DRV_NAME ": mpc5200 pcm030 fabric driver"); | ||
89 | MODULE_LICENSE("GPL"); | ||
90 | |||
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 675732e724d5..b771238662b6 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
@@ -39,6 +39,14 @@ config SND_OMAP_SOC_OMAP2EVM | |||
39 | help | 39 | help |
40 | Say Y if you want to add support for SoC audio on the omap2evm board. | 40 | Say Y if you want to add support for SoC audio on the omap2evm board. |
41 | 41 | ||
42 | config SND_OMAP_SOC_OMAP3EVM | ||
43 | tristate "SoC Audio support for OMAP3EVM board" | ||
44 | depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3EVM | ||
45 | select SND_OMAP_SOC_MCBSP | ||
46 | select SND_SOC_TWL4030 | ||
47 | help | ||
48 | Say Y if you want to add support for SoC audio on the omap3evm board. | ||
49 | |||
42 | config SND_OMAP_SOC_SDP3430 | 50 | config SND_OMAP_SOC_SDP3430 |
43 | tristate "SoC Audio support for Texas Instruments SDP3430" | 51 | tristate "SoC Audio support for Texas Instruments SDP3430" |
44 | depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_3430SDP | 52 | depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_3430SDP |
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 0c9e4ac37660..a37f49862389 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile | |||
@@ -10,6 +10,7 @@ snd-soc-n810-objs := n810.o | |||
10 | snd-soc-osk5912-objs := osk5912.o | 10 | snd-soc-osk5912-objs := osk5912.o |
11 | snd-soc-overo-objs := overo.o | 11 | snd-soc-overo-objs := overo.o |
12 | snd-soc-omap2evm-objs := omap2evm.o | 12 | snd-soc-omap2evm-objs := omap2evm.o |
13 | snd-soc-omap3evm-objs := omap3evm.o | ||
13 | snd-soc-sdp3430-objs := sdp3430.o | 14 | snd-soc-sdp3430-objs := sdp3430.o |
14 | snd-soc-omap3pandora-objs := omap3pandora.o | 15 | snd-soc-omap3pandora-objs := omap3pandora.o |
15 | snd-soc-omap3beagle-objs := omap3beagle.o | 16 | snd-soc-omap3beagle-objs := omap3beagle.o |
@@ -18,6 +19,7 @@ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o | |||
18 | obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o | 19 | obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o |
19 | obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o | 20 | obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o |
20 | obj-$(CONFIG_MACH_OMAP2EVM) += snd-soc-omap2evm.o | 21 | obj-$(CONFIG_MACH_OMAP2EVM) += snd-soc-omap2evm.o |
22 | obj-$(CONFIG_MACH_OMAP3EVM) += snd-soc-omap3evm.o | ||
21 | obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o | 23 | obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o |
22 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o | 24 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o |
23 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o | 25 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o |
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 91ef17992de5..b60b1dfbc435 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c | |||
@@ -383,10 +383,9 @@ static int __init n810_soc_init(void) | |||
383 | clk_set_parent(sys_clkout2_src, func96m_clk); | 383 | clk_set_parent(sys_clkout2_src, func96m_clk); |
384 | clk_set_rate(sys_clkout2, 12000000); | 384 | clk_set_rate(sys_clkout2, 12000000); |
385 | 385 | ||
386 | if (gpio_request(N810_HEADSET_AMP_GPIO, "hs_amp") < 0) | 386 | BUG_ON((gpio_request(N810_HEADSET_AMP_GPIO, "hs_amp") < 0) || |
387 | BUG(); | 387 | (gpio_request(N810_SPEAKER_AMP_GPIO, "spk_amp") < 0)); |
388 | if (gpio_request(N810_SPEAKER_AMP_GPIO, "spk_amp") < 0) | 388 | |
389 | BUG(); | ||
390 | gpio_direction_output(N810_HEADSET_AMP_GPIO, 0); | 389 | gpio_direction_output(N810_HEADSET_AMP_GPIO, 0); |
391 | gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0); | 390 | gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0); |
392 | 391 | ||
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 912614283848..a5d46a7b196a 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
@@ -215,8 +215,9 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, | |||
215 | struct omap_mcbsp_data *mcbsp_data = to_mcbsp(cpu_dai->private_data); | 215 | struct omap_mcbsp_data *mcbsp_data = to_mcbsp(cpu_dai->private_data); |
216 | struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs; | 216 | struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs; |
217 | int dma, bus_id = mcbsp_data->bus_id, id = cpu_dai->id; | 217 | int dma, bus_id = mcbsp_data->bus_id, id = cpu_dai->id; |
218 | int wlen, channels; | 218 | int wlen, channels, wpf; |
219 | unsigned long port; | 219 | unsigned long port; |
220 | unsigned int format; | ||
220 | 221 | ||
221 | if (cpu_class_is_omap1()) { | 222 | if (cpu_class_is_omap1()) { |
222 | dma = omap1_dma_reqs[bus_id][substream->stream]; | 223 | dma = omap1_dma_reqs[bus_id][substream->stream]; |
@@ -244,18 +245,24 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, | |||
244 | return 0; | 245 | return 0; |
245 | } | 246 | } |
246 | 247 | ||
247 | channels = params_channels(params); | 248 | format = mcbsp_data->fmt & SND_SOC_DAIFMT_FORMAT_MASK; |
249 | wpf = channels = params_channels(params); | ||
248 | switch (channels) { | 250 | switch (channels) { |
249 | case 2: | 251 | case 2: |
250 | /* Use dual-phase frames */ | 252 | if (format == SND_SOC_DAIFMT_I2S) { |
251 | regs->rcr2 |= RPHASE; | 253 | /* Use dual-phase frames */ |
252 | regs->xcr2 |= XPHASE; | 254 | regs->rcr2 |= RPHASE; |
255 | regs->xcr2 |= XPHASE; | ||
256 | /* Set 1 word per (McBSP) frame for phase1 and phase2 */ | ||
257 | wpf--; | ||
258 | regs->rcr2 |= RFRLEN2(wpf - 1); | ||
259 | regs->xcr2 |= XFRLEN2(wpf - 1); | ||
260 | } | ||
253 | case 1: | 261 | case 1: |
254 | /* Set 1 word per (McBSP) frame */ | 262 | case 4: |
255 | regs->rcr2 |= RFRLEN2(1 - 1); | 263 | /* Set word per (McBSP) frame for phase1 */ |
256 | regs->rcr1 |= RFRLEN1(1 - 1); | 264 | regs->rcr1 |= RFRLEN1(wpf - 1); |
257 | regs->xcr2 |= XFRLEN2(1 - 1); | 265 | regs->xcr1 |= XFRLEN1(wpf - 1); |
258 | regs->xcr1 |= XFRLEN1(1 - 1); | ||
259 | break; | 266 | break; |
260 | default: | 267 | default: |
261 | /* Unsupported number of channels */ | 268 | /* Unsupported number of channels */ |
@@ -277,11 +284,12 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, | |||
277 | } | 284 | } |
278 | 285 | ||
279 | /* Set FS period and length in terms of bit clock periods */ | 286 | /* Set FS period and length in terms of bit clock periods */ |
280 | switch (mcbsp_data->fmt & SND_SOC_DAIFMT_FORMAT_MASK) { | 287 | switch (format) { |
281 | case SND_SOC_DAIFMT_I2S: | 288 | case SND_SOC_DAIFMT_I2S: |
282 | regs->srgr2 |= FPER(wlen * 2 - 1); | 289 | regs->srgr2 |= FPER(wlen * channels - 1); |
283 | regs->srgr1 |= FWID(wlen - 1); | 290 | regs->srgr1 |= FWID(wlen - 1); |
284 | break; | 291 | break; |
292 | case SND_SOC_DAIFMT_DSP_A: | ||
285 | case SND_SOC_DAIFMT_DSP_B: | 293 | case SND_SOC_DAIFMT_DSP_B: |
286 | regs->srgr2 |= FPER(wlen * channels - 1); | 294 | regs->srgr2 |= FPER(wlen * channels - 1); |
287 | regs->srgr1 |= FWID(0); | 295 | regs->srgr1 |= FWID(0); |
@@ -326,6 +334,13 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, | |||
326 | regs->rcr2 |= RDATDLY(1); | 334 | regs->rcr2 |= RDATDLY(1); |
327 | regs->xcr2 |= XDATDLY(1); | 335 | regs->xcr2 |= XDATDLY(1); |
328 | break; | 336 | break; |
337 | case SND_SOC_DAIFMT_DSP_A: | ||
338 | /* 1-bit data delay */ | ||
339 | regs->rcr2 |= RDATDLY(1); | ||
340 | regs->xcr2 |= XDATDLY(1); | ||
341 | /* Invert FS polarity configuration */ | ||
342 | temp_fmt ^= SND_SOC_DAIFMT_NB_IF; | ||
343 | break; | ||
329 | case SND_SOC_DAIFMT_DSP_B: | 344 | case SND_SOC_DAIFMT_DSP_B: |
330 | /* 0-bit data delay */ | 345 | /* 0-bit data delay */ |
331 | regs->rcr2 |= RDATDLY(0); | 346 | regs->rcr2 |= RDATDLY(0); |
@@ -492,13 +507,13 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = { | |||
492 | .id = (link_id), \ | 507 | .id = (link_id), \ |
493 | .playback = { \ | 508 | .playback = { \ |
494 | .channels_min = 1, \ | 509 | .channels_min = 1, \ |
495 | .channels_max = 2, \ | 510 | .channels_max = 4, \ |
496 | .rates = OMAP_MCBSP_RATES, \ | 511 | .rates = OMAP_MCBSP_RATES, \ |
497 | .formats = SNDRV_PCM_FMTBIT_S16_LE, \ | 512 | .formats = SNDRV_PCM_FMTBIT_S16_LE, \ |
498 | }, \ | 513 | }, \ |
499 | .capture = { \ | 514 | .capture = { \ |
500 | .channels_min = 1, \ | 515 | .channels_min = 1, \ |
501 | .channels_max = 2, \ | 516 | .channels_max = 4, \ |
502 | .rates = OMAP_MCBSP_RATES, \ | 517 | .rates = OMAP_MCBSP_RATES, \ |
503 | .formats = SNDRV_PCM_FMTBIT_S16_LE, \ | 518 | .formats = SNDRV_PCM_FMTBIT_S16_LE, \ |
504 | }, \ | 519 | }, \ |
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 07cf7f46b584..6454e15f7d28 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
@@ -87,8 +87,10 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream, | |||
87 | struct omap_pcm_dma_data *dma_data = rtd->dai->cpu_dai->dma_data; | 87 | struct omap_pcm_dma_data *dma_data = rtd->dai->cpu_dai->dma_data; |
88 | int err = 0; | 88 | int err = 0; |
89 | 89 | ||
90 | /* return if this is a bufferless transfer e.g. | ||
91 | * codec <--> BT codec or GSM modem -- lg FIXME */ | ||
90 | if (!dma_data) | 92 | if (!dma_data) |
91 | return -ENODEV; | 93 | return 0; |
92 | 94 | ||
93 | snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); | 95 | snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); |
94 | runtime->dma_bytes = params_buffer_bytes(params); | 96 | runtime->dma_bytes = params_buffer_bytes(params); |
@@ -134,6 +136,11 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream) | |||
134 | struct omap_pcm_dma_data *dma_data = prtd->dma_data; | 136 | struct omap_pcm_dma_data *dma_data = prtd->dma_data; |
135 | struct omap_dma_channel_params dma_params; | 137 | struct omap_dma_channel_params dma_params; |
136 | 138 | ||
139 | /* return if this is a bufferless transfer e.g. | ||
140 | * codec <--> BT codec or GSM modem -- lg FIXME */ | ||
141 | if (!prtd->dma_data) | ||
142 | return 0; | ||
143 | |||
137 | memset(&dma_params, 0, sizeof(dma_params)); | 144 | memset(&dma_params, 0, sizeof(dma_params)); |
138 | /* | 145 | /* |
139 | * Note: Regardless of interface data formats supported by OMAP McBSP | 146 | * Note: Regardless of interface data formats supported by OMAP McBSP |
diff --git a/sound/soc/omap/omap2evm.c b/sound/soc/omap/omap2evm.c index 0c2322dcf02a..027e1a40f8a1 100644 --- a/sound/soc/omap/omap2evm.c +++ b/sound/soc/omap/omap2evm.c | |||
@@ -86,7 +86,7 @@ static struct snd_soc_dai_link omap2evm_dai = { | |||
86 | .name = "TWL4030", | 86 | .name = "TWL4030", |
87 | .stream_name = "TWL4030", | 87 | .stream_name = "TWL4030", |
88 | .cpu_dai = &omap_mcbsp_dai[0], | 88 | .cpu_dai = &omap_mcbsp_dai[0], |
89 | .codec_dai = &twl4030_dai, | 89 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
90 | .ops = &omap2evm_ops, | 90 | .ops = &omap2evm_ops, |
91 | }; | 91 | }; |
92 | 92 | ||
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c index fd24a4acd2f5..b0cff9f33b7e 100644 --- a/sound/soc/omap/omap3beagle.c +++ b/sound/soc/omap/omap3beagle.c | |||
@@ -41,23 +41,33 @@ static int omap3beagle_hw_params(struct snd_pcm_substream *substream, | |||
41 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 41 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
42 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; | 42 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; |
43 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | 43 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; |
44 | unsigned int fmt; | ||
44 | int ret; | 45 | int ret; |
45 | 46 | ||
47 | switch (params_channels(params)) { | ||
48 | case 2: /* Stereo I2S mode */ | ||
49 | fmt = SND_SOC_DAIFMT_I2S | | ||
50 | SND_SOC_DAIFMT_NB_NF | | ||
51 | SND_SOC_DAIFMT_CBM_CFM; | ||
52 | break; | ||
53 | case 4: /* Four channel TDM mode */ | ||
54 | fmt = SND_SOC_DAIFMT_DSP_A | | ||
55 | SND_SOC_DAIFMT_IB_NF | | ||
56 | SND_SOC_DAIFMT_CBM_CFM; | ||
57 | break; | ||
58 | default: | ||
59 | return -EINVAL; | ||
60 | } | ||
61 | |||
46 | /* Set codec DAI configuration */ | 62 | /* Set codec DAI configuration */ |
47 | ret = snd_soc_dai_set_fmt(codec_dai, | 63 | ret = snd_soc_dai_set_fmt(codec_dai, fmt); |
48 | SND_SOC_DAIFMT_I2S | | ||
49 | SND_SOC_DAIFMT_NB_NF | | ||
50 | SND_SOC_DAIFMT_CBM_CFM); | ||
51 | if (ret < 0) { | 64 | if (ret < 0) { |
52 | printk(KERN_ERR "can't set codec DAI configuration\n"); | 65 | printk(KERN_ERR "can't set codec DAI configuration\n"); |
53 | return ret; | 66 | return ret; |
54 | } | 67 | } |
55 | 68 | ||
56 | /* Set cpu DAI configuration */ | 69 | /* Set cpu DAI configuration */ |
57 | ret = snd_soc_dai_set_fmt(cpu_dai, | 70 | ret = snd_soc_dai_set_fmt(cpu_dai, fmt); |
58 | SND_SOC_DAIFMT_I2S | | ||
59 | SND_SOC_DAIFMT_NB_NF | | ||
60 | SND_SOC_DAIFMT_CBM_CFM); | ||
61 | if (ret < 0) { | 71 | if (ret < 0) { |
62 | printk(KERN_ERR "can't set cpu DAI configuration\n"); | 72 | printk(KERN_ERR "can't set cpu DAI configuration\n"); |
63 | return ret; | 73 | return ret; |
@@ -83,7 +93,7 @@ static struct snd_soc_dai_link omap3beagle_dai = { | |||
83 | .name = "TWL4030", | 93 | .name = "TWL4030", |
84 | .stream_name = "TWL4030", | 94 | .stream_name = "TWL4030", |
85 | .cpu_dai = &omap_mcbsp_dai[0], | 95 | .cpu_dai = &omap_mcbsp_dai[0], |
86 | .codec_dai = &twl4030_dai, | 96 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
87 | .ops = &omap3beagle_ops, | 97 | .ops = &omap3beagle_ops, |
88 | }; | 98 | }; |
89 | 99 | ||
diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c new file mode 100644 index 000000000000..9114c263077b --- /dev/null +++ b/sound/soc/omap/omap3evm.c | |||
@@ -0,0 +1,147 @@ | |||
1 | /* | ||
2 | * omap3evm.c -- ALSA SoC support for OMAP3 EVM | ||
3 | * | ||
4 | * Author: Anuj Aggarwal <anuj.aggarwal@ti.com> | ||
5 | * | ||
6 | * Based on sound/soc/omap/beagle.c by Steve Sakoman | ||
7 | * | ||
8 | * Copyright (C) 2008 Texas Instruments, Incorporated | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify it | ||
11 | * under the terms of the GNU General Public License as published by the | ||
12 | * Free Software Foundation version 2. | ||
13 | * | ||
14 | * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind, | ||
15 | * whether express or implied; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
17 | * General Public License for more details. | ||
18 | */ | ||
19 | |||
20 | #include <linux/clk.h> | ||
21 | #include <linux/platform_device.h> | ||
22 | #include <sound/core.h> | ||
23 | #include <sound/pcm.h> | ||
24 | #include <sound/soc.h> | ||
25 | #include <sound/soc-dapm.h> | ||
26 | |||
27 | #include <asm/mach-types.h> | ||
28 | #include <mach/hardware.h> | ||
29 | #include <mach/gpio.h> | ||
30 | #include <mach/mcbsp.h> | ||
31 | |||
32 | #include "omap-mcbsp.h" | ||
33 | #include "omap-pcm.h" | ||
34 | #include "../codecs/twl4030.h" | ||
35 | |||
36 | static int omap3evm_hw_params(struct snd_pcm_substream *substream, | ||
37 | struct snd_pcm_hw_params *params) | ||
38 | { | ||
39 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
40 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; | ||
41 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | ||
42 | int ret; | ||
43 | |||
44 | /* Set codec DAI configuration */ | ||
45 | ret = snd_soc_dai_set_fmt(codec_dai, | ||
46 | SND_SOC_DAIFMT_I2S | | ||
47 | SND_SOC_DAIFMT_NB_NF | | ||
48 | SND_SOC_DAIFMT_CBM_CFM); | ||
49 | if (ret < 0) { | ||
50 | printk(KERN_ERR "Can't set codec DAI configuration\n"); | ||
51 | return ret; | ||
52 | } | ||
53 | |||
54 | /* Set cpu DAI configuration */ | ||
55 | ret = snd_soc_dai_set_fmt(cpu_dai, | ||
56 | SND_SOC_DAIFMT_I2S | | ||
57 | SND_SOC_DAIFMT_NB_NF | | ||
58 | SND_SOC_DAIFMT_CBM_CFM); | ||
59 | if (ret < 0) { | ||
60 | printk(KERN_ERR "Can't set cpu DAI configuration\n"); | ||
61 | return ret; | ||
62 | } | ||
63 | |||
64 | /* Set the codec system clock for DAC and ADC */ | ||
65 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000, | ||
66 | SND_SOC_CLOCK_IN); | ||
67 | if (ret < 0) { | ||
68 | printk(KERN_ERR "Can't set codec system clock\n"); | ||
69 | return ret; | ||
70 | } | ||
71 | |||
72 | return 0; | ||
73 | } | ||
74 | |||
75 | static struct snd_soc_ops omap3evm_ops = { | ||
76 | .hw_params = omap3evm_hw_params, | ||
77 | }; | ||
78 | |||
79 | /* Digital audio interface glue - connects codec <--> CPU */ | ||
80 | static struct snd_soc_dai_link omap3evm_dai = { | ||
81 | .name = "TWL4030", | ||
82 | .stream_name = "TWL4030", | ||
83 | .cpu_dai = &omap_mcbsp_dai[0], | ||
84 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], | ||
85 | .ops = &omap3evm_ops, | ||
86 | }; | ||
87 | |||
88 | /* Audio machine driver */ | ||
89 | static struct snd_soc_card snd_soc_omap3evm = { | ||
90 | .name = "omap3evm", | ||
91 | .platform = &omap_soc_platform, | ||
92 | .dai_link = &omap3evm_dai, | ||
93 | .num_links = 1, | ||
94 | }; | ||
95 | |||
96 | /* Audio subsystem */ | ||
97 | static struct snd_soc_device omap3evm_snd_devdata = { | ||
98 | .card = &snd_soc_omap3evm, | ||
99 | .codec_dev = &soc_codec_dev_twl4030, | ||
100 | }; | ||
101 | |||
102 | static struct platform_device *omap3evm_snd_device; | ||
103 | |||
104 | static int __init omap3evm_soc_init(void) | ||
105 | { | ||
106 | int ret; | ||
107 | |||
108 | if (!machine_is_omap3evm()) { | ||
109 | pr_err("Not OMAP3 EVM!\n"); | ||
110 | return -ENODEV; | ||
111 | } | ||
112 | pr_info("OMAP3 EVM SoC init\n"); | ||
113 | |||
114 | omap3evm_snd_device = platform_device_alloc("soc-audio", -1); | ||
115 | if (!omap3evm_snd_device) { | ||
116 | printk(KERN_ERR "Platform device allocation failed\n"); | ||
117 | return -ENOMEM; | ||
118 | } | ||
119 | |||
120 | platform_set_drvdata(omap3evm_snd_device, &omap3evm_snd_devdata); | ||
121 | omap3evm_snd_devdata.dev = &omap3evm_snd_device->dev; | ||
122 | *(unsigned int *)omap3evm_dai.cpu_dai->private_data = 1; | ||
123 | |||
124 | ret = platform_device_add(omap3evm_snd_device); | ||
125 | if (ret) | ||
126 | goto err1; | ||
127 | |||
128 | return 0; | ||
129 | |||
130 | err1: | ||
131 | printk(KERN_ERR "Unable to add platform device\n"); | ||
132 | platform_device_put(omap3evm_snd_device); | ||
133 | |||
134 | return ret; | ||
135 | } | ||
136 | |||
137 | static void __exit omap3evm_soc_exit(void) | ||
138 | { | ||
139 | platform_device_unregister(omap3evm_snd_device); | ||
140 | } | ||
141 | |||
142 | module_init(omap3evm_soc_init); | ||
143 | module_exit(omap3evm_soc_exit); | ||
144 | |||
145 | MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal@ti.com>"); | ||
146 | MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM"); | ||
147 | MODULE_LICENSE("GPLv2"); | ||
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index fe282d4ef422..ad219aaf7cb8 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c | |||
@@ -228,14 +228,14 @@ static struct snd_soc_dai_link omap3pandora_dai[] = { | |||
228 | .name = "PCM1773", | 228 | .name = "PCM1773", |
229 | .stream_name = "HiFi Out", | 229 | .stream_name = "HiFi Out", |
230 | .cpu_dai = &omap_mcbsp_dai[0], | 230 | .cpu_dai = &omap_mcbsp_dai[0], |
231 | .codec_dai = &twl4030_dai, | 231 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
232 | .ops = &omap3pandora_out_ops, | 232 | .ops = &omap3pandora_out_ops, |
233 | .init = omap3pandora_out_init, | 233 | .init = omap3pandora_out_init, |
234 | }, { | 234 | }, { |
235 | .name = "TWL4030", | 235 | .name = "TWL4030", |
236 | .stream_name = "Line/Mic In", | 236 | .stream_name = "Line/Mic In", |
237 | .cpu_dai = &omap_mcbsp_dai[1], | 237 | .cpu_dai = &omap_mcbsp_dai[1], |
238 | .codec_dai = &twl4030_dai, | 238 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
239 | .ops = &omap3pandora_in_ops, | 239 | .ops = &omap3pandora_in_ops, |
240 | .init = omap3pandora_in_init, | 240 | .init = omap3pandora_in_init, |
241 | } | 241 | } |
diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index a72dc4e159e5..ec4f8fd8b3a2 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c | |||
@@ -83,7 +83,7 @@ static struct snd_soc_dai_link overo_dai = { | |||
83 | .name = "TWL4030", | 83 | .name = "TWL4030", |
84 | .stream_name = "TWL4030", | 84 | .stream_name = "TWL4030", |
85 | .cpu_dai = &omap_mcbsp_dai[0], | 85 | .cpu_dai = &omap_mcbsp_dai[0], |
86 | .codec_dai = &twl4030_dai, | 86 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
87 | .ops = &overo_ops, | 87 | .ops = &overo_ops, |
88 | }; | 88 | }; |
89 | 89 | ||
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index 10f1c867f11d..b719e5db4f57 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c | |||
@@ -84,6 +84,49 @@ static struct snd_soc_ops sdp3430_ops = { | |||
84 | .hw_params = sdp3430_hw_params, | 84 | .hw_params = sdp3430_hw_params, |
85 | }; | 85 | }; |
86 | 86 | ||
87 | static int sdp3430_hw_voice_params(struct snd_pcm_substream *substream, | ||
88 | struct snd_pcm_hw_params *params) | ||
89 | { | ||
90 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
91 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; | ||
92 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | ||
93 | int ret; | ||
94 | |||
95 | /* Set codec DAI configuration */ | ||
96 | ret = snd_soc_dai_set_fmt(codec_dai, | ||
97 | SND_SOC_DAIFMT_DSP_A | | ||
98 | SND_SOC_DAIFMT_IB_NF | | ||
99 | SND_SOC_DAIFMT_CBS_CFM); | ||
100 | if (ret) { | ||
101 | printk(KERN_ERR "can't set codec DAI configuration\n"); | ||
102 | return ret; | ||
103 | } | ||
104 | |||
105 | /* Set cpu DAI configuration */ | ||
106 | ret = snd_soc_dai_set_fmt(cpu_dai, | ||
107 | SND_SOC_DAIFMT_DSP_A | | ||
108 | SND_SOC_DAIFMT_IB_NF | | ||
109 | SND_SOC_DAIFMT_CBM_CFM); | ||
110 | if (ret < 0) { | ||
111 | printk(KERN_ERR "can't set cpu DAI configuration\n"); | ||
112 | return ret; | ||
113 | } | ||
114 | |||
115 | /* Set the codec system clock for DAC and ADC */ | ||
116 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000, | ||
117 | SND_SOC_CLOCK_IN); | ||
118 | if (ret < 0) { | ||
119 | printk(KERN_ERR "can't set codec system clock\n"); | ||
120 | return ret; | ||
121 | } | ||
122 | |||
123 | return 0; | ||
124 | } | ||
125 | |||
126 | static struct snd_soc_ops sdp3430_voice_ops = { | ||
127 | .hw_params = sdp3430_hw_voice_params, | ||
128 | }; | ||
129 | |||
87 | /* Headset jack */ | 130 | /* Headset jack */ |
88 | static struct snd_soc_jack hs_jack; | 131 | static struct snd_soc_jack hs_jack; |
89 | 132 | ||
@@ -192,28 +235,58 @@ static int sdp3430_twl4030_init(struct snd_soc_codec *codec) | |||
192 | return ret; | 235 | return ret; |
193 | } | 236 | } |
194 | 237 | ||
238 | static int sdp3430_twl4030_voice_init(struct snd_soc_codec *codec) | ||
239 | { | ||
240 | unsigned short reg; | ||
241 | |||
242 | /* Enable voice interface */ | ||
243 | reg = codec->read(codec, TWL4030_REG_VOICE_IF); | ||
244 | reg |= TWL4030_VIF_DIN_EN | TWL4030_VIF_DOUT_EN | TWL4030_VIF_EN; | ||
245 | codec->write(codec, TWL4030_REG_VOICE_IF, reg); | ||
246 | |||
247 | return 0; | ||
248 | } | ||
249 | |||
250 | |||
195 | /* Digital audio interface glue - connects codec <--> CPU */ | 251 | /* Digital audio interface glue - connects codec <--> CPU */ |
196 | static struct snd_soc_dai_link sdp3430_dai = { | 252 | static struct snd_soc_dai_link sdp3430_dai[] = { |
197 | .name = "TWL4030", | 253 | { |
198 | .stream_name = "TWL4030", | 254 | .name = "TWL4030 I2S", |
199 | .cpu_dai = &omap_mcbsp_dai[0], | 255 | .stream_name = "TWL4030 Audio", |
200 | .codec_dai = &twl4030_dai, | 256 | .cpu_dai = &omap_mcbsp_dai[0], |
201 | .init = sdp3430_twl4030_init, | 257 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
202 | .ops = &sdp3430_ops, | 258 | .init = sdp3430_twl4030_init, |
259 | .ops = &sdp3430_ops, | ||
260 | }, | ||
261 | { | ||
262 | .name = "TWL4030 PCM", | ||
263 | .stream_name = "TWL4030 Voice", | ||
264 | .cpu_dai = &omap_mcbsp_dai[1], | ||
265 | .codec_dai = &twl4030_dai[TWL4030_DAI_VOICE], | ||
266 | .init = sdp3430_twl4030_voice_init, | ||
267 | .ops = &sdp3430_voice_ops, | ||
268 | }, | ||
203 | }; | 269 | }; |
204 | 270 | ||
205 | /* Audio machine driver */ | 271 | /* Audio machine driver */ |
206 | static struct snd_soc_card snd_soc_sdp3430 = { | 272 | static struct snd_soc_card snd_soc_sdp3430 = { |
207 | .name = "SDP3430", | 273 | .name = "SDP3430", |
208 | .platform = &omap_soc_platform, | 274 | .platform = &omap_soc_platform, |
209 | .dai_link = &sdp3430_dai, | 275 | .dai_link = sdp3430_dai, |
210 | .num_links = 1, | 276 | .num_links = ARRAY_SIZE(sdp3430_dai), |
277 | }; | ||
278 | |||
279 | /* twl4030 setup */ | ||
280 | static struct twl4030_setup_data twl4030_setup = { | ||
281 | .ramp_delay_value = 3, | ||
282 | .sysclk = 26000, | ||
211 | }; | 283 | }; |
212 | 284 | ||
213 | /* Audio subsystem */ | 285 | /* Audio subsystem */ |
214 | static struct snd_soc_device sdp3430_snd_devdata = { | 286 | static struct snd_soc_device sdp3430_snd_devdata = { |
215 | .card = &snd_soc_sdp3430, | 287 | .card = &snd_soc_sdp3430, |
216 | .codec_dev = &soc_codec_dev_twl4030, | 288 | .codec_dev = &soc_codec_dev_twl4030, |
289 | .codec_data = &twl4030_setup, | ||
217 | }; | 290 | }; |
218 | 291 | ||
219 | static struct platform_device *sdp3430_snd_device; | 292 | static struct platform_device *sdp3430_snd_device; |
@@ -236,7 +309,8 @@ static int __init sdp3430_soc_init(void) | |||
236 | 309 | ||
237 | platform_set_drvdata(sdp3430_snd_device, &sdp3430_snd_devdata); | 310 | platform_set_drvdata(sdp3430_snd_device, &sdp3430_snd_devdata); |
238 | sdp3430_snd_devdata.dev = &sdp3430_snd_device->dev; | 311 | sdp3430_snd_devdata.dev = &sdp3430_snd_device->dev; |
239 | *(unsigned int *)sdp3430_dai.cpu_dai->private_data = 1; /* McBSP2 */ | 312 | *(unsigned int *)sdp3430_dai[0].cpu_dai->private_data = 1; /* McBSP2 */ |
313 | *(unsigned int *)sdp3430_dai[1].cpu_dai->private_data = 2; /* McBSP3 */ | ||
240 | 314 | ||
241 | ret = platform_device_add(sdp3430_snd_device); | 315 | ret = platform_device_add(sdp3430_snd_device); |
242 | if (ret) | 316 | if (ret) |
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index ad8a10fe6298..dcd163a4ee9a 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig | |||
@@ -89,13 +89,13 @@ config SND_PXA2XX_SOC_E800 | |||
89 | Toshiba e800 PDA | 89 | Toshiba e800 PDA |
90 | 90 | ||
91 | config SND_PXA2XX_SOC_EM_X270 | 91 | config SND_PXA2XX_SOC_EM_X270 |
92 | tristate "SoC Audio support for CompuLab EM-x270" | 92 | tristate "SoC Audio support for CompuLab EM-x270, eXeda and CM-X300" |
93 | depends on SND_PXA2XX_SOC && MACH_EM_X270 | 93 | depends on SND_PXA2XX_SOC && MACH_EM_X270 |
94 | select SND_PXA2XX_SOC_AC97 | 94 | select SND_PXA2XX_SOC_AC97 |
95 | select SND_SOC_WM9712 | 95 | select SND_SOC_WM9712 |
96 | help | 96 | help |
97 | Say Y if you want to add support for SoC audio on | 97 | Say Y if you want to add support for SoC audio on |
98 | CompuLab EM-x270. | 98 | CompuLab EM-x270, eXeda and CM-X300 machines. |
99 | 99 | ||
100 | config SND_PXA2XX_SOC_PALM27X | 100 | config SND_PXA2XX_SOC_PALM27X |
101 | bool "SoC Audio support for Palm T|X, T5 and LifeDrive" | 101 | bool "SoC Audio support for Palm T|X, T5 and LifeDrive" |
@@ -134,3 +134,12 @@ config SND_PXA2XX_SOC_MIOA701 | |||
134 | help | 134 | help |
135 | Say Y if you want to add support for SoC audio on the | 135 | Say Y if you want to add support for SoC audio on the |
136 | MIO A701. | 136 | MIO A701. |
137 | |||
138 | config SND_PXA2XX_SOC_IMOTE2 | ||
139 | tristate "SoC Audio support for IMote 2" | ||
140 | depends on SND_PXA2XX_SOC && MACH_INTELMOTE2 | ||
141 | select SND_PXA2XX_SOC_I2S | ||
142 | select SND_SOC_WM8940 | ||
143 | help | ||
144 | Say Y if you want to add support for SoC audio on the | ||
145 | IMote 2. | ||
diff --git a/sound/soc/pxa/Makefile b/sound/soc/pxa/Makefile index 4b90c3ccae45..6e096b480335 100644 --- a/sound/soc/pxa/Makefile +++ b/sound/soc/pxa/Makefile | |||
@@ -22,6 +22,7 @@ snd-soc-palm27x-objs := palm27x.o | |||
22 | snd-soc-zylonite-objs := zylonite.o | 22 | snd-soc-zylonite-objs := zylonite.o |
23 | snd-soc-magician-objs := magician.o | 23 | snd-soc-magician-objs := magician.o |
24 | snd-soc-mioa701-objs := mioa701_wm9713.o | 24 | snd-soc-mioa701-objs := mioa701_wm9713.o |
25 | snd-soc-imote2-objs := imote2.o | ||
25 | 26 | ||
26 | obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o | 27 | obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o |
27 | obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o | 28 | obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o |
@@ -35,3 +36,4 @@ obj-$(CONFIG_SND_PXA2XX_SOC_PALM27X) += snd-soc-palm27x.o | |||
35 | obj-$(CONFIG_SND_PXA2XX_SOC_MAGICIAN) += snd-soc-magician.o | 36 | obj-$(CONFIG_SND_PXA2XX_SOC_MAGICIAN) += snd-soc-magician.o |
36 | obj-$(CONFIG_SND_PXA2XX_SOC_MIOA701) += snd-soc-mioa701.o | 37 | obj-$(CONFIG_SND_PXA2XX_SOC_MIOA701) += snd-soc-mioa701.o |
37 | obj-$(CONFIG_SND_SOC_ZYLONITE) += snd-soc-zylonite.o | 38 | obj-$(CONFIG_SND_SOC_ZYLONITE) += snd-soc-zylonite.o |
39 | obj-$(CONFIG_SND_PXA2XX_SOC_IMOTE2) += snd-soc-imote2.o | ||
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index 949be9c2a01b..f4756e4025fd 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * em-x270.c -- SoC audio for EM-X270 | 2 | * SoC audio driver for EM-X270, eXeda and CM-X300 |
3 | * | 3 | * |
4 | * Copyright 2007 CompuLab, Ltd. | 4 | * Copyright 2007, 2009 CompuLab, Ltd. |
5 | * | 5 | * |
6 | * Author: Mike Rapoport <mike@compulab.co.il> | 6 | * Author: Mike Rapoport <mike@compulab.co.il> |
7 | * | 7 | * |
@@ -68,7 +68,8 @@ static int __init em_x270_init(void) | |||
68 | { | 68 | { |
69 | int ret; | 69 | int ret; |
70 | 70 | ||
71 | if (!machine_is_em_x270()) | 71 | if (!(machine_is_em_x270() || machine_is_exeda() |
72 | || machine_is_cm_x300())) | ||
72 | return -ENODEV; | 73 | return -ENODEV; |
73 | 74 | ||
74 | em_x270_snd_device = platform_device_alloc("soc-audio", -1); | 75 | em_x270_snd_device = platform_device_alloc("soc-audio", -1); |
@@ -95,5 +96,5 @@ module_exit(em_x270_exit); | |||
95 | 96 | ||
96 | /* Module information */ | 97 | /* Module information */ |
97 | MODULE_AUTHOR("Mike Rapoport"); | 98 | MODULE_AUTHOR("Mike Rapoport"); |
98 | MODULE_DESCRIPTION("ALSA SoC EM-X270"); | 99 | MODULE_DESCRIPTION("ALSA SoC EM-X270, eXeda and CM-X300"); |
99 | MODULE_LICENSE("GPL"); | 100 | MODULE_LICENSE("GPL"); |
diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c new file mode 100644 index 000000000000..405587a01160 --- /dev/null +++ b/sound/soc/pxa/imote2.c | |||
@@ -0,0 +1,114 @@ | |||
1 | |||
2 | #include <linux/module.h> | ||
3 | #include <sound/soc.h> | ||
4 | |||
5 | #include <asm/mach-types.h> | ||
6 | |||
7 | #include "../codecs/wm8940.h" | ||
8 | #include "pxa2xx-i2s.h" | ||
9 | #include "pxa2xx-pcm.h" | ||
10 | |||
11 | static int imote2_asoc_hw_params(struct snd_pcm_substream *substream, | ||
12 | struct snd_pcm_hw_params *params) | ||
13 | { | ||
14 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
15 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; | ||
16 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | ||
17 | unsigned int clk = 0; | ||
18 | int ret; | ||
19 | |||
20 | switch (params_rate(params)) { | ||
21 | case 8000: | ||
22 | case 16000: | ||
23 | case 48000: | ||
24 | case 96000: | ||
25 | clk = 12288000; | ||
26 | break; | ||
27 | case 11025: | ||
28 | case 22050: | ||
29 | case 44100: | ||
30 | clk = 11289600; | ||
31 | break; | ||
32 | } | ||
33 | |||
34 | /* set codec DAI configuration */ | ||
35 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | ||
36 | | SND_SOC_DAIFMT_NB_NF | ||
37 | | SND_SOC_DAIFMT_CBS_CFS); | ||
38 | if (ret < 0) | ||
39 | return ret; | ||
40 | |||
41 | /* CPU should be clock master */ | ||
42 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | ||
43 | | SND_SOC_DAIFMT_NB_NF | ||
44 | | SND_SOC_DAIFMT_CBS_CFS); | ||
45 | if (ret < 0) | ||
46 | return ret; | ||
47 | |||
48 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, clk, | ||
49 | SND_SOC_CLOCK_IN); | ||
50 | if (ret < 0) | ||
51 | return ret; | ||
52 | |||
53 | /* set the I2S system clock as input (unused) */ | ||
54 | ret = snd_soc_dai_set_sysclk(cpu_dai, PXA2XX_I2S_SYSCLK, clk, | ||
55 | SND_SOC_CLOCK_OUT); | ||
56 | |||
57 | return ret; | ||
58 | } | ||
59 | |||
60 | static struct snd_soc_ops imote2_asoc_ops = { | ||
61 | .hw_params = imote2_asoc_hw_params, | ||
62 | }; | ||
63 | |||
64 | static struct snd_soc_dai_link imote2_dai = { | ||
65 | .name = "WM8940", | ||
66 | .stream_name = "WM8940", | ||
67 | .cpu_dai = &pxa_i2s_dai, | ||
68 | .codec_dai = &wm8940_dai, | ||
69 | .ops = &imote2_asoc_ops, | ||
70 | }; | ||
71 | |||
72 | static struct snd_soc_card snd_soc_imote2 = { | ||
73 | .name = "Imote2", | ||
74 | .platform = &pxa2xx_soc_platform, | ||
75 | .dai_link = &imote2_dai, | ||
76 | .num_links = 1, | ||
77 | }; | ||
78 | |||
79 | static struct snd_soc_device imote2_snd_devdata = { | ||
80 | .card = &snd_soc_imote2, | ||
81 | .codec_dev = &soc_codec_dev_wm8940, | ||
82 | }; | ||
83 | |||
84 | static struct platform_device *imote2_snd_device; | ||
85 | |||
86 | static int __init imote2_asoc_init(void) | ||
87 | { | ||
88 | int ret; | ||
89 | |||
90 | if (!machine_is_intelmote2()) | ||
91 | return -ENODEV; | ||
92 | imote2_snd_device = platform_device_alloc("soc-audio", -1); | ||
93 | if (!imote2_snd_device) | ||
94 | return -ENOMEM; | ||
95 | |||
96 | platform_set_drvdata(imote2_snd_device, &imote2_snd_devdata); | ||
97 | imote2_snd_devdata.dev = &imote2_snd_device->dev; | ||
98 | ret = platform_device_add(imote2_snd_device); | ||
99 | if (ret) | ||
100 | platform_device_put(imote2_snd_device); | ||
101 | |||
102 | return ret; | ||
103 | } | ||
104 | module_init(imote2_asoc_init); | ||
105 | |||
106 | static void __exit imote2_asoc_exit(void) | ||
107 | { | ||
108 | platform_device_unregister(imote2_snd_device); | ||
109 | } | ||
110 | module_exit(imote2_asoc_exit); | ||
111 | |||
112 | MODULE_AUTHOR("Jonathan Cameron"); | ||
113 | MODULE_DESCRIPTION("ALSA SoC Imote 2"); | ||
114 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index 0625c342a1c9..326955dea36c 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c | |||
@@ -106,7 +106,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, | |||
106 | /* 513156 Hz ~= _2_ * 8000 Hz * 32 (+0.23%) */ | 106 | /* 513156 Hz ~= _2_ * 8000 Hz * 32 (+0.23%) */ |
107 | acds = PXA_SSP_CLK_AUDIO_DIV_16; | 107 | acds = PXA_SSP_CLK_AUDIO_DIV_16; |
108 | break; | 108 | break; |
109 | case 32: | 109 | default: /* 32 */ |
110 | /* 1026312 Hz ~= _2_ * 8000 Hz * 64 (+0.23%) */ | 110 | /* 1026312 Hz ~= _2_ * 8000 Hz * 64 (+0.23%) */ |
111 | acds = PXA_SSP_CLK_AUDIO_DIV_8; | 111 | acds = PXA_SSP_CLK_AUDIO_DIV_8; |
112 | } | 112 | } |
@@ -118,7 +118,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, | |||
118 | /* 351375 Hz ~= 11025 Hz * 32 (-0.41%) */ | 118 | /* 351375 Hz ~= 11025 Hz * 32 (-0.41%) */ |
119 | acds = PXA_SSP_CLK_AUDIO_DIV_4; | 119 | acds = PXA_SSP_CLK_AUDIO_DIV_4; |
120 | break; | 120 | break; |
121 | case 32: | 121 | default: /* 32 */ |
122 | /* 702750 Hz ~= 11025 Hz * 64 (-0.41%) */ | 122 | /* 702750 Hz ~= 11025 Hz * 64 (-0.41%) */ |
123 | acds = PXA_SSP_CLK_AUDIO_DIV_2; | 123 | acds = PXA_SSP_CLK_AUDIO_DIV_2; |
124 | } | 124 | } |
@@ -130,7 +130,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, | |||
130 | /* 702750 Hz ~= 22050 Hz * 32 (-0.41%) */ | 130 | /* 702750 Hz ~= 22050 Hz * 32 (-0.41%) */ |
131 | acds = PXA_SSP_CLK_AUDIO_DIV_2; | 131 | acds = PXA_SSP_CLK_AUDIO_DIV_2; |
132 | break; | 132 | break; |
133 | case 32: | 133 | default: /* 32 */ |
134 | /* 1405500 Hz ~= 22050 Hz * 64 (-0.41%) */ | 134 | /* 1405500 Hz ~= 22050 Hz * 64 (-0.41%) */ |
135 | acds = PXA_SSP_CLK_AUDIO_DIV_1; | 135 | acds = PXA_SSP_CLK_AUDIO_DIV_1; |
136 | } | 136 | } |
@@ -142,7 +142,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, | |||
142 | /* 1405500 Hz ~= 44100 Hz * 32 (-0.41%) */ | 142 | /* 1405500 Hz ~= 44100 Hz * 32 (-0.41%) */ |
143 | acds = PXA_SSP_CLK_AUDIO_DIV_2; | 143 | acds = PXA_SSP_CLK_AUDIO_DIV_2; |
144 | break; | 144 | break; |
145 | case 32: | 145 | default: /* 32 */ |
146 | /* 2811000 Hz ~= 44100 Hz * 64 (-0.41%) */ | 146 | /* 2811000 Hz ~= 44100 Hz * 64 (-0.41%) */ |
147 | acds = PXA_SSP_CLK_AUDIO_DIV_1; | 147 | acds = PXA_SSP_CLK_AUDIO_DIV_1; |
148 | } | 148 | } |
@@ -154,19 +154,20 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, | |||
154 | /* 1529375 Hz ~= 48000 Hz * 32 (-0.44%) */ | 154 | /* 1529375 Hz ~= 48000 Hz * 32 (-0.44%) */ |
155 | acds = PXA_SSP_CLK_AUDIO_DIV_2; | 155 | acds = PXA_SSP_CLK_AUDIO_DIV_2; |
156 | break; | 156 | break; |
157 | case 32: | 157 | default: /* 32 */ |
158 | /* 3058750 Hz ~= 48000 Hz * 64 (-0.44%) */ | 158 | /* 3058750 Hz ~= 48000 Hz * 64 (-0.44%) */ |
159 | acds = PXA_SSP_CLK_AUDIO_DIV_1; | 159 | acds = PXA_SSP_CLK_AUDIO_DIV_1; |
160 | } | 160 | } |
161 | break; | 161 | break; |
162 | case 96000: | 162 | case 96000: |
163 | default: | ||
163 | acps = 12235000; | 164 | acps = 12235000; |
164 | switch (width) { | 165 | switch (width) { |
165 | case 16: | 166 | case 16: |
166 | /* 3058750 Hz ~= 96000 Hz * 32 (-0.44%) */ | 167 | /* 3058750 Hz ~= 96000 Hz * 32 (-0.44%) */ |
167 | acds = PXA_SSP_CLK_AUDIO_DIV_1; | 168 | acds = PXA_SSP_CLK_AUDIO_DIV_1; |
168 | break; | 169 | break; |
169 | case 32: | 170 | default: /* 32 */ |
170 | /* 6117500 Hz ~= 96000 Hz * 64 (-0.44%) */ | 171 | /* 6117500 Hz ~= 96000 Hz * 64 (-0.44%) */ |
171 | acds = PXA_SSP_CLK_AUDIO_DIV_2; | 172 | acds = PXA_SSP_CLK_AUDIO_DIV_2; |
172 | div4 = PXA_SSP_CLK_SCDB_1; | 173 | div4 = PXA_SSP_CLK_SCDB_1; |
@@ -183,7 +184,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, | |||
183 | 184 | ||
184 | /* set cpu DAI configuration */ | 185 | /* set cpu DAI configuration */ |
185 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A | | 186 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A | |
186 | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBS_CFS); | 187 | SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBS_CFS); |
187 | if (ret < 0) | 188 | if (ret < 0) |
188 | return ret; | 189 | return ret; |
189 | 190 | ||
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 286be31545df..19c45409d94c 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
@@ -50,139 +50,6 @@ struct ssp_priv { | |||
50 | #endif | 50 | #endif |
51 | }; | 51 | }; |
52 | 52 | ||
53 | #define PXA2xx_SSP1_BASE 0x41000000 | ||
54 | #define PXA27x_SSP2_BASE 0x41700000 | ||
55 | #define PXA27x_SSP3_BASE 0x41900000 | ||
56 | #define PXA3xx_SSP4_BASE 0x41a00000 | ||
57 | |||
58 | static struct pxa2xx_pcm_dma_params pxa_ssp1_pcm_mono_out = { | ||
59 | .name = "SSP1 PCM Mono out", | ||
60 | .dev_addr = PXA2xx_SSP1_BASE + SSDR, | ||
61 | .drcmr = &DRCMR(14), | ||
62 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | | ||
63 | DCMD_BURST16 | DCMD_WIDTH2, | ||
64 | }; | ||
65 | |||
66 | static struct pxa2xx_pcm_dma_params pxa_ssp1_pcm_mono_in = { | ||
67 | .name = "SSP1 PCM Mono in", | ||
68 | .dev_addr = PXA2xx_SSP1_BASE + SSDR, | ||
69 | .drcmr = &DRCMR(13), | ||
70 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | | ||
71 | DCMD_BURST16 | DCMD_WIDTH2, | ||
72 | }; | ||
73 | |||
74 | static struct pxa2xx_pcm_dma_params pxa_ssp1_pcm_stereo_out = { | ||
75 | .name = "SSP1 PCM Stereo out", | ||
76 | .dev_addr = PXA2xx_SSP1_BASE + SSDR, | ||
77 | .drcmr = &DRCMR(14), | ||
78 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | | ||
79 | DCMD_BURST16 | DCMD_WIDTH4, | ||
80 | }; | ||
81 | |||
82 | static struct pxa2xx_pcm_dma_params pxa_ssp1_pcm_stereo_in = { | ||
83 | .name = "SSP1 PCM Stereo in", | ||
84 | .dev_addr = PXA2xx_SSP1_BASE + SSDR, | ||
85 | .drcmr = &DRCMR(13), | ||
86 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | | ||
87 | DCMD_BURST16 | DCMD_WIDTH4, | ||
88 | }; | ||
89 | |||
90 | static struct pxa2xx_pcm_dma_params pxa_ssp2_pcm_mono_out = { | ||
91 | .name = "SSP2 PCM Mono out", | ||
92 | .dev_addr = PXA27x_SSP2_BASE + SSDR, | ||
93 | .drcmr = &DRCMR(16), | ||
94 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | | ||
95 | DCMD_BURST16 | DCMD_WIDTH2, | ||
96 | }; | ||
97 | |||
98 | static struct pxa2xx_pcm_dma_params pxa_ssp2_pcm_mono_in = { | ||
99 | .name = "SSP2 PCM Mono in", | ||
100 | .dev_addr = PXA27x_SSP2_BASE + SSDR, | ||
101 | .drcmr = &DRCMR(15), | ||
102 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | | ||
103 | DCMD_BURST16 | DCMD_WIDTH2, | ||
104 | }; | ||
105 | |||
106 | static struct pxa2xx_pcm_dma_params pxa_ssp2_pcm_stereo_out = { | ||
107 | .name = "SSP2 PCM Stereo out", | ||
108 | .dev_addr = PXA27x_SSP2_BASE + SSDR, | ||
109 | .drcmr = &DRCMR(16), | ||
110 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | | ||
111 | DCMD_BURST16 | DCMD_WIDTH4, | ||
112 | }; | ||
113 | |||
114 | static struct pxa2xx_pcm_dma_params pxa_ssp2_pcm_stereo_in = { | ||
115 | .name = "SSP2 PCM Stereo in", | ||
116 | .dev_addr = PXA27x_SSP2_BASE + SSDR, | ||
117 | .drcmr = &DRCMR(15), | ||
118 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | | ||
119 | DCMD_BURST16 | DCMD_WIDTH4, | ||
120 | }; | ||
121 | |||
122 | static struct pxa2xx_pcm_dma_params pxa_ssp3_pcm_mono_out = { | ||
123 | .name = "SSP3 PCM Mono out", | ||
124 | .dev_addr = PXA27x_SSP3_BASE + SSDR, | ||
125 | .drcmr = &DRCMR(67), | ||
126 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | | ||
127 | DCMD_BURST16 | DCMD_WIDTH2, | ||
128 | }; | ||
129 | |||
130 | static struct pxa2xx_pcm_dma_params pxa_ssp3_pcm_mono_in = { | ||
131 | .name = "SSP3 PCM Mono in", | ||
132 | .dev_addr = PXA27x_SSP3_BASE + SSDR, | ||
133 | .drcmr = &DRCMR(66), | ||
134 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | | ||
135 | DCMD_BURST16 | DCMD_WIDTH2, | ||
136 | }; | ||
137 | |||
138 | static struct pxa2xx_pcm_dma_params pxa_ssp3_pcm_stereo_out = { | ||
139 | .name = "SSP3 PCM Stereo out", | ||
140 | .dev_addr = PXA27x_SSP3_BASE + SSDR, | ||
141 | .drcmr = &DRCMR(67), | ||
142 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | | ||
143 | DCMD_BURST16 | DCMD_WIDTH4, | ||
144 | }; | ||
145 | |||
146 | static struct pxa2xx_pcm_dma_params pxa_ssp3_pcm_stereo_in = { | ||
147 | .name = "SSP3 PCM Stereo in", | ||
148 | .dev_addr = PXA27x_SSP3_BASE + SSDR, | ||
149 | .drcmr = &DRCMR(66), | ||
150 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | | ||
151 | DCMD_BURST16 | DCMD_WIDTH4, | ||
152 | }; | ||
153 | |||
154 | static struct pxa2xx_pcm_dma_params pxa_ssp4_pcm_mono_out = { | ||
155 | .name = "SSP4 PCM Mono out", | ||
156 | .dev_addr = PXA3xx_SSP4_BASE + SSDR, | ||
157 | .drcmr = &DRCMR(67), | ||
158 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | | ||
159 | DCMD_BURST16 | DCMD_WIDTH2, | ||
160 | }; | ||
161 | |||
162 | static struct pxa2xx_pcm_dma_params pxa_ssp4_pcm_mono_in = { | ||
163 | .name = "SSP4 PCM Mono in", | ||
164 | .dev_addr = PXA3xx_SSP4_BASE + SSDR, | ||
165 | .drcmr = &DRCMR(66), | ||
166 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | | ||
167 | DCMD_BURST16 | DCMD_WIDTH2, | ||
168 | }; | ||
169 | |||
170 | static struct pxa2xx_pcm_dma_params pxa_ssp4_pcm_stereo_out = { | ||
171 | .name = "SSP4 PCM Stereo out", | ||
172 | .dev_addr = PXA3xx_SSP4_BASE + SSDR, | ||
173 | .drcmr = &DRCMR(67), | ||
174 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | | ||
175 | DCMD_BURST16 | DCMD_WIDTH4, | ||
176 | }; | ||
177 | |||
178 | static struct pxa2xx_pcm_dma_params pxa_ssp4_pcm_stereo_in = { | ||
179 | .name = "SSP4 PCM Stereo in", | ||
180 | .dev_addr = PXA3xx_SSP4_BASE + SSDR, | ||
181 | .drcmr = &DRCMR(66), | ||
182 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | | ||
183 | DCMD_BURST16 | DCMD_WIDTH4, | ||
184 | }; | ||
185 | |||
186 | static void dump_registers(struct ssp_device *ssp) | 53 | static void dump_registers(struct ssp_device *ssp) |
187 | { | 54 | { |
188 | dev_dbg(&ssp->pdev->dev, "SSCR0 0x%08x SSCR1 0x%08x SSTO 0x%08x\n", | 55 | dev_dbg(&ssp->pdev->dev, "SSCR0 0x%08x SSCR1 0x%08x SSTO 0x%08x\n", |
@@ -194,25 +61,33 @@ static void dump_registers(struct ssp_device *ssp) | |||
194 | ssp_read_reg(ssp, SSACD)); | 61 | ssp_read_reg(ssp, SSACD)); |
195 | } | 62 | } |
196 | 63 | ||
197 | static struct pxa2xx_pcm_dma_params *ssp_dma_params[4][4] = { | 64 | struct pxa2xx_pcm_dma_data { |
198 | { | 65 | struct pxa2xx_pcm_dma_params params; |
199 | &pxa_ssp1_pcm_mono_out, &pxa_ssp1_pcm_mono_in, | 66 | char name[20]; |
200 | &pxa_ssp1_pcm_stereo_out, &pxa_ssp1_pcm_stereo_in, | ||
201 | }, | ||
202 | { | ||
203 | &pxa_ssp2_pcm_mono_out, &pxa_ssp2_pcm_mono_in, | ||
204 | &pxa_ssp2_pcm_stereo_out, &pxa_ssp2_pcm_stereo_in, | ||
205 | }, | ||
206 | { | ||
207 | &pxa_ssp3_pcm_mono_out, &pxa_ssp3_pcm_mono_in, | ||
208 | &pxa_ssp3_pcm_stereo_out, &pxa_ssp3_pcm_stereo_in, | ||
209 | }, | ||
210 | { | ||
211 | &pxa_ssp4_pcm_mono_out, &pxa_ssp4_pcm_mono_in, | ||
212 | &pxa_ssp4_pcm_stereo_out, &pxa_ssp4_pcm_stereo_in, | ||
213 | }, | ||
214 | }; | 67 | }; |
215 | 68 | ||
69 | static struct pxa2xx_pcm_dma_params * | ||
70 | ssp_get_dma_params(struct ssp_device *ssp, int width4, int out) | ||
71 | { | ||
72 | struct pxa2xx_pcm_dma_data *dma; | ||
73 | |||
74 | dma = kzalloc(sizeof(struct pxa2xx_pcm_dma_data), GFP_KERNEL); | ||
75 | if (dma == NULL) | ||
76 | return NULL; | ||
77 | |||
78 | snprintf(dma->name, 20, "SSP%d PCM %s %s", ssp->port_id, | ||
79 | width4 ? "32-bit" : "16-bit", out ? "out" : "in"); | ||
80 | |||
81 | dma->params.name = dma->name; | ||
82 | dma->params.drcmr = &DRCMR(out ? ssp->drcmr_tx : ssp->drcmr_rx); | ||
83 | dma->params.dcmd = (out ? (DCMD_INCSRCADDR | DCMD_FLOWTRG) : | ||
84 | (DCMD_INCTRGADDR | DCMD_FLOWSRC)) | | ||
85 | (width4 ? DCMD_WIDTH4 : DCMD_WIDTH2) | DCMD_BURST16; | ||
86 | dma->params.dev_addr = ssp->phys_base + SSDR; | ||
87 | |||
88 | return &dma->params; | ||
89 | } | ||
90 | |||
216 | static int pxa_ssp_startup(struct snd_pcm_substream *substream, | 91 | static int pxa_ssp_startup(struct snd_pcm_substream *substream, |
217 | struct snd_soc_dai *dai) | 92 | struct snd_soc_dai *dai) |
218 | { | 93 | { |
@@ -227,6 +102,11 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream, | |||
227 | clk_enable(priv->dev.ssp->clk); | 102 | clk_enable(priv->dev.ssp->clk); |
228 | ssp_disable(&priv->dev); | 103 | ssp_disable(&priv->dev); |
229 | } | 104 | } |
105 | |||
106 | if (cpu_dai->dma_data) { | ||
107 | kfree(cpu_dai->dma_data); | ||
108 | cpu_dai->dma_data = NULL; | ||
109 | } | ||
230 | return ret; | 110 | return ret; |
231 | } | 111 | } |
232 | 112 | ||
@@ -241,6 +121,11 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream, | |||
241 | ssp_disable(&priv->dev); | 121 | ssp_disable(&priv->dev); |
242 | clk_disable(priv->dev.ssp->clk); | 122 | clk_disable(priv->dev.ssp->clk); |
243 | } | 123 | } |
124 | |||
125 | if (cpu_dai->dma_data) { | ||
126 | kfree(cpu_dai->dma_data); | ||
127 | cpu_dai->dma_data = NULL; | ||
128 | } | ||
244 | } | 129 | } |
245 | 130 | ||
246 | #ifdef CONFIG_PM | 131 | #ifdef CONFIG_PM |
@@ -323,7 +208,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, | |||
323 | ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); | 208 | ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); |
324 | 209 | ||
325 | dev_dbg(&ssp->pdev->dev, | 210 | dev_dbg(&ssp->pdev->dev, |
326 | "pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %d\n", | 211 | "pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %u\n", |
327 | cpu_dai->id, clk_id, freq); | 212 | cpu_dai->id, clk_id, freq); |
328 | 213 | ||
329 | switch (clk_id) { | 214 | switch (clk_id) { |
@@ -472,7 +357,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, | |||
472 | ssacd |= (0x6 << 4); | 357 | ssacd |= (0x6 << 4); |
473 | 358 | ||
474 | dev_dbg(&ssp->pdev->dev, | 359 | dev_dbg(&ssp->pdev->dev, |
475 | "Using SSACDD %x to supply %dHz\n", | 360 | "Using SSACDD %x to supply %uHz\n", |
476 | val, freq_out); | 361 | val, freq_out); |
477 | break; | 362 | break; |
478 | } | 363 | } |
@@ -589,7 +474,10 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai, | |||
589 | case SND_SOC_DAIFMT_NB_IF: | 474 | case SND_SOC_DAIFMT_NB_IF: |
590 | break; | 475 | break; |
591 | case SND_SOC_DAIFMT_IB_IF: | 476 | case SND_SOC_DAIFMT_IB_IF: |
592 | sspsp |= SSPSP_SCMODE(3); | 477 | sspsp |= SSPSP_SCMODE(2); |
478 | break; | ||
479 | case SND_SOC_DAIFMT_IB_NF: | ||
480 | sspsp |= SSPSP_SCMODE(2) | SSPSP_SFRMP; | ||
593 | break; | 481 | break; |
594 | default: | 482 | default: |
595 | return -EINVAL; | 483 | return -EINVAL; |
@@ -606,7 +494,13 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai, | |||
606 | case SND_SOC_DAIFMT_NB_NF: | 494 | case SND_SOC_DAIFMT_NB_NF: |
607 | sspsp |= SSPSP_SFRMP; | 495 | sspsp |= SSPSP_SFRMP; |
608 | break; | 496 | break; |
497 | case SND_SOC_DAIFMT_NB_IF: | ||
498 | break; | ||
609 | case SND_SOC_DAIFMT_IB_IF: | 499 | case SND_SOC_DAIFMT_IB_IF: |
500 | sspsp |= SSPSP_SCMODE(2); | ||
501 | break; | ||
502 | case SND_SOC_DAIFMT_IB_NF: | ||
503 | sspsp |= SSPSP_SCMODE(2) | SSPSP_SFRMP; | ||
610 | break; | 504 | break; |
611 | default: | 505 | default: |
612 | return -EINVAL; | 506 | return -EINVAL; |
@@ -644,25 +538,23 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, | |||
644 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | 538 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; |
645 | struct ssp_priv *priv = cpu_dai->private_data; | 539 | struct ssp_priv *priv = cpu_dai->private_data; |
646 | struct ssp_device *ssp = priv->dev.ssp; | 540 | struct ssp_device *ssp = priv->dev.ssp; |
647 | int dma = 0, chn = params_channels(params); | 541 | int chn = params_channels(params); |
648 | u32 sscr0; | 542 | u32 sscr0; |
649 | u32 sspsp; | 543 | u32 sspsp; |
650 | int width = snd_pcm_format_physical_width(params_format(params)); | 544 | int width = snd_pcm_format_physical_width(params_format(params)); |
651 | int ttsa = ssp_read_reg(ssp, SSTSA) & 0xf; | 545 | int ttsa = ssp_read_reg(ssp, SSTSA) & 0xf; |
652 | 546 | ||
653 | /* select correct DMA params */ | 547 | /* generate correct DMA params */ |
654 | if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) | 548 | if (cpu_dai->dma_data) |
655 | dma = 1; /* capture DMA offset is 1,3 */ | 549 | kfree(cpu_dai->dma_data); |
550 | |||
656 | /* Network mode with one active slot (ttsa == 1) can be used | 551 | /* Network mode with one active slot (ttsa == 1) can be used |
657 | * to force 16-bit frame width on the wire (for S16_LE), even | 552 | * to force 16-bit frame width on the wire (for S16_LE), even |
658 | * with two channels. Use 16-bit DMA transfers for this case. | 553 | * with two channels. Use 16-bit DMA transfers for this case. |
659 | */ | 554 | */ |
660 | if (((chn == 2) && (ttsa != 1)) || (width == 32)) | 555 | cpu_dai->dma_data = ssp_get_dma_params(ssp, |
661 | dma += 2; /* 32-bit DMA offset is 2, 16-bit is 0 */ | 556 | ((chn == 2) && (ttsa != 1)) || (width == 32), |
662 | 557 | substream->stream == SNDRV_PCM_STREAM_PLAYBACK); | |
663 | cpu_dai->dma_data = ssp_dma_params[cpu_dai->id][dma]; | ||
664 | |||
665 | dev_dbg(&ssp->pdev->dev, "pxa_ssp_hw_params: dma %d\n", dma); | ||
666 | 558 | ||
667 | /* we can only change the settings if the port is not in use */ | 559 | /* we can only change the settings if the port is not in use */ |
668 | if (ssp_read_reg(ssp, SSCR0) & SSCR0_SSE) | 560 | if (ssp_read_reg(ssp, SSCR0) & SSCR0_SSE) |
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 2f4b6e489b78..4743e262895d 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c | |||
@@ -106,10 +106,8 @@ static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream, | |||
106 | if (IS_ERR(clk_i2s)) | 106 | if (IS_ERR(clk_i2s)) |
107 | return PTR_ERR(clk_i2s); | 107 | return PTR_ERR(clk_i2s); |
108 | 108 | ||
109 | if (!cpu_dai->active) { | 109 | if (!cpu_dai->active) |
110 | SACR0 |= SACR0_RST; | ||
111 | SACR0 = 0; | 110 | SACR0 = 0; |
112 | } | ||
113 | 111 | ||
114 | return 0; | 112 | return 0; |
115 | } | 113 | } |
@@ -178,9 +176,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, | |||
178 | 176 | ||
179 | /* is port used by another stream */ | 177 | /* is port used by another stream */ |
180 | if (!(SACR0 & SACR0_ENB)) { | 178 | if (!(SACR0 & SACR0_ENB)) { |
181 | |||
182 | SACR0 = 0; | 179 | SACR0 = 0; |
183 | SACR1 = 0; | ||
184 | if (pxa_i2s.master) | 180 | if (pxa_i2s.master) |
185 | SACR0 |= SACR0_BCKD; | 181 | SACR0 |= SACR0_BCKD; |
186 | 182 | ||
@@ -226,6 +222,10 @@ static int pxa2xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, | |||
226 | 222 | ||
227 | switch (cmd) { | 223 | switch (cmd) { |
228 | case SNDRV_PCM_TRIGGER_START: | 224 | case SNDRV_PCM_TRIGGER_START: |
225 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
226 | SACR1 &= ~SACR1_DRPL; | ||
227 | else | ||
228 | SACR1 &= ~SACR1_DREC; | ||
229 | SACR0 |= SACR0_ENB; | 229 | SACR0 |= SACR0_ENB; |
230 | break; | 230 | break; |
231 | case SNDRV_PCM_TRIGGER_RESUME: | 231 | case SNDRV_PCM_TRIGGER_RESUME: |
@@ -252,21 +252,16 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, | |||
252 | SAIMR &= ~SAIMR_RFS; | 252 | SAIMR &= ~SAIMR_RFS; |
253 | } | 253 | } |
254 | 254 | ||
255 | if (SACR1 & (SACR1_DREC | SACR1_DRPL)) { | 255 | if ((SACR1 & (SACR1_DREC | SACR1_DRPL)) == (SACR1_DREC | SACR1_DRPL)) { |
256 | SACR0 &= ~SACR0_ENB; | 256 | SACR0 &= ~SACR0_ENB; |
257 | pxa_i2s_wait(); | 257 | pxa_i2s_wait(); |
258 | clk_disable(clk_i2s); | 258 | clk_disable(clk_i2s); |
259 | } | 259 | } |
260 | |||
261 | clk_put(clk_i2s); | ||
262 | } | 260 | } |
263 | 261 | ||
264 | #ifdef CONFIG_PM | 262 | #ifdef CONFIG_PM |
265 | static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) | 263 | static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) |
266 | { | 264 | { |
267 | if (!dai->active) | ||
268 | return 0; | ||
269 | |||
270 | /* store registers */ | 265 | /* store registers */ |
271 | pxa_i2s.sacr0 = SACR0; | 266 | pxa_i2s.sacr0 = SACR0; |
272 | pxa_i2s.sacr1 = SACR1; | 267 | pxa_i2s.sacr1 = SACR1; |
@@ -281,16 +276,14 @@ static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) | |||
281 | 276 | ||
282 | static int pxa2xx_i2s_resume(struct snd_soc_dai *dai) | 277 | static int pxa2xx_i2s_resume(struct snd_soc_dai *dai) |
283 | { | 278 | { |
284 | if (!dai->active) | ||
285 | return 0; | ||
286 | |||
287 | pxa_i2s_wait(); | 279 | pxa_i2s_wait(); |
288 | 280 | ||
289 | SACR0 = pxa_i2s.sacr0 &= ~SACR0_ENB; | 281 | SACR0 = pxa_i2s.sacr0 & ~SACR0_ENB; |
290 | SACR1 = pxa_i2s.sacr1; | 282 | SACR1 = pxa_i2s.sacr1; |
291 | SAIMR = pxa_i2s.saimr; | 283 | SAIMR = pxa_i2s.saimr; |
292 | SADIV = pxa_i2s.sadiv; | 284 | SADIV = pxa_i2s.sadiv; |
293 | SACR0 |= SACR0_ENB; | 285 | |
286 | SACR0 = pxa_i2s.sacr0; | ||
294 | 287 | ||
295 | return 0; | 288 | return 0; |
296 | } | 289 | } |
@@ -329,6 +322,7 @@ struct snd_soc_dai pxa_i2s_dai = { | |||
329 | .rates = PXA2XX_I2S_RATES, | 322 | .rates = PXA2XX_I2S_RATES, |
330 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 323 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, |
331 | .ops = &pxa_i2s_dai_ops, | 324 | .ops = &pxa_i2s_dai_ops, |
325 | .symmetric_rates = 1, | ||
332 | }; | 326 | }; |
333 | 327 | ||
334 | EXPORT_SYMBOL_GPL(pxa_i2s_dai); | 328 | EXPORT_SYMBOL_GPL(pxa_i2s_dai); |
@@ -346,6 +340,19 @@ static int pxa2xx_i2s_probe(struct platform_device *dev) | |||
346 | if (ret != 0) | 340 | if (ret != 0) |
347 | clk_put(clk_i2s); | 341 | clk_put(clk_i2s); |
348 | 342 | ||
343 | /* | ||
344 | * PXA Developer's Manual: | ||
345 | * If SACR0[ENB] is toggled in the middle of a normal operation, | ||
346 | * the SACR0[RST] bit must also be set and cleared to reset all | ||
347 | * I2S controller registers. | ||
348 | */ | ||
349 | SACR0 = SACR0_RST; | ||
350 | SACR0 = 0; | ||
351 | /* Make sure RPL and REC are disabled */ | ||
352 | SACR1 = SACR1_DRPL | SACR1_DREC; | ||
353 | /* Along with FIFO servicing */ | ||
354 | SAIMR &= ~(SAIMR_RFS | SAIMR_TFS); | ||
355 | |||
349 | return ret; | 356 | return ret; |
350 | } | 357 | } |
351 | 358 | ||
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 289fadf60b10..906709e6dd5f 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
@@ -345,9 +345,11 @@ static void lm4857_write_regs(void) | |||
345 | static int lm4857_get_reg(struct snd_kcontrol *kcontrol, | 345 | static int lm4857_get_reg(struct snd_kcontrol *kcontrol, |
346 | struct snd_ctl_elem_value *ucontrol) | 346 | struct snd_ctl_elem_value *ucontrol) |
347 | { | 347 | { |
348 | int reg = kcontrol->private_value & 0xFF; | 348 | struct soc_mixer_control *mc = |
349 | int shift = (kcontrol->private_value >> 8) & 0x0F; | 349 | (struct soc_mixer_control *)kcontrol->private_value; |
350 | int mask = (kcontrol->private_value >> 16) & 0xFF; | 350 | int reg = mc->reg; |
351 | int shift = mc->shift; | ||
352 | int mask = mc->max; | ||
351 | 353 | ||
352 | pr_debug("Entered %s\n", __func__); | 354 | pr_debug("Entered %s\n", __func__); |
353 | 355 | ||
@@ -358,9 +360,11 @@ static int lm4857_get_reg(struct snd_kcontrol *kcontrol, | |||
358 | static int lm4857_set_reg(struct snd_kcontrol *kcontrol, | 360 | static int lm4857_set_reg(struct snd_kcontrol *kcontrol, |
359 | struct snd_ctl_elem_value *ucontrol) | 361 | struct snd_ctl_elem_value *ucontrol) |
360 | { | 362 | { |
361 | int reg = kcontrol->private_value & 0xFF; | 363 | struct soc_mixer_control *mc = |
362 | int shift = (kcontrol->private_value >> 8) & 0x0F; | 364 | (struct soc_mixer_control *)kcontrol->private_value; |
363 | int mask = (kcontrol->private_value >> 16) & 0xFF; | 365 | int reg = mc->reg; |
366 | int shift = mc->shift; | ||
367 | int mask = mc->max; | ||
364 | 368 | ||
365 | if (((lm4857_regs[reg] >> shift) & mask) == | 369 | if (((lm4857_regs[reg] >> shift) & mask) == |
366 | ucontrol->value.integer.value[0]) | 370 | ucontrol->value.integer.value[0]) |
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index ab680aac3fcb..1a283170ca92 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c | |||
@@ -37,6 +37,20 @@ | |||
37 | 37 | ||
38 | #include "s3c-i2s-v2.h" | 38 | #include "s3c-i2s-v2.h" |
39 | 39 | ||
40 | #undef S3C_IIS_V2_SUPPORTED | ||
41 | |||
42 | #if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) | ||
43 | #define S3C_IIS_V2_SUPPORTED | ||
44 | #endif | ||
45 | |||
46 | #ifdef CONFIG_PLAT_S3C64XX | ||
47 | #define S3C_IIS_V2_SUPPORTED | ||
48 | #endif | ||
49 | |||
50 | #ifndef S3C_IIS_V2_SUPPORTED | ||
51 | #error Unsupported CPU model | ||
52 | #endif | ||
53 | |||
40 | #define S3C2412_I2S_DEBUG_CON 0 | 54 | #define S3C2412_I2S_DEBUG_CON 0 |
41 | 55 | ||
42 | static inline struct s3c_i2sv2_info *to_info(struct snd_soc_dai *cpu_dai) | 56 | static inline struct s3c_i2sv2_info *to_info(struct snd_soc_dai *cpu_dai) |
@@ -75,7 +89,7 @@ static inline void dbg_showcon(const char *fn, u32 con) | |||
75 | 89 | ||
76 | 90 | ||
77 | /* Turn on or off the transmission path. */ | 91 | /* Turn on or off the transmission path. */ |
78 | void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on) | 92 | static void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on) |
79 | { | 93 | { |
80 | void __iomem *regs = i2s->regs; | 94 | void __iomem *regs = i2s->regs; |
81 | u32 fic, con, mod; | 95 | u32 fic, con, mod; |
@@ -105,7 +119,9 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on) | |||
105 | break; | 119 | break; |
106 | 120 | ||
107 | default: | 121 | default: |
108 | dev_err(i2s->dev, "TXEN: Invalid MODE in IISMOD\n"); | 122 | dev_err(i2s->dev, "TXEN: Invalid MODE %x in IISMOD\n", |
123 | mod & S3C2412_IISMOD_MODE_MASK); | ||
124 | break; | ||
109 | } | 125 | } |
110 | 126 | ||
111 | writel(con, regs + S3C2412_IISCON); | 127 | writel(con, regs + S3C2412_IISCON); |
@@ -132,7 +148,9 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on) | |||
132 | break; | 148 | break; |
133 | 149 | ||
134 | default: | 150 | default: |
135 | dev_err(i2s->dev, "TXDIS: Invalid MODE in IISMOD\n"); | 151 | dev_err(i2s->dev, "TXDIS: Invalid MODE %x in IISMOD\n", |
152 | mod & S3C2412_IISMOD_MODE_MASK); | ||
153 | break; | ||
136 | } | 154 | } |
137 | 155 | ||
138 | writel(mod, regs + S3C2412_IISMOD); | 156 | writel(mod, regs + S3C2412_IISMOD); |
@@ -143,9 +161,8 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on) | |||
143 | dbg_showcon(__func__, con); | 161 | dbg_showcon(__func__, con); |
144 | pr_debug("%s: IIS: CON=%x MOD=%x FIC=%x\n", __func__, con, mod, fic); | 162 | pr_debug("%s: IIS: CON=%x MOD=%x FIC=%x\n", __func__, con, mod, fic); |
145 | } | 163 | } |
146 | EXPORT_SYMBOL_GPL(s3c2412_snd_txctrl); | ||
147 | 164 | ||
148 | void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on) | 165 | static void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on) |
149 | { | 166 | { |
150 | void __iomem *regs = i2s->regs; | 167 | void __iomem *regs = i2s->regs; |
151 | u32 fic, con, mod; | 168 | u32 fic, con, mod; |
@@ -175,7 +192,8 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on) | |||
175 | break; | 192 | break; |
176 | 193 | ||
177 | default: | 194 | default: |
178 | dev_err(i2s->dev, "RXEN: Invalid MODE in IISMOD\n"); | 195 | dev_err(i2s->dev, "RXEN: Invalid MODE %x in IISMOD\n", |
196 | mod & S3C2412_IISMOD_MODE_MASK); | ||
179 | } | 197 | } |
180 | 198 | ||
181 | writel(mod, regs + S3C2412_IISMOD); | 199 | writel(mod, regs + S3C2412_IISMOD); |
@@ -199,7 +217,8 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on) | |||
199 | break; | 217 | break; |
200 | 218 | ||
201 | default: | 219 | default: |
202 | dev_err(i2s->dev, "RXEN: Invalid MODE in IISMOD\n"); | 220 | dev_err(i2s->dev, "RXDIS: Invalid MODE %x in IISMOD\n", |
221 | mod & S3C2412_IISMOD_MODE_MASK); | ||
203 | } | 222 | } |
204 | 223 | ||
205 | writel(con, regs + S3C2412_IISCON); | 224 | writel(con, regs + S3C2412_IISCON); |
@@ -209,7 +228,6 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on) | |||
209 | fic = readl(regs + S3C2412_IISFIC); | 228 | fic = readl(regs + S3C2412_IISFIC); |
210 | pr_debug("%s: IIS: CON=%x MOD=%x FIC=%x\n", __func__, con, mod, fic); | 229 | pr_debug("%s: IIS: CON=%x MOD=%x FIC=%x\n", __func__, con, mod, fic); |
211 | } | 230 | } |
212 | EXPORT_SYMBOL_GPL(s3c2412_snd_rxctrl); | ||
213 | 231 | ||
214 | /* | 232 | /* |
215 | * Wait for the LR signal to allow synchronisation to the L/R clock | 233 | * Wait for the LR signal to allow synchronisation to the L/R clock |
@@ -266,7 +284,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai, | |||
266 | */ | 284 | */ |
267 | #define IISMOD_MASTER_MASK (1 << 11) | 285 | #define IISMOD_MASTER_MASK (1 << 11) |
268 | #define IISMOD_SLAVE (1 << 11) | 286 | #define IISMOD_SLAVE (1 << 11) |
269 | #define IISMOD_MASTER (0x0) | 287 | #define IISMOD_MASTER (0 << 11) |
270 | #endif | 288 | #endif |
271 | 289 | ||
272 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | 290 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { |
@@ -281,7 +299,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai, | |||
281 | iismod |= IISMOD_MASTER; | 299 | iismod |= IISMOD_MASTER; |
282 | break; | 300 | break; |
283 | default: | 301 | default: |
284 | pr_debug("unknwon master/slave format\n"); | 302 | pr_err("unknwon master/slave format\n"); |
285 | return -EINVAL; | 303 | return -EINVAL; |
286 | } | 304 | } |
287 | 305 | ||
@@ -298,7 +316,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai, | |||
298 | iismod |= S3C2412_IISMOD_SDF_IIS; | 316 | iismod |= S3C2412_IISMOD_SDF_IIS; |
299 | break; | 317 | break; |
300 | default: | 318 | default: |
301 | pr_debug("Unknown data format\n"); | 319 | pr_err("Unknown data format\n"); |
302 | return -EINVAL; | 320 | return -EINVAL; |
303 | } | 321 | } |
304 | 322 | ||
@@ -327,6 +345,7 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream, | |||
327 | iismod = readl(i2s->regs + S3C2412_IISMOD); | 345 | iismod = readl(i2s->regs + S3C2412_IISMOD); |
328 | pr_debug("%s: r: IISMOD: %x\n", __func__, iismod); | 346 | pr_debug("%s: r: IISMOD: %x\n", __func__, iismod); |
329 | 347 | ||
348 | #if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) | ||
330 | switch (params_format(params)) { | 349 | switch (params_format(params)) { |
331 | case SNDRV_PCM_FORMAT_S8: | 350 | case SNDRV_PCM_FORMAT_S8: |
332 | iismod |= S3C2412_IISMOD_8BIT; | 351 | iismod |= S3C2412_IISMOD_8BIT; |
@@ -335,6 +354,25 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream, | |||
335 | iismod &= ~S3C2412_IISMOD_8BIT; | 354 | iismod &= ~S3C2412_IISMOD_8BIT; |
336 | break; | 355 | break; |
337 | } | 356 | } |
357 | #endif | ||
358 | |||
359 | #ifdef CONFIG_PLAT_S3C64XX | ||
360 | iismod &= ~0x606; | ||
361 | /* Sample size */ | ||
362 | switch (params_format(params)) { | ||
363 | case SNDRV_PCM_FORMAT_S8: | ||
364 | /* 8 bit sample, 16fs BCLK */ | ||
365 | iismod |= 0x2004; | ||
366 | break; | ||
367 | case SNDRV_PCM_FORMAT_S16_LE: | ||
368 | /* 16 bit sample, 32fs BCLK */ | ||
369 | break; | ||
370 | case SNDRV_PCM_FORMAT_S24_LE: | ||
371 | /* 24 bit sample, 48fs BCLK */ | ||
372 | iismod |= 0x4002; | ||
373 | break; | ||
374 | } | ||
375 | #endif | ||
338 | 376 | ||
339 | writel(iismod, i2s->regs + S3C2412_IISMOD); | 377 | writel(iismod, i2s->regs + S3C2412_IISMOD); |
340 | pr_debug("%s: w: IISMOD: %x\n", __func__, iismod); | 378 | pr_debug("%s: w: IISMOD: %x\n", __func__, iismod); |
@@ -489,6 +527,8 @@ int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info, | |||
489 | unsigned int best_rate = 0; | 527 | unsigned int best_rate = 0; |
490 | unsigned int best_deviation = INT_MAX; | 528 | unsigned int best_deviation = INT_MAX; |
491 | 529 | ||
530 | pr_debug("Input clock rate %ldHz\n", clkrate); | ||
531 | |||
492 | if (fstab == NULL) | 532 | if (fstab == NULL) |
493 | fstab = iis_fs_tab; | 533 | fstab = iis_fs_tab; |
494 | 534 | ||
@@ -507,7 +547,7 @@ int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info, | |||
507 | actual = clkrate / (fsdiv * div); | 547 | actual = clkrate / (fsdiv * div); |
508 | deviation = actual - rate; | 548 | deviation = actual - rate; |
509 | 549 | ||
510 | printk(KERN_DEBUG "%dfs: div %d => result %d, deviation %d\n", | 550 | printk(KERN_DEBUG "%ufs: div %u => result %u, deviation %d\n", |
511 | fsdiv, div, actual, deviation); | 551 | fsdiv, div, actual, deviation); |
512 | 552 | ||
513 | deviation = abs(deviation); | 553 | deviation = abs(deviation); |
@@ -523,7 +563,7 @@ int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info, | |||
523 | break; | 563 | break; |
524 | } | 564 | } |
525 | 565 | ||
526 | printk(KERN_DEBUG "best: fs=%d, div=%d, rate=%d\n", | 566 | printk(KERN_DEBUG "best: fs=%u, div=%u, rate=%u\n", |
527 | best_fs, best_div, best_rate); | 567 | best_fs, best_div, best_rate); |
528 | 568 | ||
529 | info->fs_div = best_fs; | 569 | info->fs_div = best_fs; |
@@ -539,12 +579,31 @@ int s3c_i2sv2_probe(struct platform_device *pdev, | |||
539 | unsigned long base) | 579 | unsigned long base) |
540 | { | 580 | { |
541 | struct device *dev = &pdev->dev; | 581 | struct device *dev = &pdev->dev; |
582 | unsigned int iismod; | ||
542 | 583 | ||
543 | i2s->dev = dev; | 584 | i2s->dev = dev; |
544 | 585 | ||
545 | /* record our i2s structure for later use in the callbacks */ | 586 | /* record our i2s structure for later use in the callbacks */ |
546 | dai->private_data = i2s; | 587 | dai->private_data = i2s; |
547 | 588 | ||
589 | if (!base) { | ||
590 | struct resource *res = platform_get_resource(pdev, | ||
591 | IORESOURCE_MEM, | ||
592 | 0); | ||
593 | if (!res) { | ||
594 | dev_err(dev, "Unable to get register resource\n"); | ||
595 | return -ENXIO; | ||
596 | } | ||
597 | |||
598 | if (!request_mem_region(res->start, resource_size(res), | ||
599 | "s3c64xx-i2s-v4")) { | ||
600 | dev_err(dev, "Unable to request register region\n"); | ||
601 | return -EBUSY; | ||
602 | } | ||
603 | |||
604 | base = res->start; | ||
605 | } | ||
606 | |||
548 | i2s->regs = ioremap(base, 0x100); | 607 | i2s->regs = ioremap(base, 0x100); |
549 | if (i2s->regs == NULL) { | 608 | if (i2s->regs == NULL) { |
550 | dev_err(dev, "cannot ioremap registers\n"); | 609 | dev_err(dev, "cannot ioremap registers\n"); |
@@ -560,12 +619,16 @@ int s3c_i2sv2_probe(struct platform_device *pdev, | |||
560 | 619 | ||
561 | clk_enable(i2s->iis_pclk); | 620 | clk_enable(i2s->iis_pclk); |
562 | 621 | ||
622 | /* Mark ourselves as in TXRX mode so we can run through our cleanup | ||
623 | * process without warnings. */ | ||
624 | iismod = readl(i2s->regs + S3C2412_IISMOD); | ||
625 | iismod |= S3C2412_IISMOD_MODE_TXRX; | ||
626 | writel(iismod, i2s->regs + S3C2412_IISMOD); | ||
563 | s3c2412_snd_txctrl(i2s, 0); | 627 | s3c2412_snd_txctrl(i2s, 0); |
564 | s3c2412_snd_rxctrl(i2s, 0); | 628 | s3c2412_snd_rxctrl(i2s, 0); |
565 | 629 | ||
566 | return 0; | 630 | return 0; |
567 | } | 631 | } |
568 | |||
569 | EXPORT_SYMBOL_GPL(s3c_i2sv2_probe); | 632 | EXPORT_SYMBOL_GPL(s3c_i2sv2_probe); |
570 | 633 | ||
571 | #ifdef CONFIG_PM | 634 | #ifdef CONFIG_PM |
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index b7e0b3f0bfc8..168a088ba761 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c | |||
@@ -120,7 +120,7 @@ static int s3c2412_i2s_probe(struct platform_device *pdev, | |||
120 | 120 | ||
121 | s3c2412_i2s.iis_cclk = clk_get(&pdev->dev, "i2sclk"); | 121 | s3c2412_i2s.iis_cclk = clk_get(&pdev->dev, "i2sclk"); |
122 | if (s3c2412_i2s.iis_cclk == NULL) { | 122 | if (s3c2412_i2s.iis_cclk == NULL) { |
123 | pr_debug("failed to get i2sclk clock\n"); | 123 | pr_err("failed to get i2sclk clock\n"); |
124 | iounmap(s3c2412_i2s.regs); | 124 | iounmap(s3c2412_i2s.regs); |
125 | return -ENODEV; | 125 | return -ENODEV; |
126 | } | 126 | } |
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index 33c5de7e255f..3c06c401d0fb 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c | |||
@@ -108,48 +108,19 @@ static int s3c64xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, | |||
108 | return 0; | 108 | return 0; |
109 | } | 109 | } |
110 | 110 | ||
111 | 111 | struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai) | |
112 | unsigned long s3c64xx_i2s_get_clockrate(struct snd_soc_dai *dai) | ||
113 | { | 112 | { |
114 | struct s3c_i2sv2_info *i2s = to_info(dai); | 113 | struct s3c_i2sv2_info *i2s = to_info(dai); |
115 | 114 | ||
116 | return clk_get_rate(i2s->iis_cclk); | 115 | return i2s->iis_cclk; |
117 | } | 116 | } |
118 | EXPORT_SYMBOL_GPL(s3c64xx_i2s_get_clockrate); | 117 | EXPORT_SYMBOL_GPL(s3c64xx_i2s_get_clock); |
119 | 118 | ||
120 | static int s3c64xx_i2s_probe(struct platform_device *pdev, | 119 | static int s3c64xx_i2s_probe(struct platform_device *pdev, |
121 | struct snd_soc_dai *dai) | 120 | struct snd_soc_dai *dai) |
122 | { | 121 | { |
123 | struct device *dev = &pdev->dev; | ||
124 | struct s3c_i2sv2_info *i2s; | ||
125 | int ret; | ||
126 | |||
127 | dev_dbg(dev, "%s: probing dai %d\n", __func__, pdev->id); | ||
128 | |||
129 | if (pdev->id < 0 || pdev->id > ARRAY_SIZE(s3c64xx_i2s)) { | ||
130 | dev_err(dev, "id %d out of range\n", pdev->id); | ||
131 | return -EINVAL; | ||
132 | } | ||
133 | |||
134 | i2s = &s3c64xx_i2s[pdev->id]; | ||
135 | |||
136 | ret = s3c_i2sv2_probe(pdev, dai, i2s, | ||
137 | pdev->id ? S3C64XX_PA_IIS1 : S3C64XX_PA_IIS0); | ||
138 | if (ret) | ||
139 | return ret; | ||
140 | |||
141 | i2s->dma_capture = &s3c64xx_i2s_pcm_stereo_in[pdev->id]; | ||
142 | i2s->dma_playback = &s3c64xx_i2s_pcm_stereo_out[pdev->id]; | ||
143 | |||
144 | i2s->iis_cclk = clk_get(dev, "audio-bus"); | ||
145 | if (IS_ERR(i2s->iis_cclk)) { | ||
146 | dev_err(dev, "failed to get audio-bus"); | ||
147 | iounmap(i2s->regs); | ||
148 | return -ENODEV; | ||
149 | } | ||
150 | |||
151 | /* configure GPIO for i2s port */ | 122 | /* configure GPIO for i2s port */ |
152 | switch (pdev->id) { | 123 | switch (dai->id) { |
153 | case 0: | 124 | case 0: |
154 | s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C64XX_GPD0_I2S0_CLK); | 125 | s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C64XX_GPD0_I2S0_CLK); |
155 | s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C64XX_GPD1_I2S0_CDCLK); | 126 | s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C64XX_GPD1_I2S0_CDCLK); |
@@ -175,41 +146,122 @@ static int s3c64xx_i2s_probe(struct platform_device *pdev, | |||
175 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) | 146 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) |
176 | 147 | ||
177 | #define S3C64XX_I2S_FMTS \ | 148 | #define S3C64XX_I2S_FMTS \ |
178 | (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE) | 149 | (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\ |
150 | SNDRV_PCM_FMTBIT_S24_LE) | ||
179 | 151 | ||
180 | static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops = { | 152 | static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops = { |
181 | .set_sysclk = s3c64xx_i2s_set_sysclk, | 153 | .set_sysclk = s3c64xx_i2s_set_sysclk, |
182 | }; | 154 | }; |
183 | 155 | ||
184 | struct snd_soc_dai s3c64xx_i2s_dai = { | 156 | struct snd_soc_dai s3c64xx_i2s_dai[] = { |
185 | .name = "s3c64xx-i2s", | 157 | { |
186 | .id = 0, | 158 | .name = "s3c64xx-i2s", |
187 | .probe = s3c64xx_i2s_probe, | 159 | .id = 0, |
188 | .playback = { | 160 | .probe = s3c64xx_i2s_probe, |
189 | .channels_min = 2, | 161 | .playback = { |
190 | .channels_max = 2, | 162 | .channels_min = 2, |
191 | .rates = S3C64XX_I2S_RATES, | 163 | .channels_max = 2, |
192 | .formats = S3C64XX_I2S_FMTS, | 164 | .rates = S3C64XX_I2S_RATES, |
165 | .formats = S3C64XX_I2S_FMTS, | ||
166 | }, | ||
167 | .capture = { | ||
168 | .channels_min = 2, | ||
169 | .channels_max = 2, | ||
170 | .rates = S3C64XX_I2S_RATES, | ||
171 | .formats = S3C64XX_I2S_FMTS, | ||
172 | }, | ||
173 | .ops = &s3c64xx_i2s_dai_ops, | ||
174 | .symmetric_rates = 1, | ||
193 | }, | 175 | }, |
194 | .capture = { | 176 | { |
195 | .channels_min = 2, | 177 | .name = "s3c64xx-i2s", |
196 | .channels_max = 2, | 178 | .id = 1, |
197 | .rates = S3C64XX_I2S_RATES, | 179 | .probe = s3c64xx_i2s_probe, |
198 | .formats = S3C64XX_I2S_FMTS, | 180 | .playback = { |
181 | .channels_min = 2, | ||
182 | .channels_max = 2, | ||
183 | .rates = S3C64XX_I2S_RATES, | ||
184 | .formats = S3C64XX_I2S_FMTS, | ||
185 | }, | ||
186 | .capture = { | ||
187 | .channels_min = 2, | ||
188 | .channels_max = 2, | ||
189 | .rates = S3C64XX_I2S_RATES, | ||
190 | .formats = S3C64XX_I2S_FMTS, | ||
191 | }, | ||
192 | .ops = &s3c64xx_i2s_dai_ops, | ||
193 | .symmetric_rates = 1, | ||
199 | }, | 194 | }, |
200 | .ops = &s3c64xx_i2s_dai_ops, | ||
201 | }; | 195 | }; |
202 | EXPORT_SYMBOL_GPL(s3c64xx_i2s_dai); | 196 | EXPORT_SYMBOL_GPL(s3c64xx_i2s_dai); |
203 | 197 | ||
198 | static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev) | ||
199 | { | ||
200 | struct s3c_i2sv2_info *i2s; | ||
201 | struct snd_soc_dai *dai; | ||
202 | int ret; | ||
203 | |||
204 | if (pdev->id >= ARRAY_SIZE(s3c64xx_i2s)) { | ||
205 | dev_err(&pdev->dev, "id %d out of range\n", pdev->id); | ||
206 | return -EINVAL; | ||
207 | } | ||
208 | |||
209 | i2s = &s3c64xx_i2s[pdev->id]; | ||
210 | dai = &s3c64xx_i2s_dai[pdev->id]; | ||
211 | dai->dev = &pdev->dev; | ||
212 | |||
213 | i2s->dma_capture = &s3c64xx_i2s_pcm_stereo_in[pdev->id]; | ||
214 | i2s->dma_playback = &s3c64xx_i2s_pcm_stereo_out[pdev->id]; | ||
215 | |||
216 | i2s->iis_cclk = clk_get(&pdev->dev, "audio-bus"); | ||
217 | if (IS_ERR(i2s->iis_cclk)) { | ||
218 | dev_err(&pdev->dev, "failed to get audio-bus\n"); | ||
219 | ret = PTR_ERR(i2s->iis_cclk); | ||
220 | goto err; | ||
221 | } | ||
222 | |||
223 | ret = s3c_i2sv2_probe(pdev, dai, i2s, 0); | ||
224 | if (ret) | ||
225 | goto err_clk; | ||
226 | |||
227 | ret = s3c_i2sv2_register_dai(dai); | ||
228 | if (ret != 0) | ||
229 | goto err_i2sv2; | ||
230 | |||
231 | return 0; | ||
232 | |||
233 | err_i2sv2: | ||
234 | /* Not implemented for I2Sv2 core yet */ | ||
235 | err_clk: | ||
236 | clk_put(i2s->iis_cclk); | ||
237 | err: | ||
238 | return ret; | ||
239 | } | ||
240 | |||
241 | static __devexit int s3c64xx_iis_dev_remove(struct platform_device *pdev) | ||
242 | { | ||
243 | dev_err(&pdev->dev, "Device removal not yet supported\n"); | ||
244 | return 0; | ||
245 | } | ||
246 | |||
247 | static struct platform_driver s3c64xx_iis_driver = { | ||
248 | .probe = s3c64xx_iis_dev_probe, | ||
249 | .remove = s3c64xx_iis_dev_remove, | ||
250 | .driver = { | ||
251 | .name = "s3c64xx-iis", | ||
252 | .owner = THIS_MODULE, | ||
253 | }, | ||
254 | }; | ||
255 | |||
204 | static int __init s3c64xx_i2s_init(void) | 256 | static int __init s3c64xx_i2s_init(void) |
205 | { | 257 | { |
206 | return s3c_i2sv2_register_dai(&s3c64xx_i2s_dai); | 258 | return platform_driver_register(&s3c64xx_iis_driver); |
207 | } | 259 | } |
208 | module_init(s3c64xx_i2s_init); | 260 | module_init(s3c64xx_i2s_init); |
209 | 261 | ||
210 | static void __exit s3c64xx_i2s_exit(void) | 262 | static void __exit s3c64xx_i2s_exit(void) |
211 | { | 263 | { |
212 | snd_soc_unregister_dai(&s3c64xx_i2s_dai); | 264 | platform_driver_unregister(&s3c64xx_iis_driver); |
213 | } | 265 | } |
214 | module_exit(s3c64xx_i2s_exit); | 266 | module_exit(s3c64xx_i2s_exit); |
215 | 267 | ||
@@ -217,6 +269,3 @@ module_exit(s3c64xx_i2s_exit); | |||
217 | MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>"); | 269 | MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>"); |
218 | MODULE_DESCRIPTION("S3C64XX I2S SoC Interface"); | 270 | MODULE_DESCRIPTION("S3C64XX I2S SoC Interface"); |
219 | MODULE_LICENSE("GPL"); | 271 | MODULE_LICENSE("GPL"); |
220 | |||
221 | |||
222 | |||
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.h b/sound/soc/s3c24xx/s3c64xx-i2s.h index b7ffe3c38b66..02148cee2613 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.h +++ b/sound/soc/s3c24xx/s3c64xx-i2s.h | |||
@@ -15,6 +15,8 @@ | |||
15 | #ifndef __SND_SOC_S3C24XX_S3C64XX_I2S_H | 15 | #ifndef __SND_SOC_S3C24XX_S3C64XX_I2S_H |
16 | #define __SND_SOC_S3C24XX_S3C64XX_I2S_H __FILE__ | 16 | #define __SND_SOC_S3C24XX_S3C64XX_I2S_H __FILE__ |
17 | 17 | ||
18 | struct clk; | ||
19 | |||
18 | #include "s3c-i2s-v2.h" | 20 | #include "s3c-i2s-v2.h" |
19 | 21 | ||
20 | #define S3C64XX_DIV_BCLK S3C_I2SV2_DIV_BCLK | 22 | #define S3C64XX_DIV_BCLK S3C_I2SV2_DIV_BCLK |
@@ -24,8 +26,8 @@ | |||
24 | #define S3C64XX_CLKSRC_PCLK (0) | 26 | #define S3C64XX_CLKSRC_PCLK (0) |
25 | #define S3C64XX_CLKSRC_MUX (1) | 27 | #define S3C64XX_CLKSRC_MUX (1) |
26 | 28 | ||
27 | extern struct snd_soc_dai s3c64xx_i2s_dai; | 29 | extern struct snd_soc_dai s3c64xx_i2s_dai[]; |
28 | 30 | ||
29 | extern unsigned long s3c64xx_i2s_get_clockrate(struct snd_soc_dai *cpu_dai); | 31 | extern struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai); |
30 | 32 | ||
31 | #endif /* __SND_SOC_S3C24XX_S3C64XX_I2S_H */ | 33 | #endif /* __SND_SOC_S3C24XX_S3C64XX_I2S_H */ |
diff --git a/sound/soc/s6000/Kconfig b/sound/soc/s6000/Kconfig new file mode 100644 index 000000000000..c74eb3d4a47c --- /dev/null +++ b/sound/soc/s6000/Kconfig | |||
@@ -0,0 +1,19 @@ | |||
1 | config SND_S6000_SOC | ||
2 | tristate "SoC Audio for the Stretch s6000 family" | ||
3 | depends on XTENSA_VARIANT_S6000 | ||
4 | help | ||
5 | Say Y or M if you want to add support for codecs attached to | ||
6 | s6000 family chips. You will also need to select the platform | ||
7 | to support below. | ||
8 | |||
9 | config SND_S6000_SOC_I2S | ||
10 | tristate | ||
11 | |||
12 | config SND_S6000_SOC_S6IPCAM | ||
13 | tristate "SoC Audio support for Stretch 6105 IP Camera" | ||
14 | depends on SND_S6000_SOC && XTENSA_PLATFORM_S6105 | ||
15 | select SND_S6000_SOC_I2S | ||
16 | select SND_SOC_TLV320AIC3X | ||
17 | help | ||
18 | Say Y if you want to add support for SoC audio on the | ||
19 | Stretch s6105 IP Camera Reference Design. | ||
diff --git a/sound/soc/s6000/Makefile b/sound/soc/s6000/Makefile new file mode 100644 index 000000000000..7a613612e010 --- /dev/null +++ b/sound/soc/s6000/Makefile | |||
@@ -0,0 +1,11 @@ | |||
1 | # s6000 Platform Support | ||
2 | snd-soc-s6000-objs := s6000-pcm.o | ||
3 | snd-soc-s6000-i2s-objs := s6000-i2s.o | ||
4 | |||
5 | obj-$(CONFIG_SND_S6000_SOC) += snd-soc-s6000.o | ||
6 | obj-$(CONFIG_SND_S6000_SOC_I2S) += snd-soc-s6000-i2s.o | ||
7 | |||
8 | # s6105 Machine Support | ||
9 | snd-soc-s6ipcam-objs := s6105-ipcam.o | ||
10 | |||
11 | obj-$(CONFIG_SND_S6000_SOC_S6IPCAM) += snd-soc-s6ipcam.o | ||
diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c new file mode 100644 index 000000000000..c5cda187ecab --- /dev/null +++ b/sound/soc/s6000/s6000-i2s.c | |||
@@ -0,0 +1,629 @@ | |||
1 | /* | ||
2 | * ALSA SoC I2S Audio Layer for the Stretch S6000 family | ||
3 | * | ||
4 | * Author: Daniel Gloeckner, <dg@emlix.com> | ||
5 | * Copyright: (C) 2009 emlix GmbH <info@emlix.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #include <linux/init.h> | ||
13 | #include <linux/module.h> | ||
14 | #include <linux/device.h> | ||
15 | #include <linux/delay.h> | ||
16 | #include <linux/clk.h> | ||
17 | #include <linux/interrupt.h> | ||
18 | #include <linux/io.h> | ||
19 | |||
20 | #include <sound/core.h> | ||
21 | #include <sound/pcm.h> | ||
22 | #include <sound/pcm_params.h> | ||
23 | #include <sound/initval.h> | ||
24 | #include <sound/soc.h> | ||
25 | |||
26 | #include "s6000-i2s.h" | ||
27 | #include "s6000-pcm.h" | ||
28 | |||
29 | struct s6000_i2s_dev { | ||
30 | dma_addr_t sifbase; | ||
31 | u8 __iomem *scbbase; | ||
32 | unsigned int wide; | ||
33 | unsigned int channel_in; | ||
34 | unsigned int channel_out; | ||
35 | unsigned int lines_in; | ||
36 | unsigned int lines_out; | ||
37 | struct s6000_pcm_dma_params dma_params; | ||
38 | }; | ||
39 | |||
40 | #define S6_I2S_INTERRUPT_STATUS 0x00 | ||
41 | #define S6_I2S_INT_OVERRUN 1 | ||
42 | #define S6_I2S_INT_UNDERRUN 2 | ||
43 | #define S6_I2S_INT_ALIGNMENT 4 | ||
44 | #define S6_I2S_INTERRUPT_ENABLE 0x04 | ||
45 | #define S6_I2S_INTERRUPT_RAW 0x08 | ||
46 | #define S6_I2S_INTERRUPT_CLEAR 0x0C | ||
47 | #define S6_I2S_INTERRUPT_SET 0x10 | ||
48 | #define S6_I2S_MODE 0x20 | ||
49 | #define S6_I2S_DUAL 0 | ||
50 | #define S6_I2S_WIDE 1 | ||
51 | #define S6_I2S_TX_DEFAULT 0x24 | ||
52 | #define S6_I2S_DATA_CFG(c) (0x40 + 0x10 * (c)) | ||
53 | #define S6_I2S_IN 0 | ||
54 | #define S6_I2S_OUT 1 | ||
55 | #define S6_I2S_UNUSED 2 | ||
56 | #define S6_I2S_INTERFACE_CFG(c) (0x44 + 0x10 * (c)) | ||
57 | #define S6_I2S_DIV_MASK 0x001fff | ||
58 | #define S6_I2S_16BIT 0x000000 | ||
59 | #define S6_I2S_20BIT 0x002000 | ||
60 | #define S6_I2S_24BIT 0x004000 | ||
61 | #define S6_I2S_32BIT 0x006000 | ||
62 | #define S6_I2S_BITS_MASK 0x006000 | ||
63 | #define S6_I2S_MEM_16BIT 0x000000 | ||
64 | #define S6_I2S_MEM_32BIT 0x008000 | ||
65 | #define S6_I2S_MEM_MASK 0x008000 | ||
66 | #define S6_I2S_CHANNELS_SHIFT 16 | ||
67 | #define S6_I2S_CHANNELS_MASK 0x030000 | ||
68 | #define S6_I2S_SCK_IN 0x000000 | ||
69 | #define S6_I2S_SCK_OUT 0x040000 | ||
70 | #define S6_I2S_SCK_DIR 0x040000 | ||
71 | #define S6_I2S_WS_IN 0x000000 | ||
72 | #define S6_I2S_WS_OUT 0x080000 | ||
73 | #define S6_I2S_WS_DIR 0x080000 | ||
74 | #define S6_I2S_LEFT_FIRST 0x000000 | ||
75 | #define S6_I2S_RIGHT_FIRST 0x100000 | ||
76 | #define S6_I2S_FIRST 0x100000 | ||
77 | #define S6_I2S_CUR_SCK 0x200000 | ||
78 | #define S6_I2S_CUR_WS 0x400000 | ||
79 | #define S6_I2S_ENABLE(c) (0x48 + 0x10 * (c)) | ||
80 | #define S6_I2S_DISABLE_IF 0x02 | ||
81 | #define S6_I2S_ENABLE_IF 0x03 | ||
82 | #define S6_I2S_IS_BUSY 0x04 | ||
83 | #define S6_I2S_DMA_ACTIVE 0x08 | ||
84 | #define S6_I2S_IS_ENABLED 0x10 | ||
85 | |||
86 | #define S6_I2S_NUM_LINES 4 | ||
87 | |||
88 | #define S6_I2S_SIF_PORT0 0x0000000 | ||
89 | #define S6_I2S_SIF_PORT1 0x0000080 /* docs say 0x0000010 */ | ||
90 | |||
91 | static inline void s6_i2s_write_reg(struct s6000_i2s_dev *dev, int reg, u32 val) | ||
92 | { | ||
93 | writel(val, dev->scbbase + reg); | ||
94 | } | ||
95 | |||
96 | static inline u32 s6_i2s_read_reg(struct s6000_i2s_dev *dev, int reg) | ||
97 | { | ||
98 | return readl(dev->scbbase + reg); | ||
99 | } | ||
100 | |||
101 | static inline void s6_i2s_mod_reg(struct s6000_i2s_dev *dev, int reg, | ||
102 | u32 mask, u32 val) | ||
103 | { | ||
104 | val ^= s6_i2s_read_reg(dev, reg) & ~mask; | ||
105 | s6_i2s_write_reg(dev, reg, val); | ||
106 | } | ||
107 | |||
108 | static void s6000_i2s_start_channel(struct s6000_i2s_dev *dev, int channel) | ||
109 | { | ||
110 | int i, j, cur, prev; | ||
111 | |||
112 | /* | ||
113 | * Wait for WCLK to toggle 5 times before enabling the channel | ||
114 | * s6000 Family Datasheet 3.6.4: | ||
115 | * "At least two cycles of WS must occur between commands | ||
116 | * to disable or enable the interface" | ||
117 | */ | ||
118 | j = 0; | ||
119 | prev = ~S6_I2S_CUR_WS; | ||
120 | for (i = 1000000; --i && j < 6; ) { | ||
121 | cur = s6_i2s_read_reg(dev, S6_I2S_INTERFACE_CFG(channel)) | ||
122 | & S6_I2S_CUR_WS; | ||
123 | if (prev != cur) { | ||
124 | prev = cur; | ||
125 | j++; | ||
126 | } | ||
127 | } | ||
128 | if (j < 6) | ||
129 | printk(KERN_WARNING "s6000-i2s: timeout waiting for WCLK\n"); | ||
130 | |||
131 | s6_i2s_write_reg(dev, S6_I2S_ENABLE(channel), S6_I2S_ENABLE_IF); | ||
132 | } | ||
133 | |||
134 | static void s6000_i2s_stop_channel(struct s6000_i2s_dev *dev, int channel) | ||
135 | { | ||
136 | s6_i2s_write_reg(dev, S6_I2S_ENABLE(channel), S6_I2S_DISABLE_IF); | ||
137 | } | ||
138 | |||
139 | static void s6000_i2s_start(struct snd_pcm_substream *substream) | ||
140 | { | ||
141 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
142 | struct s6000_i2s_dev *dev = rtd->dai->cpu_dai->private_data; | ||
143 | int channel; | ||
144 | |||
145 | channel = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? | ||
146 | dev->channel_out : dev->channel_in; | ||
147 | |||
148 | s6000_i2s_start_channel(dev, channel); | ||
149 | } | ||
150 | |||
151 | static void s6000_i2s_stop(struct snd_pcm_substream *substream) | ||
152 | { | ||
153 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
154 | struct s6000_i2s_dev *dev = rtd->dai->cpu_dai->private_data; | ||
155 | int channel; | ||
156 | |||
157 | channel = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? | ||
158 | dev->channel_out : dev->channel_in; | ||
159 | |||
160 | s6000_i2s_stop_channel(dev, channel); | ||
161 | } | ||
162 | |||
163 | static int s6000_i2s_trigger(struct snd_pcm_substream *substream, int cmd, | ||
164 | int after) | ||
165 | { | ||
166 | switch (cmd) { | ||
167 | case SNDRV_PCM_TRIGGER_START: | ||
168 | case SNDRV_PCM_TRIGGER_RESUME: | ||
169 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | ||
170 | if ((substream->stream == SNDRV_PCM_STREAM_CAPTURE) ^ !after) | ||
171 | s6000_i2s_start(substream); | ||
172 | break; | ||
173 | case SNDRV_PCM_TRIGGER_STOP: | ||
174 | case SNDRV_PCM_TRIGGER_SUSPEND: | ||
175 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: | ||
176 | if (!after) | ||
177 | s6000_i2s_stop(substream); | ||
178 | } | ||
179 | return 0; | ||
180 | } | ||
181 | |||
182 | static unsigned int s6000_i2s_int_sources(struct s6000_i2s_dev *dev) | ||
183 | { | ||
184 | unsigned int pending; | ||
185 | pending = s6_i2s_read_reg(dev, S6_I2S_INTERRUPT_RAW); | ||
186 | pending &= S6_I2S_INT_ALIGNMENT | | ||
187 | S6_I2S_INT_UNDERRUN | | ||
188 | S6_I2S_INT_OVERRUN; | ||
189 | s6_i2s_write_reg(dev, S6_I2S_INTERRUPT_CLEAR, pending); | ||
190 | |||
191 | return pending; | ||
192 | } | ||
193 | |||
194 | static unsigned int s6000_i2s_check_xrun(struct snd_soc_dai *cpu_dai) | ||
195 | { | ||
196 | struct s6000_i2s_dev *dev = cpu_dai->private_data; | ||
197 | unsigned int errors; | ||
198 | unsigned int ret; | ||
199 | |||
200 | errors = s6000_i2s_int_sources(dev); | ||
201 | if (likely(!errors)) | ||
202 | return 0; | ||
203 | |||
204 | ret = 0; | ||
205 | if (errors & S6_I2S_INT_ALIGNMENT) | ||
206 | printk(KERN_ERR "s6000-i2s: WCLK misaligned\n"); | ||
207 | if (errors & S6_I2S_INT_UNDERRUN) | ||
208 | ret |= 1 << SNDRV_PCM_STREAM_PLAYBACK; | ||
209 | if (errors & S6_I2S_INT_OVERRUN) | ||
210 | ret |= 1 << SNDRV_PCM_STREAM_CAPTURE; | ||
211 | return ret; | ||
212 | } | ||
213 | |||
214 | static void s6000_i2s_wait_disabled(struct s6000_i2s_dev *dev) | ||
215 | { | ||
216 | int channel; | ||
217 | int n = 50; | ||
218 | for (channel = 0; channel < 2; channel++) { | ||
219 | while (--n >= 0) { | ||
220 | int v = s6_i2s_read_reg(dev, S6_I2S_ENABLE(channel)); | ||
221 | if ((v & S6_I2S_IS_ENABLED) | ||
222 | || !(v & (S6_I2S_DMA_ACTIVE | S6_I2S_IS_BUSY))) | ||
223 | break; | ||
224 | udelay(20); | ||
225 | } | ||
226 | } | ||
227 | if (n < 0) | ||
228 | printk(KERN_WARNING "s6000-i2s: timeout disabling interfaces"); | ||
229 | } | ||
230 | |||
231 | static int s6000_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, | ||
232 | unsigned int fmt) | ||
233 | { | ||
234 | struct s6000_i2s_dev *dev = cpu_dai->private_data; | ||
235 | u32 w; | ||
236 | |||
237 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | ||
238 | case SND_SOC_DAIFMT_CBM_CFM: | ||
239 | w = S6_I2S_SCK_IN | S6_I2S_WS_IN; | ||
240 | break; | ||
241 | case SND_SOC_DAIFMT_CBS_CFM: | ||
242 | w = S6_I2S_SCK_OUT | S6_I2S_WS_IN; | ||
243 | break; | ||
244 | case SND_SOC_DAIFMT_CBM_CFS: | ||
245 | w = S6_I2S_SCK_IN | S6_I2S_WS_OUT; | ||
246 | break; | ||
247 | case SND_SOC_DAIFMT_CBS_CFS: | ||
248 | w = S6_I2S_SCK_OUT | S6_I2S_WS_OUT; | ||
249 | break; | ||
250 | default: | ||
251 | return -EINVAL; | ||
252 | } | ||
253 | |||
254 | switch (fmt & SND_SOC_DAIFMT_INV_MASK) { | ||
255 | case SND_SOC_DAIFMT_NB_NF: | ||
256 | w |= S6_I2S_LEFT_FIRST; | ||
257 | break; | ||
258 | case SND_SOC_DAIFMT_NB_IF: | ||
259 | w |= S6_I2S_RIGHT_FIRST; | ||
260 | break; | ||
261 | default: | ||
262 | return -EINVAL; | ||
263 | } | ||
264 | |||
265 | s6_i2s_mod_reg(dev, S6_I2S_INTERFACE_CFG(0), | ||
266 | S6_I2S_FIRST | S6_I2S_WS_DIR | S6_I2S_SCK_DIR, w); | ||
267 | s6_i2s_mod_reg(dev, S6_I2S_INTERFACE_CFG(1), | ||
268 | S6_I2S_FIRST | S6_I2S_WS_DIR | S6_I2S_SCK_DIR, w); | ||
269 | |||
270 | return 0; | ||
271 | } | ||
272 | |||
273 | static int s6000_i2s_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div) | ||
274 | { | ||
275 | struct s6000_i2s_dev *dev = dai->private_data; | ||
276 | |||
277 | if (!div || (div & 1) || div > (S6_I2S_DIV_MASK + 1) * 2) | ||
278 | return -EINVAL; | ||
279 | |||
280 | s6_i2s_mod_reg(dev, S6_I2S_INTERFACE_CFG(div_id), | ||
281 | S6_I2S_DIV_MASK, div / 2 - 1); | ||
282 | return 0; | ||
283 | } | ||
284 | |||
285 | static int s6000_i2s_hw_params(struct snd_pcm_substream *substream, | ||
286 | struct snd_pcm_hw_params *params, | ||
287 | struct snd_soc_dai *dai) | ||
288 | { | ||
289 | struct s6000_i2s_dev *dev = dai->private_data; | ||
290 | int interf; | ||
291 | u32 w = 0; | ||
292 | |||
293 | if (dev->wide) | ||
294 | interf = 0; | ||
295 | else { | ||
296 | w |= (((params_channels(params) - 2) / 2) | ||
297 | << S6_I2S_CHANNELS_SHIFT) & S6_I2S_CHANNELS_MASK; | ||
298 | interf = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
299 | ? dev->channel_out : dev->channel_in; | ||
300 | } | ||
301 | |||
302 | switch (params_format(params)) { | ||
303 | case SNDRV_PCM_FORMAT_S16_LE: | ||
304 | w |= S6_I2S_16BIT | S6_I2S_MEM_16BIT; | ||
305 | break; | ||
306 | case SNDRV_PCM_FORMAT_S32_LE: | ||
307 | w |= S6_I2S_32BIT | S6_I2S_MEM_32BIT; | ||
308 | break; | ||
309 | default: | ||
310 | printk(KERN_WARNING "s6000-i2s: unsupported PCM format %x\n", | ||
311 | params_format(params)); | ||
312 | return -EINVAL; | ||
313 | } | ||
314 | |||
315 | if (s6_i2s_read_reg(dev, S6_I2S_INTERFACE_CFG(interf)) | ||
316 | & S6_I2S_IS_ENABLED) { | ||
317 | printk(KERN_ERR "s6000-i2s: interface already enabled\n"); | ||
318 | return -EBUSY; | ||
319 | } | ||
320 | |||
321 | s6_i2s_mod_reg(dev, S6_I2S_INTERFACE_CFG(interf), | ||
322 | S6_I2S_CHANNELS_MASK|S6_I2S_MEM_MASK|S6_I2S_BITS_MASK, | ||
323 | w); | ||
324 | |||
325 | return 0; | ||
326 | } | ||
327 | |||
328 | static int s6000_i2s_dai_probe(struct platform_device *pdev, | ||
329 | struct snd_soc_dai *dai) | ||
330 | { | ||
331 | struct s6000_i2s_dev *dev = dai->private_data; | ||
332 | struct s6000_snd_platform_data *pdata = pdev->dev.platform_data; | ||
333 | |||
334 | if (!pdata) | ||
335 | return -EINVAL; | ||
336 | |||
337 | dev->wide = pdata->wide; | ||
338 | dev->channel_in = pdata->channel_in; | ||
339 | dev->channel_out = pdata->channel_out; | ||
340 | dev->lines_in = pdata->lines_in; | ||
341 | dev->lines_out = pdata->lines_out; | ||
342 | |||
343 | s6_i2s_write_reg(dev, S6_I2S_MODE, | ||
344 | dev->wide ? S6_I2S_WIDE : S6_I2S_DUAL); | ||
345 | |||
346 | if (dev->wide) { | ||
347 | int i; | ||
348 | |||
349 | if (dev->lines_in + dev->lines_out > S6_I2S_NUM_LINES) | ||
350 | return -EINVAL; | ||
351 | |||
352 | dev->channel_in = 0; | ||
353 | dev->channel_out = 1; | ||
354 | dai->capture.channels_min = 2 * dev->lines_in; | ||
355 | dai->capture.channels_max = dai->capture.channels_min; | ||
356 | dai->playback.channels_min = 2 * dev->lines_out; | ||
357 | dai->playback.channels_max = dai->playback.channels_min; | ||
358 | |||
359 | for (i = 0; i < dev->lines_out; i++) | ||
360 | s6_i2s_write_reg(dev, S6_I2S_DATA_CFG(i), S6_I2S_OUT); | ||
361 | |||
362 | for (; i < S6_I2S_NUM_LINES - dev->lines_in; i++) | ||
363 | s6_i2s_write_reg(dev, S6_I2S_DATA_CFG(i), | ||
364 | S6_I2S_UNUSED); | ||
365 | |||
366 | for (; i < S6_I2S_NUM_LINES; i++) | ||
367 | s6_i2s_write_reg(dev, S6_I2S_DATA_CFG(i), S6_I2S_IN); | ||
368 | } else { | ||
369 | unsigned int cfg[2] = {S6_I2S_UNUSED, S6_I2S_UNUSED}; | ||
370 | |||
371 | if (dev->lines_in > 1 || dev->lines_out > 1) | ||
372 | return -EINVAL; | ||
373 | |||
374 | dai->capture.channels_min = 2 * dev->lines_in; | ||
375 | dai->capture.channels_max = 8 * dev->lines_in; | ||
376 | dai->playback.channels_min = 2 * dev->lines_out; | ||
377 | dai->playback.channels_max = 8 * dev->lines_out; | ||
378 | |||
379 | if (dev->lines_in) | ||
380 | cfg[dev->channel_in] = S6_I2S_IN; | ||
381 | if (dev->lines_out) | ||
382 | cfg[dev->channel_out] = S6_I2S_OUT; | ||
383 | |||
384 | s6_i2s_write_reg(dev, S6_I2S_DATA_CFG(0), cfg[0]); | ||
385 | s6_i2s_write_reg(dev, S6_I2S_DATA_CFG(1), cfg[1]); | ||
386 | } | ||
387 | |||
388 | if (dev->lines_out) { | ||
389 | if (dev->lines_in) { | ||
390 | if (!dev->dma_params.dma_out) | ||
391 | return -ENODEV; | ||
392 | } else { | ||
393 | dev->dma_params.dma_out = dev->dma_params.dma_in; | ||
394 | dev->dma_params.dma_in = 0; | ||
395 | } | ||
396 | } | ||
397 | dev->dma_params.sif_in = dev->sifbase + (dev->channel_in ? | ||
398 | S6_I2S_SIF_PORT1 : S6_I2S_SIF_PORT0); | ||
399 | dev->dma_params.sif_out = dev->sifbase + (dev->channel_out ? | ||
400 | S6_I2S_SIF_PORT1 : S6_I2S_SIF_PORT0); | ||
401 | dev->dma_params.same_rate = pdata->same_rate | pdata->wide; | ||
402 | return 0; | ||
403 | } | ||
404 | |||
405 | #define S6000_I2S_RATES (SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_5512 | \ | ||
406 | SNDRV_PCM_RATE_8000_192000) | ||
407 | #define S6000_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE) | ||
408 | |||
409 | static struct snd_soc_dai_ops s6000_i2s_dai_ops = { | ||
410 | .set_fmt = s6000_i2s_set_dai_fmt, | ||
411 | .set_clkdiv = s6000_i2s_set_clkdiv, | ||
412 | .hw_params = s6000_i2s_hw_params, | ||
413 | }; | ||
414 | |||
415 | struct snd_soc_dai s6000_i2s_dai = { | ||
416 | .name = "s6000-i2s", | ||
417 | .id = 0, | ||
418 | .probe = s6000_i2s_dai_probe, | ||
419 | .playback = { | ||
420 | .channels_min = 2, | ||
421 | .channels_max = 8, | ||
422 | .formats = S6000_I2S_FORMATS, | ||
423 | .rates = S6000_I2S_RATES, | ||
424 | .rate_min = 0, | ||
425 | .rate_max = 1562500, | ||
426 | }, | ||
427 | .capture = { | ||
428 | .channels_min = 2, | ||
429 | .channels_max = 8, | ||
430 | .formats = S6000_I2S_FORMATS, | ||
431 | .rates = S6000_I2S_RATES, | ||
432 | .rate_min = 0, | ||
433 | .rate_max = 1562500, | ||
434 | }, | ||
435 | .ops = &s6000_i2s_dai_ops, | ||
436 | } | ||
437 | EXPORT_SYMBOL_GPL(s6000_i2s_dai); | ||
438 | |||
439 | static int __devinit s6000_i2s_probe(struct platform_device *pdev) | ||
440 | { | ||
441 | struct s6000_i2s_dev *dev; | ||
442 | struct resource *scbmem, *sifmem, *region, *dma1, *dma2; | ||
443 | u8 __iomem *mmio; | ||
444 | int ret; | ||
445 | |||
446 | scbmem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
447 | if (!scbmem) { | ||
448 | dev_err(&pdev->dev, "no mem resource?\n"); | ||
449 | ret = -ENODEV; | ||
450 | goto err_release_none; | ||
451 | } | ||
452 | |||
453 | region = request_mem_region(scbmem->start, | ||
454 | scbmem->end - scbmem->start + 1, | ||
455 | pdev->name); | ||
456 | if (!region) { | ||
457 | dev_err(&pdev->dev, "I2S SCB region already claimed\n"); | ||
458 | ret = -EBUSY; | ||
459 | goto err_release_none; | ||
460 | } | ||
461 | |||
462 | mmio = ioremap(scbmem->start, scbmem->end - scbmem->start + 1); | ||
463 | if (!mmio) { | ||
464 | dev_err(&pdev->dev, "can't ioremap SCB region\n"); | ||
465 | ret = -ENOMEM; | ||
466 | goto err_release_scb; | ||
467 | } | ||
468 | |||
469 | sifmem = platform_get_resource(pdev, IORESOURCE_MEM, 1); | ||
470 | if (!sifmem) { | ||
471 | dev_err(&pdev->dev, "no second mem resource?\n"); | ||
472 | ret = -ENODEV; | ||
473 | goto err_release_map; | ||
474 | } | ||
475 | |||
476 | region = request_mem_region(sifmem->start, | ||
477 | sifmem->end - sifmem->start + 1, | ||
478 | pdev->name); | ||
479 | if (!region) { | ||
480 | dev_err(&pdev->dev, "I2S SIF region already claimed\n"); | ||
481 | ret = -EBUSY; | ||
482 | goto err_release_map; | ||
483 | } | ||
484 | |||
485 | dma1 = platform_get_resource(pdev, IORESOURCE_DMA, 0); | ||
486 | if (!dma1) { | ||
487 | dev_err(&pdev->dev, "no dma resource?\n"); | ||
488 | ret = -ENODEV; | ||
489 | goto err_release_sif; | ||
490 | } | ||
491 | |||
492 | region = request_mem_region(dma1->start, dma1->end - dma1->start + 1, | ||
493 | pdev->name); | ||
494 | if (!region) { | ||
495 | dev_err(&pdev->dev, "I2S DMA region already claimed\n"); | ||
496 | ret = -EBUSY; | ||
497 | goto err_release_sif; | ||
498 | } | ||
499 | |||
500 | dma2 = platform_get_resource(pdev, IORESOURCE_DMA, 1); | ||
501 | if (dma2) { | ||
502 | region = request_mem_region(dma2->start, | ||
503 | dma2->end - dma2->start + 1, | ||
504 | pdev->name); | ||
505 | if (!region) { | ||
506 | dev_err(&pdev->dev, | ||
507 | "I2S DMA region already claimed\n"); | ||
508 | ret = -EBUSY; | ||
509 | goto err_release_dma1; | ||
510 | } | ||
511 | } | ||
512 | |||
513 | dev = kzalloc(sizeof(struct s6000_i2s_dev), GFP_KERNEL); | ||
514 | if (!dev) { | ||
515 | ret = -ENOMEM; | ||
516 | goto err_release_dma2; | ||
517 | } | ||
518 | |||
519 | s6000_i2s_dai.dev = &pdev->dev; | ||
520 | s6000_i2s_dai.private_data = dev; | ||
521 | s6000_i2s_dai.dma_data = &dev->dma_params; | ||
522 | |||
523 | dev->sifbase = sifmem->start; | ||
524 | dev->scbbase = mmio; | ||
525 | |||
526 | s6_i2s_write_reg(dev, S6_I2S_INTERRUPT_ENABLE, 0); | ||
527 | s6_i2s_write_reg(dev, S6_I2S_INTERRUPT_CLEAR, | ||
528 | S6_I2S_INT_ALIGNMENT | | ||
529 | S6_I2S_INT_UNDERRUN | | ||
530 | S6_I2S_INT_OVERRUN); | ||
531 | |||
532 | s6000_i2s_stop_channel(dev, 0); | ||
533 | s6000_i2s_stop_channel(dev, 1); | ||
534 | s6000_i2s_wait_disabled(dev); | ||
535 | |||
536 | dev->dma_params.check_xrun = s6000_i2s_check_xrun; | ||
537 | dev->dma_params.trigger = s6000_i2s_trigger; | ||
538 | dev->dma_params.dma_in = dma1->start; | ||
539 | dev->dma_params.dma_out = dma2 ? dma2->start : 0; | ||
540 | dev->dma_params.irq = platform_get_irq(pdev, 0); | ||
541 | if (dev->dma_params.irq < 0) { | ||
542 | dev_err(&pdev->dev, "no irq resource?\n"); | ||
543 | ret = -ENODEV; | ||
544 | goto err_release_dev; | ||
545 | } | ||
546 | |||
547 | s6_i2s_write_reg(dev, S6_I2S_INTERRUPT_ENABLE, | ||
548 | S6_I2S_INT_ALIGNMENT | | ||
549 | S6_I2S_INT_UNDERRUN | | ||
550 | S6_I2S_INT_OVERRUN); | ||
551 | |||
552 | ret = snd_soc_register_dai(&s6000_i2s_dai); | ||
553 | if (ret) | ||
554 | goto err_release_dev; | ||
555 | |||
556 | return 0; | ||
557 | |||
558 | err_release_dev: | ||
559 | kfree(dev); | ||
560 | err_release_dma2: | ||
561 | if (dma2) | ||
562 | release_mem_region(dma2->start, dma2->end - dma2->start + 1); | ||
563 | err_release_dma1: | ||
564 | release_mem_region(dma1->start, dma1->end - dma1->start + 1); | ||
565 | err_release_sif: | ||
566 | release_mem_region(sifmem->start, (sifmem->end - sifmem->start) + 1); | ||
567 | err_release_map: | ||
568 | iounmap(mmio); | ||
569 | err_release_scb: | ||
570 | release_mem_region(scbmem->start, (scbmem->end - scbmem->start) + 1); | ||
571 | err_release_none: | ||
572 | return ret; | ||
573 | } | ||
574 | |||
575 | static void __devexit s6000_i2s_remove(struct platform_device *pdev) | ||
576 | { | ||
577 | struct s6000_i2s_dev *dev = s6000_i2s_dai.private_data; | ||
578 | struct resource *region; | ||
579 | void __iomem *mmio = dev->scbbase; | ||
580 | |||
581 | snd_soc_unregister_dai(&s6000_i2s_dai); | ||
582 | |||
583 | s6000_i2s_stop_channel(dev, 0); | ||
584 | s6000_i2s_stop_channel(dev, 1); | ||
585 | |||
586 | s6_i2s_write_reg(dev, S6_I2S_INTERRUPT_ENABLE, 0); | ||
587 | s6000_i2s_dai.private_data = 0; | ||
588 | kfree(dev); | ||
589 | |||
590 | region = platform_get_resource(pdev, IORESOURCE_DMA, 0); | ||
591 | release_mem_region(region->start, region->end - region->start + 1); | ||
592 | |||
593 | region = platform_get_resource(pdev, IORESOURCE_DMA, 1); | ||
594 | if (region) | ||
595 | release_mem_region(region->start, | ||
596 | region->end - region->start + 1); | ||
597 | |||
598 | region = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
599 | release_mem_region(region->start, (region->end - region->start) + 1); | ||
600 | |||
601 | iounmap(mmio); | ||
602 | region = platform_get_resource(pdev, IORESOURCE_IO, 0); | ||
603 | release_mem_region(region->start, (region->end - region->start) + 1); | ||
604 | } | ||
605 | |||
606 | static struct platform_driver s6000_i2s_driver = { | ||
607 | .probe = s6000_i2s_probe, | ||
608 | .remove = __devexit_p(s6000_i2s_remove), | ||
609 | .driver = { | ||
610 | .name = "s6000-i2s", | ||
611 | .owner = THIS_MODULE, | ||
612 | }, | ||
613 | }; | ||
614 | |||
615 | static int __init s6000_i2s_init(void) | ||
616 | { | ||
617 | return platform_driver_register(&s6000_i2s_driver); | ||
618 | } | ||
619 | module_init(s6000_i2s_init); | ||
620 | |||
621 | static void __exit s6000_i2s_exit(void) | ||
622 | { | ||
623 | platform_driver_unregister(&s6000_i2s_driver); | ||
624 | } | ||
625 | module_exit(s6000_i2s_exit); | ||
626 | |||
627 | MODULE_AUTHOR("Daniel Gloeckner"); | ||
628 | MODULE_DESCRIPTION("Stretch s6000 family I2S SoC Interface"); | ||
629 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/s6000/s6000-i2s.h b/sound/soc/s6000/s6000-i2s.h new file mode 100644 index 000000000000..2375fdfe6dba --- /dev/null +++ b/sound/soc/s6000/s6000-i2s.h | |||
@@ -0,0 +1,25 @@ | |||
1 | /* | ||
2 | * ALSA SoC I2S Audio Layer for the Stretch s6000 family | ||
3 | * | ||
4 | * Author: Daniel Gloeckner, <dg@emlix.com> | ||
5 | * Copyright: (C) 2009 emlix GmbH <info@emlix.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #ifndef _S6000_I2S_H | ||
13 | #define _S6000_I2S_H | ||
14 | |||
15 | extern struct snd_soc_dai s6000_i2s_dai; | ||
16 | |||
17 | struct s6000_snd_platform_data { | ||
18 | int lines_in; | ||
19 | int lines_out; | ||
20 | int channel_in; | ||
21 | int channel_out; | ||
22 | int wide; | ||
23 | int same_rate; | ||
24 | }; | ||
25 | #endif | ||
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c new file mode 100644 index 000000000000..83b8028e209d --- /dev/null +++ b/sound/soc/s6000/s6000-pcm.c | |||
@@ -0,0 +1,497 @@ | |||
1 | /* | ||
2 | * ALSA PCM interface for the Stetch s6000 family | ||
3 | * | ||
4 | * Author: Daniel Gloeckner, <dg@emlix.com> | ||
5 | * Copyright: (C) 2009 emlix GmbH <info@emlix.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #include <linux/module.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/platform_device.h> | ||
15 | #include <linux/slab.h> | ||
16 | #include <linux/dma-mapping.h> | ||
17 | #include <linux/interrupt.h> | ||
18 | |||
19 | #include <sound/core.h> | ||
20 | #include <sound/pcm.h> | ||
21 | #include <sound/pcm_params.h> | ||
22 | #include <sound/soc.h> | ||
23 | |||
24 | #include <asm/dma.h> | ||
25 | #include <variant/dmac.h> | ||
26 | |||
27 | #include "s6000-pcm.h" | ||
28 | |||
29 | #define S6_PCM_PREALLOCATE_SIZE (96 * 1024) | ||
30 | #define S6_PCM_PREALLOCATE_MAX (2048 * 1024) | ||
31 | |||
32 | static struct snd_pcm_hardware s6000_pcm_hardware = { | ||
33 | .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | | ||
34 | SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | | ||
35 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_JOINT_DUPLEX), | ||
36 | .formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE), | ||
37 | .rates = (SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_5512 | \ | ||
38 | SNDRV_PCM_RATE_8000_192000), | ||
39 | .rate_min = 0, | ||
40 | .rate_max = 1562500, | ||
41 | .channels_min = 2, | ||
42 | .channels_max = 8, | ||
43 | .buffer_bytes_max = 0x7ffffff0, | ||
44 | .period_bytes_min = 16, | ||
45 | .period_bytes_max = 0xfffff0, | ||
46 | .periods_min = 2, | ||
47 | .periods_max = 1024, /* no limit */ | ||
48 | .fifo_size = 0, | ||
49 | }; | ||
50 | |||
51 | struct s6000_runtime_data { | ||
52 | spinlock_t lock; | ||
53 | int period; /* current DMA period */ | ||
54 | }; | ||
55 | |||
56 | static void s6000_pcm_enqueue_dma(struct snd_pcm_substream *substream) | ||
57 | { | ||
58 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
59 | struct s6000_runtime_data *prtd = runtime->private_data; | ||
60 | struct snd_soc_pcm_runtime *soc_runtime = substream->private_data; | ||
61 | struct s6000_pcm_dma_params *par = soc_runtime->dai->cpu_dai->dma_data; | ||
62 | int channel; | ||
63 | unsigned int period_size; | ||
64 | unsigned int dma_offset; | ||
65 | dma_addr_t dma_pos; | ||
66 | dma_addr_t src, dst; | ||
67 | |||
68 | period_size = snd_pcm_lib_period_bytes(substream); | ||
69 | dma_offset = prtd->period * period_size; | ||
70 | dma_pos = runtime->dma_addr + dma_offset; | ||
71 | |||
72 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { | ||
73 | src = dma_pos; | ||
74 | dst = par->sif_out; | ||
75 | channel = par->dma_out; | ||
76 | } else { | ||
77 | src = par->sif_in; | ||
78 | dst = dma_pos; | ||
79 | channel = par->dma_in; | ||
80 | } | ||
81 | |||
82 | if (!s6dmac_channel_enabled(DMA_MASK_DMAC(channel), | ||
83 | DMA_INDEX_CHNL(channel))) | ||
84 | return; | ||
85 | |||
86 | if (s6dmac_fifo_full(DMA_MASK_DMAC(channel), DMA_INDEX_CHNL(channel))) { | ||
87 | printk(KERN_ERR "s6000-pcm: fifo full\n"); | ||
88 | return; | ||
89 | } | ||
90 | |||
91 | BUG_ON(period_size & 15); | ||
92 | s6dmac_put_fifo(DMA_MASK_DMAC(channel), DMA_INDEX_CHNL(channel), | ||
93 | src, dst, period_size); | ||
94 | |||
95 | prtd->period++; | ||
96 | if (unlikely(prtd->period >= runtime->periods)) | ||
97 | prtd->period = 0; | ||
98 | } | ||
99 | |||
100 | static irqreturn_t s6000_pcm_irq(int irq, void *data) | ||
101 | { | ||
102 | struct snd_pcm *pcm = data; | ||
103 | struct snd_soc_pcm_runtime *runtime = pcm->private_data; | ||
104 | struct s6000_pcm_dma_params *params = runtime->dai->cpu_dai->dma_data; | ||
105 | struct s6000_runtime_data *prtd; | ||
106 | unsigned int has_xrun; | ||
107 | int i, ret = IRQ_NONE; | ||
108 | u32 channel[2] = { | ||
109 | [SNDRV_PCM_STREAM_PLAYBACK] = params->dma_out, | ||
110 | [SNDRV_PCM_STREAM_CAPTURE] = params->dma_in | ||
111 | }; | ||
112 | |||
113 | has_xrun = params->check_xrun(runtime->dai->cpu_dai); | ||
114 | |||
115 | for (i = 0; i < ARRAY_SIZE(channel); ++i) { | ||
116 | struct snd_pcm_substream *substream = pcm->streams[i].substream; | ||
117 | unsigned int pending; | ||
118 | |||
119 | if (!channel[i]) | ||
120 | continue; | ||
121 | |||
122 | if (unlikely(has_xrun & (1 << i)) && | ||
123 | substream->runtime && | ||
124 | snd_pcm_running(substream)) { | ||
125 | dev_dbg(pcm->dev, "xrun\n"); | ||
126 | snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); | ||
127 | ret = IRQ_HANDLED; | ||
128 | } | ||
129 | |||
130 | pending = s6dmac_int_sources(DMA_MASK_DMAC(channel[i]), | ||
131 | DMA_INDEX_CHNL(channel[i])); | ||
132 | |||
133 | if (pending & 1) { | ||
134 | ret = IRQ_HANDLED; | ||
135 | if (likely(substream->runtime && | ||
136 | snd_pcm_running(substream))) { | ||
137 | snd_pcm_period_elapsed(substream); | ||
138 | dev_dbg(pcm->dev, "period elapsed %x %x\n", | ||
139 | s6dmac_cur_src(DMA_MASK_DMAC(channel[i]), | ||
140 | DMA_INDEX_CHNL(channel[i])), | ||
141 | s6dmac_cur_dst(DMA_MASK_DMAC(channel[i]), | ||
142 | DMA_INDEX_CHNL(channel[i]))); | ||
143 | prtd = substream->runtime->private_data; | ||
144 | spin_lock(&prtd->lock); | ||
145 | s6000_pcm_enqueue_dma(substream); | ||
146 | spin_unlock(&prtd->lock); | ||
147 | } | ||
148 | } | ||
149 | |||
150 | if (unlikely(pending & ~7)) { | ||
151 | if (pending & (1 << 3)) | ||
152 | printk(KERN_WARNING | ||
153 | "s6000-pcm: DMA %x Underflow\n", | ||
154 | channel[i]); | ||
155 | if (pending & (1 << 4)) | ||
156 | printk(KERN_WARNING | ||
157 | "s6000-pcm: DMA %x Overflow\n", | ||
158 | channel[i]); | ||
159 | if (pending & 0x1e0) | ||
160 | printk(KERN_WARNING | ||
161 | "s6000-pcm: DMA %x Master Error " | ||
162 | "(mask %x)\n", | ||
163 | channel[i], pending >> 5); | ||
164 | |||
165 | } | ||
166 | } | ||
167 | |||
168 | return ret; | ||
169 | } | ||
170 | |||
171 | static int s6000_pcm_start(struct snd_pcm_substream *substream) | ||
172 | { | ||
173 | struct s6000_runtime_data *prtd = substream->runtime->private_data; | ||
174 | struct snd_soc_pcm_runtime *soc_runtime = substream->private_data; | ||
175 | struct s6000_pcm_dma_params *par = soc_runtime->dai->cpu_dai->dma_data; | ||
176 | unsigned long flags; | ||
177 | int srcinc; | ||
178 | u32 dma; | ||
179 | |||
180 | spin_lock_irqsave(&prtd->lock, flags); | ||
181 | |||
182 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { | ||
183 | srcinc = 1; | ||
184 | dma = par->dma_out; | ||
185 | } else { | ||
186 | srcinc = 0; | ||
187 | dma = par->dma_in; | ||
188 | } | ||
189 | s6dmac_enable_chan(DMA_MASK_DMAC(dma), DMA_INDEX_CHNL(dma), | ||
190 | 1 /* priority 1 (0 is max) */, | ||
191 | 0 /* peripheral requests w/o xfer length mode */, | ||
192 | srcinc /* source address increment */, | ||
193 | srcinc^1 /* destination address increment */, | ||
194 | 0 /* chunksize 0 (skip impossible on this dma) */, | ||
195 | 0 /* source skip after chunk (impossible) */, | ||
196 | 0 /* destination skip after chunk (impossible) */, | ||
197 | 4 /* 16 byte burst size */, | ||
198 | -1 /* don't conserve bandwidth */, | ||
199 | 0 /* low watermark irq descriptor theshold */, | ||
200 | 0 /* disable hardware timestamps */, | ||
201 | 1 /* enable channel */); | ||
202 | |||
203 | s6000_pcm_enqueue_dma(substream); | ||
204 | s6000_pcm_enqueue_dma(substream); | ||
205 | |||
206 | spin_unlock_irqrestore(&prtd->lock, flags); | ||
207 | |||
208 | return 0; | ||
209 | } | ||
210 | |||
211 | static int s6000_pcm_stop(struct snd_pcm_substream *substream) | ||
212 | { | ||
213 | struct s6000_runtime_data *prtd = substream->runtime->private_data; | ||
214 | struct snd_soc_pcm_runtime *soc_runtime = substream->private_data; | ||
215 | struct s6000_pcm_dma_params *par = soc_runtime->dai->cpu_dai->dma_data; | ||
216 | unsigned long flags; | ||
217 | u32 channel; | ||
218 | |||
219 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
220 | channel = par->dma_out; | ||
221 | else | ||
222 | channel = par->dma_in; | ||
223 | |||
224 | s6dmac_set_terminal_count(DMA_MASK_DMAC(channel), | ||
225 | DMA_INDEX_CHNL(channel), 0); | ||
226 | |||
227 | spin_lock_irqsave(&prtd->lock, flags); | ||
228 | |||
229 | s6dmac_disable_chan(DMA_MASK_DMAC(channel), DMA_INDEX_CHNL(channel)); | ||
230 | |||
231 | spin_unlock_irqrestore(&prtd->lock, flags); | ||
232 | |||
233 | return 0; | ||
234 | } | ||
235 | |||
236 | static int s6000_pcm_trigger(struct snd_pcm_substream *substream, int cmd) | ||
237 | { | ||
238 | struct snd_soc_pcm_runtime *soc_runtime = substream->private_data; | ||
239 | struct s6000_pcm_dma_params *par = soc_runtime->dai->cpu_dai->dma_data; | ||
240 | int ret; | ||
241 | |||
242 | ret = par->trigger(substream, cmd, 0); | ||
243 | if (ret < 0) | ||
244 | return ret; | ||
245 | |||
246 | switch (cmd) { | ||
247 | case SNDRV_PCM_TRIGGER_START: | ||
248 | case SNDRV_PCM_TRIGGER_RESUME: | ||
249 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | ||
250 | ret = s6000_pcm_start(substream); | ||
251 | break; | ||
252 | case SNDRV_PCM_TRIGGER_STOP: | ||
253 | case SNDRV_PCM_TRIGGER_SUSPEND: | ||
254 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: | ||
255 | ret = s6000_pcm_stop(substream); | ||
256 | break; | ||
257 | default: | ||
258 | ret = -EINVAL; | ||
259 | } | ||
260 | if (ret < 0) | ||
261 | return ret; | ||
262 | |||
263 | return par->trigger(substream, cmd, 1); | ||
264 | } | ||
265 | |||
266 | static int s6000_pcm_prepare(struct snd_pcm_substream *substream) | ||
267 | { | ||
268 | struct s6000_runtime_data *prtd = substream->runtime->private_data; | ||
269 | |||
270 | prtd->period = 0; | ||
271 | |||
272 | return 0; | ||
273 | } | ||
274 | |||
275 | static snd_pcm_uframes_t s6000_pcm_pointer(struct snd_pcm_substream *substream) | ||
276 | { | ||
277 | struct snd_soc_pcm_runtime *soc_runtime = substream->private_data; | ||
278 | struct s6000_pcm_dma_params *par = soc_runtime->dai->cpu_dai->dma_data; | ||
279 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
280 | struct s6000_runtime_data *prtd = runtime->private_data; | ||
281 | unsigned long flags; | ||
282 | unsigned int offset; | ||
283 | dma_addr_t count; | ||
284 | |||
285 | spin_lock_irqsave(&prtd->lock, flags); | ||
286 | |||
287 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
288 | count = s6dmac_cur_src(DMA_MASK_DMAC(par->dma_out), | ||
289 | DMA_INDEX_CHNL(par->dma_out)); | ||
290 | else | ||
291 | count = s6dmac_cur_dst(DMA_MASK_DMAC(par->dma_in), | ||
292 | DMA_INDEX_CHNL(par->dma_in)); | ||
293 | |||
294 | count -= runtime->dma_addr; | ||
295 | |||
296 | spin_unlock_irqrestore(&prtd->lock, flags); | ||
297 | |||
298 | offset = bytes_to_frames(runtime, count); | ||
299 | if (unlikely(offset >= runtime->buffer_size)) | ||
300 | offset = 0; | ||
301 | |||
302 | return offset; | ||
303 | } | ||
304 | |||
305 | static int s6000_pcm_open(struct snd_pcm_substream *substream) | ||
306 | { | ||
307 | struct snd_soc_pcm_runtime *soc_runtime = substream->private_data; | ||
308 | struct s6000_pcm_dma_params *par = soc_runtime->dai->cpu_dai->dma_data; | ||
309 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
310 | struct s6000_runtime_data *prtd; | ||
311 | int ret; | ||
312 | |||
313 | snd_soc_set_runtime_hwparams(substream, &s6000_pcm_hardware); | ||
314 | |||
315 | ret = snd_pcm_hw_constraint_step(runtime, 0, | ||
316 | SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 16); | ||
317 | if (ret < 0) | ||
318 | return ret; | ||
319 | ret = snd_pcm_hw_constraint_step(runtime, 0, | ||
320 | SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 16); | ||
321 | if (ret < 0) | ||
322 | return ret; | ||
323 | ret = snd_pcm_hw_constraint_integer(runtime, | ||
324 | SNDRV_PCM_HW_PARAM_PERIODS); | ||
325 | if (ret < 0) | ||
326 | return ret; | ||
327 | |||
328 | if (par->same_rate) { | ||
329 | int rate; | ||
330 | spin_lock(&par->lock); /* needed? */ | ||
331 | rate = par->rate; | ||
332 | spin_unlock(&par->lock); | ||
333 | if (rate != -1) { | ||
334 | ret = snd_pcm_hw_constraint_minmax(runtime, | ||
335 | SNDRV_PCM_HW_PARAM_RATE, | ||
336 | rate, rate); | ||
337 | if (ret < 0) | ||
338 | return ret; | ||
339 | } | ||
340 | } | ||
341 | |||
342 | prtd = kzalloc(sizeof(struct s6000_runtime_data), GFP_KERNEL); | ||
343 | if (prtd == NULL) | ||
344 | return -ENOMEM; | ||
345 | |||
346 | spin_lock_init(&prtd->lock); | ||
347 | |||
348 | runtime->private_data = prtd; | ||
349 | |||
350 | return 0; | ||
351 | } | ||
352 | |||
353 | static int s6000_pcm_close(struct snd_pcm_substream *substream) | ||
354 | { | ||
355 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
356 | struct s6000_runtime_data *prtd = runtime->private_data; | ||
357 | |||
358 | kfree(prtd); | ||
359 | |||
360 | return 0; | ||
361 | } | ||
362 | |||
363 | static int s6000_pcm_hw_params(struct snd_pcm_substream *substream, | ||
364 | struct snd_pcm_hw_params *hw_params) | ||
365 | { | ||
366 | struct snd_soc_pcm_runtime *soc_runtime = substream->private_data; | ||
367 | struct s6000_pcm_dma_params *par = soc_runtime->dai->cpu_dai->dma_data; | ||
368 | int ret; | ||
369 | ret = snd_pcm_lib_malloc_pages(substream, | ||
370 | params_buffer_bytes(hw_params)); | ||
371 | if (ret < 0) { | ||
372 | printk(KERN_WARNING "s6000-pcm: allocation of memory failed\n"); | ||
373 | return ret; | ||
374 | } | ||
375 | |||
376 | if (par->same_rate) { | ||
377 | spin_lock(&par->lock); | ||
378 | if (par->rate == -1 || | ||
379 | !(par->in_use & ~(1 << substream->stream))) { | ||
380 | par->rate = params_rate(hw_params); | ||
381 | par->in_use |= 1 << substream->stream; | ||
382 | } else if (params_rate(hw_params) != par->rate) { | ||
383 | snd_pcm_lib_free_pages(substream); | ||
384 | par->in_use &= ~(1 << substream->stream); | ||
385 | ret = -EBUSY; | ||
386 | } | ||
387 | spin_unlock(&par->lock); | ||
388 | } | ||
389 | return ret; | ||
390 | } | ||
391 | |||
392 | static int s6000_pcm_hw_free(struct snd_pcm_substream *substream) | ||
393 | { | ||
394 | struct snd_soc_pcm_runtime *soc_runtime = substream->private_data; | ||
395 | struct s6000_pcm_dma_params *par = soc_runtime->dai->cpu_dai->dma_data; | ||
396 | |||
397 | spin_lock(&par->lock); | ||
398 | par->in_use &= ~(1 << substream->stream); | ||
399 | if (!par->in_use) | ||
400 | par->rate = -1; | ||
401 | spin_unlock(&par->lock); | ||
402 | |||
403 | return snd_pcm_lib_free_pages(substream); | ||
404 | } | ||
405 | |||
406 | static struct snd_pcm_ops s6000_pcm_ops = { | ||
407 | .open = s6000_pcm_open, | ||
408 | .close = s6000_pcm_close, | ||
409 | .ioctl = snd_pcm_lib_ioctl, | ||
410 | .hw_params = s6000_pcm_hw_params, | ||
411 | .hw_free = s6000_pcm_hw_free, | ||
412 | .trigger = s6000_pcm_trigger, | ||
413 | .prepare = s6000_pcm_prepare, | ||
414 | .pointer = s6000_pcm_pointer, | ||
415 | }; | ||
416 | |||
417 | static void s6000_pcm_free(struct snd_pcm *pcm) | ||
418 | { | ||
419 | struct snd_soc_pcm_runtime *runtime = pcm->private_data; | ||
420 | struct s6000_pcm_dma_params *params = runtime->dai->cpu_dai->dma_data; | ||
421 | |||
422 | free_irq(params->irq, pcm); | ||
423 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
424 | } | ||
425 | |||
426 | static u64 s6000_pcm_dmamask = DMA_32BIT_MASK; | ||
427 | |||
428 | static int s6000_pcm_new(struct snd_card *card, | ||
429 | struct snd_soc_dai *dai, struct snd_pcm *pcm) | ||
430 | { | ||
431 | struct snd_soc_pcm_runtime *runtime = pcm->private_data; | ||
432 | struct s6000_pcm_dma_params *params = runtime->dai->cpu_dai->dma_data; | ||
433 | int res; | ||
434 | |||
435 | if (!card->dev->dma_mask) | ||
436 | card->dev->dma_mask = &s6000_pcm_dmamask; | ||
437 | if (!card->dev->coherent_dma_mask) | ||
438 | card->dev->coherent_dma_mask = DMA_32BIT_MASK; | ||
439 | |||
440 | if (params->dma_in) { | ||
441 | s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in), | ||
442 | DMA_INDEX_CHNL(params->dma_in)); | ||
443 | s6dmac_int_sources(DMA_MASK_DMAC(params->dma_in), | ||
444 | DMA_INDEX_CHNL(params->dma_in)); | ||
445 | } | ||
446 | |||
447 | if (params->dma_out) { | ||
448 | s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_out), | ||
449 | DMA_INDEX_CHNL(params->dma_out)); | ||
450 | s6dmac_int_sources(DMA_MASK_DMAC(params->dma_out), | ||
451 | DMA_INDEX_CHNL(params->dma_out)); | ||
452 | } | ||
453 | |||
454 | res = request_irq(params->irq, s6000_pcm_irq, IRQF_SHARED, | ||
455 | s6000_soc_platform.name, pcm); | ||
456 | if (res) { | ||
457 | printk(KERN_ERR "s6000-pcm couldn't get IRQ\n"); | ||
458 | return res; | ||
459 | } | ||
460 | |||
461 | res = snd_pcm_lib_preallocate_pages_for_all(pcm, | ||
462 | SNDRV_DMA_TYPE_DEV, | ||
463 | card->dev, | ||
464 | S6_PCM_PREALLOCATE_SIZE, | ||
465 | S6_PCM_PREALLOCATE_MAX); | ||
466 | if (res) | ||
467 | printk(KERN_WARNING "s6000-pcm: preallocation failed\n"); | ||
468 | |||
469 | spin_lock_init(¶ms->lock); | ||
470 | params->in_use = 0; | ||
471 | params->rate = -1; | ||
472 | return 0; | ||
473 | } | ||
474 | |||
475 | struct snd_soc_platform s6000_soc_platform = { | ||
476 | .name = "s6000-audio", | ||
477 | .pcm_ops = &s6000_pcm_ops, | ||
478 | .pcm_new = s6000_pcm_new, | ||
479 | .pcm_free = s6000_pcm_free, | ||
480 | }; | ||
481 | EXPORT_SYMBOL_GPL(s6000_soc_platform); | ||
482 | |||
483 | static int __init s6000_pcm_init(void) | ||
484 | { | ||
485 | return snd_soc_register_platform(&s6000_soc_platform); | ||
486 | } | ||
487 | module_init(s6000_pcm_init); | ||
488 | |||
489 | static void __exit s6000_pcm_exit(void) | ||
490 | { | ||
491 | snd_soc_unregister_platform(&s6000_soc_platform); | ||
492 | } | ||
493 | module_exit(s6000_pcm_exit); | ||
494 | |||
495 | MODULE_AUTHOR("Daniel Gloeckner"); | ||
496 | MODULE_DESCRIPTION("Stretch s6000 family PCM DMA module"); | ||
497 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/s6000/s6000-pcm.h b/sound/soc/s6000/s6000-pcm.h new file mode 100644 index 000000000000..96f23f6f52bf --- /dev/null +++ b/sound/soc/s6000/s6000-pcm.h | |||
@@ -0,0 +1,35 @@ | |||
1 | /* | ||
2 | * ALSA PCM interface for the Stretch s6000 family | ||
3 | * | ||
4 | * Author: Daniel Gloeckner, <dg@emlix.com> | ||
5 | * Copyright: (C) 2009 emlix GmbH <info@emlix.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #ifndef _S6000_PCM_H | ||
13 | #define _S6000_PCM_H | ||
14 | |||
15 | struct snd_soc_dai; | ||
16 | struct snd_pcm_substream; | ||
17 | |||
18 | struct s6000_pcm_dma_params { | ||
19 | unsigned int (*check_xrun)(struct snd_soc_dai *cpu_dai); | ||
20 | int (*trigger)(struct snd_pcm_substream *substream, int cmd, int after); | ||
21 | dma_addr_t sif_in; | ||
22 | dma_addr_t sif_out; | ||
23 | u32 dma_in; | ||
24 | u32 dma_out; | ||
25 | int irq; | ||
26 | int same_rate; | ||
27 | |||
28 | spinlock_t lock; | ||
29 | int in_use; | ||
30 | int rate; | ||
31 | }; | ||
32 | |||
33 | extern struct snd_soc_platform s6000_soc_platform; | ||
34 | |||
35 | #endif | ||
diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c new file mode 100644 index 000000000000..b5f95f9781c1 --- /dev/null +++ b/sound/soc/s6000/s6105-ipcam.c | |||
@@ -0,0 +1,244 @@ | |||
1 | /* | ||
2 | * ASoC driver for Stretch s6105 IP camera platform | ||
3 | * | ||
4 | * Author: Daniel Gloeckner, <dg@emlix.com> | ||
5 | * Copyright: (C) 2009 emlix GmbH <info@emlix.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #include <linux/module.h> | ||
13 | #include <linux/moduleparam.h> | ||
14 | #include <linux/timer.h> | ||
15 | #include <linux/interrupt.h> | ||
16 | #include <linux/platform_device.h> | ||
17 | #include <sound/core.h> | ||
18 | #include <sound/pcm.h> | ||
19 | #include <sound/soc.h> | ||
20 | #include <sound/soc-dapm.h> | ||
21 | |||
22 | #include <variant/dmac.h> | ||
23 | |||
24 | #include "../codecs/tlv320aic3x.h" | ||
25 | #include "s6000-pcm.h" | ||
26 | #include "s6000-i2s.h" | ||
27 | |||
28 | #define S6105_CAM_CODEC_CLOCK 12288000 | ||
29 | |||
30 | static int s6105_hw_params(struct snd_pcm_substream *substream, | ||
31 | struct snd_pcm_hw_params *params) | ||
32 | { | ||
33 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
34 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; | ||
35 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | ||
36 | int ret = 0; | ||
37 | |||
38 | /* set codec DAI configuration */ | ||
39 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | | ||
40 | SND_SOC_DAIFMT_CBM_CFM); | ||
41 | if (ret < 0) | ||
42 | return ret; | ||
43 | |||
44 | /* set cpu DAI configuration */ | ||
45 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBM_CFM | | ||
46 | SND_SOC_DAIFMT_NB_NF); | ||
47 | if (ret < 0) | ||
48 | return ret; | ||
49 | |||
50 | /* set the codec system clock */ | ||
51 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, S6105_CAM_CODEC_CLOCK, | ||
52 | SND_SOC_CLOCK_OUT); | ||
53 | if (ret < 0) | ||
54 | return ret; | ||
55 | |||
56 | return 0; | ||
57 | } | ||
58 | |||
59 | static struct snd_soc_ops s6105_ops = { | ||
60 | .hw_params = s6105_hw_params, | ||
61 | }; | ||
62 | |||
63 | /* s6105 machine dapm widgets */ | ||
64 | static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = { | ||
65 | SND_SOC_DAPM_LINE("Audio Out Differential", NULL), | ||
66 | SND_SOC_DAPM_LINE("Audio Out Stereo", NULL), | ||
67 | SND_SOC_DAPM_LINE("Audio In", NULL), | ||
68 | }; | ||
69 | |||
70 | /* s6105 machine audio_mapnections to the codec pins */ | ||
71 | static const struct snd_soc_dapm_route audio_map[] = { | ||
72 | /* Audio Out connected to HPLOUT, HPLCOM, HPROUT */ | ||
73 | {"Audio Out Differential", NULL, "HPLOUT"}, | ||
74 | {"Audio Out Differential", NULL, "HPLCOM"}, | ||
75 | {"Audio Out Stereo", NULL, "HPLOUT"}, | ||
76 | {"Audio Out Stereo", NULL, "HPROUT"}, | ||
77 | |||
78 | /* Audio In connected to LINE1L, LINE1R */ | ||
79 | {"LINE1L", NULL, "Audio In"}, | ||
80 | {"LINE1R", NULL, "Audio In"}, | ||
81 | }; | ||
82 | |||
83 | static int output_type_info(struct snd_kcontrol *kcontrol, | ||
84 | struct snd_ctl_elem_info *uinfo) | ||
85 | { | ||
86 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | ||
87 | uinfo->count = 1; | ||
88 | uinfo->value.enumerated.items = 2; | ||
89 | if (uinfo->value.enumerated.item) { | ||
90 | uinfo->value.enumerated.item = 1; | ||
91 | strcpy(uinfo->value.enumerated.name, "HPLOUT/HPROUT"); | ||
92 | } else { | ||
93 | strcpy(uinfo->value.enumerated.name, "HPLOUT/HPLCOM"); | ||
94 | } | ||
95 | return 0; | ||
96 | } | ||
97 | |||
98 | static int output_type_get(struct snd_kcontrol *kcontrol, | ||
99 | struct snd_ctl_elem_value *ucontrol) | ||
100 | { | ||
101 | ucontrol->value.enumerated.item[0] = kcontrol->private_value; | ||
102 | return 0; | ||
103 | } | ||
104 | |||
105 | static int output_type_put(struct snd_kcontrol *kcontrol, | ||
106 | struct snd_ctl_elem_value *ucontrol) | ||
107 | { | ||
108 | struct snd_soc_codec *codec = kcontrol->private_data; | ||
109 | unsigned int val = (ucontrol->value.enumerated.item[0] != 0); | ||
110 | char *differential = "Audio Out Differential"; | ||
111 | char *stereo = "Audio Out Stereo"; | ||
112 | |||
113 | if (kcontrol->private_value == val) | ||
114 | return 0; | ||
115 | kcontrol->private_value = val; | ||
116 | snd_soc_dapm_disable_pin(codec, val ? differential : stereo); | ||
117 | snd_soc_dapm_sync(codec); | ||
118 | snd_soc_dapm_enable_pin(codec, val ? stereo : differential); | ||
119 | snd_soc_dapm_sync(codec); | ||
120 | |||
121 | return 1; | ||
122 | } | ||
123 | |||
124 | static const struct snd_kcontrol_new audio_out_mux = { | ||
125 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
126 | .name = "Master Output Mux", | ||
127 | .index = 0, | ||
128 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | ||
129 | .info = output_type_info, | ||
130 | .get = output_type_get, | ||
131 | .put = output_type_put, | ||
132 | .private_value = 1 /* default to stereo */ | ||
133 | }; | ||
134 | |||
135 | /* Logic for a aic3x as connected on the s6105 ip camera ref design */ | ||
136 | static int s6105_aic3x_init(struct snd_soc_codec *codec) | ||
137 | { | ||
138 | /* Add s6105 specific widgets */ | ||
139 | snd_soc_dapm_new_controls(codec, aic3x_dapm_widgets, | ||
140 | ARRAY_SIZE(aic3x_dapm_widgets)); | ||
141 | |||
142 | /* Set up s6105 specific audio path audio_map */ | ||
143 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | ||
144 | |||
145 | /* not present */ | ||
146 | snd_soc_dapm_nc_pin(codec, "MONO_LOUT"); | ||
147 | snd_soc_dapm_nc_pin(codec, "LINE2L"); | ||
148 | snd_soc_dapm_nc_pin(codec, "LINE2R"); | ||
149 | |||
150 | /* not connected */ | ||
151 | snd_soc_dapm_nc_pin(codec, "MIC3L"); /* LINE2L on this chip */ | ||
152 | snd_soc_dapm_nc_pin(codec, "MIC3R"); /* LINE2R on this chip */ | ||
153 | snd_soc_dapm_nc_pin(codec, "LLOUT"); | ||
154 | snd_soc_dapm_nc_pin(codec, "RLOUT"); | ||
155 | snd_soc_dapm_nc_pin(codec, "HPRCOM"); | ||
156 | |||
157 | /* always connected */ | ||
158 | snd_soc_dapm_enable_pin(codec, "Audio In"); | ||
159 | |||
160 | /* must correspond to audio_out_mux.private_value initializer */ | ||
161 | snd_soc_dapm_disable_pin(codec, "Audio Out Differential"); | ||
162 | snd_soc_dapm_sync(codec); | ||
163 | snd_soc_dapm_enable_pin(codec, "Audio Out Stereo"); | ||
164 | |||
165 | snd_soc_dapm_sync(codec); | ||
166 | |||
167 | snd_ctl_add(codec->card, snd_ctl_new1(&audio_out_mux, codec)); | ||
168 | |||
169 | return 0; | ||
170 | } | ||
171 | |||
172 | /* s6105 digital audio interface glue - connects codec <--> CPU */ | ||
173 | static struct snd_soc_dai_link s6105_dai = { | ||
174 | .name = "TLV320AIC31", | ||
175 | .stream_name = "AIC31", | ||
176 | .cpu_dai = &s6000_i2s_dai, | ||
177 | .codec_dai = &aic3x_dai, | ||
178 | .init = s6105_aic3x_init, | ||
179 | .ops = &s6105_ops, | ||
180 | }; | ||
181 | |||
182 | /* s6105 audio machine driver */ | ||
183 | static struct snd_soc_card snd_soc_card_s6105 = { | ||
184 | .name = "Stretch IP Camera", | ||
185 | .platform = &s6000_soc_platform, | ||
186 | .dai_link = &s6105_dai, | ||
187 | .num_links = 1, | ||
188 | }; | ||
189 | |||
190 | /* s6105 audio private data */ | ||
191 | static struct aic3x_setup_data s6105_aic3x_setup = { | ||
192 | .i2c_bus = 0, | ||
193 | .i2c_address = 0x18, | ||
194 | }; | ||
195 | |||
196 | /* s6105 audio subsystem */ | ||
197 | static struct snd_soc_device s6105_snd_devdata = { | ||
198 | .card = &snd_soc_card_s6105, | ||
199 | .codec_dev = &soc_codec_dev_aic3x, | ||
200 | .codec_data = &s6105_aic3x_setup, | ||
201 | }; | ||
202 | |||
203 | static struct s6000_snd_platform_data __initdata s6105_snd_data = { | ||
204 | .wide = 0, | ||
205 | .channel_in = 0, | ||
206 | .channel_out = 1, | ||
207 | .lines_in = 1, | ||
208 | .lines_out = 1, | ||
209 | .same_rate = 1, | ||
210 | }; | ||
211 | |||
212 | static struct platform_device *s6105_snd_device; | ||
213 | |||
214 | static int __init s6105_init(void) | ||
215 | { | ||
216 | int ret; | ||
217 | |||
218 | s6105_snd_device = platform_device_alloc("soc-audio", -1); | ||
219 | if (!s6105_snd_device) | ||
220 | return -ENOMEM; | ||
221 | |||
222 | platform_set_drvdata(s6105_snd_device, &s6105_snd_devdata); | ||
223 | s6105_snd_devdata.dev = &s6105_snd_device->dev; | ||
224 | platform_device_add_data(s6105_snd_device, &s6105_snd_data, | ||
225 | sizeof(s6105_snd_data)); | ||
226 | |||
227 | ret = platform_device_add(s6105_snd_device); | ||
228 | if (ret) | ||
229 | platform_device_put(s6105_snd_device); | ||
230 | |||
231 | return ret; | ||
232 | } | ||
233 | |||
234 | static void __exit s6105_exit(void) | ||
235 | { | ||
236 | platform_device_unregister(s6105_snd_device); | ||
237 | } | ||
238 | |||
239 | module_init(s6105_init); | ||
240 | module_exit(s6105_exit); | ||
241 | |||
242 | MODULE_AUTHOR("Daniel Gloeckner"); | ||
243 | MODULE_DESCRIPTION("Stretch s6105 IP camera ASoC driver"); | ||
244 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index 56fa0872abbb..b378096cadb1 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c | |||
@@ -145,7 +145,7 @@ static int ssi_hw_params(struct snd_pcm_substream *substream, | |||
145 | recv = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? 0 : 1; | 145 | recv = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? 0 : 1; |
146 | 146 | ||
147 | pr_debug("ssi_hw_params() enter\nssicr was %08lx\n", ssicr); | 147 | pr_debug("ssi_hw_params() enter\nssicr was %08lx\n", ssicr); |
148 | pr_debug("bits: %d channels: %d\n", bits, channels); | 148 | pr_debug("bits: %u channels: %u\n", bits, channels); |
149 | 149 | ||
150 | ssicr &= ~(CR_TRMD | CR_CHNL_MASK | CR_DWL_MASK | CR_PDTA | | 150 | ssicr &= ~(CR_TRMD | CR_CHNL_MASK | CR_DWL_MASK | CR_PDTA | |
151 | CR_SWL_MASK); | 151 | CR_SWL_MASK); |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1cd149b9ce69..1d70829464ef 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -113,6 +113,35 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec) | |||
113 | } | 113 | } |
114 | #endif | 114 | #endif |
115 | 115 | ||
116 | static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream) | ||
117 | { | ||
118 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
119 | struct snd_soc_device *socdev = rtd->socdev; | ||
120 | struct snd_soc_card *card = socdev->card; | ||
121 | struct snd_soc_dai_link *machine = rtd->dai; | ||
122 | struct snd_soc_dai *cpu_dai = machine->cpu_dai; | ||
123 | struct snd_soc_dai *codec_dai = machine->codec_dai; | ||
124 | int ret; | ||
125 | |||
126 | if (codec_dai->symmetric_rates || cpu_dai->symmetric_rates || | ||
127 | machine->symmetric_rates) { | ||
128 | dev_dbg(card->dev, "Symmetry forces %dHz rate\n", | ||
129 | machine->rate); | ||
130 | |||
131 | ret = snd_pcm_hw_constraint_minmax(substream->runtime, | ||
132 | SNDRV_PCM_HW_PARAM_RATE, | ||
133 | machine->rate, | ||
134 | machine->rate); | ||
135 | if (ret < 0) { | ||
136 | dev_err(card->dev, | ||
137 | "Unable to apply rate symmetry constraint: %d\n", ret); | ||
138 | return ret; | ||
139 | } | ||
140 | } | ||
141 | |||
142 | return 0; | ||
143 | } | ||
144 | |||
116 | /* | 145 | /* |
117 | * Called by ALSA when a PCM substream is opened, the runtime->hw record is | 146 | * Called by ALSA when a PCM substream is opened, the runtime->hw record is |
118 | * then initialized and any private data can be allocated. This also calls | 147 | * then initialized and any private data can be allocated. This also calls |
@@ -221,6 +250,13 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) | |||
221 | goto machine_err; | 250 | goto machine_err; |
222 | } | 251 | } |
223 | 252 | ||
253 | /* Symmetry only applies if we've already got an active stream. */ | ||
254 | if (cpu_dai->active || codec_dai->active) { | ||
255 | ret = soc_pcm_apply_symmetry(substream); | ||
256 | if (ret != 0) | ||
257 | goto machine_err; | ||
258 | } | ||
259 | |||
224 | pr_debug("asoc: %s <-> %s info:\n", codec_dai->name, cpu_dai->name); | 260 | pr_debug("asoc: %s <-> %s info:\n", codec_dai->name, cpu_dai->name); |
225 | pr_debug("asoc: rate mask 0x%x\n", runtime->hw.rates); | 261 | pr_debug("asoc: rate mask 0x%x\n", runtime->hw.rates); |
226 | pr_debug("asoc: min ch %d max ch %d\n", runtime->hw.channels_min, | 262 | pr_debug("asoc: min ch %d max ch %d\n", runtime->hw.channels_min, |
@@ -263,7 +299,6 @@ static void close_delayed_work(struct work_struct *work) | |||
263 | { | 299 | { |
264 | struct snd_soc_card *card = container_of(work, struct snd_soc_card, | 300 | struct snd_soc_card *card = container_of(work, struct snd_soc_card, |
265 | delayed_work.work); | 301 | delayed_work.work); |
266 | struct snd_soc_device *socdev = card->socdev; | ||
267 | struct snd_soc_codec *codec = card->codec; | 302 | struct snd_soc_codec *codec = card->codec; |
268 | struct snd_soc_dai *codec_dai; | 303 | struct snd_soc_dai *codec_dai; |
269 | int i; | 304 | int i; |
@@ -279,27 +314,10 @@ static void close_delayed_work(struct work_struct *work) | |||
279 | 314 | ||
280 | /* are we waiting on this codec DAI stream */ | 315 | /* are we waiting on this codec DAI stream */ |
281 | if (codec_dai->pop_wait == 1) { | 316 | if (codec_dai->pop_wait == 1) { |
282 | |||
283 | /* Reduce power if no longer active */ | ||
284 | if (codec->active == 0) { | ||
285 | pr_debug("pop wq D1 %s %s\n", codec->name, | ||
286 | codec_dai->playback.stream_name); | ||
287 | snd_soc_dapm_set_bias_level(socdev, | ||
288 | SND_SOC_BIAS_PREPARE); | ||
289 | } | ||
290 | |||
291 | codec_dai->pop_wait = 0; | 317 | codec_dai->pop_wait = 0; |
292 | snd_soc_dapm_stream_event(codec, | 318 | snd_soc_dapm_stream_event(codec, |
293 | codec_dai->playback.stream_name, | 319 | codec_dai->playback.stream_name, |
294 | SND_SOC_DAPM_STREAM_STOP); | 320 | SND_SOC_DAPM_STREAM_STOP); |
295 | |||
296 | /* Fall into standby if no longer active */ | ||
297 | if (codec->active == 0) { | ||
298 | pr_debug("pop wq D3 %s %s\n", codec->name, | ||
299 | codec_dai->playback.stream_name); | ||
300 | snd_soc_dapm_set_bias_level(socdev, | ||
301 | SND_SOC_BIAS_STANDBY); | ||
302 | } | ||
303 | } | 321 | } |
304 | } | 322 | } |
305 | mutex_unlock(&pcm_mutex); | 323 | mutex_unlock(&pcm_mutex); |
@@ -363,10 +381,6 @@ static int soc_codec_close(struct snd_pcm_substream *substream) | |||
363 | snd_soc_dapm_stream_event(codec, | 381 | snd_soc_dapm_stream_event(codec, |
364 | codec_dai->capture.stream_name, | 382 | codec_dai->capture.stream_name, |
365 | SND_SOC_DAPM_STREAM_STOP); | 383 | SND_SOC_DAPM_STREAM_STOP); |
366 | |||
367 | if (codec->active == 0 && codec_dai->pop_wait == 0) | ||
368 | snd_soc_dapm_set_bias_level(socdev, | ||
369 | SND_SOC_BIAS_STANDBY); | ||
370 | } | 384 | } |
371 | 385 | ||
372 | mutex_unlock(&pcm_mutex); | 386 | mutex_unlock(&pcm_mutex); |
@@ -431,36 +445,16 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) | |||
431 | cancel_delayed_work(&card->delayed_work); | 445 | cancel_delayed_work(&card->delayed_work); |
432 | } | 446 | } |
433 | 447 | ||
434 | /* do we need to power up codec */ | 448 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) |
435 | if (codec->bias_level != SND_SOC_BIAS_ON) { | 449 | snd_soc_dapm_stream_event(codec, |
436 | snd_soc_dapm_set_bias_level(socdev, | 450 | codec_dai->playback.stream_name, |
437 | SND_SOC_BIAS_PREPARE); | 451 | SND_SOC_DAPM_STREAM_START); |
438 | 452 | else | |
439 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | 453 | snd_soc_dapm_stream_event(codec, |
440 | snd_soc_dapm_stream_event(codec, | 454 | codec_dai->capture.stream_name, |
441 | codec_dai->playback.stream_name, | 455 | SND_SOC_DAPM_STREAM_START); |
442 | SND_SOC_DAPM_STREAM_START); | ||
443 | else | ||
444 | snd_soc_dapm_stream_event(codec, | ||
445 | codec_dai->capture.stream_name, | ||
446 | SND_SOC_DAPM_STREAM_START); | ||
447 | |||
448 | snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_ON); | ||
449 | snd_soc_dai_digital_mute(codec_dai, 0); | ||
450 | |||
451 | } else { | ||
452 | /* codec already powered - power on widgets */ | ||
453 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
454 | snd_soc_dapm_stream_event(codec, | ||
455 | codec_dai->playback.stream_name, | ||
456 | SND_SOC_DAPM_STREAM_START); | ||
457 | else | ||
458 | snd_soc_dapm_stream_event(codec, | ||
459 | codec_dai->capture.stream_name, | ||
460 | SND_SOC_DAPM_STREAM_START); | ||
461 | 456 | ||
462 | snd_soc_dai_digital_mute(codec_dai, 0); | 457 | snd_soc_dai_digital_mute(codec_dai, 0); |
463 | } | ||
464 | 458 | ||
465 | out: | 459 | out: |
466 | mutex_unlock(&pcm_mutex); | 460 | mutex_unlock(&pcm_mutex); |
@@ -521,6 +515,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, | |||
521 | } | 515 | } |
522 | } | 516 | } |
523 | 517 | ||
518 | machine->rate = params_rate(params); | ||
519 | |||
524 | out: | 520 | out: |
525 | mutex_unlock(&pcm_mutex); | 521 | mutex_unlock(&pcm_mutex); |
526 | return ret; | 522 | return ret; |
@@ -632,6 +628,12 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state) | |||
632 | struct snd_soc_codec *codec = card->codec; | 628 | struct snd_soc_codec *codec = card->codec; |
633 | int i; | 629 | int i; |
634 | 630 | ||
631 | /* If the initialization of this soc device failed, there is no codec | ||
632 | * associated with it. Just bail out in this case. | ||
633 | */ | ||
634 | if (!codec) | ||
635 | return 0; | ||
636 | |||
635 | /* Due to the resume being scheduled into a workqueue we could | 637 | /* Due to the resume being scheduled into a workqueue we could |
636 | * suspend before that's finished - wait for it to complete. | 638 | * suspend before that's finished - wait for it to complete. |
637 | */ | 639 | */ |
@@ -1334,6 +1336,7 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid) | |||
1334 | return ret; | 1336 | return ret; |
1335 | } | 1337 | } |
1336 | 1338 | ||
1339 | codec->socdev = socdev; | ||
1337 | codec->card->dev = socdev->dev; | 1340 | codec->card->dev = socdev->dev; |
1338 | codec->card->private_data = codec; | 1341 | codec->card->private_data = codec; |
1339 | strncpy(codec->card->driver, codec->name, sizeof(codec->card->driver)); | 1342 | strncpy(codec->card->driver, codec->name, sizeof(codec->card->driver)); |
@@ -1386,6 +1389,9 @@ int snd_soc_init_card(struct snd_soc_device *socdev) | |||
1386 | snprintf(codec->card->longname, sizeof(codec->card->longname), | 1389 | snprintf(codec->card->longname, sizeof(codec->card->longname), |
1387 | "%s (%s)", card->name, codec->name); | 1390 | "%s (%s)", card->name, codec->name); |
1388 | 1391 | ||
1392 | /* Make sure all DAPM widgets are instantiated */ | ||
1393 | snd_soc_dapm_new_widgets(codec); | ||
1394 | |||
1389 | ret = snd_card_register(codec->card); | 1395 | ret = snd_card_register(codec->card); |
1390 | if (ret < 0) { | 1396 | if (ret < 0) { |
1391 | printk(KERN_ERR "asoc: failed to register soundcard for %s\n", | 1397 | printk(KERN_ERR "asoc: failed to register soundcard for %s\n", |
@@ -1744,7 +1750,7 @@ int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, | |||
1744 | { | 1750 | { |
1745 | int max = kcontrol->private_value; | 1751 | int max = kcontrol->private_value; |
1746 | 1752 | ||
1747 | if (max == 1) | 1753 | if (max == 1 && !strstr(kcontrol->id.name, " Volume")) |
1748 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | 1754 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; |
1749 | else | 1755 | else |
1750 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 1756 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
@@ -1774,7 +1780,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, | |||
1774 | unsigned int shift = mc->shift; | 1780 | unsigned int shift = mc->shift; |
1775 | unsigned int rshift = mc->rshift; | 1781 | unsigned int rshift = mc->rshift; |
1776 | 1782 | ||
1777 | if (max == 1) | 1783 | if (max == 1 && !strstr(kcontrol->id.name, " Volume")) |
1778 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | 1784 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; |
1779 | else | 1785 | else |
1780 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 1786 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
@@ -1881,7 +1887,7 @@ int snd_soc_info_volsw_2r(struct snd_kcontrol *kcontrol, | |||
1881 | (struct soc_mixer_control *)kcontrol->private_value; | 1887 | (struct soc_mixer_control *)kcontrol->private_value; |
1882 | int max = mc->max; | 1888 | int max = mc->max; |
1883 | 1889 | ||
1884 | if (max == 1) | 1890 | if (max == 1 && !strstr(kcontrol->id.name, " Volume")) |
1885 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | 1891 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; |
1886 | else | 1892 | else |
1887 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 1893 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
@@ -2065,7 +2071,7 @@ EXPORT_SYMBOL_GPL(snd_soc_put_volsw_s8); | |||
2065 | int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, | 2071 | int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, |
2066 | unsigned int freq, int dir) | 2072 | unsigned int freq, int dir) |
2067 | { | 2073 | { |
2068 | if (dai->ops->set_sysclk) | 2074 | if (dai->ops && dai->ops->set_sysclk) |
2069 | return dai->ops->set_sysclk(dai, clk_id, freq, dir); | 2075 | return dai->ops->set_sysclk(dai, clk_id, freq, dir); |
2070 | else | 2076 | else |
2071 | return -EINVAL; | 2077 | return -EINVAL; |
@@ -2085,7 +2091,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_sysclk); | |||
2085 | int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai, | 2091 | int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai, |
2086 | int div_id, int div) | 2092 | int div_id, int div) |
2087 | { | 2093 | { |
2088 | if (dai->ops->set_clkdiv) | 2094 | if (dai->ops && dai->ops->set_clkdiv) |
2089 | return dai->ops->set_clkdiv(dai, div_id, div); | 2095 | return dai->ops->set_clkdiv(dai, div_id, div); |
2090 | else | 2096 | else |
2091 | return -EINVAL; | 2097 | return -EINVAL; |
@@ -2104,7 +2110,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_clkdiv); | |||
2104 | int snd_soc_dai_set_pll(struct snd_soc_dai *dai, | 2110 | int snd_soc_dai_set_pll(struct snd_soc_dai *dai, |
2105 | int pll_id, unsigned int freq_in, unsigned int freq_out) | 2111 | int pll_id, unsigned int freq_in, unsigned int freq_out) |
2106 | { | 2112 | { |
2107 | if (dai->ops->set_pll) | 2113 | if (dai->ops && dai->ops->set_pll) |
2108 | return dai->ops->set_pll(dai, pll_id, freq_in, freq_out); | 2114 | return dai->ops->set_pll(dai, pll_id, freq_in, freq_out); |
2109 | else | 2115 | else |
2110 | return -EINVAL; | 2116 | return -EINVAL; |
@@ -2120,7 +2126,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_pll); | |||
2120 | */ | 2126 | */ |
2121 | int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) | 2127 | int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) |
2122 | { | 2128 | { |
2123 | if (dai->ops->set_fmt) | 2129 | if (dai->ops && dai->ops->set_fmt) |
2124 | return dai->ops->set_fmt(dai, fmt); | 2130 | return dai->ops->set_fmt(dai, fmt); |
2125 | else | 2131 | else |
2126 | return -EINVAL; | 2132 | return -EINVAL; |
@@ -2139,7 +2145,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt); | |||
2139 | int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, | 2145 | int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, |
2140 | unsigned int mask, int slots) | 2146 | unsigned int mask, int slots) |
2141 | { | 2147 | { |
2142 | if (dai->ops->set_sysclk) | 2148 | if (dai->ops && dai->ops->set_tdm_slot) |
2143 | return dai->ops->set_tdm_slot(dai, mask, slots); | 2149 | return dai->ops->set_tdm_slot(dai, mask, slots); |
2144 | else | 2150 | else |
2145 | return -EINVAL; | 2151 | return -EINVAL; |
@@ -2155,7 +2161,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_tdm_slot); | |||
2155 | */ | 2161 | */ |
2156 | int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate) | 2162 | int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate) |
2157 | { | 2163 | { |
2158 | if (dai->ops->set_sysclk) | 2164 | if (dai->ops && dai->ops->set_tristate) |
2159 | return dai->ops->set_tristate(dai, tristate); | 2165 | return dai->ops->set_tristate(dai, tristate); |
2160 | else | 2166 | else |
2161 | return -EINVAL; | 2167 | return -EINVAL; |
@@ -2171,7 +2177,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_tristate); | |||
2171 | */ | 2177 | */ |
2172 | int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute) | 2178 | int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute) |
2173 | { | 2179 | { |
2174 | if (dai->ops->digital_mute) | 2180 | if (dai->ops && dai->ops->digital_mute) |
2175 | return dai->ops->digital_mute(dai, mute); | 2181 | return dai->ops->digital_mute(dai, mute); |
2176 | else | 2182 | else |
2177 | return -EINVAL; | 2183 | return -EINVAL; |
@@ -2352,6 +2358,39 @@ void snd_soc_unregister_platform(struct snd_soc_platform *platform) | |||
2352 | } | 2358 | } |
2353 | EXPORT_SYMBOL_GPL(snd_soc_unregister_platform); | 2359 | EXPORT_SYMBOL_GPL(snd_soc_unregister_platform); |
2354 | 2360 | ||
2361 | static u64 codec_format_map[] = { | ||
2362 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE, | ||
2363 | SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_U16_BE, | ||
2364 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_BE, | ||
2365 | SNDRV_PCM_FMTBIT_U24_LE | SNDRV_PCM_FMTBIT_U24_BE, | ||
2366 | SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S32_BE, | ||
2367 | SNDRV_PCM_FMTBIT_U32_LE | SNDRV_PCM_FMTBIT_U32_BE, | ||
2368 | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_U24_3BE, | ||
2369 | SNDRV_PCM_FMTBIT_U24_3LE | SNDRV_PCM_FMTBIT_U24_3BE, | ||
2370 | SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S20_3BE, | ||
2371 | SNDRV_PCM_FMTBIT_U20_3LE | SNDRV_PCM_FMTBIT_U20_3BE, | ||
2372 | SNDRV_PCM_FMTBIT_S18_3LE | SNDRV_PCM_FMTBIT_S18_3BE, | ||
2373 | SNDRV_PCM_FMTBIT_U18_3LE | SNDRV_PCM_FMTBIT_U18_3BE, | ||
2374 | SNDRV_PCM_FMTBIT_FLOAT_LE | SNDRV_PCM_FMTBIT_FLOAT_BE, | ||
2375 | SNDRV_PCM_FMTBIT_FLOAT64_LE | SNDRV_PCM_FMTBIT_FLOAT64_BE, | ||
2376 | SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE | ||
2377 | | SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_BE, | ||
2378 | }; | ||
2379 | |||
2380 | /* Fix up the DAI formats for endianness: codecs don't actually see | ||
2381 | * the endianness of the data but we're using the CPU format | ||
2382 | * definitions which do need to include endianness so we ensure that | ||
2383 | * codec DAIs always have both big and little endian variants set. | ||
2384 | */ | ||
2385 | static void fixup_codec_formats(struct snd_soc_pcm_stream *stream) | ||
2386 | { | ||
2387 | int i; | ||
2388 | |||
2389 | for (i = 0; i < ARRAY_SIZE(codec_format_map); i++) | ||
2390 | if (stream->formats & codec_format_map[i]) | ||
2391 | stream->formats |= codec_format_map[i]; | ||
2392 | } | ||
2393 | |||
2355 | /** | 2394 | /** |
2356 | * snd_soc_register_codec - Register a codec with the ASoC core | 2395 | * snd_soc_register_codec - Register a codec with the ASoC core |
2357 | * | 2396 | * |
@@ -2359,6 +2398,8 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_platform); | |||
2359 | */ | 2398 | */ |
2360 | int snd_soc_register_codec(struct snd_soc_codec *codec) | 2399 | int snd_soc_register_codec(struct snd_soc_codec *codec) |
2361 | { | 2400 | { |
2401 | int i; | ||
2402 | |||
2362 | if (!codec->name) | 2403 | if (!codec->name) |
2363 | return -EINVAL; | 2404 | return -EINVAL; |
2364 | 2405 | ||
@@ -2368,6 +2409,11 @@ int snd_soc_register_codec(struct snd_soc_codec *codec) | |||
2368 | 2409 | ||
2369 | INIT_LIST_HEAD(&codec->list); | 2410 | INIT_LIST_HEAD(&codec->list); |
2370 | 2411 | ||
2412 | for (i = 0; i < codec->num_dai; i++) { | ||
2413 | fixup_codec_formats(&codec->dai[i].playback); | ||
2414 | fixup_codec_formats(&codec->dai[i].capture); | ||
2415 | } | ||
2416 | |||
2371 | mutex_lock(&client_mutex); | 2417 | mutex_lock(&client_mutex); |
2372 | list_add(&codec->list, &codec_list); | 2418 | list_add(&codec->list, &codec_list); |
2373 | snd_soc_instantiate_cards(); | 2419 | snd_soc_instantiate_cards(); |
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 735903a74675..21c69074aa17 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * Features: | 12 | * Features: |
13 | * o Changes power status of internal codec blocks depending on the | 13 | * o Changes power status of internal codec blocks depending on the |
14 | * dynamic configuration of codec internal audio paths and active | 14 | * dynamic configuration of codec internal audio paths and active |
15 | * DAC's/ADC's. | 15 | * DACs/ADCs. |
16 | * o Platform power domain - can support external components i.e. amps and | 16 | * o Platform power domain - can support external components i.e. amps and |
17 | * mic/meadphone insertion events. | 17 | * mic/meadphone insertion events. |
18 | * o Automatic Mic Bias support | 18 | * o Automatic Mic Bias support |
@@ -52,23 +52,21 @@ | |||
52 | 52 | ||
53 | /* dapm power sequences - make this per codec in the future */ | 53 | /* dapm power sequences - make this per codec in the future */ |
54 | static int dapm_up_seq[] = { | 54 | static int dapm_up_seq[] = { |
55 | snd_soc_dapm_pre, snd_soc_dapm_micbias, snd_soc_dapm_mic, | 55 | snd_soc_dapm_pre, snd_soc_dapm_supply, snd_soc_dapm_micbias, |
56 | snd_soc_dapm_mux, snd_soc_dapm_value_mux, snd_soc_dapm_dac, | 56 | snd_soc_dapm_mic, snd_soc_dapm_mux, snd_soc_dapm_value_mux, |
57 | snd_soc_dapm_mixer, snd_soc_dapm_mixer_named_ctl, snd_soc_dapm_pga, | 57 | snd_soc_dapm_dac, snd_soc_dapm_mixer, snd_soc_dapm_mixer_named_ctl, |
58 | snd_soc_dapm_adc, snd_soc_dapm_hp, snd_soc_dapm_spk, snd_soc_dapm_post | 58 | snd_soc_dapm_pga, snd_soc_dapm_adc, snd_soc_dapm_hp, snd_soc_dapm_spk, |
59 | snd_soc_dapm_post | ||
59 | }; | 60 | }; |
60 | 61 | ||
61 | static int dapm_down_seq[] = { | 62 | static int dapm_down_seq[] = { |
62 | snd_soc_dapm_pre, snd_soc_dapm_adc, snd_soc_dapm_hp, snd_soc_dapm_spk, | 63 | snd_soc_dapm_pre, snd_soc_dapm_adc, snd_soc_dapm_hp, snd_soc_dapm_spk, |
63 | snd_soc_dapm_pga, snd_soc_dapm_mixer_named_ctl, snd_soc_dapm_mixer, | 64 | snd_soc_dapm_pga, snd_soc_dapm_mixer_named_ctl, snd_soc_dapm_mixer, |
64 | snd_soc_dapm_dac, snd_soc_dapm_mic, snd_soc_dapm_micbias, | 65 | snd_soc_dapm_dac, snd_soc_dapm_mic, snd_soc_dapm_micbias, |
65 | snd_soc_dapm_mux, snd_soc_dapm_value_mux, snd_soc_dapm_post | 66 | snd_soc_dapm_mux, snd_soc_dapm_value_mux, snd_soc_dapm_supply, |
67 | snd_soc_dapm_post | ||
66 | }; | 68 | }; |
67 | 69 | ||
68 | static int dapm_status = 1; | ||
69 | module_param(dapm_status, int, 0); | ||
70 | MODULE_PARM_DESC(dapm_status, "enable DPM sysfs entries"); | ||
71 | |||
72 | static void pop_wait(u32 pop_time) | 70 | static void pop_wait(u32 pop_time) |
73 | { | 71 | { |
74 | if (pop_time) | 72 | if (pop_time) |
@@ -96,6 +94,48 @@ static inline struct snd_soc_dapm_widget *dapm_cnew_widget( | |||
96 | return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL); | 94 | return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL); |
97 | } | 95 | } |
98 | 96 | ||
97 | /** | ||
98 | * snd_soc_dapm_set_bias_level - set the bias level for the system | ||
99 | * @socdev: audio device | ||
100 | * @level: level to configure | ||
101 | * | ||
102 | * Configure the bias (power) levels for the SoC audio device. | ||
103 | * | ||
104 | * Returns 0 for success else error. | ||
105 | */ | ||
106 | static int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev, | ||
107 | enum snd_soc_bias_level level) | ||
108 | { | ||
109 | struct snd_soc_card *card = socdev->card; | ||
110 | struct snd_soc_codec *codec = socdev->card->codec; | ||
111 | int ret = 0; | ||
112 | |||
113 | switch (level) { | ||
114 | case SND_SOC_BIAS_ON: | ||
115 | dev_dbg(socdev->dev, "Setting full bias\n"); | ||
116 | break; | ||
117 | case SND_SOC_BIAS_PREPARE: | ||
118 | dev_dbg(socdev->dev, "Setting bias prepare\n"); | ||
119 | break; | ||
120 | case SND_SOC_BIAS_STANDBY: | ||
121 | dev_dbg(socdev->dev, "Setting standby bias\n"); | ||
122 | break; | ||
123 | case SND_SOC_BIAS_OFF: | ||
124 | dev_dbg(socdev->dev, "Setting bias off\n"); | ||
125 | break; | ||
126 | default: | ||
127 | dev_err(socdev->dev, "Setting invalid bias %d\n", level); | ||
128 | return -EINVAL; | ||
129 | } | ||
130 | |||
131 | if (card->set_bias_level) | ||
132 | ret = card->set_bias_level(card, level); | ||
133 | if (ret == 0 && codec->set_bias_level) | ||
134 | ret = codec->set_bias_level(codec, level); | ||
135 | |||
136 | return ret; | ||
137 | } | ||
138 | |||
99 | /* set up initial codec paths */ | 139 | /* set up initial codec paths */ |
100 | static void dapm_set_path_status(struct snd_soc_dapm_widget *w, | 140 | static void dapm_set_path_status(struct snd_soc_dapm_widget *w, |
101 | struct snd_soc_dapm_path *p, int i) | 141 | struct snd_soc_dapm_path *p, int i) |
@@ -165,6 +205,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, | |||
165 | case snd_soc_dapm_dac: | 205 | case snd_soc_dapm_dac: |
166 | case snd_soc_dapm_micbias: | 206 | case snd_soc_dapm_micbias: |
167 | case snd_soc_dapm_vmid: | 207 | case snd_soc_dapm_vmid: |
208 | case snd_soc_dapm_supply: | ||
168 | p->connect = 1; | 209 | p->connect = 1; |
169 | break; | 210 | break; |
170 | /* does effect routing - dynamically connected */ | 211 | /* does effect routing - dynamically connected */ |
@@ -179,7 +220,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, | |||
179 | } | 220 | } |
180 | } | 221 | } |
181 | 222 | ||
182 | /* connect mux widget to it's interconnecting audio paths */ | 223 | /* connect mux widget to its interconnecting audio paths */ |
183 | static int dapm_connect_mux(struct snd_soc_codec *codec, | 224 | static int dapm_connect_mux(struct snd_soc_codec *codec, |
184 | struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest, | 225 | struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest, |
185 | struct snd_soc_dapm_path *path, const char *control_name, | 226 | struct snd_soc_dapm_path *path, const char *control_name, |
@@ -202,7 +243,7 @@ static int dapm_connect_mux(struct snd_soc_codec *codec, | |||
202 | return -ENODEV; | 243 | return -ENODEV; |
203 | } | 244 | } |
204 | 245 | ||
205 | /* connect mixer widget to it's interconnecting audio paths */ | 246 | /* connect mixer widget to its interconnecting audio paths */ |
206 | static int dapm_connect_mixer(struct snd_soc_codec *codec, | 247 | static int dapm_connect_mixer(struct snd_soc_codec *codec, |
207 | struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest, | 248 | struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest, |
208 | struct snd_soc_dapm_path *path, const char *control_name) | 249 | struct snd_soc_dapm_path *path, const char *control_name) |
@@ -357,8 +398,9 @@ static int dapm_new_mixer(struct snd_soc_codec *codec, | |||
357 | path->long_name); | 398 | path->long_name); |
358 | ret = snd_ctl_add(codec->card, path->kcontrol); | 399 | ret = snd_ctl_add(codec->card, path->kcontrol); |
359 | if (ret < 0) { | 400 | if (ret < 0) { |
360 | printk(KERN_ERR "asoc: failed to add dapm kcontrol %s\n", | 401 | printk(KERN_ERR "asoc: failed to add dapm kcontrol %s: %d\n", |
361 | path->long_name); | 402 | path->long_name, |
403 | ret); | ||
362 | kfree(path->long_name); | 404 | kfree(path->long_name); |
363 | path->long_name = NULL; | 405 | path->long_name = NULL; |
364 | return ret; | 406 | return ret; |
@@ -434,6 +476,9 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget) | |||
434 | struct snd_soc_dapm_path *path; | 476 | struct snd_soc_dapm_path *path; |
435 | int con = 0; | 477 | int con = 0; |
436 | 478 | ||
479 | if (widget->id == snd_soc_dapm_supply) | ||
480 | return 0; | ||
481 | |||
437 | if (widget->id == snd_soc_dapm_adc && widget->active) | 482 | if (widget->id == snd_soc_dapm_adc && widget->active) |
438 | return 1; | 483 | return 1; |
439 | 484 | ||
@@ -470,6 +515,9 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget) | |||
470 | struct snd_soc_dapm_path *path; | 515 | struct snd_soc_dapm_path *path; |
471 | int con = 0; | 516 | int con = 0; |
472 | 517 | ||
518 | if (widget->id == snd_soc_dapm_supply) | ||
519 | return 0; | ||
520 | |||
473 | /* active stream ? */ | 521 | /* active stream ? */ |
474 | if (widget->id == snd_soc_dapm_dac && widget->active) | 522 | if (widget->id == snd_soc_dapm_dac && widget->active) |
475 | return 1; | 523 | return 1; |
@@ -521,84 +569,12 @@ int dapm_reg_event(struct snd_soc_dapm_widget *w, | |||
521 | } | 569 | } |
522 | EXPORT_SYMBOL_GPL(dapm_reg_event); | 570 | EXPORT_SYMBOL_GPL(dapm_reg_event); |
523 | 571 | ||
524 | /* | 572 | /* Standard power change method, used to apply power changes to most |
525 | * Scan a single DAPM widget for a complete audio path and update the | 573 | * widgets. |
526 | * power status appropriately. | ||
527 | */ | 574 | */ |
528 | static int dapm_power_widget(struct snd_soc_codec *codec, int event, | 575 | static int dapm_generic_apply_power(struct snd_soc_dapm_widget *w) |
529 | struct snd_soc_dapm_widget *w) | ||
530 | { | 576 | { |
531 | int in, out, power_change, power, ret; | 577 | int ret; |
532 | |||
533 | /* vmid - no action */ | ||
534 | if (w->id == snd_soc_dapm_vmid) | ||
535 | return 0; | ||
536 | |||
537 | /* active ADC */ | ||
538 | if (w->id == snd_soc_dapm_adc && w->active) { | ||
539 | in = is_connected_input_ep(w); | ||
540 | dapm_clear_walk(w->codec); | ||
541 | w->power = (in != 0) ? 1 : 0; | ||
542 | dapm_update_bits(w); | ||
543 | return 0; | ||
544 | } | ||
545 | |||
546 | /* active DAC */ | ||
547 | if (w->id == snd_soc_dapm_dac && w->active) { | ||
548 | out = is_connected_output_ep(w); | ||
549 | dapm_clear_walk(w->codec); | ||
550 | w->power = (out != 0) ? 1 : 0; | ||
551 | dapm_update_bits(w); | ||
552 | return 0; | ||
553 | } | ||
554 | |||
555 | /* pre and post event widgets */ | ||
556 | if (w->id == snd_soc_dapm_pre) { | ||
557 | if (!w->event) | ||
558 | return 0; | ||
559 | |||
560 | if (event == SND_SOC_DAPM_STREAM_START) { | ||
561 | ret = w->event(w, | ||
562 | NULL, SND_SOC_DAPM_PRE_PMU); | ||
563 | if (ret < 0) | ||
564 | return ret; | ||
565 | } else if (event == SND_SOC_DAPM_STREAM_STOP) { | ||
566 | ret = w->event(w, | ||
567 | NULL, SND_SOC_DAPM_PRE_PMD); | ||
568 | if (ret < 0) | ||
569 | return ret; | ||
570 | } | ||
571 | return 0; | ||
572 | } | ||
573 | if (w->id == snd_soc_dapm_post) { | ||
574 | if (!w->event) | ||
575 | return 0; | ||
576 | |||
577 | if (event == SND_SOC_DAPM_STREAM_START) { | ||
578 | ret = w->event(w, | ||
579 | NULL, SND_SOC_DAPM_POST_PMU); | ||
580 | if (ret < 0) | ||
581 | return ret; | ||
582 | } else if (event == SND_SOC_DAPM_STREAM_STOP) { | ||
583 | ret = w->event(w, | ||
584 | NULL, SND_SOC_DAPM_POST_PMD); | ||
585 | if (ret < 0) | ||
586 | return ret; | ||
587 | } | ||
588 | return 0; | ||
589 | } | ||
590 | |||
591 | /* all other widgets */ | ||
592 | in = is_connected_input_ep(w); | ||
593 | dapm_clear_walk(w->codec); | ||
594 | out = is_connected_output_ep(w); | ||
595 | dapm_clear_walk(w->codec); | ||
596 | power = (out != 0 && in != 0) ? 1 : 0; | ||
597 | power_change = (w->power == power) ? 0 : 1; | ||
598 | w->power = power; | ||
599 | |||
600 | if (!power_change) | ||
601 | return 0; | ||
602 | 578 | ||
603 | /* call any power change event handlers */ | 579 | /* call any power change event handlers */ |
604 | if (w->event) | 580 | if (w->event) |
@@ -607,7 +583,7 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event, | |||
607 | w->name, w->event_flags); | 583 | w->name, w->event_flags); |
608 | 584 | ||
609 | /* power up pre event */ | 585 | /* power up pre event */ |
610 | if (power && w->event && | 586 | if (w->power && w->event && |
611 | (w->event_flags & SND_SOC_DAPM_PRE_PMU)) { | 587 | (w->event_flags & SND_SOC_DAPM_PRE_PMU)) { |
612 | ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMU); | 588 | ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMU); |
613 | if (ret < 0) | 589 | if (ret < 0) |
@@ -615,7 +591,7 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event, | |||
615 | } | 591 | } |
616 | 592 | ||
617 | /* power down pre event */ | 593 | /* power down pre event */ |
618 | if (!power && w->event && | 594 | if (!w->power && w->event && |
619 | (w->event_flags & SND_SOC_DAPM_PRE_PMD)) { | 595 | (w->event_flags & SND_SOC_DAPM_PRE_PMD)) { |
620 | ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMD); | 596 | ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMD); |
621 | if (ret < 0) | 597 | if (ret < 0) |
@@ -623,17 +599,17 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event, | |||
623 | } | 599 | } |
624 | 600 | ||
625 | /* Lower PGA volume to reduce pops */ | 601 | /* Lower PGA volume to reduce pops */ |
626 | if (w->id == snd_soc_dapm_pga && !power) | 602 | if (w->id == snd_soc_dapm_pga && !w->power) |
627 | dapm_set_pga(w, power); | 603 | dapm_set_pga(w, w->power); |
628 | 604 | ||
629 | dapm_update_bits(w); | 605 | dapm_update_bits(w); |
630 | 606 | ||
631 | /* Raise PGA volume to reduce pops */ | 607 | /* Raise PGA volume to reduce pops */ |
632 | if (w->id == snd_soc_dapm_pga && power) | 608 | if (w->id == snd_soc_dapm_pga && w->power) |
633 | dapm_set_pga(w, power); | 609 | dapm_set_pga(w, w->power); |
634 | 610 | ||
635 | /* power up post event */ | 611 | /* power up post event */ |
636 | if (power && w->event && | 612 | if (w->power && w->event && |
637 | (w->event_flags & SND_SOC_DAPM_POST_PMU)) { | 613 | (w->event_flags & SND_SOC_DAPM_POST_PMU)) { |
638 | ret = w->event(w, | 614 | ret = w->event(w, |
639 | NULL, SND_SOC_DAPM_POST_PMU); | 615 | NULL, SND_SOC_DAPM_POST_PMU); |
@@ -642,7 +618,7 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event, | |||
642 | } | 618 | } |
643 | 619 | ||
644 | /* power down post event */ | 620 | /* power down post event */ |
645 | if (!power && w->event && | 621 | if (!w->power && w->event && |
646 | (w->event_flags & SND_SOC_DAPM_POST_PMD)) { | 622 | (w->event_flags & SND_SOC_DAPM_POST_PMD)) { |
647 | ret = w->event(w, NULL, SND_SOC_DAPM_POST_PMD); | 623 | ret = w->event(w, NULL, SND_SOC_DAPM_POST_PMD); |
648 | if (ret < 0) | 624 | if (ret < 0) |
@@ -652,6 +628,116 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event, | |||
652 | return 0; | 628 | return 0; |
653 | } | 629 | } |
654 | 630 | ||
631 | /* Generic check to see if a widget should be powered. | ||
632 | */ | ||
633 | static int dapm_generic_check_power(struct snd_soc_dapm_widget *w) | ||
634 | { | ||
635 | int in, out; | ||
636 | |||
637 | in = is_connected_input_ep(w); | ||
638 | dapm_clear_walk(w->codec); | ||
639 | out = is_connected_output_ep(w); | ||
640 | dapm_clear_walk(w->codec); | ||
641 | return out != 0 && in != 0; | ||
642 | } | ||
643 | |||
644 | /* Check to see if an ADC has power */ | ||
645 | static int dapm_adc_check_power(struct snd_soc_dapm_widget *w) | ||
646 | { | ||
647 | int in; | ||
648 | |||
649 | if (w->active) { | ||
650 | in = is_connected_input_ep(w); | ||
651 | dapm_clear_walk(w->codec); | ||
652 | return in != 0; | ||
653 | } else { | ||
654 | return dapm_generic_check_power(w); | ||
655 | } | ||
656 | } | ||
657 | |||
658 | /* Check to see if a DAC has power */ | ||
659 | static int dapm_dac_check_power(struct snd_soc_dapm_widget *w) | ||
660 | { | ||
661 | int out; | ||
662 | |||
663 | if (w->active) { | ||
664 | out = is_connected_output_ep(w); | ||
665 | dapm_clear_walk(w->codec); | ||
666 | return out != 0; | ||
667 | } else { | ||
668 | return dapm_generic_check_power(w); | ||
669 | } | ||
670 | } | ||
671 | |||
672 | /* Check to see if a power supply is needed */ | ||
673 | static int dapm_supply_check_power(struct snd_soc_dapm_widget *w) | ||
674 | { | ||
675 | struct snd_soc_dapm_path *path; | ||
676 | int power = 0; | ||
677 | |||
678 | /* Check if one of our outputs is connected */ | ||
679 | list_for_each_entry(path, &w->sinks, list_source) { | ||
680 | if (path->sink && path->sink->power_check && | ||
681 | path->sink->power_check(path->sink)) { | ||
682 | power = 1; | ||
683 | break; | ||
684 | } | ||
685 | } | ||
686 | |||
687 | dapm_clear_walk(w->codec); | ||
688 | |||
689 | return power; | ||
690 | } | ||
691 | |||
692 | /* | ||
693 | * Scan a single DAPM widget for a complete audio path and update the | ||
694 | * power status appropriately. | ||
695 | */ | ||
696 | static int dapm_power_widget(struct snd_soc_codec *codec, int event, | ||
697 | struct snd_soc_dapm_widget *w) | ||
698 | { | ||
699 | int ret; | ||
700 | |||
701 | switch (w->id) { | ||
702 | case snd_soc_dapm_pre: | ||
703 | if (!w->event) | ||
704 | return 0; | ||
705 | |||
706 | if (event == SND_SOC_DAPM_STREAM_START) { | ||
707 | ret = w->event(w, | ||
708 | NULL, SND_SOC_DAPM_PRE_PMU); | ||
709 | if (ret < 0) | ||
710 | return ret; | ||
711 | } else if (event == SND_SOC_DAPM_STREAM_STOP) { | ||
712 | ret = w->event(w, | ||
713 | NULL, SND_SOC_DAPM_PRE_PMD); | ||
714 | if (ret < 0) | ||
715 | return ret; | ||
716 | } | ||
717 | return 0; | ||
718 | |||
719 | case snd_soc_dapm_post: | ||
720 | if (!w->event) | ||
721 | return 0; | ||
722 | |||
723 | if (event == SND_SOC_DAPM_STREAM_START) { | ||
724 | ret = w->event(w, | ||
725 | NULL, SND_SOC_DAPM_POST_PMU); | ||
726 | if (ret < 0) | ||
727 | return ret; | ||
728 | } else if (event == SND_SOC_DAPM_STREAM_STOP) { | ||
729 | ret = w->event(w, | ||
730 | NULL, SND_SOC_DAPM_POST_PMD); | ||
731 | if (ret < 0) | ||
732 | return ret; | ||
733 | } | ||
734 | return 0; | ||
735 | |||
736 | default: | ||
737 | return dapm_generic_apply_power(w); | ||
738 | } | ||
739 | } | ||
740 | |||
655 | /* | 741 | /* |
656 | * Scan each dapm widget for complete audio path. | 742 | * Scan each dapm widget for complete audio path. |
657 | * A complete path is a route that has valid endpoints i.e.:- | 743 | * A complete path is a route that has valid endpoints i.e.:- |
@@ -663,31 +749,102 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event, | |||
663 | */ | 749 | */ |
664 | static int dapm_power_widgets(struct snd_soc_codec *codec, int event) | 750 | static int dapm_power_widgets(struct snd_soc_codec *codec, int event) |
665 | { | 751 | { |
752 | struct snd_soc_device *socdev = codec->socdev; | ||
666 | struct snd_soc_dapm_widget *w; | 753 | struct snd_soc_dapm_widget *w; |
667 | int i, c = 1, *seq = NULL, ret = 0; | 754 | int ret = 0; |
668 | 755 | int i, power; | |
669 | /* do we have a sequenced stream event */ | 756 | int sys_power = 0; |
670 | if (event == SND_SOC_DAPM_STREAM_START) { | 757 | |
671 | c = ARRAY_SIZE(dapm_up_seq); | 758 | INIT_LIST_HEAD(&codec->up_list); |
672 | seq = dapm_up_seq; | 759 | INIT_LIST_HEAD(&codec->down_list); |
673 | } else if (event == SND_SOC_DAPM_STREAM_STOP) { | 760 | |
674 | c = ARRAY_SIZE(dapm_down_seq); | 761 | /* Check which widgets we need to power and store them in |
675 | seq = dapm_down_seq; | 762 | * lists indicating if they should be powered up or down. |
763 | */ | ||
764 | list_for_each_entry(w, &codec->dapm_widgets, list) { | ||
765 | switch (w->id) { | ||
766 | case snd_soc_dapm_pre: | ||
767 | list_add_tail(&codec->down_list, &w->power_list); | ||
768 | break; | ||
769 | case snd_soc_dapm_post: | ||
770 | list_add_tail(&codec->up_list, &w->power_list); | ||
771 | break; | ||
772 | |||
773 | default: | ||
774 | if (!w->power_check) | ||
775 | continue; | ||
776 | |||
777 | power = w->power_check(w); | ||
778 | if (power) | ||
779 | sys_power = 1; | ||
780 | |||
781 | if (w->power == power) | ||
782 | continue; | ||
783 | |||
784 | if (power) | ||
785 | list_add_tail(&w->power_list, &codec->up_list); | ||
786 | else | ||
787 | list_add_tail(&w->power_list, | ||
788 | &codec->down_list); | ||
789 | |||
790 | w->power = power; | ||
791 | break; | ||
792 | } | ||
676 | } | 793 | } |
677 | 794 | ||
678 | for (i = 0; i < c; i++) { | 795 | /* If we're changing to all on or all off then prepare */ |
679 | list_for_each_entry(w, &codec->dapm_widgets, list) { | 796 | if ((sys_power && codec->bias_level == SND_SOC_BIAS_STANDBY) || |
797 | (!sys_power && codec->bias_level == SND_SOC_BIAS_ON)) { | ||
798 | ret = snd_soc_dapm_set_bias_level(socdev, | ||
799 | SND_SOC_BIAS_PREPARE); | ||
800 | if (ret != 0) | ||
801 | pr_err("Failed to prepare bias: %d\n", ret); | ||
802 | } | ||
680 | 803 | ||
804 | /* Power down widgets first; try to avoid amplifying pops. */ | ||
805 | for (i = 0; i < ARRAY_SIZE(dapm_down_seq); i++) { | ||
806 | list_for_each_entry(w, &codec->down_list, power_list) { | ||
681 | /* is widget in stream order */ | 807 | /* is widget in stream order */ |
682 | if (seq && seq[i] && w->id != seq[i]) | 808 | if (w->id != dapm_down_seq[i]) |
683 | continue; | 809 | continue; |
684 | 810 | ||
685 | ret = dapm_power_widget(codec, event, w); | 811 | ret = dapm_power_widget(codec, event, w); |
686 | if (ret != 0) | 812 | if (ret != 0) |
687 | return ret; | 813 | pr_err("Failed to power down %s: %d\n", |
814 | w->name, ret); | ||
688 | } | 815 | } |
689 | } | 816 | } |
690 | 817 | ||
818 | /* Now power up. */ | ||
819 | for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++) { | ||
820 | list_for_each_entry(w, &codec->up_list, power_list) { | ||
821 | /* is widget in stream order */ | ||
822 | if (w->id != dapm_up_seq[i]) | ||
823 | continue; | ||
824 | |||
825 | ret = dapm_power_widget(codec, event, w); | ||
826 | if (ret != 0) | ||
827 | pr_err("Failed to power up %s: %d\n", | ||
828 | w->name, ret); | ||
829 | } | ||
830 | } | ||
831 | |||
832 | /* If we just powered the last thing off drop to standby bias */ | ||
833 | if (codec->bias_level == SND_SOC_BIAS_PREPARE && !sys_power) { | ||
834 | ret = snd_soc_dapm_set_bias_level(socdev, | ||
835 | SND_SOC_BIAS_STANDBY); | ||
836 | if (ret != 0) | ||
837 | pr_err("Failed to apply standby bias: %d\n", ret); | ||
838 | } | ||
839 | |||
840 | /* If we just powered up then move to active bias */ | ||
841 | if (codec->bias_level == SND_SOC_BIAS_PREPARE && sys_power) { | ||
842 | ret = snd_soc_dapm_set_bias_level(socdev, | ||
843 | SND_SOC_BIAS_ON); | ||
844 | if (ret != 0) | ||
845 | pr_err("Failed to apply active bias: %d\n", ret); | ||
846 | } | ||
847 | |||
691 | return 0; | 848 | return 0; |
692 | } | 849 | } |
693 | 850 | ||
@@ -723,6 +880,7 @@ static void dbg_dump_dapm(struct snd_soc_codec* codec, const char *action) | |||
723 | case snd_soc_dapm_pga: | 880 | case snd_soc_dapm_pga: |
724 | case snd_soc_dapm_mixer: | 881 | case snd_soc_dapm_mixer: |
725 | case snd_soc_dapm_mixer_named_ctl: | 882 | case snd_soc_dapm_mixer_named_ctl: |
883 | case snd_soc_dapm_supply: | ||
726 | if (w->name) { | 884 | if (w->name) { |
727 | in = is_connected_input_ep(w); | 885 | in = is_connected_input_ep(w); |
728 | dapm_clear_walk(w->codec); | 886 | dapm_clear_walk(w->codec); |
@@ -851,6 +1009,7 @@ static ssize_t dapm_widget_show(struct device *dev, | |||
851 | case snd_soc_dapm_pga: | 1009 | case snd_soc_dapm_pga: |
852 | case snd_soc_dapm_mixer: | 1010 | case snd_soc_dapm_mixer: |
853 | case snd_soc_dapm_mixer_named_ctl: | 1011 | case snd_soc_dapm_mixer_named_ctl: |
1012 | case snd_soc_dapm_supply: | ||
854 | if (w->name) | 1013 | if (w->name) |
855 | count += sprintf(buf + count, "%s: %s\n", | 1014 | count += sprintf(buf + count, "%s: %s\n", |
856 | w->name, w->power ? "On":"Off"); | 1015 | w->name, w->power ? "On":"Off"); |
@@ -883,16 +1042,12 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); | |||
883 | 1042 | ||
884 | int snd_soc_dapm_sys_add(struct device *dev) | 1043 | int snd_soc_dapm_sys_add(struct device *dev) |
885 | { | 1044 | { |
886 | if (!dapm_status) | ||
887 | return 0; | ||
888 | return device_create_file(dev, &dev_attr_dapm_widget); | 1045 | return device_create_file(dev, &dev_attr_dapm_widget); |
889 | } | 1046 | } |
890 | 1047 | ||
891 | static void snd_soc_dapm_sys_remove(struct device *dev) | 1048 | static void snd_soc_dapm_sys_remove(struct device *dev) |
892 | { | 1049 | { |
893 | if (dapm_status) { | 1050 | device_remove_file(dev, &dev_attr_dapm_widget); |
894 | device_remove_file(dev, &dev_attr_dapm_widget); | ||
895 | } | ||
896 | } | 1051 | } |
897 | 1052 | ||
898 | /* free all dapm widgets and resources */ | 1053 | /* free all dapm widgets and resources */ |
@@ -1015,6 +1170,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_codec *codec, | |||
1015 | case snd_soc_dapm_vmid: | 1170 | case snd_soc_dapm_vmid: |
1016 | case snd_soc_dapm_pre: | 1171 | case snd_soc_dapm_pre: |
1017 | case snd_soc_dapm_post: | 1172 | case snd_soc_dapm_post: |
1173 | case snd_soc_dapm_supply: | ||
1018 | list_add(&path->list, &codec->dapm_paths); | 1174 | list_add(&path->list, &codec->dapm_paths); |
1019 | list_add(&path->list_sink, &wsink->sources); | 1175 | list_add(&path->list_sink, &wsink->sources); |
1020 | list_add(&path->list_source, &wsource->sinks); | 1176 | list_add(&path->list_source, &wsource->sinks); |
@@ -1108,15 +1264,22 @@ int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec) | |||
1108 | case snd_soc_dapm_switch: | 1264 | case snd_soc_dapm_switch: |
1109 | case snd_soc_dapm_mixer: | 1265 | case snd_soc_dapm_mixer: |
1110 | case snd_soc_dapm_mixer_named_ctl: | 1266 | case snd_soc_dapm_mixer_named_ctl: |
1267 | w->power_check = dapm_generic_check_power; | ||
1111 | dapm_new_mixer(codec, w); | 1268 | dapm_new_mixer(codec, w); |
1112 | break; | 1269 | break; |
1113 | case snd_soc_dapm_mux: | 1270 | case snd_soc_dapm_mux: |
1114 | case snd_soc_dapm_value_mux: | 1271 | case snd_soc_dapm_value_mux: |
1272 | w->power_check = dapm_generic_check_power; | ||
1115 | dapm_new_mux(codec, w); | 1273 | dapm_new_mux(codec, w); |
1116 | break; | 1274 | break; |
1117 | case snd_soc_dapm_adc: | 1275 | case snd_soc_dapm_adc: |
1276 | w->power_check = dapm_adc_check_power; | ||
1277 | break; | ||
1118 | case snd_soc_dapm_dac: | 1278 | case snd_soc_dapm_dac: |
1279 | w->power_check = dapm_dac_check_power; | ||
1280 | break; | ||
1119 | case snd_soc_dapm_pga: | 1281 | case snd_soc_dapm_pga: |
1282 | w->power_check = dapm_generic_check_power; | ||
1120 | dapm_new_pga(codec, w); | 1283 | dapm_new_pga(codec, w); |
1121 | break; | 1284 | break; |
1122 | case snd_soc_dapm_input: | 1285 | case snd_soc_dapm_input: |
@@ -1126,6 +1289,10 @@ int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec) | |||
1126 | case snd_soc_dapm_hp: | 1289 | case snd_soc_dapm_hp: |
1127 | case snd_soc_dapm_mic: | 1290 | case snd_soc_dapm_mic: |
1128 | case snd_soc_dapm_line: | 1291 | case snd_soc_dapm_line: |
1292 | w->power_check = dapm_generic_check_power; | ||
1293 | break; | ||
1294 | case snd_soc_dapm_supply: | ||
1295 | w->power_check = dapm_supply_check_power; | ||
1129 | case snd_soc_dapm_vmid: | 1296 | case snd_soc_dapm_vmid: |
1130 | case snd_soc_dapm_pre: | 1297 | case snd_soc_dapm_pre: |
1131 | case snd_soc_dapm_post: | 1298 | case snd_soc_dapm_post: |
@@ -1626,35 +1793,11 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec, | |||
1626 | EXPORT_SYMBOL_GPL(snd_soc_dapm_stream_event); | 1793 | EXPORT_SYMBOL_GPL(snd_soc_dapm_stream_event); |
1627 | 1794 | ||
1628 | /** | 1795 | /** |
1629 | * snd_soc_dapm_set_bias_level - set the bias level for the system | ||
1630 | * @socdev: audio device | ||
1631 | * @level: level to configure | ||
1632 | * | ||
1633 | * Configure the bias (power) levels for the SoC audio device. | ||
1634 | * | ||
1635 | * Returns 0 for success else error. | ||
1636 | */ | ||
1637 | int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev, | ||
1638 | enum snd_soc_bias_level level) | ||
1639 | { | ||
1640 | struct snd_soc_card *card = socdev->card; | ||
1641 | struct snd_soc_codec *codec = socdev->card->codec; | ||
1642 | int ret = 0; | ||
1643 | |||
1644 | if (card->set_bias_level) | ||
1645 | ret = card->set_bias_level(card, level); | ||
1646 | if (ret == 0 && codec->set_bias_level) | ||
1647 | ret = codec->set_bias_level(codec, level); | ||
1648 | |||
1649 | return ret; | ||
1650 | } | ||
1651 | |||
1652 | /** | ||
1653 | * snd_soc_dapm_enable_pin - enable pin. | 1796 | * snd_soc_dapm_enable_pin - enable pin. |
1654 | * @codec: SoC codec | 1797 | * @codec: SoC codec |
1655 | * @pin: pin name | 1798 | * @pin: pin name |
1656 | * | 1799 | * |
1657 | * Enables input/output pin and it's parents or children widgets iff there is | 1800 | * Enables input/output pin and its parents or children widgets iff there is |
1658 | * a valid audio route and active audio stream. | 1801 | * a valid audio route and active audio stream. |
1659 | * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to | 1802 | * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to |
1660 | * do any widget power switching. | 1803 | * do any widget power switching. |
@@ -1670,7 +1813,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin); | |||
1670 | * @codec: SoC codec | 1813 | * @codec: SoC codec |
1671 | * @pin: pin name | 1814 | * @pin: pin name |
1672 | * | 1815 | * |
1673 | * Disables input/output pin and it's parents or children widgets. | 1816 | * Disables input/output pin and its parents or children widgets. |
1674 | * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to | 1817 | * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to |
1675 | * do any widget power switching. | 1818 | * do any widget power switching. |
1676 | */ | 1819 | */ |
diff --git a/sound/soc/txx9/Kconfig b/sound/soc/txx9/Kconfig new file mode 100644 index 000000000000..ebc9327eae71 --- /dev/null +++ b/sound/soc/txx9/Kconfig | |||
@@ -0,0 +1,29 @@ | |||
1 | ## | ||
2 | ## TXx9 ACLC | ||
3 | ## | ||
4 | config SND_SOC_TXX9ACLC | ||
5 | tristate "SoC Audio for TXx9" | ||
6 | depends on HAS_TXX9_ACLC && TXX9_DMAC | ||
7 | help | ||
8 | This option enables support for the AC Link Controllers in TXx9 SoC. | ||
9 | |||
10 | config HAS_TXX9_ACLC | ||
11 | bool | ||
12 | |||
13 | config SND_SOC_TXX9ACLC_AC97 | ||
14 | tristate | ||
15 | select AC97_BUS | ||
16 | select SND_AC97_CODEC | ||
17 | select SND_SOC_AC97_BUS | ||
18 | |||
19 | |||
20 | ## | ||
21 | ## Boards | ||
22 | ## | ||
23 | config SND_SOC_TXX9ACLC_GENERIC | ||
24 | tristate "Generic TXx9 ACLC sound machine" | ||
25 | depends on SND_SOC_TXX9ACLC | ||
26 | select SND_SOC_TXX9ACLC_AC97 | ||
27 | select SND_SOC_AC97_CODEC | ||
28 | help | ||
29 | This is a generic AC97 sound machine for use in TXx9 based systems. | ||
diff --git a/sound/soc/txx9/Makefile b/sound/soc/txx9/Makefile new file mode 100644 index 000000000000..551f16c0c4f9 --- /dev/null +++ b/sound/soc/txx9/Makefile | |||
@@ -0,0 +1,11 @@ | |||
1 | # Platform | ||
2 | snd-soc-txx9aclc-objs := txx9aclc.o | ||
3 | snd-soc-txx9aclc-ac97-objs := txx9aclc-ac97.o | ||
4 | |||
5 | obj-$(CONFIG_SND_SOC_TXX9ACLC) += snd-soc-txx9aclc.o | ||
6 | obj-$(CONFIG_SND_SOC_TXX9ACLC_AC97) += snd-soc-txx9aclc-ac97.o | ||
7 | |||
8 | # Machine | ||
9 | snd-soc-txx9aclc-generic-objs := txx9aclc-generic.o | ||
10 | |||
11 | obj-$(CONFIG_SND_SOC_TXX9ACLC_GENERIC) += snd-soc-txx9aclc-generic.o | ||
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c new file mode 100644 index 000000000000..0f83bdb9b16f --- /dev/null +++ b/sound/soc/txx9/txx9aclc-ac97.c | |||
@@ -0,0 +1,255 @@ | |||
1 | /* | ||
2 | * TXx9 ACLC AC97 driver | ||
3 | * | ||
4 | * Copyright (C) 2009 Atsushi Nemoto | ||
5 | * | ||
6 | * Based on RBTX49xx patch from CELF patch archive. | ||
7 | * (C) Copyright TOSHIBA CORPORATION 2004-2006 | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #include <linux/init.h> | ||
15 | #include <linux/module.h> | ||
16 | #include <linux/delay.h> | ||
17 | #include <linux/interrupt.h> | ||
18 | #include <linux/io.h> | ||
19 | #include <sound/core.h> | ||
20 | #include <sound/pcm.h> | ||
21 | #include <sound/soc.h> | ||
22 | #include "txx9aclc.h" | ||
23 | |||
24 | #define AC97_DIR \ | ||
25 | (SND_SOC_DAIDIR_PLAYBACK | SND_SOC_DAIDIR_CAPTURE) | ||
26 | |||
27 | #define AC97_RATES \ | ||
28 | SNDRV_PCM_RATE_8000_48000 | ||
29 | |||
30 | #ifdef __BIG_ENDIAN | ||
31 | #define AC97_FMTS SNDRV_PCM_FMTBIT_S16_BE | ||
32 | #else | ||
33 | #define AC97_FMTS SNDRV_PCM_FMTBIT_S16_LE | ||
34 | #endif | ||
35 | |||
36 | static DECLARE_WAIT_QUEUE_HEAD(ac97_waitq); | ||
37 | |||
38 | /* REVISIT: How to find txx9aclc_soc_device from snd_ac97? */ | ||
39 | static struct txx9aclc_soc_device *txx9aclc_soc_dev; | ||
40 | |||
41 | static int txx9aclc_regready(struct txx9aclc_soc_device *dev) | ||
42 | { | ||
43 | struct txx9aclc_plat_drvdata *drvdata = txx9aclc_get_plat_drvdata(dev); | ||
44 | |||
45 | return __raw_readl(drvdata->base + ACINTSTS) & ACINT_REGACCRDY; | ||
46 | } | ||
47 | |||
48 | /* AC97 controller reads codec register */ | ||
49 | static unsigned short txx9aclc_ac97_read(struct snd_ac97 *ac97, | ||
50 | unsigned short reg) | ||
51 | { | ||
52 | struct txx9aclc_soc_device *dev = txx9aclc_soc_dev; | ||
53 | struct txx9aclc_plat_drvdata *drvdata = txx9aclc_get_plat_drvdata(dev); | ||
54 | void __iomem *base = drvdata->base; | ||
55 | u32 dat; | ||
56 | |||
57 | if (!(__raw_readl(base + ACINTSTS) & ACINT_CODECRDY(ac97->num))) | ||
58 | return 0xffff; | ||
59 | reg |= ac97->num << 7; | ||
60 | dat = (reg << ACREGACC_REG_SHIFT) | ACREGACC_READ; | ||
61 | __raw_writel(dat, base + ACREGACC); | ||
62 | __raw_writel(ACINT_REGACCRDY, base + ACINTEN); | ||
63 | if (!wait_event_timeout(ac97_waitq, txx9aclc_regready(dev), HZ)) { | ||
64 | __raw_writel(ACINT_REGACCRDY, base + ACINTDIS); | ||
65 | dev_err(dev->soc_dev.dev, "ac97 read timeout (reg %#x)\n", reg); | ||
66 | dat = 0xffff; | ||
67 | goto done; | ||
68 | } | ||
69 | dat = __raw_readl(base + ACREGACC); | ||
70 | if (((dat >> ACREGACC_REG_SHIFT) & 0xff) != reg) { | ||
71 | dev_err(dev->soc_dev.dev, "reg mismatch %x with %x\n", | ||
72 | dat, reg); | ||
73 | dat = 0xffff; | ||
74 | goto done; | ||
75 | } | ||
76 | dat = (dat >> ACREGACC_DAT_SHIFT) & 0xffff; | ||
77 | done: | ||
78 | __raw_writel(ACINT_REGACCRDY, base + ACINTDIS); | ||
79 | return dat; | ||
80 | } | ||
81 | |||
82 | /* AC97 controller writes to codec register */ | ||
83 | static void txx9aclc_ac97_write(struct snd_ac97 *ac97, unsigned short reg, | ||
84 | unsigned short val) | ||
85 | { | ||
86 | struct txx9aclc_soc_device *dev = txx9aclc_soc_dev; | ||
87 | struct txx9aclc_plat_drvdata *drvdata = txx9aclc_get_plat_drvdata(dev); | ||
88 | void __iomem *base = drvdata->base; | ||
89 | |||
90 | __raw_writel(((reg | (ac97->num << 7)) << ACREGACC_REG_SHIFT) | | ||
91 | (val << ACREGACC_DAT_SHIFT), | ||
92 | base + ACREGACC); | ||
93 | __raw_writel(ACINT_REGACCRDY, base + ACINTEN); | ||
94 | if (!wait_event_timeout(ac97_waitq, txx9aclc_regready(dev), HZ)) { | ||
95 | dev_err(dev->soc_dev.dev, | ||
96 | "ac97 write timeout (reg %#x)\n", reg); | ||
97 | } | ||
98 | __raw_writel(ACINT_REGACCRDY, base + ACINTDIS); | ||
99 | } | ||
100 | |||
101 | static void txx9aclc_ac97_cold_reset(struct snd_ac97 *ac97) | ||
102 | { | ||
103 | struct txx9aclc_soc_device *dev = txx9aclc_soc_dev; | ||
104 | struct txx9aclc_plat_drvdata *drvdata = txx9aclc_get_plat_drvdata(dev); | ||
105 | void __iomem *base = drvdata->base; | ||
106 | u32 ready = ACINT_CODECRDY(ac97->num) | ACINT_REGACCRDY; | ||
107 | |||
108 | __raw_writel(ACCTL_ENLINK, base + ACCTLDIS); | ||
109 | mmiowb(); | ||
110 | udelay(1); | ||
111 | __raw_writel(ACCTL_ENLINK, base + ACCTLEN); | ||
112 | /* wait for primary codec ready status */ | ||
113 | __raw_writel(ready, base + ACINTEN); | ||
114 | if (!wait_event_timeout(ac97_waitq, | ||
115 | (__raw_readl(base + ACINTSTS) & ready) == ready, | ||
116 | HZ)) { | ||
117 | dev_err(&ac97->dev, "primary codec is not ready " | ||
118 | "(status %#x)\n", | ||
119 | __raw_readl(base + ACINTSTS)); | ||
120 | } | ||
121 | __raw_writel(ACINT_REGACCRDY, base + ACINTSTS); | ||
122 | __raw_writel(ready, base + ACINTDIS); | ||
123 | } | ||
124 | |||
125 | /* AC97 controller operations */ | ||
126 | struct snd_ac97_bus_ops soc_ac97_ops = { | ||
127 | .read = txx9aclc_ac97_read, | ||
128 | .write = txx9aclc_ac97_write, | ||
129 | .reset = txx9aclc_ac97_cold_reset, | ||
130 | }; | ||
131 | EXPORT_SYMBOL_GPL(soc_ac97_ops); | ||
132 | |||
133 | static irqreturn_t txx9aclc_ac97_irq(int irq, void *dev_id) | ||
134 | { | ||
135 | struct txx9aclc_plat_drvdata *drvdata = dev_id; | ||
136 | void __iomem *base = drvdata->base; | ||
137 | |||
138 | __raw_writel(__raw_readl(base + ACINTMSTS), base + ACINTDIS); | ||
139 | wake_up(&ac97_waitq); | ||
140 | return IRQ_HANDLED; | ||
141 | } | ||
142 | |||
143 | static int txx9aclc_ac97_probe(struct platform_device *pdev, | ||
144 | struct snd_soc_dai *dai) | ||
145 | { | ||
146 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
147 | struct txx9aclc_soc_device *dev = | ||
148 | container_of(socdev, struct txx9aclc_soc_device, soc_dev); | ||
149 | |||
150 | dev->aclc_pdev = to_platform_device(dai->dev); | ||
151 | txx9aclc_soc_dev = dev; | ||
152 | return 0; | ||
153 | } | ||
154 | |||
155 | static void txx9aclc_ac97_remove(struct platform_device *pdev, | ||
156 | struct snd_soc_dai *dai) | ||
157 | { | ||
158 | struct platform_device *aclc_pdev = to_platform_device(dai->dev); | ||
159 | struct txx9aclc_plat_drvdata *drvdata = platform_get_drvdata(aclc_pdev); | ||
160 | |||
161 | /* disable AC-link */ | ||
162 | __raw_writel(ACCTL_ENLINK, drvdata->base + ACCTLDIS); | ||
163 | txx9aclc_soc_dev = NULL; | ||
164 | } | ||
165 | |||
166 | struct snd_soc_dai txx9aclc_ac97_dai = { | ||
167 | .name = "txx9aclc_ac97", | ||
168 | .ac97_control = 1, | ||
169 | .probe = txx9aclc_ac97_probe, | ||
170 | .remove = txx9aclc_ac97_remove, | ||
171 | .playback = { | ||
172 | .rates = AC97_RATES, | ||
173 | .formats = AC97_FMTS, | ||
174 | .channels_min = 2, | ||
175 | .channels_max = 2, | ||
176 | }, | ||
177 | .capture = { | ||
178 | .rates = AC97_RATES, | ||
179 | .formats = AC97_FMTS, | ||
180 | .channels_min = 2, | ||
181 | .channels_max = 2, | ||
182 | }, | ||
183 | }; | ||
184 | EXPORT_SYMBOL_GPL(txx9aclc_ac97_dai); | ||
185 | |||
186 | static int __devinit txx9aclc_ac97_dev_probe(struct platform_device *pdev) | ||
187 | { | ||
188 | struct txx9aclc_plat_drvdata *drvdata; | ||
189 | struct resource *r; | ||
190 | int err; | ||
191 | int irq; | ||
192 | |||
193 | irq = platform_get_irq(pdev, 0); | ||
194 | if (irq < 0) | ||
195 | return irq; | ||
196 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
197 | if (!r) | ||
198 | return -EBUSY; | ||
199 | |||
200 | if (!devm_request_mem_region(&pdev->dev, r->start, resource_size(r), | ||
201 | dev_name(&pdev->dev))) | ||
202 | return -EBUSY; | ||
203 | |||
204 | drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); | ||
205 | if (!drvdata) | ||
206 | return -ENOMEM; | ||
207 | platform_set_drvdata(pdev, drvdata); | ||
208 | drvdata->physbase = r->start; | ||
209 | if (sizeof(drvdata->physbase) > sizeof(r->start) && | ||
210 | r->start >= TXX9_DIRECTMAP_BASE && | ||
211 | r->start < TXX9_DIRECTMAP_BASE + 0x400000) | ||
212 | drvdata->physbase |= 0xf00000000ull; | ||
213 | drvdata->base = devm_ioremap(&pdev->dev, r->start, resource_size(r)); | ||
214 | if (!drvdata->base) | ||
215 | return -EBUSY; | ||
216 | err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq, | ||
217 | IRQF_DISABLED, dev_name(&pdev->dev), drvdata); | ||
218 | if (err < 0) | ||
219 | return err; | ||
220 | |||
221 | txx9aclc_ac97_dai.dev = &pdev->dev; | ||
222 | return snd_soc_register_dai(&txx9aclc_ac97_dai); | ||
223 | } | ||
224 | |||
225 | static int __devexit txx9aclc_ac97_dev_remove(struct platform_device *pdev) | ||
226 | { | ||
227 | snd_soc_unregister_dai(&txx9aclc_ac97_dai); | ||
228 | return 0; | ||
229 | } | ||
230 | |||
231 | static struct platform_driver txx9aclc_ac97_driver = { | ||
232 | .probe = txx9aclc_ac97_dev_probe, | ||
233 | .remove = __devexit_p(txx9aclc_ac97_dev_remove), | ||
234 | .driver = { | ||
235 | .name = "txx9aclc-ac97", | ||
236 | .owner = THIS_MODULE, | ||
237 | }, | ||
238 | }; | ||
239 | |||
240 | static int __init txx9aclc_ac97_init(void) | ||
241 | { | ||
242 | return platform_driver_register(&txx9aclc_ac97_driver); | ||
243 | } | ||
244 | |||
245 | static void __exit txx9aclc_ac97_exit(void) | ||
246 | { | ||
247 | platform_driver_unregister(&txx9aclc_ac97_driver); | ||
248 | } | ||
249 | |||
250 | module_init(txx9aclc_ac97_init); | ||
251 | module_exit(txx9aclc_ac97_exit); | ||
252 | |||
253 | MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); | ||
254 | MODULE_DESCRIPTION("TXx9 ACLC AC97 driver"); | ||
255 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/txx9/txx9aclc-generic.c b/sound/soc/txx9/txx9aclc-generic.c new file mode 100644 index 000000000000..3175de9a92cb --- /dev/null +++ b/sound/soc/txx9/txx9aclc-generic.c | |||
@@ -0,0 +1,98 @@ | |||
1 | /* | ||
2 | * Generic TXx9 ACLC machine driver | ||
3 | * | ||
4 | * Copyright (C) 2009 Atsushi Nemoto | ||
5 | * | ||
6 | * Based on RBTX49xx patch from CELF patch archive. | ||
7 | * (C) Copyright TOSHIBA CORPORATION 2004-2006 | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | * | ||
13 | * This is a very generic AC97 sound machine driver for boards which | ||
14 | * have (AC97) audio at ACLC (e.g. RBTX49XX boards). | ||
15 | */ | ||
16 | |||
17 | #include <linux/module.h> | ||
18 | #include <linux/platform_device.h> | ||
19 | #include <sound/core.h> | ||
20 | #include <sound/pcm.h> | ||
21 | #include <sound/soc.h> | ||
22 | #include "../codecs/ac97.h" | ||
23 | #include "txx9aclc.h" | ||
24 | |||
25 | static struct snd_soc_dai_link txx9aclc_generic_dai = { | ||
26 | .name = "AC97", | ||
27 | .stream_name = "AC97 HiFi", | ||
28 | .cpu_dai = &txx9aclc_ac97_dai, | ||
29 | .codec_dai = &ac97_dai, | ||
30 | }; | ||
31 | |||
32 | static struct snd_soc_card txx9aclc_generic_card = { | ||
33 | .name = "Generic TXx9 ACLC Audio", | ||
34 | .platform = &txx9aclc_soc_platform, | ||
35 | .dai_link = &txx9aclc_generic_dai, | ||
36 | .num_links = 1, | ||
37 | }; | ||
38 | |||
39 | static struct txx9aclc_soc_device txx9aclc_generic_soc_device = { | ||
40 | .soc_dev = { | ||
41 | .card = &txx9aclc_generic_card, | ||
42 | .codec_dev = &soc_codec_dev_ac97, | ||
43 | }, | ||
44 | }; | ||
45 | |||
46 | static int __init txx9aclc_generic_probe(struct platform_device *pdev) | ||
47 | { | ||
48 | struct txx9aclc_soc_device *dev = &txx9aclc_generic_soc_device; | ||
49 | struct platform_device *soc_pdev; | ||
50 | int ret; | ||
51 | |||
52 | soc_pdev = platform_device_alloc("soc-audio", -1); | ||
53 | if (!soc_pdev) | ||
54 | return -ENOMEM; | ||
55 | platform_set_drvdata(soc_pdev, &dev->soc_dev); | ||
56 | dev->soc_dev.dev = &soc_pdev->dev; | ||
57 | ret = platform_device_add(soc_pdev); | ||
58 | if (ret) { | ||
59 | platform_device_put(soc_pdev); | ||
60 | return ret; | ||
61 | } | ||
62 | platform_set_drvdata(pdev, soc_pdev); | ||
63 | return 0; | ||
64 | } | ||
65 | |||
66 | static int __exit txx9aclc_generic_remove(struct platform_device *pdev) | ||
67 | { | ||
68 | struct platform_device *soc_pdev = platform_get_drvdata(pdev); | ||
69 | |||
70 | platform_device_unregister(soc_pdev); | ||
71 | return 0; | ||
72 | } | ||
73 | |||
74 | static struct platform_driver txx9aclc_generic_driver = { | ||
75 | .remove = txx9aclc_generic_remove, | ||
76 | .driver = { | ||
77 | .name = "txx9aclc-generic", | ||
78 | .owner = THIS_MODULE, | ||
79 | }, | ||
80 | }; | ||
81 | |||
82 | static int __init txx9aclc_generic_init(void) | ||
83 | { | ||
84 | return platform_driver_probe(&txx9aclc_generic_driver, | ||
85 | txx9aclc_generic_probe); | ||
86 | } | ||
87 | |||
88 | static void __exit txx9aclc_generic_exit(void) | ||
89 | { | ||
90 | platform_driver_unregister(&txx9aclc_generic_driver); | ||
91 | } | ||
92 | |||
93 | module_init(txx9aclc_generic_init); | ||
94 | module_exit(txx9aclc_generic_exit); | ||
95 | |||
96 | MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); | ||
97 | MODULE_DESCRIPTION("Generic TXx9 ACLC ALSA SoC audio driver"); | ||
98 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c new file mode 100644 index 000000000000..938a58a5a244 --- /dev/null +++ b/sound/soc/txx9/txx9aclc.c | |||
@@ -0,0 +1,430 @@ | |||
1 | /* | ||
2 | * Generic TXx9 ACLC platform driver | ||
3 | * | ||
4 | * Copyright (C) 2009 Atsushi Nemoto | ||
5 | * | ||
6 | * Based on RBTX49xx patch from CELF patch archive. | ||
7 | * (C) Copyright TOSHIBA CORPORATION 2004-2006 | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #include <linux/module.h> | ||
15 | #include <linux/init.h> | ||
16 | #include <linux/platform_device.h> | ||
17 | #include <linux/scatterlist.h> | ||
18 | #include <sound/core.h> | ||
19 | #include <sound/pcm.h> | ||
20 | #include <sound/pcm_params.h> | ||
21 | #include <sound/soc.h> | ||
22 | #include "txx9aclc.h" | ||
23 | |||
24 | static const struct snd_pcm_hardware txx9aclc_pcm_hardware = { | ||
25 | /* | ||
26 | * REVISIT: SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | ||
27 | * needs more works for noncoherent MIPS. | ||
28 | */ | ||
29 | .info = SNDRV_PCM_INFO_INTERLEAVED | | ||
30 | SNDRV_PCM_INFO_BATCH | | ||
31 | SNDRV_PCM_INFO_PAUSE, | ||
32 | #ifdef __BIG_ENDIAN | ||
33 | .formats = SNDRV_PCM_FMTBIT_S16_BE, | ||
34 | #else | ||
35 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | ||
36 | #endif | ||
37 | .period_bytes_min = 1024, | ||
38 | .period_bytes_max = 8 * 1024, | ||
39 | .periods_min = 2, | ||
40 | .periods_max = 4096, | ||
41 | .buffer_bytes_max = 32 * 1024, | ||
42 | }; | ||
43 | |||
44 | static int txx9aclc_pcm_hw_params(struct snd_pcm_substream *substream, | ||
45 | struct snd_pcm_hw_params *params) | ||
46 | { | ||
47 | struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); | ||
48 | struct snd_soc_device *socdev = rtd->socdev; | ||
49 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
50 | struct txx9aclc_dmadata *dmadata = runtime->private_data; | ||
51 | int ret; | ||
52 | |||
53 | ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params)); | ||
54 | if (ret < 0) | ||
55 | return ret; | ||
56 | |||
57 | dev_dbg(socdev->dev, | ||
58 | "runtime->dma_area = %#lx dma_addr = %#lx dma_bytes = %zd " | ||
59 | "runtime->min_align %ld\n", | ||
60 | (unsigned long)runtime->dma_area, | ||
61 | (unsigned long)runtime->dma_addr, runtime->dma_bytes, | ||
62 | runtime->min_align); | ||
63 | dev_dbg(socdev->dev, | ||
64 | "periods %d period_bytes %d stream %d\n", | ||
65 | params_periods(params), params_period_bytes(params), | ||
66 | substream->stream); | ||
67 | |||
68 | dmadata->substream = substream; | ||
69 | dmadata->pos = 0; | ||
70 | return 0; | ||
71 | } | ||
72 | |||
73 | static int txx9aclc_pcm_hw_free(struct snd_pcm_substream *substream) | ||
74 | { | ||
75 | return snd_pcm_lib_free_pages(substream); | ||
76 | } | ||
77 | |||
78 | static int txx9aclc_pcm_prepare(struct snd_pcm_substream *substream) | ||
79 | { | ||
80 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
81 | struct txx9aclc_dmadata *dmadata = runtime->private_data; | ||
82 | |||
83 | dmadata->dma_addr = runtime->dma_addr; | ||
84 | dmadata->buffer_bytes = snd_pcm_lib_buffer_bytes(substream); | ||
85 | dmadata->period_bytes = snd_pcm_lib_period_bytes(substream); | ||
86 | |||
87 | if (dmadata->buffer_bytes == dmadata->period_bytes) { | ||
88 | dmadata->frag_bytes = dmadata->period_bytes >> 1; | ||
89 | dmadata->frags = 2; | ||
90 | } else { | ||
91 | dmadata->frag_bytes = dmadata->period_bytes; | ||
92 | dmadata->frags = dmadata->buffer_bytes / dmadata->period_bytes; | ||
93 | } | ||
94 | dmadata->frag_count = 0; | ||
95 | dmadata->pos = 0; | ||
96 | return 0; | ||
97 | } | ||
98 | |||
99 | static void txx9aclc_dma_complete(void *arg) | ||
100 | { | ||
101 | struct txx9aclc_dmadata *dmadata = arg; | ||
102 | unsigned long flags; | ||
103 | |||
104 | /* dma completion handler cannot submit new operations */ | ||
105 | spin_lock_irqsave(&dmadata->dma_lock, flags); | ||
106 | if (dmadata->frag_count >= 0) { | ||
107 | dmadata->dmacount--; | ||
108 | BUG_ON(dmadata->dmacount < 0); | ||
109 | tasklet_schedule(&dmadata->tasklet); | ||
110 | } | ||
111 | spin_unlock_irqrestore(&dmadata->dma_lock, flags); | ||
112 | } | ||
113 | |||
114 | static struct dma_async_tx_descriptor * | ||
115 | txx9aclc_dma_submit(struct txx9aclc_dmadata *dmadata, dma_addr_t buf_dma_addr) | ||
116 | { | ||
117 | struct dma_chan *chan = dmadata->dma_chan; | ||
118 | struct dma_async_tx_descriptor *desc; | ||
119 | struct scatterlist sg; | ||
120 | |||
121 | sg_init_table(&sg, 1); | ||
122 | sg_set_page(&sg, pfn_to_page(PFN_DOWN(buf_dma_addr)), | ||
123 | dmadata->frag_bytes, buf_dma_addr & (PAGE_SIZE - 1)); | ||
124 | sg_dma_address(&sg) = buf_dma_addr; | ||
125 | desc = chan->device->device_prep_slave_sg(chan, &sg, 1, | ||
126 | dmadata->substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? | ||
127 | DMA_TO_DEVICE : DMA_FROM_DEVICE, | ||
128 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | ||
129 | if (!desc) { | ||
130 | dev_err(&chan->dev->device, "cannot prepare slave dma\n"); | ||
131 | return NULL; | ||
132 | } | ||
133 | desc->callback = txx9aclc_dma_complete; | ||
134 | desc->callback_param = dmadata; | ||
135 | desc->tx_submit(desc); | ||
136 | return desc; | ||
137 | } | ||
138 | |||
139 | #define NR_DMA_CHAIN 2 | ||
140 | |||
141 | static void txx9aclc_dma_tasklet(unsigned long data) | ||
142 | { | ||
143 | struct txx9aclc_dmadata *dmadata = (struct txx9aclc_dmadata *)data; | ||
144 | struct dma_chan *chan = dmadata->dma_chan; | ||
145 | struct dma_async_tx_descriptor *desc; | ||
146 | struct snd_pcm_substream *substream = dmadata->substream; | ||
147 | u32 ctlbit = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? | ||
148 | ACCTL_AUDODMA : ACCTL_AUDIDMA; | ||
149 | int i; | ||
150 | unsigned long flags; | ||
151 | |||
152 | spin_lock_irqsave(&dmadata->dma_lock, flags); | ||
153 | if (dmadata->frag_count < 0) { | ||
154 | struct txx9aclc_soc_device *dev = | ||
155 | container_of(dmadata, struct txx9aclc_soc_device, | ||
156 | dmadata[substream->stream]); | ||
157 | struct txx9aclc_plat_drvdata *drvdata = | ||
158 | txx9aclc_get_plat_drvdata(dev); | ||
159 | void __iomem *base = drvdata->base; | ||
160 | |||
161 | spin_unlock_irqrestore(&dmadata->dma_lock, flags); | ||
162 | chan->device->device_terminate_all(chan); | ||
163 | /* first time */ | ||
164 | for (i = 0; i < NR_DMA_CHAIN; i++) { | ||
165 | desc = txx9aclc_dma_submit(dmadata, | ||
166 | dmadata->dma_addr + i * dmadata->frag_bytes); | ||
167 | if (!desc) | ||
168 | return; | ||
169 | } | ||
170 | dmadata->dmacount = NR_DMA_CHAIN; | ||
171 | chan->device->device_issue_pending(chan); | ||
172 | spin_lock_irqsave(&dmadata->dma_lock, flags); | ||
173 | __raw_writel(ctlbit, base + ACCTLEN); | ||
174 | dmadata->frag_count = NR_DMA_CHAIN % dmadata->frags; | ||
175 | spin_unlock_irqrestore(&dmadata->dma_lock, flags); | ||
176 | return; | ||
177 | } | ||
178 | BUG_ON(dmadata->dmacount >= NR_DMA_CHAIN); | ||
179 | while (dmadata->dmacount < NR_DMA_CHAIN) { | ||
180 | dmadata->dmacount++; | ||
181 | spin_unlock_irqrestore(&dmadata->dma_lock, flags); | ||
182 | desc = txx9aclc_dma_submit(dmadata, | ||
183 | dmadata->dma_addr + | ||
184 | dmadata->frag_count * dmadata->frag_bytes); | ||
185 | if (!desc) | ||
186 | return; | ||
187 | chan->device->device_issue_pending(chan); | ||
188 | |||
189 | spin_lock_irqsave(&dmadata->dma_lock, flags); | ||
190 | dmadata->frag_count++; | ||
191 | dmadata->frag_count %= dmadata->frags; | ||
192 | dmadata->pos += dmadata->frag_bytes; | ||
193 | dmadata->pos %= dmadata->buffer_bytes; | ||
194 | if ((dmadata->frag_count * dmadata->frag_bytes) % | ||
195 | dmadata->period_bytes == 0) | ||
196 | snd_pcm_period_elapsed(substream); | ||
197 | } | ||
198 | spin_unlock_irqrestore(&dmadata->dma_lock, flags); | ||
199 | } | ||
200 | |||
201 | static int txx9aclc_pcm_trigger(struct snd_pcm_substream *substream, int cmd) | ||
202 | { | ||
203 | struct txx9aclc_dmadata *dmadata = substream->runtime->private_data; | ||
204 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
205 | struct txx9aclc_soc_device *dev = | ||
206 | container_of(rtd->socdev, struct txx9aclc_soc_device, soc_dev); | ||
207 | struct txx9aclc_plat_drvdata *drvdata = txx9aclc_get_plat_drvdata(dev); | ||
208 | void __iomem *base = drvdata->base; | ||
209 | unsigned long flags; | ||
210 | int ret = 0; | ||
211 | u32 ctlbit = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? | ||
212 | ACCTL_AUDODMA : ACCTL_AUDIDMA; | ||
213 | |||
214 | spin_lock_irqsave(&dmadata->dma_lock, flags); | ||
215 | switch (cmd) { | ||
216 | case SNDRV_PCM_TRIGGER_START: | ||
217 | dmadata->frag_count = -1; | ||
218 | tasklet_schedule(&dmadata->tasklet); | ||
219 | break; | ||
220 | case SNDRV_PCM_TRIGGER_STOP: | ||
221 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: | ||
222 | case SNDRV_PCM_TRIGGER_SUSPEND: | ||
223 | __raw_writel(ctlbit, base + ACCTLDIS); | ||
224 | break; | ||
225 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | ||
226 | case SNDRV_PCM_TRIGGER_RESUME: | ||
227 | __raw_writel(ctlbit, base + ACCTLEN); | ||
228 | break; | ||
229 | default: | ||
230 | ret = -EINVAL; | ||
231 | } | ||
232 | spin_unlock_irqrestore(&dmadata->dma_lock, flags); | ||
233 | return ret; | ||
234 | } | ||
235 | |||
236 | static snd_pcm_uframes_t | ||
237 | txx9aclc_pcm_pointer(struct snd_pcm_substream *substream) | ||
238 | { | ||
239 | struct txx9aclc_dmadata *dmadata = substream->runtime->private_data; | ||
240 | |||
241 | return bytes_to_frames(substream->runtime, dmadata->pos); | ||
242 | } | ||
243 | |||
244 | static int txx9aclc_pcm_open(struct snd_pcm_substream *substream) | ||
245 | { | ||
246 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
247 | struct txx9aclc_soc_device *dev = | ||
248 | container_of(rtd->socdev, struct txx9aclc_soc_device, soc_dev); | ||
249 | struct txx9aclc_dmadata *dmadata = &dev->dmadata[substream->stream]; | ||
250 | int ret; | ||
251 | |||
252 | ret = snd_soc_set_runtime_hwparams(substream, &txx9aclc_pcm_hardware); | ||
253 | if (ret) | ||
254 | return ret; | ||
255 | /* ensure that buffer size is a multiple of period size */ | ||
256 | ret = snd_pcm_hw_constraint_integer(substream->runtime, | ||
257 | SNDRV_PCM_HW_PARAM_PERIODS); | ||
258 | if (ret < 0) | ||
259 | return ret; | ||
260 | substream->runtime->private_data = dmadata; | ||
261 | return 0; | ||
262 | } | ||
263 | |||
264 | static int txx9aclc_pcm_close(struct snd_pcm_substream *substream) | ||
265 | { | ||
266 | struct txx9aclc_dmadata *dmadata = substream->runtime->private_data; | ||
267 | struct dma_chan *chan = dmadata->dma_chan; | ||
268 | |||
269 | dmadata->frag_count = -1; | ||
270 | chan->device->device_terminate_all(chan); | ||
271 | return 0; | ||
272 | } | ||
273 | |||
274 | static struct snd_pcm_ops txx9aclc_pcm_ops = { | ||
275 | .open = txx9aclc_pcm_open, | ||
276 | .close = txx9aclc_pcm_close, | ||
277 | .ioctl = snd_pcm_lib_ioctl, | ||
278 | .hw_params = txx9aclc_pcm_hw_params, | ||
279 | .hw_free = txx9aclc_pcm_hw_free, | ||
280 | .prepare = txx9aclc_pcm_prepare, | ||
281 | .trigger = txx9aclc_pcm_trigger, | ||
282 | .pointer = txx9aclc_pcm_pointer, | ||
283 | }; | ||
284 | |||
285 | static void txx9aclc_pcm_free_dma_buffers(struct snd_pcm *pcm) | ||
286 | { | ||
287 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
288 | } | ||
289 | |||
290 | static int txx9aclc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | ||
291 | struct snd_pcm *pcm) | ||
292 | { | ||
293 | return snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, | ||
294 | card->dev, 64 * 1024, 4 * 1024 * 1024); | ||
295 | } | ||
296 | |||
297 | static bool filter(struct dma_chan *chan, void *param) | ||
298 | { | ||
299 | struct txx9aclc_dmadata *dmadata = param; | ||
300 | char devname[20 + 2]; /* FIXME: old BUS_ID_SIZE + 2 */ | ||
301 | |||
302 | snprintf(devname, sizeof(devname), "%s.%d", dmadata->dma_res->name, | ||
303 | (int)dmadata->dma_res->start); | ||
304 | if (strcmp(dev_name(chan->device->dev), devname) == 0) { | ||
305 | chan->private = &dmadata->dma_slave; | ||
306 | return true; | ||
307 | } | ||
308 | return false; | ||
309 | } | ||
310 | |||
311 | static int txx9aclc_dma_init(struct txx9aclc_soc_device *dev, | ||
312 | struct txx9aclc_dmadata *dmadata) | ||
313 | { | ||
314 | struct txx9aclc_plat_drvdata *drvdata = txx9aclc_get_plat_drvdata(dev); | ||
315 | struct txx9dmac_slave *ds = &dmadata->dma_slave; | ||
316 | dma_cap_mask_t mask; | ||
317 | |||
318 | spin_lock_init(&dmadata->dma_lock); | ||
319 | |||
320 | ds->reg_width = sizeof(u32); | ||
321 | if (dmadata->stream == SNDRV_PCM_STREAM_PLAYBACK) { | ||
322 | ds->tx_reg = drvdata->physbase + ACAUDODAT; | ||
323 | ds->rx_reg = 0; | ||
324 | } else { | ||
325 | ds->tx_reg = 0; | ||
326 | ds->rx_reg = drvdata->physbase + ACAUDIDAT; | ||
327 | } | ||
328 | |||
329 | /* Try to grab a DMA channel */ | ||
330 | dma_cap_zero(mask); | ||
331 | dma_cap_set(DMA_SLAVE, mask); | ||
332 | dmadata->dma_chan = dma_request_channel(mask, filter, dmadata); | ||
333 | if (!dmadata->dma_chan) { | ||
334 | dev_err(dev->soc_dev.dev, | ||
335 | "DMA channel for %s is not available\n", | ||
336 | dmadata->stream == SNDRV_PCM_STREAM_PLAYBACK ? | ||
337 | "playback" : "capture"); | ||
338 | return -EBUSY; | ||
339 | } | ||
340 | tasklet_init(&dmadata->tasklet, txx9aclc_dma_tasklet, | ||
341 | (unsigned long)dmadata); | ||
342 | return 0; | ||
343 | } | ||
344 | |||
345 | static int txx9aclc_pcm_probe(struct platform_device *pdev) | ||
346 | { | ||
347 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
348 | struct txx9aclc_soc_device *dev = | ||
349 | container_of(socdev, struct txx9aclc_soc_device, soc_dev); | ||
350 | struct resource *r; | ||
351 | int i; | ||
352 | int ret; | ||
353 | |||
354 | dev->dmadata[0].stream = SNDRV_PCM_STREAM_PLAYBACK; | ||
355 | dev->dmadata[1].stream = SNDRV_PCM_STREAM_CAPTURE; | ||
356 | for (i = 0; i < 2; i++) { | ||
357 | r = platform_get_resource(dev->aclc_pdev, IORESOURCE_DMA, i); | ||
358 | if (!r) { | ||
359 | ret = -EBUSY; | ||
360 | goto exit; | ||
361 | } | ||
362 | dev->dmadata[i].dma_res = r; | ||
363 | ret = txx9aclc_dma_init(dev, &dev->dmadata[i]); | ||
364 | if (ret) | ||
365 | goto exit; | ||
366 | } | ||
367 | return 0; | ||
368 | |||
369 | exit: | ||
370 | for (i = 0; i < 2; i++) { | ||
371 | if (dev->dmadata[i].dma_chan) | ||
372 | dma_release_channel(dev->dmadata[i].dma_chan); | ||
373 | dev->dmadata[i].dma_chan = NULL; | ||
374 | } | ||
375 | return ret; | ||
376 | } | ||
377 | |||
378 | static int txx9aclc_pcm_remove(struct platform_device *pdev) | ||
379 | { | ||
380 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | ||
381 | struct txx9aclc_soc_device *dev = | ||
382 | container_of(socdev, struct txx9aclc_soc_device, soc_dev); | ||
383 | struct txx9aclc_plat_drvdata *drvdata = txx9aclc_get_plat_drvdata(dev); | ||
384 | void __iomem *base = drvdata->base; | ||
385 | int i; | ||
386 | |||
387 | /* disable all FIFO DMAs */ | ||
388 | __raw_writel(ACCTL_AUDODMA | ACCTL_AUDIDMA, base + ACCTLDIS); | ||
389 | /* dummy R/W to clear pending DMAREQ if any */ | ||
390 | __raw_writel(__raw_readl(base + ACAUDIDAT), base + ACAUDODAT); | ||
391 | |||
392 | for (i = 0; i < 2; i++) { | ||
393 | struct txx9aclc_dmadata *dmadata = &dev->dmadata[i]; | ||
394 | struct dma_chan *chan = dmadata->dma_chan; | ||
395 | if (chan) { | ||
396 | dmadata->frag_count = -1; | ||
397 | chan->device->device_terminate_all(chan); | ||
398 | dma_release_channel(chan); | ||
399 | } | ||
400 | dev->dmadata[i].dma_chan = NULL; | ||
401 | } | ||
402 | return 0; | ||
403 | } | ||
404 | |||
405 | struct snd_soc_platform txx9aclc_soc_platform = { | ||
406 | .name = "txx9aclc-audio", | ||
407 | .probe = txx9aclc_pcm_probe, | ||
408 | .remove = txx9aclc_pcm_remove, | ||
409 | .pcm_ops = &txx9aclc_pcm_ops, | ||
410 | .pcm_new = txx9aclc_pcm_new, | ||
411 | .pcm_free = txx9aclc_pcm_free_dma_buffers, | ||
412 | }; | ||
413 | EXPORT_SYMBOL_GPL(txx9aclc_soc_platform); | ||
414 | |||
415 | static int __init txx9aclc_soc_platform_init(void) | ||
416 | { | ||
417 | return snd_soc_register_platform(&txx9aclc_soc_platform); | ||
418 | } | ||
419 | |||
420 | static void __exit txx9aclc_soc_platform_exit(void) | ||
421 | { | ||
422 | snd_soc_unregister_platform(&txx9aclc_soc_platform); | ||
423 | } | ||
424 | |||
425 | module_init(txx9aclc_soc_platform_init); | ||
426 | module_exit(txx9aclc_soc_platform_exit); | ||
427 | |||
428 | MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); | ||
429 | MODULE_DESCRIPTION("TXx9 ACLC Audio DMA driver"); | ||
430 | MODULE_LICENSE("GPL"); | ||
diff --git a/sound/soc/txx9/txx9aclc.h b/sound/soc/txx9/txx9aclc.h new file mode 100644 index 000000000000..6769aab41b33 --- /dev/null +++ b/sound/soc/txx9/txx9aclc.h | |||
@@ -0,0 +1,83 @@ | |||
1 | /* | ||
2 | * TXx9 SoC AC Link Controller | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | |||
9 | #ifndef __TXX9ACLC_H | ||
10 | #define __TXX9ACLC_H | ||
11 | |||
12 | #include <linux/interrupt.h> | ||
13 | #include <asm/txx9/dmac.h> | ||
14 | |||
15 | #define ACCTLEN 0x00 /* control enable */ | ||
16 | #define ACCTLDIS 0x04 /* control disable */ | ||
17 | #define ACCTL_ENLINK 0x00000001 /* enable/disable AC-link */ | ||
18 | #define ACCTL_AUDODMA 0x00000100 /* AUDODMA enable/disable */ | ||
19 | #define ACCTL_AUDIDMA 0x00001000 /* AUDIDMA enable/disable */ | ||
20 | #define ACCTL_AUDOEHLT 0x00010000 /* AUDO error halt | ||
21 | enable/disable */ | ||
22 | #define ACCTL_AUDIEHLT 0x00100000 /* AUDI error halt | ||
23 | enable/disable */ | ||
24 | #define ACREGACC 0x08 /* codec register access */ | ||
25 | #define ACREGACC_DAT_SHIFT 0 /* data field */ | ||
26 | #define ACREGACC_REG_SHIFT 16 /* address field */ | ||
27 | #define ACREGACC_CODECID_SHIFT 24 /* CODEC ID field */ | ||
28 | #define ACREGACC_READ 0x80000000 /* CODEC read */ | ||
29 | #define ACREGACC_WRITE 0x00000000 /* CODEC write */ | ||
30 | #define ACINTSTS 0x10 /* interrupt status */ | ||
31 | #define ACINTMSTS 0x14 /* interrupt masked status */ | ||
32 | #define ACINTEN 0x18 /* interrupt enable */ | ||
33 | #define ACINTDIS 0x1c /* interrupt disable */ | ||
34 | #define ACINT_CODECRDY(n) (0x00000001 << (n)) /* CODECn ready */ | ||
35 | #define ACINT_REGACCRDY 0x00000010 /* ACREGACC ready */ | ||
36 | #define ACINT_AUDOERR 0x00000100 /* AUDO underrun error */ | ||
37 | #define ACINT_AUDIERR 0x00001000 /* AUDI overrun error */ | ||
38 | #define ACDMASTS 0x80 /* DMA request status */ | ||
39 | #define ACDMA_AUDO 0x00000001 /* AUDODMA pending */ | ||
40 | #define ACDMA_AUDI 0x00000010 /* AUDIDMA pending */ | ||
41 | #define ACAUDODAT 0xa0 /* audio out data */ | ||
42 | #define ACAUDIDAT 0xb0 /* audio in data */ | ||
43 | #define ACREVID 0xfc /* revision ID */ | ||
44 | |||
45 | struct txx9aclc_dmadata { | ||
46 | struct resource *dma_res; | ||
47 | struct txx9dmac_slave dma_slave; | ||
48 | struct dma_chan *dma_chan; | ||
49 | struct tasklet_struct tasklet; | ||
50 | spinlock_t dma_lock; | ||
51 | int stream; /* SNDRV_PCM_STREAM_PLAYBACK or SNDRV_PCM_STREAM_CAPTURE */ | ||
52 | struct snd_pcm_substream *substream; | ||
53 | unsigned long pos; | ||
54 | dma_addr_t dma_addr; | ||
55 | unsigned long buffer_bytes; | ||
56 | unsigned long period_bytes; | ||
57 | unsigned long frag_bytes; | ||
58 | int frags; | ||
59 | int frag_count; | ||
60 | int dmacount; | ||
61 | }; | ||
62 | |||
63 | struct txx9aclc_plat_drvdata { | ||
64 | void __iomem *base; | ||
65 | u64 physbase; | ||
66 | }; | ||
67 | |||
68 | struct txx9aclc_soc_device { | ||
69 | struct snd_soc_device soc_dev; | ||
70 | struct platform_device *aclc_pdev; /* for ioresources, drvdata */ | ||
71 | struct txx9aclc_dmadata dmadata[2]; | ||
72 | }; | ||
73 | |||
74 | static inline struct txx9aclc_plat_drvdata *txx9aclc_get_plat_drvdata( | ||
75 | struct txx9aclc_soc_device *sdev) | ||
76 | { | ||
77 | return platform_get_drvdata(sdev->aclc_pdev); | ||
78 | } | ||
79 | |||
80 | extern struct snd_soc_platform txx9aclc_soc_platform; | ||
81 | extern struct snd_soc_dai txx9aclc_ac97_dai; | ||
82 | |||
83 | #endif /* __TXX9ACLC_H */ | ||
diff --git a/sound/synth/Makefile b/sound/synth/Makefile index e99fd76caa17..11eb06ac2eca 100644 --- a/sound/synth/Makefile +++ b/sound/synth/Makefile | |||
@@ -5,16 +5,8 @@ | |||
5 | 5 | ||
6 | snd-util-mem-objs := util_mem.o | 6 | snd-util-mem-objs := util_mem.o |
7 | 7 | ||
8 | # | ||
9 | # this function returns: | ||
10 | # "m" - CONFIG_SND_SEQUENCER is m | ||
11 | # <empty string> - CONFIG_SND_SEQUENCER is undefined | ||
12 | # otherwise parameter #1 value | ||
13 | # | ||
14 | sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) | ||
15 | |||
16 | # Toplevel Module Dependency | 8 | # Toplevel Module Dependency |
17 | obj-$(CONFIG_SND_EMU10K1) += snd-util-mem.o | 9 | obj-$(CONFIG_SND_EMU10K1) += snd-util-mem.o |
18 | obj-$(CONFIG_SND_TRIDENT) += snd-util-mem.o | 10 | obj-$(CONFIG_SND_TRIDENT) += snd-util-mem.o |
19 | obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-util-mem.o | 11 | obj-$(CONFIG_SND_SBAWE_SEQ) += snd-util-mem.o |
20 | obj-$(call sequencer,$(CONFIG_SND)) += emux/ | 12 | obj-$(CONFIG_SND_SEQUENCER) += emux/ |
diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile index b69035240cf6..328594e6152d 100644 --- a/sound/synth/emux/Makefile +++ b/sound/synth/emux/Makefile | |||
@@ -7,14 +7,6 @@ snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \ | |||
7 | emux_effect.o emux_proc.o emux_hwdep.o soundfont.o \ | 7 | emux_effect.o emux_proc.o emux_hwdep.o soundfont.o \ |
8 | $(if $(CONFIG_SND_SEQUENCER_OSS),emux_oss.o) | 8 | $(if $(CONFIG_SND_SEQUENCER_OSS),emux_oss.o) |
9 | 9 | ||
10 | # | ||
11 | # this function returns: | ||
12 | # "m" - CONFIG_SND_SEQUENCER is m | ||
13 | # <empty string> - CONFIG_SND_SEQUENCER is undefined | ||
14 | # otherwise parameter #1 value | ||
15 | # | ||
16 | sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) | ||
17 | |||
18 | # Toplevel Module Dependencies | 10 | # Toplevel Module Dependencies |
19 | obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-emux-synth.o | 11 | obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emux-synth.o |
20 | obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-emux-synth.o | 12 | obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emux-synth.o |
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c index b13ce767ac72..8f9b60c5d74c 100644 --- a/sound/usb/caiaq/audio.c +++ b/sound/usb/caiaq/audio.c | |||
@@ -42,10 +42,10 @@ | |||
42 | (stream << 1) | (~(i / (dev->n_streams * BYTES_PER_SAMPLE_USB)) & 1) | 42 | (stream << 1) | (~(i / (dev->n_streams * BYTES_PER_SAMPLE_USB)) & 1) |
43 | 43 | ||
44 | static struct snd_pcm_hardware snd_usb_caiaq_pcm_hardware = { | 44 | static struct snd_pcm_hardware snd_usb_caiaq_pcm_hardware = { |
45 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | 45 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | |
46 | SNDRV_PCM_INFO_BLOCK_TRANSFER), | 46 | SNDRV_PCM_INFO_BLOCK_TRANSFER), |
47 | .formats = SNDRV_PCM_FMTBIT_S24_3BE, | 47 | .formats = SNDRV_PCM_FMTBIT_S24_3BE, |
48 | .rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | | 48 | .rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | |
49 | SNDRV_PCM_RATE_96000), | 49 | SNDRV_PCM_RATE_96000), |
50 | .rate_min = 44100, | 50 | .rate_min = 44100, |
51 | .rate_max = 0, /* will overwrite later */ | 51 | .rate_max = 0, /* will overwrite later */ |
@@ -68,7 +68,7 @@ activate_substream(struct snd_usb_caiaqdev *dev, | |||
68 | dev->sub_capture[sub->number] = sub; | 68 | dev->sub_capture[sub->number] = sub; |
69 | } | 69 | } |
70 | 70 | ||
71 | static void | 71 | static void |
72 | deactivate_substream(struct snd_usb_caiaqdev *dev, | 72 | deactivate_substream(struct snd_usb_caiaqdev *dev, |
73 | struct snd_pcm_substream *sub) | 73 | struct snd_pcm_substream *sub) |
74 | { | 74 | { |
@@ -118,7 +118,7 @@ static int stream_start(struct snd_usb_caiaqdev *dev) | |||
118 | return -EPIPE; | 118 | return -EPIPE; |
119 | } | 119 | } |
120 | } | 120 | } |
121 | 121 | ||
122 | return 0; | 122 | return 0; |
123 | } | 123 | } |
124 | 124 | ||
@@ -129,7 +129,7 @@ static void stream_stop(struct snd_usb_caiaqdev *dev) | |||
129 | debug("%s(%p)\n", __func__, dev); | 129 | debug("%s(%p)\n", __func__, dev); |
130 | if (!dev->streaming) | 130 | if (!dev->streaming) |
131 | return; | 131 | return; |
132 | 132 | ||
133 | dev->streaming = 0; | 133 | dev->streaming = 0; |
134 | 134 | ||
135 | for (i = 0; i < N_URBS; i++) { | 135 | for (i = 0; i < N_URBS; i++) { |
@@ -154,7 +154,7 @@ static int snd_usb_caiaq_substream_close(struct snd_pcm_substream *substream) | |||
154 | debug("%s(%p)\n", __func__, substream); | 154 | debug("%s(%p)\n", __func__, substream); |
155 | if (all_substreams_zero(dev->sub_playback) && | 155 | if (all_substreams_zero(dev->sub_playback) && |
156 | all_substreams_zero(dev->sub_capture)) { | 156 | all_substreams_zero(dev->sub_capture)) { |
157 | /* when the last client has stopped streaming, | 157 | /* when the last client has stopped streaming, |
158 | * all sample rates are allowed again */ | 158 | * all sample rates are allowed again */ |
159 | stream_stop(dev); | 159 | stream_stop(dev); |
160 | dev->pcm_info.rates = dev->samplerates; | 160 | dev->pcm_info.rates = dev->samplerates; |
@@ -194,30 +194,31 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream) | |||
194 | struct snd_pcm_runtime *runtime = substream->runtime; | 194 | struct snd_pcm_runtime *runtime = substream->runtime; |
195 | 195 | ||
196 | debug("%s(%p)\n", __func__, substream); | 196 | debug("%s(%p)\n", __func__, substream); |
197 | 197 | ||
198 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { | 198 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { |
199 | dev->period_out_count[index] = BYTES_PER_SAMPLE + 1; | 199 | dev->period_out_count[index] = BYTES_PER_SAMPLE + 1; |
200 | dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1; | 200 | dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1; |
201 | } else { | 201 | } else { |
202 | dev->period_in_count[index] = BYTES_PER_SAMPLE; | 202 | int in_pos = (dev->spec.data_alignment == 2) ? 0 : 2; |
203 | dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE; | 203 | dev->period_in_count[index] = BYTES_PER_SAMPLE + in_pos; |
204 | dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE + in_pos; | ||
204 | } | 205 | } |
205 | 206 | ||
206 | if (dev->streaming) | 207 | if (dev->streaming) |
207 | return 0; | 208 | return 0; |
208 | 209 | ||
209 | /* the first client that opens a stream defines the sample rate | 210 | /* the first client that opens a stream defines the sample rate |
210 | * setting for all subsequent calls, until the last client closed. */ | 211 | * setting for all subsequent calls, until the last client closed. */ |
211 | for (i=0; i < ARRAY_SIZE(rates); i++) | 212 | for (i=0; i < ARRAY_SIZE(rates); i++) |
212 | if (runtime->rate == rates[i]) | 213 | if (runtime->rate == rates[i]) |
213 | dev->pcm_info.rates = 1 << i; | 214 | dev->pcm_info.rates = 1 << i; |
214 | 215 | ||
215 | snd_pcm_limit_hw_rates(runtime); | 216 | snd_pcm_limit_hw_rates(runtime); |
216 | 217 | ||
217 | bytes_per_sample = BYTES_PER_SAMPLE; | 218 | bytes_per_sample = BYTES_PER_SAMPLE; |
218 | if (dev->spec.data_alignment == 2) | 219 | if (dev->spec.data_alignment == 2) |
219 | bytes_per_sample++; | 220 | bytes_per_sample++; |
220 | 221 | ||
221 | bpp = ((runtime->rate / 8000) + CLOCK_DRIFT_TOLERANCE) | 222 | bpp = ((runtime->rate / 8000) + CLOCK_DRIFT_TOLERANCE) |
222 | * bytes_per_sample * CHANNELS_PER_STREAM * dev->n_streams; | 223 | * bytes_per_sample * CHANNELS_PER_STREAM * dev->n_streams; |
223 | 224 | ||
@@ -232,7 +233,7 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream) | |||
232 | ret = stream_start(dev); | 233 | ret = stream_start(dev); |
233 | if (ret) | 234 | if (ret) |
234 | return ret; | 235 | return ret; |
235 | 236 | ||
236 | dev->output_running = 0; | 237 | dev->output_running = 0; |
237 | wait_event_timeout(dev->prepare_wait_queue, dev->output_running, HZ); | 238 | wait_event_timeout(dev->prepare_wait_queue, dev->output_running, HZ); |
238 | if (!dev->output_running) { | 239 | if (!dev->output_running) { |
@@ -273,7 +274,7 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub) | |||
273 | return SNDRV_PCM_POS_XRUN; | 274 | return SNDRV_PCM_POS_XRUN; |
274 | 275 | ||
275 | if (sub->stream == SNDRV_PCM_STREAM_PLAYBACK) | 276 | if (sub->stream == SNDRV_PCM_STREAM_PLAYBACK) |
276 | return bytes_to_frames(sub->runtime, | 277 | return bytes_to_frames(sub->runtime, |
277 | dev->audio_out_buf_pos[index]); | 278 | dev->audio_out_buf_pos[index]); |
278 | else | 279 | else |
279 | return bytes_to_frames(sub->runtime, | 280 | return bytes_to_frames(sub->runtime, |
@@ -291,7 +292,7 @@ static struct snd_pcm_ops snd_usb_caiaq_ops = { | |||
291 | .trigger = snd_usb_caiaq_pcm_trigger, | 292 | .trigger = snd_usb_caiaq_pcm_trigger, |
292 | .pointer = snd_usb_caiaq_pcm_pointer | 293 | .pointer = snd_usb_caiaq_pcm_pointer |
293 | }; | 294 | }; |
294 | 295 | ||
295 | static void check_for_elapsed_periods(struct snd_usb_caiaqdev *dev, | 296 | static void check_for_elapsed_periods(struct snd_usb_caiaqdev *dev, |
296 | struct snd_pcm_substream **subs) | 297 | struct snd_pcm_substream **subs) |
297 | { | 298 | { |
@@ -333,7 +334,7 @@ static void read_in_urb_mode0(struct snd_usb_caiaqdev *dev, | |||
333 | struct snd_pcm_runtime *rt = sub->runtime; | 334 | struct snd_pcm_runtime *rt = sub->runtime; |
334 | char *audio_buf = rt->dma_area; | 335 | char *audio_buf = rt->dma_area; |
335 | int sz = frames_to_bytes(rt, rt->buffer_size); | 336 | int sz = frames_to_bytes(rt, rt->buffer_size); |
336 | audio_buf[dev->audio_in_buf_pos[stream]++] | 337 | audio_buf[dev->audio_in_buf_pos[stream]++] |
337 | = usb_buf[i]; | 338 | = usb_buf[i]; |
338 | dev->period_in_count[stream]++; | 339 | dev->period_in_count[stream]++; |
339 | if (dev->audio_in_buf_pos[stream] == sz) | 340 | if (dev->audio_in_buf_pos[stream] == sz) |
@@ -354,14 +355,14 @@ static void read_in_urb_mode2(struct snd_usb_caiaqdev *dev, | |||
354 | 355 | ||
355 | for (i = 0; i < iso->actual_length;) { | 356 | for (i = 0; i < iso->actual_length;) { |
356 | if (i % (dev->n_streams * BYTES_PER_SAMPLE_USB) == 0) { | 357 | if (i % (dev->n_streams * BYTES_PER_SAMPLE_USB) == 0) { |
357 | for (stream = 0; | 358 | for (stream = 0; |
358 | stream < dev->n_streams; | 359 | stream < dev->n_streams; |
359 | stream++, i++) { | 360 | stream++, i++) { |
360 | if (dev->first_packet) | 361 | if (dev->first_packet) |
361 | continue; | 362 | continue; |
362 | 363 | ||
363 | check_byte = MAKE_CHECKBYTE(dev, stream, i); | 364 | check_byte = MAKE_CHECKBYTE(dev, stream, i); |
364 | 365 | ||
365 | if ((usb_buf[i] & 0x3f) != check_byte) | 366 | if ((usb_buf[i] & 0x3f) != check_byte) |
366 | dev->input_panic = 1; | 367 | dev->input_panic = 1; |
367 | 368 | ||
@@ -410,21 +411,21 @@ static void read_in_urb(struct snd_usb_caiaqdev *dev, | |||
410 | } | 411 | } |
411 | 412 | ||
412 | if ((dev->input_panic || dev->output_panic) && !dev->warned) { | 413 | if ((dev->input_panic || dev->output_panic) && !dev->warned) { |
413 | debug("streaming error detected %s %s\n", | 414 | debug("streaming error detected %s %s\n", |
414 | dev->input_panic ? "(input)" : "", | 415 | dev->input_panic ? "(input)" : "", |
415 | dev->output_panic ? "(output)" : ""); | 416 | dev->output_panic ? "(output)" : ""); |
416 | dev->warned = 1; | 417 | dev->warned = 1; |
417 | } | 418 | } |
418 | } | 419 | } |
419 | 420 | ||
420 | static void fill_out_urb(struct snd_usb_caiaqdev *dev, | 421 | static void fill_out_urb(struct snd_usb_caiaqdev *dev, |
421 | struct urb *urb, | 422 | struct urb *urb, |
422 | const struct usb_iso_packet_descriptor *iso) | 423 | const struct usb_iso_packet_descriptor *iso) |
423 | { | 424 | { |
424 | unsigned char *usb_buf = urb->transfer_buffer + iso->offset; | 425 | unsigned char *usb_buf = urb->transfer_buffer + iso->offset; |
425 | struct snd_pcm_substream *sub; | 426 | struct snd_pcm_substream *sub; |
426 | int stream, i; | 427 | int stream, i; |
427 | 428 | ||
428 | for (i = 0; i < iso->length;) { | 429 | for (i = 0; i < iso->length;) { |
429 | for (stream = 0; stream < dev->n_streams; stream++, i++) { | 430 | for (stream = 0; stream < dev->n_streams; stream++, i++) { |
430 | sub = dev->sub_playback[stream]; | 431 | sub = dev->sub_playback[stream]; |
@@ -444,7 +445,7 @@ static void fill_out_urb(struct snd_usb_caiaqdev *dev, | |||
444 | 445 | ||
445 | /* fill in the check bytes */ | 446 | /* fill in the check bytes */ |
446 | if (dev->spec.data_alignment == 2 && | 447 | if (dev->spec.data_alignment == 2 && |
447 | i % (dev->n_streams * BYTES_PER_SAMPLE_USB) == | 448 | i % (dev->n_streams * BYTES_PER_SAMPLE_USB) == |
448 | (dev->n_streams * CHANNELS_PER_STREAM)) | 449 | (dev->n_streams * CHANNELS_PER_STREAM)) |
449 | for (stream = 0; stream < dev->n_streams; stream++, i++) | 450 | for (stream = 0; stream < dev->n_streams; stream++, i++) |
450 | usb_buf[i] = MAKE_CHECKBYTE(dev, stream, i); | 451 | usb_buf[i] = MAKE_CHECKBYTE(dev, stream, i); |
@@ -453,7 +454,7 @@ static void fill_out_urb(struct snd_usb_caiaqdev *dev, | |||
453 | 454 | ||
454 | static void read_completed(struct urb *urb) | 455 | static void read_completed(struct urb *urb) |
455 | { | 456 | { |
456 | struct snd_usb_caiaq_cb_info *info = urb->context; | 457 | struct snd_usb_caiaq_cb_info *info = urb->context; |
457 | struct snd_usb_caiaqdev *dev; | 458 | struct snd_usb_caiaqdev *dev; |
458 | struct urb *out; | 459 | struct urb *out; |
459 | int frame, len, send_it = 0, outframe = 0; | 460 | int frame, len, send_it = 0, outframe = 0; |
@@ -478,7 +479,7 @@ static void read_completed(struct urb *urb) | |||
478 | out->iso_frame_desc[outframe].length = len; | 479 | out->iso_frame_desc[outframe].length = len; |
479 | out->iso_frame_desc[outframe].actual_length = 0; | 480 | out->iso_frame_desc[outframe].actual_length = 0; |
480 | out->iso_frame_desc[outframe].offset = BYTES_PER_FRAME * frame; | 481 | out->iso_frame_desc[outframe].offset = BYTES_PER_FRAME * frame; |
481 | 482 | ||
482 | if (len > 0) { | 483 | if (len > 0) { |
483 | spin_lock(&dev->spinlock); | 484 | spin_lock(&dev->spinlock); |
484 | fill_out_urb(dev, out, &out->iso_frame_desc[outframe]); | 485 | fill_out_urb(dev, out, &out->iso_frame_desc[outframe]); |
@@ -497,14 +498,14 @@ static void read_completed(struct urb *urb) | |||
497 | out->transfer_flags = URB_ISO_ASAP; | 498 | out->transfer_flags = URB_ISO_ASAP; |
498 | usb_submit_urb(out, GFP_ATOMIC); | 499 | usb_submit_urb(out, GFP_ATOMIC); |
499 | } | 500 | } |
500 | 501 | ||
501 | /* re-submit inbound urb */ | 502 | /* re-submit inbound urb */ |
502 | for (frame = 0; frame < FRAMES_PER_URB; frame++) { | 503 | for (frame = 0; frame < FRAMES_PER_URB; frame++) { |
503 | urb->iso_frame_desc[frame].offset = BYTES_PER_FRAME * frame; | 504 | urb->iso_frame_desc[frame].offset = BYTES_PER_FRAME * frame; |
504 | urb->iso_frame_desc[frame].length = BYTES_PER_FRAME; | 505 | urb->iso_frame_desc[frame].length = BYTES_PER_FRAME; |
505 | urb->iso_frame_desc[frame].actual_length = 0; | 506 | urb->iso_frame_desc[frame].actual_length = 0; |
506 | } | 507 | } |
507 | 508 | ||
508 | urb->number_of_packets = FRAMES_PER_URB; | 509 | urb->number_of_packets = FRAMES_PER_URB; |
509 | urb->transfer_flags = URB_ISO_ASAP; | 510 | urb->transfer_flags = URB_ISO_ASAP; |
510 | usb_submit_urb(urb, GFP_ATOMIC); | 511 | usb_submit_urb(urb, GFP_ATOMIC); |
@@ -528,7 +529,7 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret) | |||
528 | struct usb_device *usb_dev = dev->chip.dev; | 529 | struct usb_device *usb_dev = dev->chip.dev; |
529 | unsigned int pipe; | 530 | unsigned int pipe; |
530 | 531 | ||
531 | pipe = (dir == SNDRV_PCM_STREAM_PLAYBACK) ? | 532 | pipe = (dir == SNDRV_PCM_STREAM_PLAYBACK) ? |
532 | usb_sndisocpipe(usb_dev, ENDPOINT_PLAYBACK) : | 533 | usb_sndisocpipe(usb_dev, ENDPOINT_PLAYBACK) : |
533 | usb_rcvisocpipe(usb_dev, ENDPOINT_CAPTURE); | 534 | usb_rcvisocpipe(usb_dev, ENDPOINT_CAPTURE); |
534 | 535 | ||
@@ -547,25 +548,25 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret) | |||
547 | return urbs; | 548 | return urbs; |
548 | } | 549 | } |
549 | 550 | ||
550 | urbs[i]->transfer_buffer = | 551 | urbs[i]->transfer_buffer = |
551 | kmalloc(FRAMES_PER_URB * BYTES_PER_FRAME, GFP_KERNEL); | 552 | kmalloc(FRAMES_PER_URB * BYTES_PER_FRAME, GFP_KERNEL); |
552 | if (!urbs[i]->transfer_buffer) { | 553 | if (!urbs[i]->transfer_buffer) { |
553 | log("unable to kmalloc() transfer buffer, OOM!?\n"); | 554 | log("unable to kmalloc() transfer buffer, OOM!?\n"); |
554 | *ret = -ENOMEM; | 555 | *ret = -ENOMEM; |
555 | return urbs; | 556 | return urbs; |
556 | } | 557 | } |
557 | 558 | ||
558 | for (frame = 0; frame < FRAMES_PER_URB; frame++) { | 559 | for (frame = 0; frame < FRAMES_PER_URB; frame++) { |
559 | struct usb_iso_packet_descriptor *iso = | 560 | struct usb_iso_packet_descriptor *iso = |
560 | &urbs[i]->iso_frame_desc[frame]; | 561 | &urbs[i]->iso_frame_desc[frame]; |
561 | 562 | ||
562 | iso->offset = BYTES_PER_FRAME * frame; | 563 | iso->offset = BYTES_PER_FRAME * frame; |
563 | iso->length = BYTES_PER_FRAME; | 564 | iso->length = BYTES_PER_FRAME; |
564 | } | 565 | } |
565 | 566 | ||
566 | urbs[i]->dev = usb_dev; | 567 | urbs[i]->dev = usb_dev; |
567 | urbs[i]->pipe = pipe; | 568 | urbs[i]->pipe = pipe; |
568 | urbs[i]->transfer_buffer_length = FRAMES_PER_URB | 569 | urbs[i]->transfer_buffer_length = FRAMES_PER_URB |
569 | * BYTES_PER_FRAME; | 570 | * BYTES_PER_FRAME; |
570 | urbs[i]->context = &dev->data_cb_info[i]; | 571 | urbs[i]->context = &dev->data_cb_info[i]; |
571 | urbs[i]->interval = 1; | 572 | urbs[i]->interval = 1; |
@@ -589,7 +590,7 @@ static void free_urbs(struct urb **urbs) | |||
589 | for (i = 0; i < N_URBS; i++) { | 590 | for (i = 0; i < N_URBS; i++) { |
590 | if (!urbs[i]) | 591 | if (!urbs[i]) |
591 | continue; | 592 | continue; |
592 | 593 | ||
593 | usb_kill_urb(urbs[i]); | 594 | usb_kill_urb(urbs[i]); |
594 | kfree(urbs[i]->transfer_buffer); | 595 | kfree(urbs[i]->transfer_buffer); |
595 | usb_free_urb(urbs[i]); | 596 | usb_free_urb(urbs[i]); |
@@ -602,11 +603,11 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) | |||
602 | { | 603 | { |
603 | int i, ret; | 604 | int i, ret; |
604 | 605 | ||
605 | dev->n_audio_in = max(dev->spec.num_analog_audio_in, | 606 | dev->n_audio_in = max(dev->spec.num_analog_audio_in, |
606 | dev->spec.num_digital_audio_in) / | 607 | dev->spec.num_digital_audio_in) / |
607 | CHANNELS_PER_STREAM; | 608 | CHANNELS_PER_STREAM; |
608 | dev->n_audio_out = max(dev->spec.num_analog_audio_out, | 609 | dev->n_audio_out = max(dev->spec.num_analog_audio_out, |
609 | dev->spec.num_digital_audio_out) / | 610 | dev->spec.num_digital_audio_out) / |
610 | CHANNELS_PER_STREAM; | 611 | CHANNELS_PER_STREAM; |
611 | dev->n_streams = max(dev->n_audio_in, dev->n_audio_out); | 612 | dev->n_streams = max(dev->n_audio_in, dev->n_audio_out); |
612 | 613 | ||
@@ -619,7 +620,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) | |||
619 | return -EINVAL; | 620 | return -EINVAL; |
620 | } | 621 | } |
621 | 622 | ||
622 | ret = snd_pcm_new(dev->chip.card, dev->product_name, 0, | 623 | ret = snd_pcm_new(dev->chip.card, dev->product_name, 0, |
623 | dev->n_audio_out, dev->n_audio_in, &dev->pcm); | 624 | dev->n_audio_out, dev->n_audio_in, &dev->pcm); |
624 | 625 | ||
625 | if (ret < 0) { | 626 | if (ret < 0) { |
@@ -632,7 +633,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) | |||
632 | 633 | ||
633 | memset(dev->sub_playback, 0, sizeof(dev->sub_playback)); | 634 | memset(dev->sub_playback, 0, sizeof(dev->sub_playback)); |
634 | memset(dev->sub_capture, 0, sizeof(dev->sub_capture)); | 635 | memset(dev->sub_capture, 0, sizeof(dev->sub_capture)); |
635 | 636 | ||
636 | memcpy(&dev->pcm_info, &snd_usb_caiaq_pcm_hardware, | 637 | memcpy(&dev->pcm_info, &snd_usb_caiaq_pcm_hardware, |
637 | sizeof(snd_usb_caiaq_pcm_hardware)); | 638 | sizeof(snd_usb_caiaq_pcm_hardware)); |
638 | 639 | ||
@@ -651,9 +652,9 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) | |||
651 | break; | 652 | break; |
652 | } | 653 | } |
653 | 654 | ||
654 | snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK, | 655 | snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK, |
655 | &snd_usb_caiaq_ops); | 656 | &snd_usb_caiaq_ops); |
656 | snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_CAPTURE, | 657 | snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_CAPTURE, |
657 | &snd_usb_caiaq_ops); | 658 | &snd_usb_caiaq_ops); |
658 | 659 | ||
659 | snd_pcm_lib_preallocate_pages_for_all(dev->pcm, | 660 | snd_pcm_lib_preallocate_pages_for_all(dev->pcm, |
@@ -662,7 +663,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) | |||
662 | MAX_BUFFER_SIZE, MAX_BUFFER_SIZE); | 663 | MAX_BUFFER_SIZE, MAX_BUFFER_SIZE); |
663 | 664 | ||
664 | dev->data_cb_info = | 665 | dev->data_cb_info = |
665 | kmalloc(sizeof(struct snd_usb_caiaq_cb_info) * N_URBS, | 666 | kmalloc(sizeof(struct snd_usb_caiaq_cb_info) * N_URBS, |
666 | GFP_KERNEL); | 667 | GFP_KERNEL); |
667 | 668 | ||
668 | if (!dev->data_cb_info) | 669 | if (!dev->data_cb_info) |
@@ -672,14 +673,14 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) | |||
672 | dev->data_cb_info[i].dev = dev; | 673 | dev->data_cb_info[i].dev = dev; |
673 | dev->data_cb_info[i].index = i; | 674 | dev->data_cb_info[i].index = i; |
674 | } | 675 | } |
675 | 676 | ||
676 | dev->data_urbs_in = alloc_urbs(dev, SNDRV_PCM_STREAM_CAPTURE, &ret); | 677 | dev->data_urbs_in = alloc_urbs(dev, SNDRV_PCM_STREAM_CAPTURE, &ret); |
677 | if (ret < 0) { | 678 | if (ret < 0) { |
678 | kfree(dev->data_cb_info); | 679 | kfree(dev->data_cb_info); |
679 | free_urbs(dev->data_urbs_in); | 680 | free_urbs(dev->data_urbs_in); |
680 | return ret; | 681 | return ret; |
681 | } | 682 | } |
682 | 683 | ||
683 | dev->data_urbs_out = alloc_urbs(dev, SNDRV_PCM_STREAM_PLAYBACK, &ret); | 684 | dev->data_urbs_out = alloc_urbs(dev, SNDRV_PCM_STREAM_PLAYBACK, &ret); |
684 | if (ret < 0) { | 685 | if (ret < 0) { |
685 | kfree(dev->data_cb_info); | 686 | kfree(dev->data_cb_info); |
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index 515de1cd2a3e..0e5db719de24 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "input.h" | 35 | #include "input.h" |
36 | 36 | ||
37 | MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); | 37 | MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); |
38 | MODULE_DESCRIPTION("caiaq USB audio, version 1.3.14"); | 38 | MODULE_DESCRIPTION("caiaq USB audio, version 1.3.17"); |
39 | MODULE_LICENSE("GPL"); | 39 | MODULE_LICENSE("GPL"); |
40 | MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," | 40 | MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," |
41 | "{Native Instruments, RigKontrol3}," | 41 | "{Native Instruments, RigKontrol3}," |
@@ -79,7 +79,7 @@ static struct usb_device_id snd_usb_id_table[] = { | |||
79 | { | 79 | { |
80 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | 80 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, |
81 | .idVendor = USB_VID_NATIVEINSTRUMENTS, | 81 | .idVendor = USB_VID_NATIVEINSTRUMENTS, |
82 | .idProduct = USB_PID_RIGKONTROL2 | 82 | .idProduct = USB_PID_RIGKONTROL2 |
83 | }, | 83 | }, |
84 | { | 84 | { |
85 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | 85 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, |
@@ -197,7 +197,7 @@ int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *dev, | |||
197 | 197 | ||
198 | if (buffer && len > 0) | 198 | if (buffer && len > 0) |
199 | memcpy(dev->ep1_out_buf+1, buffer, len); | 199 | memcpy(dev->ep1_out_buf+1, buffer, len); |
200 | 200 | ||
201 | dev->ep1_out_buf[0] = command; | 201 | dev->ep1_out_buf[0] = command; |
202 | return usb_bulk_msg(usb_dev, usb_sndbulkpipe(usb_dev, 1), | 202 | return usb_bulk_msg(usb_dev, usb_sndbulkpipe(usb_dev, 1), |
203 | dev->ep1_out_buf, len+1, &actual_len, 200); | 203 | dev->ep1_out_buf, len+1, &actual_len, 200); |
@@ -208,7 +208,7 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev, | |||
208 | { | 208 | { |
209 | int ret; | 209 | int ret; |
210 | char tmp[5]; | 210 | char tmp[5]; |
211 | 211 | ||
212 | switch (rate) { | 212 | switch (rate) { |
213 | case 44100: tmp[0] = SAMPLERATE_44100; break; | 213 | case 44100: tmp[0] = SAMPLERATE_44100; break; |
214 | case 48000: tmp[0] = SAMPLERATE_48000; break; | 214 | case 48000: tmp[0] = SAMPLERATE_48000; break; |
@@ -237,12 +237,12 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev, | |||
237 | 237 | ||
238 | if (ret) | 238 | if (ret) |
239 | return ret; | 239 | return ret; |
240 | 240 | ||
241 | if (!wait_event_timeout(dev->ep1_wait_queue, | 241 | if (!wait_event_timeout(dev->ep1_wait_queue, |
242 | dev->audio_parm_answer >= 0, HZ)) | 242 | dev->audio_parm_answer >= 0, HZ)) |
243 | return -EPIPE; | 243 | return -EPIPE; |
244 | 244 | ||
245 | if (dev->audio_parm_answer != 1) | 245 | if (dev->audio_parm_answer != 1) |
246 | debug("unable to set the device's audio params\n"); | 246 | debug("unable to set the device's audio params\n"); |
247 | else | 247 | else |
248 | dev->bpp = bpp; | 248 | dev->bpp = bpp; |
@@ -250,8 +250,8 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev, | |||
250 | return dev->audio_parm_answer == 1 ? 0 : -EINVAL; | 250 | return dev->audio_parm_answer == 1 ? 0 : -EINVAL; |
251 | } | 251 | } |
252 | 252 | ||
253 | int snd_usb_caiaq_set_auto_msg (struct snd_usb_caiaqdev *dev, | 253 | int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *dev, |
254 | int digital, int analog, int erp) | 254 | int digital, int analog, int erp) |
255 | { | 255 | { |
256 | char tmp[3] = { digital, analog, erp }; | 256 | char tmp[3] = { digital, analog, erp }; |
257 | return snd_usb_caiaq_send_command(dev, EP1_CMD_AUTO_MSG, | 257 | return snd_usb_caiaq_send_command(dev, EP1_CMD_AUTO_MSG, |
@@ -262,7 +262,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev) | |||
262 | { | 262 | { |
263 | int ret; | 263 | int ret; |
264 | char val[4]; | 264 | char val[4]; |
265 | 265 | ||
266 | /* device-specific startup specials */ | 266 | /* device-specific startup specials */ |
267 | switch (dev->chip.usb_id) { | 267 | switch (dev->chip.usb_id) { |
268 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2): | 268 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2): |
@@ -314,7 +314,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev) | |||
314 | dev->control_state, 1); | 314 | dev->control_state, 1); |
315 | break; | 315 | break; |
316 | } | 316 | } |
317 | 317 | ||
318 | if (dev->spec.num_analog_audio_out + | 318 | if (dev->spec.num_analog_audio_out + |
319 | dev->spec.num_analog_audio_in + | 319 | dev->spec.num_analog_audio_in + |
320 | dev->spec.num_digital_audio_out + | 320 | dev->spec.num_digital_audio_out + |
@@ -323,7 +323,7 @@ static void __devinit setup_card(struct snd_usb_caiaqdev *dev) | |||
323 | if (ret < 0) | 323 | if (ret < 0) |
324 | log("Unable to set up audio system (ret=%d)\n", ret); | 324 | log("Unable to set up audio system (ret=%d)\n", ret); |
325 | } | 325 | } |
326 | 326 | ||
327 | if (dev->spec.num_midi_in + | 327 | if (dev->spec.num_midi_in + |
328 | dev->spec.num_midi_out > 0) { | 328 | dev->spec.num_midi_out > 0) { |
329 | ret = snd_usb_caiaq_midi_init(dev); | 329 | ret = snd_usb_caiaq_midi_init(dev); |
@@ -363,7 +363,7 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp) | |||
363 | if (devnum >= SNDRV_CARDS) | 363 | if (devnum >= SNDRV_CARDS) |
364 | return -ENODEV; | 364 | return -ENODEV; |
365 | 365 | ||
366 | err = snd_card_create(index[devnum], id[devnum], THIS_MODULE, | 366 | err = snd_card_create(index[devnum], id[devnum], THIS_MODULE, |
367 | sizeof(struct snd_usb_caiaqdev), &card); | 367 | sizeof(struct snd_usb_caiaqdev), &card); |
368 | if (err < 0) | 368 | if (err < 0) |
369 | return err; | 369 | return err; |
@@ -382,11 +382,11 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp) | |||
382 | 382 | ||
383 | static int __devinit init_card(struct snd_usb_caiaqdev *dev) | 383 | static int __devinit init_card(struct snd_usb_caiaqdev *dev) |
384 | { | 384 | { |
385 | char *c; | 385 | char *c, usbpath[32]; |
386 | struct usb_device *usb_dev = dev->chip.dev; | 386 | struct usb_device *usb_dev = dev->chip.dev; |
387 | struct snd_card *card = dev->chip.card; | 387 | struct snd_card *card = dev->chip.card; |
388 | int err, len; | 388 | int err, len; |
389 | 389 | ||
390 | if (usb_set_interface(usb_dev, 0, 1) != 0) { | 390 | if (usb_set_interface(usb_dev, 0, 1) != 0) { |
391 | log("can't set alt interface.\n"); | 391 | log("can't set alt interface.\n"); |
392 | return -EIO; | 392 | return -EIO; |
@@ -395,19 +395,19 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) | |||
395 | usb_init_urb(&dev->ep1_in_urb); | 395 | usb_init_urb(&dev->ep1_in_urb); |
396 | usb_init_urb(&dev->midi_out_urb); | 396 | usb_init_urb(&dev->midi_out_urb); |
397 | 397 | ||
398 | usb_fill_bulk_urb(&dev->ep1_in_urb, usb_dev, | 398 | usb_fill_bulk_urb(&dev->ep1_in_urb, usb_dev, |
399 | usb_rcvbulkpipe(usb_dev, 0x1), | 399 | usb_rcvbulkpipe(usb_dev, 0x1), |
400 | dev->ep1_in_buf, EP1_BUFSIZE, | 400 | dev->ep1_in_buf, EP1_BUFSIZE, |
401 | usb_ep1_command_reply_dispatch, dev); | 401 | usb_ep1_command_reply_dispatch, dev); |
402 | 402 | ||
403 | usb_fill_bulk_urb(&dev->midi_out_urb, usb_dev, | 403 | usb_fill_bulk_urb(&dev->midi_out_urb, usb_dev, |
404 | usb_sndbulkpipe(usb_dev, 0x1), | 404 | usb_sndbulkpipe(usb_dev, 0x1), |
405 | dev->midi_out_buf, EP1_BUFSIZE, | 405 | dev->midi_out_buf, EP1_BUFSIZE, |
406 | snd_usb_caiaq_midi_output_done, dev); | 406 | snd_usb_caiaq_midi_output_done, dev); |
407 | 407 | ||
408 | init_waitqueue_head(&dev->ep1_wait_queue); | 408 | init_waitqueue_head(&dev->ep1_wait_queue); |
409 | init_waitqueue_head(&dev->prepare_wait_queue); | 409 | init_waitqueue_head(&dev->prepare_wait_queue); |
410 | 410 | ||
411 | if (usb_submit_urb(&dev->ep1_in_urb, GFP_KERNEL) != 0) | 411 | if (usb_submit_urb(&dev->ep1_in_urb, GFP_KERNEL) != 0) |
412 | return -EIO; | 412 | return -EIO; |
413 | 413 | ||
@@ -420,47 +420,52 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev) | |||
420 | 420 | ||
421 | usb_string(usb_dev, usb_dev->descriptor.iManufacturer, | 421 | usb_string(usb_dev, usb_dev->descriptor.iManufacturer, |
422 | dev->vendor_name, CAIAQ_USB_STR_LEN); | 422 | dev->vendor_name, CAIAQ_USB_STR_LEN); |
423 | 423 | ||
424 | usb_string(usb_dev, usb_dev->descriptor.iProduct, | 424 | usb_string(usb_dev, usb_dev->descriptor.iProduct, |
425 | dev->product_name, CAIAQ_USB_STR_LEN); | 425 | dev->product_name, CAIAQ_USB_STR_LEN); |
426 | 426 | ||
427 | usb_string(usb_dev, usb_dev->descriptor.iSerialNumber, | 427 | strlcpy(card->driver, MODNAME, sizeof(card->driver)); |
428 | dev->serial, CAIAQ_USB_STR_LEN); | 428 | strlcpy(card->shortname, dev->product_name, sizeof(card->shortname)); |
429 | 429 | strlcpy(card->mixername, dev->product_name, sizeof(card->mixername)); | |
430 | /* terminate serial string at first white space occurence */ | 430 | |
431 | c = strchr(dev->serial, ' '); | 431 | /* if the id was not passed as module option, fill it with a shortened |
432 | if (c) | 432 | * version of the product string which does not contain any |
433 | *c = '\0'; | 433 | * whitespaces */ |
434 | 434 | ||
435 | strcpy(card->driver, MODNAME); | 435 | if (*card->id == '\0') { |
436 | strcpy(card->shortname, dev->product_name); | 436 | char id[sizeof(card->id)]; |
437 | 437 | ||
438 | len = snprintf(card->longname, sizeof(card->longname), | 438 | memset(id, 0, sizeof(id)); |
439 | "%s %s (serial %s, ", | 439 | |
440 | dev->vendor_name, dev->product_name, dev->serial); | 440 | for (c = card->shortname, len = 0; |
441 | 441 | *c && len < sizeof(card->id); c++) | |
442 | if (len < sizeof(card->longname) - 2) | 442 | if (*c != ' ') |
443 | len += usb_make_path(usb_dev, card->longname + len, | 443 | id[len++] = *c; |
444 | sizeof(card->longname) - len); | 444 | |
445 | 445 | snd_card_set_id(card, id); | |
446 | card->longname[len++] = ')'; | 446 | } |
447 | card->longname[len] = '\0'; | 447 | |
448 | usb_make_path(usb_dev, usbpath, sizeof(usbpath)); | ||
449 | snprintf(card->longname, sizeof(card->longname), | ||
450 | "%s %s (%s)", | ||
451 | dev->vendor_name, dev->product_name, usbpath); | ||
452 | |||
448 | setup_card(dev); | 453 | setup_card(dev); |
449 | return 0; | 454 | return 0; |
450 | } | 455 | } |
451 | 456 | ||
452 | static int __devinit snd_probe(struct usb_interface *intf, | 457 | static int __devinit snd_probe(struct usb_interface *intf, |
453 | const struct usb_device_id *id) | 458 | const struct usb_device_id *id) |
454 | { | 459 | { |
455 | int ret; | 460 | int ret; |
456 | struct snd_card *card; | 461 | struct snd_card *card; |
457 | struct usb_device *device = interface_to_usbdev(intf); | 462 | struct usb_device *device = interface_to_usbdev(intf); |
458 | 463 | ||
459 | ret = create_card(device, &card); | 464 | ret = create_card(device, &card); |
460 | 465 | ||
461 | if (ret < 0) | 466 | if (ret < 0) |
462 | return ret; | 467 | return ret; |
463 | 468 | ||
464 | usb_set_intfdata(intf, card); | 469 | usb_set_intfdata(intf, card); |
465 | ret = init_card(caiaqdev(card)); | 470 | ret = init_card(caiaqdev(card)); |
466 | if (ret < 0) { | 471 | if (ret < 0) { |
@@ -468,7 +473,7 @@ static int __devinit snd_probe(struct usb_interface *intf, | |||
468 | snd_card_free(card); | 473 | snd_card_free(card); |
469 | return ret; | 474 | return ret; |
470 | } | 475 | } |
471 | 476 | ||
472 | return 0; | 477 | return 0; |
473 | } | 478 | } |
474 | 479 | ||
@@ -489,10 +494,10 @@ static void snd_disconnect(struct usb_interface *intf) | |||
489 | snd_usb_caiaq_input_free(dev); | 494 | snd_usb_caiaq_input_free(dev); |
490 | #endif | 495 | #endif |
491 | snd_usb_caiaq_audio_free(dev); | 496 | snd_usb_caiaq_audio_free(dev); |
492 | 497 | ||
493 | usb_kill_urb(&dev->ep1_in_urb); | 498 | usb_kill_urb(&dev->ep1_in_urb); |
494 | usb_kill_urb(&dev->midi_out_urb); | 499 | usb_kill_urb(&dev->midi_out_urb); |
495 | 500 | ||
496 | snd_card_free(card); | 501 | snd_card_free(card); |
497 | usb_reset_device(interface_to_usbdev(intf)); | 502 | usb_reset_device(interface_to_usbdev(intf)); |
498 | } | 503 | } |
diff --git a/sound/usb/caiaq/device.h b/sound/usb/caiaq/device.h index 4cce1ad7493d..ece73514854e 100644 --- a/sound/usb/caiaq/device.h +++ b/sound/usb/caiaq/device.h | |||
@@ -81,7 +81,6 @@ struct snd_usb_caiaqdev { | |||
81 | 81 | ||
82 | char vendor_name[CAIAQ_USB_STR_LEN]; | 82 | char vendor_name[CAIAQ_USB_STR_LEN]; |
83 | char product_name[CAIAQ_USB_STR_LEN]; | 83 | char product_name[CAIAQ_USB_STR_LEN]; |
84 | char serial[CAIAQ_USB_STR_LEN]; | ||
85 | 84 | ||
86 | int n_streams, n_audio_in, n_audio_out; | 85 | int n_streams, n_audio_in, n_audio_out; |
87 | int streaming, first_packet, output_running; | 86 | int streaming, first_packet, output_running; |
diff --git a/sound/usb/caiaq/midi.c b/sound/usb/caiaq/midi.c index 8fa8cd88d763..538e8c00d31a 100644 --- a/sound/usb/caiaq/midi.c +++ b/sound/usb/caiaq/midi.c | |||
@@ -40,7 +40,7 @@ static void snd_usb_caiaq_midi_input_trigger(struct snd_rawmidi_substream *subst | |||
40 | 40 | ||
41 | if (!dev) | 41 | if (!dev) |
42 | return; | 42 | return; |
43 | 43 | ||
44 | dev->midi_receive_substream = up ? substream : NULL; | 44 | dev->midi_receive_substream = up ? substream : NULL; |
45 | } | 45 | } |
46 | 46 | ||
@@ -64,18 +64,18 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev, | |||
64 | struct snd_rawmidi_substream *substream) | 64 | struct snd_rawmidi_substream *substream) |
65 | { | 65 | { |
66 | int len, ret; | 66 | int len, ret; |
67 | 67 | ||
68 | dev->midi_out_buf[0] = EP1_CMD_MIDI_WRITE; | 68 | dev->midi_out_buf[0] = EP1_CMD_MIDI_WRITE; |
69 | dev->midi_out_buf[1] = 0; /* port */ | 69 | dev->midi_out_buf[1] = 0; /* port */ |
70 | len = snd_rawmidi_transmit(substream, dev->midi_out_buf + 3, | 70 | len = snd_rawmidi_transmit(substream, dev->midi_out_buf + 3, |
71 | EP1_BUFSIZE - 3); | 71 | EP1_BUFSIZE - 3); |
72 | 72 | ||
73 | if (len <= 0) | 73 | if (len <= 0) |
74 | return; | 74 | return; |
75 | 75 | ||
76 | dev->midi_out_buf[2] = len; | 76 | dev->midi_out_buf[2] = len; |
77 | dev->midi_out_urb.transfer_buffer_length = len+3; | 77 | dev->midi_out_urb.transfer_buffer_length = len+3; |
78 | 78 | ||
79 | ret = usb_submit_urb(&dev->midi_out_urb, GFP_ATOMIC); | 79 | ret = usb_submit_urb(&dev->midi_out_urb, GFP_ATOMIC); |
80 | if (ret < 0) | 80 | if (ret < 0) |
81 | log("snd_usb_caiaq_midi_send(%p): usb_submit_urb() failed," | 81 | log("snd_usb_caiaq_midi_send(%p): usb_submit_urb() failed," |
@@ -88,7 +88,7 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev, | |||
88 | static void snd_usb_caiaq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up) | 88 | static void snd_usb_caiaq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up) |
89 | { | 89 | { |
90 | struct snd_usb_caiaqdev *dev = substream->rmidi->private_data; | 90 | struct snd_usb_caiaqdev *dev = substream->rmidi->private_data; |
91 | 91 | ||
92 | if (up) { | 92 | if (up) { |
93 | dev->midi_out_substream = substream; | 93 | dev->midi_out_substream = substream; |
94 | if (!dev->midi_out_active) | 94 | if (!dev->midi_out_active) |
@@ -113,12 +113,12 @@ static struct snd_rawmidi_ops snd_usb_caiaq_midi_input = | |||
113 | .trigger = snd_usb_caiaq_midi_input_trigger, | 113 | .trigger = snd_usb_caiaq_midi_input_trigger, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *dev, | 116 | void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *dev, |
117 | int port, const char *buf, int len) | 117 | int port, const char *buf, int len) |
118 | { | 118 | { |
119 | if (!dev->midi_receive_substream) | 119 | if (!dev->midi_receive_substream) |
120 | return; | 120 | return; |
121 | 121 | ||
122 | snd_rawmidi_receive(dev->midi_receive_substream, buf, len); | 122 | snd_rawmidi_receive(dev->midi_receive_substream, buf, len); |
123 | } | 123 | } |
124 | 124 | ||
@@ -142,16 +142,16 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device) | |||
142 | 142 | ||
143 | if (device->spec.num_midi_out > 0) { | 143 | if (device->spec.num_midi_out > 0) { |
144 | rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT; | 144 | rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT; |
145 | snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, | 145 | snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, |
146 | &snd_usb_caiaq_midi_output); | 146 | &snd_usb_caiaq_midi_output); |
147 | } | 147 | } |
148 | 148 | ||
149 | if (device->spec.num_midi_in > 0) { | 149 | if (device->spec.num_midi_in > 0) { |
150 | rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT; | 150 | rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT; |
151 | snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, | 151 | snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, |
152 | &snd_usb_caiaq_midi_input); | 152 | &snd_usb_caiaq_midi_input); |
153 | } | 153 | } |
154 | 154 | ||
155 | device->rmidi = rmidi; | 155 | device->rmidi = rmidi; |
156 | 156 | ||
157 | return 0; | 157 | return 0; |
@@ -160,7 +160,7 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device) | |||
160 | void snd_usb_caiaq_midi_output_done(struct urb* urb) | 160 | void snd_usb_caiaq_midi_output_done(struct urb* urb) |
161 | { | 161 | { |
162 | struct snd_usb_caiaqdev *dev = urb->context; | 162 | struct snd_usb_caiaqdev *dev = urb->context; |
163 | 163 | ||
164 | dev->midi_out_active = 0; | 164 | dev->midi_out_active = 0; |
165 | if (urb->status != 0) | 165 | if (urb->status != 0) |
166 | return; | 166 | return; |
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index a6b88482637b..c7b902358b7b 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -627,6 +627,7 @@ static int prepare_playback_urb(struct snd_usb_substream *subs, | |||
627 | subs->hwptr_done += offs; | 627 | subs->hwptr_done += offs; |
628 | if (subs->hwptr_done >= runtime->buffer_size) | 628 | if (subs->hwptr_done >= runtime->buffer_size) |
629 | subs->hwptr_done -= runtime->buffer_size; | 629 | subs->hwptr_done -= runtime->buffer_size; |
630 | runtime->delay += offs; | ||
630 | spin_unlock_irqrestore(&subs->lock, flags); | 631 | spin_unlock_irqrestore(&subs->lock, flags); |
631 | urb->transfer_buffer_length = offs * stride; | 632 | urb->transfer_buffer_length = offs * stride; |
632 | if (period_elapsed) | 633 | if (period_elapsed) |
@@ -636,12 +637,22 @@ static int prepare_playback_urb(struct snd_usb_substream *subs, | |||
636 | 637 | ||
637 | /* | 638 | /* |
638 | * process after playback data complete | 639 | * process after playback data complete |
639 | * - nothing to do | 640 | * - decrease the delay count again |
640 | */ | 641 | */ |
641 | static int retire_playback_urb(struct snd_usb_substream *subs, | 642 | static int retire_playback_urb(struct snd_usb_substream *subs, |
642 | struct snd_pcm_runtime *runtime, | 643 | struct snd_pcm_runtime *runtime, |
643 | struct urb *urb) | 644 | struct urb *urb) |
644 | { | 645 | { |
646 | unsigned long flags; | ||
647 | int stride = runtime->frame_bits >> 3; | ||
648 | int processed = urb->transfer_buffer_length / stride; | ||
649 | |||
650 | spin_lock_irqsave(&subs->lock, flags); | ||
651 | if (processed > runtime->delay) | ||
652 | runtime->delay = 0; | ||
653 | else | ||
654 | runtime->delay -= processed; | ||
655 | spin_unlock_irqrestore(&subs->lock, flags); | ||
645 | return 0; | 656 | return 0; |
646 | } | 657 | } |
647 | 658 | ||
@@ -1520,6 +1531,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) | |||
1520 | subs->hwptr_done = 0; | 1531 | subs->hwptr_done = 0; |
1521 | subs->transfer_done = 0; | 1532 | subs->transfer_done = 0; |
1522 | subs->phase = 0; | 1533 | subs->phase = 0; |
1534 | runtime->delay = 0; | ||
1523 | 1535 | ||
1524 | /* clear urbs (to be sure) */ | 1536 | /* clear urbs (to be sure) */ |
1525 | deactivate_urbs(subs, 0, 1); | 1537 | deactivate_urbs(subs, 0, 1); |
@@ -3279,6 +3291,25 @@ static int snd_usb_cm106_boot_quirk(struct usb_device *dev) | |||
3279 | return snd_usb_cm106_write_int_reg(dev, 2, 0x8004); | 3291 | return snd_usb_cm106_write_int_reg(dev, 2, 0x8004); |
3280 | } | 3292 | } |
3281 | 3293 | ||
3294 | /* | ||
3295 | * C-Media CM6206 is based on CM106 with two additional | ||
3296 | * registers that are not documented in the data sheet. | ||
3297 | * Values here are chosen based on sniffing USB traffic | ||
3298 | * under Windows. | ||
3299 | */ | ||
3300 | static int snd_usb_cm6206_boot_quirk(struct usb_device *dev) | ||
3301 | { | ||
3302 | int err, reg; | ||
3303 | int val[] = {0x200c, 0x3000, 0xf800, 0x143f, 0x0000, 0x3000}; | ||
3304 | |||
3305 | for (reg = 0; reg < ARRAY_SIZE(val); reg++) { | ||
3306 | err = snd_usb_cm106_write_int_reg(dev, reg, val[reg]); | ||
3307 | if (err < 0) | ||
3308 | return err; | ||
3309 | } | ||
3310 | |||
3311 | return err; | ||
3312 | } | ||
3282 | 3313 | ||
3283 | /* | 3314 | /* |
3284 | * Setup quirks | 3315 | * Setup quirks |
@@ -3565,6 +3596,12 @@ static void *snd_usb_audio_probe(struct usb_device *dev, | |||
3565 | goto __err_val; | 3596 | goto __err_val; |
3566 | } | 3597 | } |
3567 | 3598 | ||
3599 | /* C-Media CM6206 / CM106-Like Sound Device */ | ||
3600 | if (id == USB_ID(0x0d8c, 0x0102)) { | ||
3601 | if (snd_usb_cm6206_boot_quirk(dev) < 0) | ||
3602 | goto __err_val; | ||
3603 | } | ||
3604 | |||
3568 | /* | 3605 | /* |
3569 | * found a config. now register to ALSA | 3606 | * found a config. now register to ALSA |
3570 | */ | 3607 | */ |
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index 5d955aaad85f..f6f201eb24ce 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h | |||
@@ -1470,6 +1470,41 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
1470 | } | 1470 | } |
1471 | }, | 1471 | }, |
1472 | { | 1472 | { |
1473 | /* Edirol M-16DX */ | ||
1474 | /* FIXME: This quirk gives a good-working capture stream but the | ||
1475 | * playback seems problematic because of lacking of sync | ||
1476 | * with capture stream. It needs to sync with the capture | ||
1477 | * clock. As now, you'll get frequent sound distortions | ||
1478 | * via the playback. | ||
1479 | */ | ||
1480 | USB_DEVICE(0x0582, 0x00c4), | ||
1481 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | ||
1482 | .ifnum = QUIRK_ANY_INTERFACE, | ||
1483 | .type = QUIRK_COMPOSITE, | ||
1484 | .data = (const struct snd_usb_audio_quirk[]) { | ||
1485 | { | ||
1486 | .ifnum = 0, | ||
1487 | .type = QUIRK_AUDIO_STANDARD_INTERFACE | ||
1488 | }, | ||
1489 | { | ||
1490 | .ifnum = 1, | ||
1491 | .type = QUIRK_AUDIO_STANDARD_INTERFACE | ||
1492 | }, | ||
1493 | { | ||
1494 | .ifnum = 2, | ||
1495 | .type = QUIRK_MIDI_FIXED_ENDPOINT, | ||
1496 | .data = & (const struct snd_usb_midi_endpoint_info) { | ||
1497 | .out_cables = 0x0001, | ||
1498 | .in_cables = 0x0001 | ||
1499 | } | ||
1500 | }, | ||
1501 | { | ||
1502 | .ifnum = -1 | ||
1503 | } | ||
1504 | } | ||
1505 | } | ||
1506 | }, | ||
1507 | { | ||
1473 | /* BOSS GT-10 */ | 1508 | /* BOSS GT-10 */ |
1474 | USB_DEVICE(0x0582, 0x00da), | 1509 | USB_DEVICE(0x0582, 0x00da), |
1475 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | 1510 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { |
@@ -1951,6 +1986,14 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
1951 | } | 1986 | } |
1952 | }, | 1987 | }, |
1953 | { | 1988 | { |
1989 | USB_DEVICE(0x0ccd, 0x0028), | ||
1990 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | ||
1991 | .vendor_name = "TerraTec", | ||
1992 | .product_name = "Aureon5.1MkII", | ||
1993 | .ifnum = QUIRK_NO_INTERFACE | ||
1994 | } | ||
1995 | }, | ||
1996 | { | ||
1954 | USB_DEVICE(0x0ccd, 0x0035), | 1997 | USB_DEVICE(0x0ccd, 0x0035), |
1955 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | 1998 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { |
1956 | .vendor_name = "Miditech", | 1999 | .vendor_name = "Miditech", |