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

Commit b7bed9ec authored by Jason Gaston's avatar Jason Gaston Committed by Linus Torvalds
Browse files

[PATCH] piix: add Intel ICH8M device IDs 



Signed-off-by: default avatarJason Gaston <Jason.d.gaston@intel.com>
Acked-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 12fc1d7b

drivers/ide/pci/piix.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -135,6 +135,7 @@ static u8 piix_ratemask (ide_drive_t *drive) 
		case PCI_DEVICE_ID_INTEL_ICH6_19:

		case PCI_DEVICE_ID_INTEL_ICH6_19:

		case PCI_DEVICE_ID_INTEL_ICH7_21:

		case PCI_DEVICE_ID_INTEL_ICH7_21:

		case PCI_DEVICE_ID_INTEL_ESB2_18:

		case PCI_DEVICE_ID_INTEL_ESB2_18:

		case PCI_DEVICE_ID_INTEL_ICH8_6:

			mode = 3;

			mode = 3;

			break;

			break;

		/* UDMA 66 capable */

		/* UDMA 66 capable */
@@ -449,6 +450,7 @@ static unsigned int __devinit init_chipset_piix (struct pci_dev *dev, const char 
		case PCI_DEVICE_ID_INTEL_ICH6_19:

		case PCI_DEVICE_ID_INTEL_ICH6_19:

		case PCI_DEVICE_ID_INTEL_ICH7_21:

		case PCI_DEVICE_ID_INTEL_ICH7_21:

		case PCI_DEVICE_ID_INTEL_ESB2_18:

		case PCI_DEVICE_ID_INTEL_ESB2_18:

		case PCI_DEVICE_ID_INTEL_ICH8_6:

		{

		{

			unsigned int extra = 0;

			unsigned int extra = 0;

			pci_read_config_dword(dev, 0x54, &extra);

			pci_read_config_dword(dev, 0x54, &extra);
@@ -575,6 +577,7 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { 
	/* 21 */ DECLARE_PIIX_DEV("ICH7"),

	/* 21 */ DECLARE_PIIX_DEV("ICH7"),

	/* 22 */ DECLARE_PIIX_DEV("ICH4"),

	/* 22 */ DECLARE_PIIX_DEV("ICH4"),

	/* 23 */ DECLARE_PIIX_DEV("ESB2"),

	/* 23 */ DECLARE_PIIX_DEV("ESB2"),

	/* 24 */ DECLARE_PIIX_DEV("ICH8M"),

};

};





/**

/**
@@ -651,6 +654,7 @@ static struct pci_device_id piix_pci_tbl[] = { 
	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21},

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21},

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 22},

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 22},

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_18, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 23},

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_18, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 23},

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 24},

	{ 0, },

	{ 0, },

};

};

MODULE_DEVICE_TABLE(pci, piix_pci_tbl);

MODULE_DEVICE_TABLE(pci, piix_pci_tbl);