aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712/delta.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/ice1712/delta.c')
-rw-r--r--sound/pci/ice1712/delta.c43
1 files changed, 21 insertions, 22 deletions
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index 20c6b079d0df..ab2bca164d6f 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -22,7 +22,6 @@
22 * 22 *
23 */ 23 */
24 24
25#include <asm/io.h>
26#include <linux/delay.h> 25#include <linux/delay.h>
27#include <linux/interrupt.h> 26#include <linux/interrupt.h>
28#include <linux/init.h> 27#include <linux/init.h>
@@ -432,7 +431,7 @@ static int snd_ice1712_delta1010lt_wordclock_status_get(struct snd_kcontrol *kco
432 return 0; 431 return 0;
433} 432}
434 433
435static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata = 434static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status =
436{ 435{
437 .access = (SNDRV_CTL_ELEM_ACCESS_READ), 436 .access = (SNDRV_CTL_ELEM_ACCESS_READ),
438 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 437 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -445,7 +444,7 @@ static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devini
445 * initialize the chips on M-Audio cards 444 * initialize the chips on M-Audio cards
446 */ 445 */
447 446
448static struct snd_akm4xxx akm_audiophile __devinitdata = { 447static struct snd_akm4xxx akm_audiophile = {
449 .type = SND_AK4528, 448 .type = SND_AK4528,
450 .num_adcs = 2, 449 .num_adcs = 2,
451 .num_dacs = 2, 450 .num_dacs = 2,
@@ -454,7 +453,7 @@ static struct snd_akm4xxx akm_audiophile __devinitdata = {
454 } 453 }
455}; 454};
456 455
457static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = { 456static struct snd_ak4xxx_private akm_audiophile_priv = {
458 .caddr = 2, 457 .caddr = 2,
459 .cif = 0, 458 .cif = 0,
460 .data_mask = ICE1712_DELTA_AP_DOUT, 459 .data_mask = ICE1712_DELTA_AP_DOUT,
@@ -466,7 +465,7 @@ static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = {
466 .mask_flags = 0, 465 .mask_flags = 0,
467}; 466};
468 467
469static struct snd_akm4xxx akm_delta410 __devinitdata = { 468static struct snd_akm4xxx akm_delta410 = {
470 .type = SND_AK4529, 469 .type = SND_AK4529,
471 .num_adcs = 2, 470 .num_adcs = 2,
472 .num_dacs = 8, 471 .num_dacs = 8,
@@ -475,7 +474,7 @@ static struct snd_akm4xxx akm_delta410 __devinitdata = {
475 } 474 }
476}; 475};
477 476
478static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = { 477static struct snd_ak4xxx_private akm_delta410_priv = {
479 .caddr = 0, 478 .caddr = 0,
480 .cif = 0, 479 .cif = 0,
481 .data_mask = ICE1712_DELTA_AP_DOUT, 480 .data_mask = ICE1712_DELTA_AP_DOUT,
@@ -487,7 +486,7 @@ static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = {
487 .mask_flags = 0, 486 .mask_flags = 0,
488}; 487};
489 488
490static struct snd_akm4xxx akm_delta1010lt __devinitdata = { 489static struct snd_akm4xxx akm_delta1010lt = {
491 .type = SND_AK4524, 490 .type = SND_AK4524,
492 .num_adcs = 8, 491 .num_adcs = 8,
493 .num_dacs = 8, 492 .num_dacs = 8,
@@ -497,7 +496,7 @@ static struct snd_akm4xxx akm_delta1010lt __devinitdata = {
497 } 496 }
498}; 497};
499 498
500static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = { 499static struct snd_ak4xxx_private akm_delta1010lt_priv = {
501 .caddr = 2, 500 .caddr = 2,
502 .cif = 0, /* the default level of the CIF pin from AK4524 */ 501 .cif = 0, /* the default level of the CIF pin from AK4524 */
503 .data_mask = ICE1712_DELTA_1010LT_DOUT, 502 .data_mask = ICE1712_DELTA_1010LT_DOUT,
@@ -509,7 +508,7 @@ static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {
509 .mask_flags = 0, 508 .mask_flags = 0,
510}; 509};
511 510
512static struct snd_akm4xxx akm_delta66e __devinitdata = { 511static struct snd_akm4xxx akm_delta66e = {
513 .type = SND_AK4524, 512 .type = SND_AK4524,
514 .num_adcs = 4, 513 .num_adcs = 4,
515 .num_dacs = 4, 514 .num_dacs = 4,
@@ -519,7 +518,7 @@ static struct snd_akm4xxx akm_delta66e __devinitdata = {
519 } 518 }
520}; 519};
521 520
522static struct snd_ak4xxx_private akm_delta66e_priv __devinitdata = { 521static struct snd_ak4xxx_private akm_delta66e_priv = {
523 .caddr = 2, 522 .caddr = 2,
524 .cif = 0, /* the default level of the CIF pin from AK4524 */ 523 .cif = 0, /* the default level of the CIF pin from AK4524 */
525 .data_mask = ICE1712_DELTA_66E_DOUT, 524 .data_mask = ICE1712_DELTA_66E_DOUT,
@@ -532,7 +531,7 @@ static struct snd_ak4xxx_private akm_delta66e_priv __devinitdata = {
532}; 531};
533 532
534 533
535static struct snd_akm4xxx akm_delta44 __devinitdata = { 534static struct snd_akm4xxx akm_delta44 = {
536 .type = SND_AK4524, 535 .type = SND_AK4524,
537 .num_adcs = 4, 536 .num_adcs = 4,
538 .num_dacs = 4, 537 .num_dacs = 4,
@@ -542,7 +541,7 @@ static struct snd_akm4xxx akm_delta44 __devinitdata = {
542 } 541 }
543}; 542};
544 543
545static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = { 544static struct snd_ak4xxx_private akm_delta44_priv = {
546 .caddr = 2, 545 .caddr = 2,
547 .cif = 0, /* the default level of the CIF pin from AK4524 */ 546 .cif = 0, /* the default level of the CIF pin from AK4524 */
548 .data_mask = ICE1712_DELTA_CODEC_SERIAL_DATA, 547 .data_mask = ICE1712_DELTA_CODEC_SERIAL_DATA,
@@ -554,7 +553,7 @@ static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = {
554 .mask_flags = 0, 553 .mask_flags = 0,
555}; 554};
556 555
557static struct snd_akm4xxx akm_vx442 __devinitdata = { 556static struct snd_akm4xxx akm_vx442 = {
558 .type = SND_AK4524, 557 .type = SND_AK4524,
559 .num_adcs = 4, 558 .num_adcs = 4,
560 .num_dacs = 4, 559 .num_dacs = 4,
@@ -564,7 +563,7 @@ static struct snd_akm4xxx akm_vx442 __devinitdata = {
564 } 563 }
565}; 564};
566 565
567static struct snd_ak4xxx_private akm_vx442_priv __devinitdata = { 566static struct snd_ak4xxx_private akm_vx442_priv = {
568 .caddr = 2, 567 .caddr = 2,
569 .cif = 0, 568 .cif = 0,
570 .data_mask = ICE1712_VX442_DOUT, 569 .data_mask = ICE1712_VX442_DOUT,
@@ -576,7 +575,7 @@ static struct snd_ak4xxx_private akm_vx442_priv __devinitdata = {
576 .mask_flags = 0, 575 .mask_flags = 0,
577}; 576};
578 577
579static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice) 578static int snd_ice1712_delta_init(struct snd_ice1712 *ice)
580{ 579{
581 int err; 580 int err;
582 struct snd_akm4xxx *ak; 581 struct snd_akm4xxx *ak;
@@ -714,19 +713,19 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
714 * additional controls for M-Audio cards 713 * additional controls for M-Audio cards
715 */ 714 */
716 715
717static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata = 716static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select =
718ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0); 717ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0);
719static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata = 718static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select =
720ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_1010LT_WORDCLOCK, 0, 0); 719ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_1010LT_WORDCLOCK, 0, 0);
721static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata = 720static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status =
722ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE); 721ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
723static struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata = 722static struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select =
724ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0); 723ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0);
725static struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata = 724static struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status =
726ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE); 725ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
727 726
728 727
729static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice) 728static int snd_ice1712_delta_add_controls(struct snd_ice1712 *ice)
730{ 729{
731 int err; 730 int err;
732 731
@@ -802,7 +801,7 @@ static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice)
802 801
803 802
804/* entry point */ 803/* entry point */
805struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = { 804struct snd_ice1712_card_info snd_ice1712_delta_cards[] = {
806 { 805 {
807 .subvendor = ICE1712_SUBDEVICE_DELTA1010, 806 .subvendor = ICE1712_SUBDEVICE_DELTA1010,
808 .name = "M Audio Delta 1010", 807 .name = "M Audio Delta 1010",
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-01 01:35:49 -0400