[AGPGART] Move ATI PCI IDs to pci_ids.h

- sort some of the ATI entries. (note, there are dupes in there
  that could be fixed up at some point).
- Rename PCI_DEVICE_ID_RADEON_IGP to ATI_RS100.
  RadeonIGP is the family, not the specific chip.

diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index 70d02bb0e1389db35611264c59533aacffa4f9d1..b23f116191af8f3085a668356e2bfe55a9ea6134 100644 (file)
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -326,31 +326,6 @@ struct agp_bridge_data {
 #define ALI_CACHE_FLUSH_ADDR_MASK      0xFFFFF000
 #define ALI_CACHE_FLUSH_EN             0x100
 
-#ifndef PCI_VENDOR_ID_ATI
-#define PCI_VENDOR_ID_ATI              0x1002
-#endif
-#ifndef PCI_DEVICE_ID_ATI_RS100
-#define PCI_DEVICE_ID_ATI_RS100                0xcab0
-#endif
-#ifndef PCI_DEVICE_ID_ATI_RS200
-#define PCI_DEVICE_ID_ATI_RS200                0xcab2
-#endif
-#ifndef PCI_DEVICE_ID_ATI_RS250
-#define PCI_DEVICE_ID_ATI_RS250                0xcab3
-#endif
-#ifndef PCI_DEVICE_ID_ATI_RS300_100
-#define PCI_DEVICE_ID_ATI_RS300_100    0x5830
-#endif
-#ifndef PCI_DEVICE_ID_ATI_RS300_133
-#define PCI_DEVICE_ID_ATI_RS300_133    0x5831
-#endif
-#ifndef PCI_DEVICE_ID_ATI_RS300_166
-#define PCI_DEVICE_ID_ATI_RS300_166    0x5832
-#endif
-#ifndef PCI_DEVICE_ID_ATI_RS300_200
-#define PCI_DEVICE_ID_ATI_RS300_200    0x5833
-#endif
-
 /* ATI register */
 #define ATI_APBASE                  0x10
 #define ATI_GART_MMBASE_ADDR        0x14

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index f6cd6e084b868e56369002a842f89e22f2250d73..d09e916bef0a220bdd90c87dd7b0fb2b9f681e94 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -822,7 +822,7 @@ static struct pci_fixup pci_fixups[] __devinitdata = {
        { PCI_FIXUP_FINAL,      PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_82C686_6,     quirk_via_irqpic },
 
        { PCI_FIXUP_FINAL,      PCI_VENDOR_ID_AMD,      PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering },
-       { PCI_FIXUP_FINAL,      PCI_VENDOR_ID_ATI,      PCI_DEVICE_ID_ATI_RADEON_IGP,   quirk_ati_exploding_mce },
+       { PCI_FIXUP_FINAL,      PCI_VENDOR_ID_ATI,      PCI_DEVICE_ID_ATI_RS100,   quirk_ati_exploding_mce },
        /*
         * i82380FB mobile docking controller: its PCI-to-PCI bridge
         * is subtractive decoding (transparent), and does indicate this

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 27e515912d29362923c2b96b62851357013767fd..02bfda4414308b12b89ce9e7a8ca1ab324d8c19a 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -209,10 +209,9 @@
 #define PCI_DEVICE_ID_ATI_215_LR       0x4c52
 #define PCI_DEVICE_ID_ATI_215_LS       0x4c53
 #define PCI_DEVICE_ID_ATI_264_LT       0x4c54
-/* Mach64 VT */
-#define PCI_DEVICE_ID_ATI_264VT                0x5654
-#define PCI_DEVICE_ID_ATI_264VU                0x5655
-#define PCI_DEVICE_ID_ATI_264VV                0x5656
+/* Radeon M4 */
+#define PCI_DEVICE_ID_ATI_RADEON_LE    0x4d45
+#define PCI_DEVICE_ID_ATI_RADEON_LF    0x4d46
 /* Rage128 Pro GL */
 #define PCI_DEVICE_ID_ATI_Rage128_PA   0x5041
 #define PCI_DEVICE_ID_ATI_Rage128_PB   0x5042
@@ -240,39 +239,11 @@
 #define PCI_DEVICE_ID_ATI_RAGE128_PV   0x5056
 #define PCI_DEVICE_ID_ATI_RAGE128_PW   0x5057
 #define PCI_DEVICE_ID_ATI_RAGE128_PX   0x5058
-/* Rage128 GL */
-#define PCI_DEVICE_ID_ATI_RAGE128_RE   0x5245
-#define PCI_DEVICE_ID_ATI_RAGE128_RF   0x5246
-#define PCI_DEVICE_ID_ATI_RAGE128_RG   0x534b
-#define PCI_DEVICE_ID_ATI_RAGE128_RH   0x534c
-#define PCI_DEVICE_ID_ATI_RAGE128_RI   0x534d
-/* Rage128 VR */
-#define PCI_DEVICE_ID_ATI_RAGE128_RK   0x524b
-#define PCI_DEVICE_ID_ATI_RAGE128_RL   0x524c
-#define PCI_DEVICE_ID_ATI_RAGE128_RM   0x5345
-#define PCI_DEVICE_ID_ATI_RAGE128_RN   0x5346
-#define PCI_DEVICE_ID_ATI_RAGE128_RO   0x5347
-/* Rage128 M3 */
-#define PCI_DEVICE_ID_ATI_RAGE128_LE   0x4c45
-#define PCI_DEVICE_ID_ATI_RAGE128_LF   0x4c46
-/* Rage128 Pro Ultra */
-#define PCI_DEVICE_ID_ATI_RAGE128_U1   0x5446
-#define PCI_DEVICE_ID_ATI_RAGE128_U2   0x544C
-#define PCI_DEVICE_ID_ATI_RAGE128_U3   0x5452
-/* Radeon M4 */
-#define PCI_DEVICE_ID_ATI_RADEON_LE    0x4d45
-#define PCI_DEVICE_ID_ATI_RADEON_LF    0x4d46
-/* Radeon NV-100 */
-#define PCI_DEVICE_ID_ATI_RADEON_N1    0x5159
-#define PCI_DEVICE_ID_ATI_RADEON_N2    0x515a
 /* Radeon R100 */
 #define PCI_DEVICE_ID_ATI_RADEON_QD    0x5144
 #define PCI_DEVICE_ID_ATI_RADEON_QE    0x5145
 #define PCI_DEVICE_ID_ATI_RADEON_QF    0x5146
 #define PCI_DEVICE_ID_ATI_RADEON_QG    0x5147
-/* Radeon RV100 (VE) */
-#define PCI_DEVICE_ID_ATI_RADEON_QY    0x5159
-#define PCI_DEVICE_ID_ATI_RADEON_QZ    0x515a
 /* Radeon R200 (8500) */
 #define PCI_DEVICE_ID_ATI_RADEON_QL    0x514c
 #define PCI_DEVICE_ID_ATI_RADEON_QN    0x514e
@@ -282,6 +253,12 @@
 /* Radeon RV200 (7500) */
 #define PCI_DEVICE_ID_ATI_RADEON_QW    0x5157
 #define PCI_DEVICE_ID_ATI_RADEON_QX    0x5158
+/* Radeon NV-100 */
+#define PCI_DEVICE_ID_ATI_RADEON_N1    0x5159
+#define PCI_DEVICE_ID_ATI_RADEON_N2    0x515a
+/* Radeon RV100 (VE) */
+#define PCI_DEVICE_ID_ATI_RADEON_QY    0x5159
+#define PCI_DEVICE_ID_ATI_RADEON_QZ    0x515a
 /* Radeon RV250 (9000) */
 #define PCI_DEVICE_ID_ATI_RADEON_Id    0x4964
 #define PCI_DEVICE_ID_ATI_RADEON_Ie    0x4965
@@ -308,8 +285,37 @@
 #define PCI_DEVICE_ID_ATI_RADEON_RB    0x5145
 #define PCI_DEVICE_ID_ATI_RADEON_RC    0x5146
 #define PCI_DEVICE_ID_ATI_RADEON_RD    0x5147
+/* Rage128 GL */
+#define PCI_DEVICE_ID_ATI_RAGE128_RE   0x5245
+#define PCI_DEVICE_ID_ATI_RAGE128_RF   0x5246
+#define PCI_DEVICE_ID_ATI_RAGE128_RG   0x534b
+#define PCI_DEVICE_ID_ATI_RAGE128_RH   0x534c
+#define PCI_DEVICE_ID_ATI_RAGE128_RI   0x534d
+/* Rage128 VR */
+#define PCI_DEVICE_ID_ATI_RAGE128_RK   0x524b
+#define PCI_DEVICE_ID_ATI_RAGE128_RL   0x524c
+#define PCI_DEVICE_ID_ATI_RAGE128_RM   0x5345
+#define PCI_DEVICE_ID_ATI_RAGE128_RN   0x5346
+#define PCI_DEVICE_ID_ATI_RAGE128_RO   0x5347
+/* Rage128 M3 */
+#define PCI_DEVICE_ID_ATI_RAGE128_LE   0x4c45
+#define PCI_DEVICE_ID_ATI_RAGE128_LF   0x4c46
+/* Rage128 Pro Ultra */
+#define PCI_DEVICE_ID_ATI_RAGE128_U1   0x5446
+#define PCI_DEVICE_ID_ATI_RAGE128_U2   0x544C
+#define PCI_DEVICE_ID_ATI_RAGE128_U3   0x5452
+/* Mach64 VT */
+#define PCI_DEVICE_ID_ATI_264VT                0x5654
+#define PCI_DEVICE_ID_ATI_264VU                0x5655
+#define PCI_DEVICE_ID_ATI_264VV                0x5656
 /* RadeonIGP */
-#define PCI_DEVICE_ID_ATI_RADEON_IGP   0xCAB0
+#define PCI_DEVICE_ID_ATI_RS100                0xcab0
+#define PCI_DEVICE_ID_ATI_RS200                0xcab2
+#define PCI_DEVICE_ID_ATI_RS250                0xcab3
+#define PCI_DEVICE_ID_ATI_RS300_100    0x5830
+#define PCI_DEVICE_ID_ATI_RS300_133    0x5831
+#define PCI_DEVICE_ID_ATI_RS300_166    0x5832
+#define PCI_DEVICE_ID_ATI_RS300_200    0x5833
 
 #define PCI_VENDOR_ID_VLSI             0x1004
 #define PCI_DEVICE_ID_VLSI_82C592      0x0005