Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b6c82ea authored Jan 18, 2010 by Bartlomiej Zolnierkiewicz Committed by David S. Miller Jan 19, 2010

via82cxxx: add support for vt8261 and future chips



Based on commit e4d866cd for pata_via host driver.

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

parent f931a5d5

drivers/ide/via82cxxx.c

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -75,6 +75,7 @@ static struct via_isa_bridge {
	{ "vx855", PCI_DEVICE_ID_VIA_VX855, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST \| VIA_SATA_PATA },		{ "vx855", PCI_DEVICE_ID_VIA_VX855, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST \| VIA_SATA_PATA },
	{ "vx800", PCI_DEVICE_ID_VIA_VX800, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST \| VIA_SATA_PATA },		{ "vx800", PCI_DEVICE_ID_VIA_VX800, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST \| VIA_SATA_PATA },
	{ "cx700", PCI_DEVICE_ID_VIA_CX700, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST \| VIA_SATA_PATA },		{ "cx700", PCI_DEVICE_ID_VIA_CX700, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST \| VIA_SATA_PATA },
			{ "vt8261", PCI_DEVICE_ID_VIA_8261, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
	{ "vt8237s", PCI_DEVICE_ID_VIA_8237S, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },		{ "vt8237s", PCI_DEVICE_ID_VIA_8237S, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
	{ "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },		{ "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
	{ "vt8251", PCI_DEVICE_ID_VIA_8251, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },		{ "vt8251", PCI_DEVICE_ID_VIA_8251, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
	@@ -97,6 +98,7 @@ static struct via_isa_bridge {
	{ "vt82c586", PCI_DEVICE_ID_VIA_82C586_0, 0x00, 0x0f, 0x00, VIA_SET_FIFO },		{ "vt82c586", PCI_DEVICE_ID_VIA_82C586_0, 0x00, 0x0f, 0x00, VIA_SET_FIFO },
	{ "vt82c576", PCI_DEVICE_ID_VIA_82C576, 0x00, 0x2f, 0x00, VIA_SET_FIFO \| VIA_NO_UNMASK },		{ "vt82c576", PCI_DEVICE_ID_VIA_82C576, 0x00, 0x2f, 0x00, VIA_SET_FIFO \| VIA_NO_UNMASK },
	{ "vt82c576", PCI_DEVICE_ID_VIA_82C576, 0x00, 0x2f, 0x00, VIA_SET_FIFO \| VIA_NO_UNMASK \| VIA_BAD_ID },		{ "vt82c576", PCI_DEVICE_ID_VIA_82C576, 0x00, 0x2f, 0x00, VIA_SET_FIFO \| VIA_NO_UNMASK \| VIA_BAD_ID },
			{ "vtxxxx", PCI_DEVICE_ID_VIA_ANON, 0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
	{ NULL }		{ NULL }
	};		};

	@@ -205,7 +207,8 @@ static struct via_isa_bridge via_config_find(struct pci_dev *isa)
	{		{
	struct via_isa_bridge *via_config;		struct via_isa_bridge *via_config;

	for (via_config = via_isa_bridges; via_config->id; via_config++)		for (via_config = via_isa_bridges;
			via_config->id != PCI_DEVICE_ID_VIA_ANON; via_config++)
	if ((*isa = pci_get_device(PCI_VENDOR_ID_VIA +		if ((*isa = pci_get_device(PCI_VENDOR_ID_VIA +
	!!(via_config->flags & VIA_BAD_ID),		!!(via_config->flags & VIA_BAD_ID),
	via_config->id, NULL))) {		via_config->id, NULL))) {
	@@ -467,11 +470,6 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
	* Find the ISA bridge and check we know what it is.		* Find the ISA bridge and check we know what it is.
	*/		*/
	via_config = via_config_find(&isa);		via_config = via_config_find(&isa);
	if (!via_config->id) {
	printk(KERN_WARNING DRV_NAME " %s: unknown chipset, skipping\n",
	pci_name(dev));
	return -ENODEV;
	}

	/*		/*
	* Print the boot message.		* Print the boot message.