Author: mav
Date: Tue Apr 12 07:54:55 2016
New Revision: 297852
URL: https://svnweb.freebsd.org/changeset/base/297852

Log:
  MFC r297387: Add some device IDs found on AMD FCH shipsets.

Modified:
  stable/10/sys/dev/sound/pci/hda/hdac.c
  stable/10/sys/dev/sound/pci/hda/hdac.h
  stable/10/sys/dev/usb/controller/ehci_pci.c
  stable/10/sys/dev/usb/controller/ohci_pci.c
  stable/10/sys/dev/usb/controller/xhci_pci.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- stable/10/sys/dev/sound/pci/hda/hdac.c      Tue Apr 12 07:54:03 2016        
(r297851)
+++ stable/10/sys/dev/sound/pci/hda/hdac.c      Tue Apr 12 07:54:55 2016        
(r297852)
@@ -159,6 +159,7 @@ static const struct {
        { HDA_ATI_RV940,     "ATI RV940",       0, 0 },
        { HDA_ATI_RV970,     "ATI RV970",       0, 0 },
        { HDA_ATI_R1000,     "ATI R1000",       0, 0 },
+       { HDA_AMD_HUDSON2,   "AMD Hudson-2",    0, 0 },
        { HDA_RDC_M3010,     "RDC M3010",       0, 0 },
        { HDA_VIA_VT82XX,    "VIA VT8251/8237A",0, 0 },
        { HDA_SIS_966,       "SiS 966",         0, 0 },
@@ -167,6 +168,7 @@ static const struct {
        { HDA_INTEL_ALL,  "Intel",              0, 0 },
        { HDA_NVIDIA_ALL, "NVIDIA",             0, 0 },
        { HDA_ATI_ALL,    "ATI",                0, 0 },
+       { HDA_AMD_ALL,    "AMD",                0, 0 },
        { HDA_VIA_ALL,    "VIA",                0, 0 },
        { HDA_SIS_ALL,    "SiS",                0, 0 },
        { HDA_ULI_ALL,    "ULI",                0, 0 },

Modified: stable/10/sys/dev/sound/pci/hda/hdac.h
==============================================================================
--- stable/10/sys/dev/sound/pci/hda/hdac.h      Tue Apr 12 07:54:03 2016        
(r297851)
+++ stable/10/sys/dev/sound/pci/hda/hdac.h      Tue Apr 12 07:54:55 2016        
(r297852)
@@ -136,6 +136,10 @@
 #define HDA_ATI_R1000          HDA_MODEL_CONSTRUCT(ATI, 0xaaa0)
 #define HDA_ATI_ALL            HDA_MODEL_CONSTRUCT(ATI, 0xffff)
 
+#define AMD_VENDORID           0x1022
+#define HDA_AMD_HUDSON2                HDA_MODEL_CONSTRUCT(AMD, 0x780d)
+#define HDA_AMD_ALL            HDA_MODEL_CONSTRUCT(AMD, 0xffff)
+
 /* RDC */
 #define RDC_VENDORID           0x17f3
 #define HDA_RDC_M3010          HDA_MODEL_CONSTRUCT(RDC, 0x3010)

Modified: stable/10/sys/dev/usb/controller/ehci_pci.c
==============================================================================
--- stable/10/sys/dev/usb/controller/ehci_pci.c Tue Apr 12 07:54:03 2016        
(r297851)
+++ stable/10/sys/dev/usb/controller/ehci_pci.c Tue Apr 12 07:54:55 2016        
(r297852)
@@ -112,6 +112,8 @@ ehci_pci_match(device_t self)
 
        case 0x20951022:
                return ("AMD CS5536 (Geode) USB 2.0 controller");
+       case 0x78081022:
+               return ("AMD FCH USB 2.0 controller");
 
        case 0x43451002:
                return "ATI SB200 USB 2.0 controller";

Modified: stable/10/sys/dev/usb/controller/ohci_pci.c
==============================================================================
--- stable/10/sys/dev/usb/controller/ohci_pci.c Tue Apr 12 07:54:03 2016        
(r297851)
+++ stable/10/sys/dev/usb/controller/ohci_pci.c Tue Apr 12 07:54:55 2016        
(r297852)
@@ -124,9 +124,10 @@ ohci_pci_match(device_t self)
 
        case 0x740c1022:
                return ("AMD-756 USB Controller");
-
        case 0x74141022:
                return ("AMD-766 USB Controller");
+       case 0x78071022:
+               return ("AMD FCH USB Controller");
 
        case 0x43741002:
                return "ATI SB400 USB Controller";

Modified: stable/10/sys/dev/usb/controller/xhci_pci.c
==============================================================================
--- stable/10/sys/dev/usb/controller/xhci_pci.c Tue Apr 12 07:54:03 2016        
(r297851)
+++ stable/10/sys/dev/usb/controller/xhci_pci.c Tue Apr 12 07:54:55 2016        
(r297852)
@@ -95,6 +95,9 @@ xhci_pci_match(device_t self)
        uint32_t device_id = pci_get_devid(self);
 
        switch (device_id) {
+       case 0x78141022:
+               return ("AMD FCH USB 3.0 controller");
+
        case 0x01941033:
                return ("NEC uPD720200 USB 3.0 controller");
 
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to