diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-22 17:10:45 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-22 17:12:24 +0200 |
| commit | b01e36fa067d476b6df42b844a4f3f359593c8b3 (patch) | |
| tree | 50f343a25fda3239fa27377922e40102ae56df51 | |
| parent | f37c63bacdb4384e7dbf8f7bcbde6f8883c2419d (diff) | |
| -rwxr-xr-x | lib/intel_chipset.h | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h index 6a85ca26..b2ee5b8d 100755 --- a/lib/intel_chipset.h +++ b/lib/intel_chipset.h @@ -85,14 +85,6 @@ #define PCI_CHIP_IVYBRIDGE_S 0x015a /* server */ #define PCI_CHIP_IVYBRIDGE_S_GT2 0x016a /* server */ -#define PCI_CHIP_HASWELL_GT1 0x0402 /* Desktop */ -#define PCI_CHIP_HASWELL_GT2 0x0412 -#define PCI_CHIP_HASWELL_M_GT1 0x0406 /* Mobile */ -#define PCI_CHIP_HASWELL_M_GT2 0x0416 -#define PCI_CHIP_HASWELL_M_ULT_GT2 0x0A16 /* Mobile ULT */ - -#define PCI_CHIP_VALLEYVIEW_PO 0x0f30 /* VLV PO board */ - #define IS_MOBILE(devid) (devid == PCI_CHIP_I855_GM || \ devid == PCI_CHIP_I915_GM || \ devid == PCI_CHIP_I945_GM || \ @@ -155,24 +147,26 @@ devid == PCI_CHIP_SANDYBRIDGE_S) #define IS_GEN7(devid) (IS_IVYBRIDGE(devid) || \ - IS_HASWELL(devid)) + IS_HASWELL(devid) || \ + IS_VALLEYVIEW(devid)) #define IS_IVYBRIDGE(dev) (dev == PCI_CHIP_IVYBRIDGE_GT1 || \ dev == PCI_CHIP_IVYBRIDGE_GT2 || \ dev == PCI_CHIP_IVYBRIDGE_M_GT1 || \ dev == PCI_CHIP_IVYBRIDGE_M_GT2 || \ dev == PCI_CHIP_IVYBRIDGE_S || \ - dev == PCI_CHIP_IVYBRIDGE_S_GT2 || \ - dev == PCI_CHIP_VALLEYVIEW_PO) - -#define IS_HSW_GT1(devid) (devid == PCI_CHIP_HASWELL_GT1 || \ - devid == PCI_CHIP_HASWELL_M_GT1) -#define IS_HSW_GT2(devid) (devid == PCI_CHIP_HASWELL_GT2 || \ - devid == PCI_CHIP_HASWELL_M_GT2 || \ - devid == PCI_CHIP_HASWELL_M_ULT_GT2) - -#define IS_HASWELL(devid) (IS_HSW_GT1(devid) || \ - IS_HSW_GT2(devid)) + dev == PCI_CHIP_IVYBRIDGE_S_GT2) + +#define IS_VALLEYVIEW(dev) ((dev) == 0x0f30 || \ + (dev) == 0x0157 || \ + (dev) == 0x0155) + +#define IS_HASWELL(devid) ((devid) == 0x0402 || \ + (devid) == 0x0412 || \ + (devid) == 0x040a || \ + (devid) == 0x041a || \ + (devid) == 0x0406 || \ + (devid) == 0x0416) #define IS_965(devid) (IS_GEN4(devid) || \ IS_GEN5(devid) || \ |