Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5b6c82ea0fd130a9f0bb7f4d86f6dbbf2fdaaa04

Authored by Bartlomiej Zolnierkiewicz
Committed by David S. Miller
1 parent f931a5d578
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

via82cxxx: add support for vt8261 and future chips 

Based on commit e4d866c for pata_via host driver.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 4 additions and 6 deletions Side-by-side Diff

drivers/ide/via82cxxx.c
Diff comments   View file @ 5b6c82e
... ... @@ -75,6 +75,7 @@
75 75 { "vx855", PCI_DEVICE_ID_VIA_VX855, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST | VIA_SATA_PATA },
76 76 { "vx800", PCI_DEVICE_ID_VIA_VX800, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST | VIA_SATA_PATA },
77 77 { "cx700", PCI_DEVICE_ID_VIA_CX700, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST | VIA_SATA_PATA },
  78 + { "vt8261", PCI_DEVICE_ID_VIA_8261, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
78 79 { "vt8237s", PCI_DEVICE_ID_VIA_8237S, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
79 80 { "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
80 81 { "vt8251", PCI_DEVICE_ID_VIA_8251, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
... ... @@ -97,6 +98,7 @@
97 98 { "vt82c586", PCI_DEVICE_ID_VIA_82C586_0, 0x00, 0x0f, 0x00, VIA_SET_FIFO },
98 99 { "vt82c576", PCI_DEVICE_ID_VIA_82C576, 0x00, 0x2f, 0x00, VIA_SET_FIFO | VIA_NO_UNMASK },
99 100 { "vt82c576", PCI_DEVICE_ID_VIA_82C576, 0x00, 0x2f, 0x00, VIA_SET_FIFO | VIA_NO_UNMASK | VIA_BAD_ID },
  101 + { "vtxxxx", PCI_DEVICE_ID_VIA_ANON, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
100 102 { NULL }
101 103 };
102 104  
... ... @@ -205,7 +207,8 @@
205 207 {
206 208 struct via_isa_bridge *via_config;
207 209  
208   - for (via_config = via_isa_bridges; via_config->id; via_config++)
  210 + for (via_config = via_isa_bridges;
  211 + via_config->id != PCI_DEVICE_ID_VIA_ANON; via_config++)
209 212 if ((*isa = pci_get_device(PCI_VENDOR_ID_VIA +
210 213 !!(via_config->flags & VIA_BAD_ID),
211 214 via_config->id, NULL))) {
... ... @@ -467,11 +470,6 @@
467 470 * Find the ISA bridge and check we know what it is.
468 471 */
469 472 via_config = via_config_find(&isa);
470   - if (!via_config->id) {
471   - printk(KERN_WARNING DRV_NAME " %s: unknown chipset, skipping\n",
472   - pci_name(dev));
473   - return -ENODEV;
474   - }
475 473  
476 474 /*
477 475 * Print the boot message.