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

Commit e0b874df authored by Josepch Chan's avatar Josepch Chan Committed by Bartlomiej Zolnierkiewicz
Browse files

via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S 



This patch:
* Corrects the wrong device ID of PCI_DEVICE_ID_VIA_SATA_EIDE
  from 0x0581 to 0x5324.
* Adds VIA CX700 and VT8237S support in drivers/ide/pci/via82cxxx.c
* Adds VIA VT8237S support in drivers/ata/pata_via.c

Signed-off-by: default avatarJosepch Chan <josephchan@via.com.tw>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 6855036a

drivers/ata/pata_via.c

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ static const struct via_isa_bridge { 
	u8 rev_max;

	u16 flags;

} via_isa_bridges[] = {

	{ "vt8237s",	PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt8251",	PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "cx700",	PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt6410",	PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_NO_ENABLES},

drivers/ide/pci/via82cxxx.c

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ static struct via_isa_bridge { 
	u8 rev_max;

	u16 flags;

} via_isa_bridges[] = {

	{ "cx7000",	PCI_DEVICE_ID_VIA_CX700,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt8237s",	PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt6410",	PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt8251",	PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt8237",	PCI_DEVICE_ID_VIA_8237,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
@@ -504,6 +506,7 @@ static struct pci_device_id via_pci_tbl[] = { 
	{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C576_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_6410,     PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},

	{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_SATA_EIDE,     PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, via_pci_tbl);

include/linux/pci_ids.h

+2 −1
Original line number Diff line number Diff line
@@ -1283,7 +1283,6 @@ 
#define PCI_DEVICE_ID_VIA_82C561	0x0561

#define PCI_DEVICE_ID_VIA_82C586_1	0x0571

#define PCI_DEVICE_ID_VIA_82C576	0x0576

#define PCI_DEVICE_ID_VIA_SATA_EIDE	0x0581

#define PCI_DEVICE_ID_VIA_82C586_0	0x0586

#define PCI_DEVICE_ID_VIA_82C596	0x0596

#define PCI_DEVICE_ID_VIA_82C597_0	0x0597
@@ -1326,6 +1325,8 @@ 
#define PCI_DEVICE_ID_VIA_8237		0x3227

#define PCI_DEVICE_ID_VIA_8251		0x3287

#define PCI_DEVICE_ID_VIA_8237A		0x3337

#define PCI_DEVICE_ID_VIA_8237S		0x3372

#define PCI_DEVICE_ID_VIA_SATA_EIDE	0x5324

#define PCI_DEVICE_ID_VIA_8231		0x8231

#define PCI_DEVICE_ID_VIA_8231_4	0x8235

#define PCI_DEVICE_ID_VIA_8365_1	0x8305