aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSujith Manoharan <c_manoha@qca.qualcomm.com>2014-01-08 22:21:13 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-01-09 10:56:40 -0500
commit9c36254cd767bbdde5538b51bf94921727e595d4 (patch)
treef0a4adeca01b8d8aac44623122227337aa9b8c8e
parentb58df4461921dad57707fbedee11e6f79f58b1e6 (diff)
ath9k: Update WB335 PCI IDs
* Add new AR9565 1.0/1.0.1/1.1 IDs * Change Dell/Lenovo/Samsung cards to 2-Antenna with diversity. Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat
-rw-r--r--drivers/net/wireless/ath/ath9k/pci.c101
1 files changed, 82 insertions, 19 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index e9a585758941..55724b02316b 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -412,6 +412,16 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
412 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 412 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
413 0x0036, 413 0x0036,
414 0x11AD, /* LITEON */ 414 0x11AD, /* LITEON */
415 0x06B2),
416 .driver_data = ATH9K_PCI_AR9565_1ANT },
417 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
418 0x0036,
419 0x11AD, /* LITEON */
420 0x0842),
421 .driver_data = ATH9K_PCI_AR9565_1ANT },
422 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
423 0x0036,
424 0x11AD, /* LITEON */
415 0x6671), 425 0x6671),
416 .driver_data = ATH9K_PCI_AR9565_1ANT }, 426 .driver_data = ATH9K_PCI_AR9565_1ANT },
417 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 427 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
@@ -424,6 +434,16 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
424 0x1B9A, /* XAVI */ 434 0x1B9A, /* XAVI */
425 0x2812), 435 0x2812),
426 .driver_data = ATH9K_PCI_AR9565_1ANT }, 436 .driver_data = ATH9K_PCI_AR9565_1ANT },
437 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
438 0x0036,
439 0x1B9A, /* XAVI */
440 0x28A1),
441 .driver_data = ATH9K_PCI_AR9565_1ANT },
442 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
443 0x0036,
444 PCI_VENDOR_ID_AZWAVE,
445 0x218A),
446 .driver_data = ATH9K_PCI_AR9565_1ANT },
427 447
428 /* WB335 1-ANT / Antenna Diversity */ 448 /* WB335 1-ANT / Antenna Diversity */
429 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 449 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
@@ -469,22 +489,17 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
469 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 489 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
470 0x0036, 490 0x0036,
471 0x11AD, /* LITEON */ 491 0x11AD, /* LITEON */
472 0x0682), 492 0x06A2),
473 .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, 493 .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },
474 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 494 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
475 0x0036, 495 0x0036,
476 PCI_VENDOR_ID_AZWAVE, 496 0x11AD, /* LITEON */
477 0x213A), 497 0x0682),
478 .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },
479 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
480 0x0036,
481 PCI_VENDOR_ID_LENOVO,
482 0x3026),
483 .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, 498 .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },
484 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 499 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
485 0x0036, 500 0x0036,
486 PCI_VENDOR_ID_LENOVO, 501 PCI_VENDOR_ID_AZWAVE,
487 0x4026), 502 0x213A),
488 .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, 503 .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },
489 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 504 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
490 0x0036, 505 0x0036,
@@ -504,37 +519,35 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
504 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 519 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
505 0x0036, 520 0x0036,
506 PCI_VENDOR_ID_DELL, 521 PCI_VENDOR_ID_DELL,
507 0x020E), 522 0x020C),
508 .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, 523 .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },
509 524
510 /* WB335 2-ANT */ 525 /* WB335 2-ANT / Antenna-Diversity */
511 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 526 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
512 0x0036, 527 0x0036,
513 PCI_VENDOR_ID_SAMSUNG, 528 PCI_VENDOR_ID_SAMSUNG,
514 0x411A), 529 0x411A),
515 .driver_data = ATH9K_PCI_AR9565_2ANT }, 530 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
516 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 531 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
517 0x0036, 532 0x0036,
518 PCI_VENDOR_ID_SAMSUNG, 533 PCI_VENDOR_ID_SAMSUNG,
519 0x411B), 534 0x411B),
520 .driver_data = ATH9K_PCI_AR9565_2ANT }, 535 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
521 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 536 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
522 0x0036, 537 0x0036,
523 PCI_VENDOR_ID_SAMSUNG, 538 PCI_VENDOR_ID_SAMSUNG,
524 0x411C), 539 0x411C),
525 .driver_data = ATH9K_PCI_AR9565_2ANT }, 540 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
526 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 541 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
527 0x0036, 542 0x0036,
528 PCI_VENDOR_ID_SAMSUNG, 543 PCI_VENDOR_ID_SAMSUNG,
529 0x411D), 544 0x411D),
530 .driver_data = ATH9K_PCI_AR9565_2ANT }, 545 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
531 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 546 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
532 0x0036, 547 0x0036,
533 PCI_VENDOR_ID_SAMSUNG, 548 PCI_VENDOR_ID_SAMSUNG,
534 0x411E), 549 0x411E),
535 .driver_data = ATH9K_PCI_AR9565_2ANT }, 550 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
536
537 /* WB335 2-ANT / Antenna-Diversity */
538 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 551 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
539 0x0036, 552 0x0036,
540 PCI_VENDOR_ID_ATHEROS, 553 PCI_VENDOR_ID_ATHEROS,
@@ -562,11 +575,31 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
562 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, 575 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
563 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 576 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
564 0x0036, 577 0x0036,
578 0x11AD, /* LITEON */
579 0x0832),
580 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
581 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
582 0x0036,
583 0x11AD, /* LITEON */
584 0x0692),
585 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
586 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
587 0x0036,
565 PCI_VENDOR_ID_AZWAVE, 588 PCI_VENDOR_ID_AZWAVE,
566 0x2130), 589 0x2130),
567 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, 590 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
568 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 591 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
569 0x0036, 592 0x0036,
593 PCI_VENDOR_ID_AZWAVE,
594 0x213B),
595 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
596 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
597 0x0036,
598 PCI_VENDOR_ID_AZWAVE,
599 0x2182),
600 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
601 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
602 0x0036,
570 0x144F, /* ASKEY */ 603 0x144F, /* ASKEY */
571 0x7202), 604 0x7202),
572 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, 605 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
@@ -577,6 +610,11 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
577 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, 610 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
578 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, 611 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
579 0x0036, 612 0x0036,
613 0x1B9A, /* XAVI */
614 0x28A2),
615 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
616 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
617 0x0036,
580 0x185F, /* WNC */ 618 0x185F, /* WNC */
581 0x3027), 619 0x3027),
582 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, 620 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
@@ -590,6 +628,31 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
590 PCI_VENDOR_ID_FOXCONN, 628 PCI_VENDOR_ID_FOXCONN,
591 0xE07F), 629 0xE07F),
592 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, 630 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
631 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
632 0x0036,
633 PCI_VENDOR_ID_FOXCONN,
634 0xE081),
635 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
636 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
637 0x0036,
638 PCI_VENDOR_ID_LENOVO,
639 0x3026),
640 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
641 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
642 0x0036,
643 PCI_VENDOR_ID_LENOVO,
644 0x4026),
645 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
646 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
647 0x0036,
648 PCI_VENDOR_ID_ASUSTEK,
649 0x85F2),
650 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
651 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
652 0x0036,
653 PCI_VENDOR_ID_DELL,
654 0x020E),
655 .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },
593 656
594 /* PCI-E AR9565 (WB335) */ 657 /* PCI-E AR9565 (WB335) */
595 { PCI_VDEVICE(ATHEROS, 0x0036), 658 { PCI_VDEVICE(ATHEROS, 0x0036),
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-26 00:56:50 -0500