Skip to content

L
linux
Commit 2de02a8e authored by Dave Jones's avatar Dave Jones Committed by Dave Jones
Browse files
Options

[AGPGART] Update VIA PCI IDs. 

- Add some new IDs
- Rename some older ones.
parent a3fcb766
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 53 deletions
drivers/char/agp/amd-k8-agp.c
View file @ 2de02a8e
...@@ -358,11 +358,21 @@ static struct pci_device_id agp_amdk8_pci_table[] = { ...@@ -358,11 +358,21 @@ static struct pci_device_id agp_amdk8_pci_table[] = {
.subvendor = PCI_ANY_ID, .subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
}, },
/* VIA K8T800 */
{ {
.class = (PCI_CLASS_BRIDGE_HOST << 8), .class = (PCI_CLASS_BRIDGE_HOST << 8),
.class_mask = ~0, .class_mask = ~0,
.vendor = PCI_VENDOR_ID_VIA, .vendor = PCI_VENDOR_ID_VIA,
.device = PCI_DEVICE_ID_VIA_K8T400M_0, .device = PCI_DEVICE_ID_VIA_8385_0,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
/* VIA K8M800 / K8N800 */
{
.class = (PCI_CLASS_BRIDGE_HOST << 8),
.class_mask = ~0,
.vendor = PCI_VENDOR_ID_VIA,
.device = PCI_DEVICE_ID_VIA_8380_0,
.subvendor = PCI_ANY_ID, .subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
}, },
......
drivers/char/agp/generic.c
View file @ 2de02a8e
...@@ -577,12 +577,12 @@ void agp_generic_enable(u32 mode) ...@@ -577,12 +577,12 @@ void agp_generic_enable(u32 mode)
agp_device_command(command, TRUE); agp_device_command(command, TRUE);
return; return;
} else { } else {
/* Disable calibration cycle in RX91<1> when not in AGP3.0 mode of operation.*/ /* Disable calibration cycle in RX91<1> when not in AGP3.0 mode of operation.*/
command &= ~(7<<10) ; command &= ~(7<<10) ;
pci_read_config_dword(agp_bridge->dev, agp_bridge->capndx+AGPCTRL, &temp); pci_read_config_dword(agp_bridge->dev, agp_bridge->capndx+AGPCTRL, &temp);
temp |= (1<<9); temp |= (1<<9);
pci_write_config_dword(agp_bridge->dev, agp_bridge->capndx+AGPCTRL, temp); pci_write_config_dword(agp_bridge->dev, agp_bridge->capndx+AGPCTRL, temp);
printk (KERN_INFO PFX "Device is in legacy mode," printk (KERN_INFO PFX "Device is in legacy mode,"
" falling back to 2.x\n"); " falling back to 2.x\n");
} }
......
drivers/char/agp/via-agp.c
View file @ 2de02a8e
...@@ -215,52 +215,52 @@ static struct agp_device_ids via_agp_device_ids[] __initdata = ...@@ -215,52 +215,52 @@ static struct agp_device_ids via_agp_device_ids[] __initdata =
{ {
{ {
.device_id = PCI_DEVICE_ID_VIA_82C597_0, .device_id = PCI_DEVICE_ID_VIA_82C597_0,
.chipset_name = "VP3", .chipset_name = "Apollo VP3",
}, },
{ {
.device_id = PCI_DEVICE_ID_VIA_82C598_0, .device_id = PCI_DEVICE_ID_VIA_82C598_0,
.chipset_name = "MVP3", .chipset_name = "Apollo MVP3",
}, },
{ {
.device_id = PCI_DEVICE_ID_VIA_8501_0, .device_id = PCI_DEVICE_ID_VIA_8501_0,
.chipset_name = "MVP4", .chipset_name = "Apollo MVP4",
}, },
/* VT8601 */ /* VT8601 */
{ {
.device_id = PCI_DEVICE_ID_VIA_8601_0, .device_id = PCI_DEVICE_ID_VIA_8601_0,
.chipset_name = "PLE133 ProMedia", .chipset_name = "Apollo ProMedia/PLE133Ta",
}, },
/* VT82C693A / VT28C694T */ /* VT82C693A / VT28C694T */
{ {
.device_id = PCI_DEVICE_ID_VIA_82C691, .device_id = PCI_DEVICE_ID_VIA_82C691_0,
.chipset_name = "Apollo Pro 133", .chipset_name = "Apollo Pro 133",
}, },
{ {
.device_id = PCI_DEVICE_ID_VIA_8371_0, .device_id = PCI_DEVICE_ID_VIA_8371_0,
.chipset_name = "Apollo Pro KX133", .chipset_name = "KX133",
}, },
/* VT8633 */ /* VT8633 */
{ {
.device_id = PCI_DEVICE_ID_VIA_8633_0, .device_id = PCI_DEVICE_ID_VIA_8633_0,
.chipset_name = "Apollo Pro 266", .chipset_name = "Pro 266",
}, },
/* VT8361 */ /* VT8361 */
{ {
.device_id = PCI_DEVICE_ID_VIA_8361, .device_id = PCI_DEVICE_ID_VIA_8361,
.chipset_name = "Apollo KLE133", .chipset_name = "KLE133",
}, },
/* VT8365 / VT8362 */ /* VT8365 / VT8362 */
{ {
.device_id = PCI_DEVICE_ID_VIA_8363_0, .device_id = PCI_DEVICE_ID_VIA_8363_0,
.chipset_name = "Apollo Pro KT133/KM133/TwisterK", .chipset_name = "Twister-K/KT133x/KM133",
}, },
/* VT8753A */ /* VT8753A */
...@@ -272,79 +272,79 @@ static struct agp_device_ids via_agp_device_ids[] __initdata = ...@@ -272,79 +272,79 @@ static struct agp_device_ids via_agp_device_ids[] __initdata =
/* VT8366 */ /* VT8366 */
{ {
.device_id = PCI_DEVICE_ID_VIA_8367_0, .device_id = PCI_DEVICE_ID_VIA_8367_0,
.chipset_name = "Apollo Pro KT266/KT333", .chipset_name = "KT266/KY266x/KT333",
}, },
/* VT8633 (for CuMine/ Celeron) */ /* VT8633 (for CuMine/ Celeron) */
{ {
.device_id = PCI_DEVICE_ID_VIA_8653_0, .device_id = PCI_DEVICE_ID_VIA_8653_0,
.chipset_name = "Apollo Pro 266T", .chipset_name = "Pro266T",
}, },
/* KM266 / PM266 */ /* KM266 / PM266 */
{ {
.device_id = PCI_DEVICE_ID_VIA_KM266, .device_id = PCI_DEVICE_ID_VIA_XM266,
.chipset_name = "KM266/PM266", .chipset_name = "PM266/KM266",
}, },
/* CLE266 */ /* CLE266 */
{ {
.device_id = PCI_DEVICE_ID_VIA_CLE266, .device_id = PCI_DEVICE_ID_VIA_862X_0,
.chipset_name = "CLE266", .chipset_name = "CLE266",
}, },
{ {
.device_id = PCI_DEVICE_ID_VIA_8377_0, .device_id = PCI_DEVICE_ID_VIA_8377_0,
.chipset_name = "Apollo Pro KT400", .chipset_name = "KT400/KT400A/KT600",
}, },
/* VT8604 / VT8605 / VT8603 / TwisterT /* VT8604 / VT8605 / VT8603
* (Apollo Pro133A chipset with S3 Savage4) */ * (Apollo Pro133A chipset with S3 Savage4) */
{ {
.device_id = PCI_DEVICE_ID_VIA_82C694X_0, .device_id = PCI_DEVICE_ID_VIA_8605_0,
.chipset_name = "Apollo ProSavage PM133/PL133/PN133/Twister" .chipset_name = "ProSavage PM133/PL133/PN133"
}, },
/* VT8752*/ /* P4M266x/P4N266 */
{ {
.device_id = PCI_DEVICE_ID_VIA_8752, .device_id = PCI_DEVICE_ID_VIA_8703_51_0,
.chipset_name = "ProSavage DDR P4M266", .chipset_name = "P4M266x/P4N266",
}, },
/* KN266/PN266 */ /* VT8754 */
{ {
.device_id = PCI_DEVICE_ID_VIA_KN266, .device_id = PCI_DEVICE_ID_VIA_8754C_0,
.chipset_name = "KN266/PN266", .chipset_name = "PT800",
}, },
/* VT8754 */ /* P4X600 */
{ {
.device_id = PCI_DEVICE_ID_VIA_8754, .device_id = PCI_DEVICE_ID_VIA_8763_0,
.chipset_name = "Apollo P4X333/P4X400" .chipset_name = "P4X600"
}, },
/* P4N333 */ /* KM400 */
{ {
.device_id = PCI_DEVICE_ID_VIA_P4N333, .device_id = PCI_DEVICE_ID_VIA_8378_0,
.chipset_name = "P4N333", .chipset_name = "KM400/KM400A",
}, },
/* P4X600 */ /* PT880 */
{ {
.device_id = PCI_DEVICE_ID_VIA_P4X600, .device_id = PCI_DEVICE_ID_VIA_PT880,
.chipset_name = "P4X600", .chipset_name = "PT880",
}, },
/* KM400 */ /* PT890 */
{ {
.device_id = PCI_DEVICE_ID_VIA_KM400, .device_id = PCI_DEVICE_ID_VIA_8783_0,
.chipset_name = "KM400", .chipset_name = "PT890",
}, },
/* P4M400 */ /* PM800/PN800/PM880/PN880 */
{ {
.device_id = PCI_DEVICE_ID_VIA_P4M400, .device_id = PCI_DEVICE_ID_VIA_PX8X0_0,
.chipset_name = "P4M400", .chipset_name = "PM800/PN800/PM880/PN880",
}, },
{ }, /* dummy final entry, always present */ { }, /* dummy final entry, always present */
......
include/linux/pci_ids.h
View file @ 2de02a8e
...@@ -1115,7 +1115,9 @@ ...@@ -1115,7 +1115,9 @@
#define PCI_DEVICE_ID_TTI_HPT374 0x0008 #define PCI_DEVICE_ID_TTI_HPT374 0x0008
#define PCI_VENDOR_ID_VIA 0x1106 #define PCI_VENDOR_ID_VIA 0x1106
#define PCI_DEVICE_ID_VIA_P4X600 0x0198 #define PCI_DEVICE_ID_VIA_8763_0 0x0198
#define PCI_DEVICE_ID_VIA_8380_0 0x0204
#define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259
#define PCI_DEVICE_ID_VIA_8363_0 0x0305 #define PCI_DEVICE_ID_VIA_8363_0 0x0305
#define PCI_DEVICE_ID_VIA_8371_0 0x0391 #define PCI_DEVICE_ID_VIA_8371_0 0x0391
#define PCI_DEVICE_ID_VIA_8501_0 0x0501 #define PCI_DEVICE_ID_VIA_8501_0 0x0501
...@@ -1130,10 +1132,10 @@ ...@@ -1130,10 +1132,10 @@
#define PCI_DEVICE_ID_VIA_82C597_0 0x0597 #define PCI_DEVICE_ID_VIA_82C597_0 0x0597
#define PCI_DEVICE_ID_VIA_82C598_0 0x0598 #define PCI_DEVICE_ID_VIA_82C598_0 0x0598
#define PCI_DEVICE_ID_VIA_8601_0 0x0601 #define PCI_DEVICE_ID_VIA_8601_0 0x0601
#define PCI_DEVICE_ID_VIA_82C694X_0 0x0605 #define PCI_DEVICE_ID_VIA_8605_0 0x0605
#define PCI_DEVICE_ID_VIA_82C680 0x0680 #define PCI_DEVICE_ID_VIA_82C680 0x0680
#define PCI_DEVICE_ID_VIA_82C686 0x0686 #define PCI_DEVICE_ID_VIA_82C686 0x0686
#define PCI_DEVICE_ID_VIA_82C691 0x0691 #define PCI_DEVICE_ID_VIA_82C691_0 0x0691
#define PCI_DEVICE_ID_VIA_82C693 0x0693 #define PCI_DEVICE_ID_VIA_82C693 0x0693
#define PCI_DEVICE_ID_VIA_82C693_1 0x0698 #define PCI_DEVICE_ID_VIA_82C693_1 0x0698
#define PCI_DEVICE_ID_VIA_82C926 0x0926 #define PCI_DEVICE_ID_VIA_82C926 0x0926
...@@ -1156,19 +1158,21 @@ ...@@ -1156,19 +1158,21 @@
#define PCI_DEVICE_ID_VIA_8622 0x3102 #define PCI_DEVICE_ID_VIA_8622 0x3102
#define PCI_DEVICE_ID_VIA_8233C_0 0x3109 #define PCI_DEVICE_ID_VIA_8233C_0 0x3109
#define PCI_DEVICE_ID_VIA_8361 0x3112 #define PCI_DEVICE_ID_VIA_8361 0x3112
#define PCI_DEVICE_ID_VIA_KM266 0x3116 #define PCI_DEVICE_ID_VIA_XM266 0x3116
#define PCI_DEVICE_ID_VIA_CLE266 0x3123 #define PCI_DEVICE_ID_VIA_862X_0 0x3123
#define PCI_DEVICE_ID_VIA_8753_0 0x3128 #define PCI_DEVICE_ID_VIA_8753_0 0x3128
#define PCI_DEVICE_ID_VIA_8233A 0x3147 #define PCI_DEVICE_ID_VIA_8233A 0x3147
#define PCI_DEVICE_ID_VIA_8752 0x3148 #define PCI_DEVICE_ID_VIA_8703_51_0 0x3148
#define PCI_DEVICE_ID_VIA_8237_SATA 0x3149 #define PCI_DEVICE_ID_VIA_8237_SATA 0x3149
#define PCI_DEVICE_ID_VIA_KN266 0x3156 #define PCI_DEVICE_ID_VIA_XN266 0x3156
#define PCI_DEVICE_ID_VIA_8754 0x3168 #define PCI_DEVICE_ID_VIA_8754C_0 0x3168
#define PCI_DEVICE_ID_VIA_8235 0x3177 #define PCI_DEVICE_ID_VIA_8235 0x3177
#define PCI_DEVICE_ID_VIA_P4N333 0x3178 #define PCI_DEVICE_ID_VIA_P4N333 0x3178
#define PCI_DEVICE_ID_VIA_K8T400M_0 0x3188 #define PCI_DEVICE_ID_VIA_8385_0 0x3188
#define PCI_DEVICE_ID_VIA_8377_0 0x3189 #define PCI_DEVICE_ID_VIA_8377_0 0x3189
#define PCI_DEVICE_ID_VIA_KM400 0x3205 #define PCI_DEVICE_ID_VIA_8378_0 0x3205
#define PCI_DEVICE_ID_VIA_8783_0 0x3208
#define PCI_DEVICE_ID_VIA_PT880 0x3258
#define PCI_DEVICE_ID_VIA_P4M400 0x3209 #define PCI_DEVICE_ID_VIA_P4M400 0x3209
#define PCI_DEVICE_ID_VIA_8237 0x3227 #define PCI_DEVICE_ID_VIA_8237 0x3227
#define PCI_DEVICE_ID_VIA_86C100A 0x6100 #define PCI_DEVICE_ID_VIA_86C100A 0x6100
...@@ -1183,7 +1187,12 @@ ...@@ -1183,7 +1187,12 @@
#define PCI_DEVICE_ID_VIA_8505_1 0x8605 #define PCI_DEVICE_ID_VIA_8505_1 0x8605
#define PCI_DEVICE_ID_VIA_8633_1 0xB091 #define PCI_DEVICE_ID_VIA_8633_1 0xB091
#define PCI_DEVICE_ID_VIA_8367_1 0xB099 #define PCI_DEVICE_ID_VIA_8367_1 0xB099
#define PCI_DEVICE_ID_VIA_8653_1 0xB101 #define PCI_DEVICE_ID_VIA_P4X266_1 0xB101
#define PCI_DEVICE_ID_VIA_8615_1 0xB103
#define PCI_DEVICE_ID_VIA_8361_1 0xB112
#define PCI_DEVICE_ID_VIA_8235_1 0xB168
#define PCI_DEVICE_ID_VIA_838X_1 0xB188
#define PCI_DEVICE_ID_VIA_83_87XX_1 0xB198
#define PCI_VENDOR_ID_SIEMENS 0x110A #define PCI_VENDOR_ID_SIEMENS 0x110A
#define PCI_DEVICE_ID_SIEMENS_DSCC4 0x2102 #define PCI_DEVICE_ID_SIEMENS_DSCC4 0x2102
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7