r300_pci_ids: set families to match r300g

1 files changed, 49 insertions, 42 deletions

diff --git a/include/pci_ids/r300_pci_ids.h b/include/pci_ids/r300_pci_ids.h
index 8f57ca77eeb..5821d444da3 100644
--- a/include/pci_ids/r300_pci_ids.h
+++ b/include/pci_ids/r300_pci_ids.h
@@ -6,8 +6,8 @@ CHIPSET(0x4E44, R300_ND, R300)
 CHIPSET(0x4E45, R300_NE, R300)
 CHIPSET(0x4E46, R300_NF, R300)
 CHIPSET(0x4E47, R300_NG, R300)
-CHIPSET(0x4E48, R350_NH, R350)
 
+CHIPSET(0x4E48, R350_NH, R350)
 CHIPSET(0x4E49, R350_NI, R350)
 CHIPSET(0x4E4B, R350_NK, R350)
 CHIPSET(0x4148, R350_AH, R350)
@@ -30,14 +30,15 @@ CHIPSET(0x4E53, RV350_NS, RV350)
 CHIPSET(0x4E54, RV350_NT, RV350)
 CHIPSET(0x4E56, RV350_NV, RV350)
 
-CHIPSET(0x5460, RV370_5460, RV380)
-CHIPSET(0x5462, RV370_5462, RV380)
-CHIPSET(0x5464, RV370_5464, RV380)
-CHIPSET(0x5B60, RV370_5B60, RV380)
-CHIPSET(0x5B62, RV370_5B62, RV380)
-CHIPSET(0x5B63, RV370_5B63, RV380)
-CHIPSET(0x5B64, RV370_5B64, RV380)
-CHIPSET(0x5B65, RV370_5B65, RV380)
+CHIPSET(0x5460, RV370_5460, RV370)
+CHIPSET(0x5462, RV370_5462, RV370)
+CHIPSET(0x5464, RV370_5464, RV370)
+CHIPSET(0x5B60, RV370_5B60, RV370)
+CHIPSET(0x5B62, RV370_5B62, RV370)
+CHIPSET(0x5B63, RV370_5B63, RV370)
+CHIPSET(0x5B64, RV370_5B64, RV370)
+CHIPSET(0x5B65, RV370_5B65, RV370)
+
 CHIPSET(0x3150, RV380_3150, RV380)
 CHIPSET(0x3152, RV380_3152, RV380)
 CHIPSET(0x3154, RV380_3154, RV380)
@@ -55,33 +56,37 @@ CHIPSET(0x4A4E, R420_JN, R420)
 CHIPSET(0x4A4F, R420_JO, R420)
 CHIPSET(0x4A50, R420_JP, R420)
 CHIPSET(0x4A54, R420_JT, R420)
-CHIPSET(0x5548, R423_UH, R420)
-CHIPSET(0x5549, R423_UI, R420)
-CHIPSET(0x554A, R423_UJ, R420)
-CHIPSET(0x554B, R423_UK, R420)
-CHIPSET(0x5550, R423_5550, R420)
-CHIPSET(0x5551, R423_UQ, R420)
-CHIPSET(0x5552, R423_UR, R420)
-CHIPSET(0x5554, R423_UT, R420)
-CHIPSET(0x5D57, R423_5D57, R420)
-CHIPSET(0x554C, R430_554C, R420)
-CHIPSET(0x554D, R430_554D, R420)
-CHIPSET(0x554E, R430_554E, R420)
-CHIPSET(0x554F, R430_554F, R420)
-CHIPSET(0x5D48, R430_5D48, R420)
-CHIPSET(0x5D49, R430_5D49, R420)
-CHIPSET(0x5D4A, R430_5D4A, R420)
-CHIPSET(0x5D4C, R480_5D4C, R420)
-CHIPSET(0x5D4D, R480_5D4D, R420)
-CHIPSET(0x5D4E, R480_5D4E, R420)
-CHIPSET(0x5D4F, R480_5D4F, R420)
-CHIPSET(0x5D50, R480_5D50, R420)
-CHIPSET(0x5D52, R480_5D52, R420)
-CHIPSET(0x4B48, R481_4B48, R420)
-CHIPSET(0x4B49, R481_4B49, R420)
-CHIPSET(0x4B4A, R481_4B4A, R420)
-CHIPSET(0x4B4B, R481_4B4B, R420)
-CHIPSET(0x4B4C, R481_4B4C, R420)
+
+CHIPSET(0x5548, R423_UH, R423)
+CHIPSET(0x5549, R423_UI, R423)
+CHIPSET(0x554A, R423_UJ, R423)
+CHIPSET(0x554B, R423_UK, R423)
+CHIPSET(0x5550, R423_5550, R423)
+CHIPSET(0x5551, R423_UQ, R423)
+CHIPSET(0x5552, R423_UR, R423)
+CHIPSET(0x5554, R423_UT, R423)
+CHIPSET(0x5D57, R423_5D57, R423)
+
+CHIPSET(0x554C, R430_554C, R430)
+CHIPSET(0x554D, R430_554D, R430)
+CHIPSET(0x554E, R430_554E, R430)
+CHIPSET(0x554F, R430_554F, R430)
+CHIPSET(0x5D48, R430_5D48, R430)
+CHIPSET(0x5D49, R430_5D49, R430)
+CHIPSET(0x5D4A, R430_5D4A, R430)
+
+CHIPSET(0x5D4C, R480_5D4C, R480)
+CHIPSET(0x5D4D, R480_5D4D, R480)
+CHIPSET(0x5D4E, R480_5D4E, R480)
+CHIPSET(0x5D4F, R480_5D4F, R480)
+CHIPSET(0x5D50, R480_5D50, R480)
+CHIPSET(0x5D52, R480_5D52, R480)
+
+CHIPSET(0x4B48, R481_4B48, R481)
+CHIPSET(0x4B49, R481_4B49, R481)
+CHIPSET(0x4B4A, R481_4B4A, R481)
+CHIPSET(0x4B4B, R481_4B4B, R481)
+CHIPSET(0x4B4C, R481_4B4C, R481)
 
 CHIPSET(0x564A, RV410_564A, RV410)
 CHIPSET(0x564B, RV410_564B, RV410)
@@ -98,12 +103,14 @@ CHIPSET(0x5E4F, RV410_5E4F, RV410)
 
 CHIPSET(0x5A41, RS400_5A41, RS400)
 CHIPSET(0x5A42, RS400_5A42, RS400)
-CHIPSET(0x5A61, RC410_5A61, RS400)
-CHIPSET(0x5A62, RC410_5A62, RS400)
-CHIPSET(0x5954, RS480_5954, RS400)
-CHIPSET(0x5955, RS480_5955, RS400)
-CHIPSET(0x5974, RS482_5974, RS400)
-CHIPSET(0x5975, RS482_5975, RS400)
+
+CHIPSET(0x5A61, RC410_5A61, RC410)
+CHIPSET(0x5A62, RC410_5A62, RC410)
+
+CHIPSET(0x5954, RS480_5954, RS480)
+CHIPSET(0x5955, RS480_5955, RS480)
+CHIPSET(0x5974, RS482_5974, RS480)
+CHIPSET(0x5975, RS482_5975, RS480)
 
 CHIPSET(0x7100, R520_7100, R520)
 CHIPSET(0x7101, R520_7101, R520)