Add Intel PCI ids to IDE (PATA) driver.

diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index c9e6e8a10e6ec7c4ed604a3f730afd86d82fb7de..7a30bdc6e73d36472edba29b2912f093fa614c73 100644 (file)
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -152,6 +152,8 @@ static int piix_get_info (char *buffer, char **addr, off_t offset, int count)
                        case PCI_DEVICE_ID_INTEL_82801DB_11:
                        case PCI_DEVICE_ID_INTEL_82801EB_11:
                        case PCI_DEVICE_ID_INTEL_82801E_11:
+                       case PCI_DEVICE_ID_INTEL_ESB_2:
+                       case PCI_DEVICE_ID_INTEL_ICH6_2:
                                p += sprintf(p, "PIIX4 Ultra 100 ");
                                break;
                        case PCI_DEVICE_ID_INTEL_82372FB_1:
@@ -289,6 +291,8 @@ static u8 piix_ratemask (ide_drive_t *drive)
                case PCI_DEVICE_ID_INTEL_82801DB_10:
                case PCI_DEVICE_ID_INTEL_82801DB_11:
                case PCI_DEVICE_ID_INTEL_82801EB_11:
+               case PCI_DEVICE_ID_INTEL_ESB_2:
+               case PCI_DEVICE_ID_INTEL_ICH6_2:
                        mode = 3;
                        break;
                /* UDMA 66 capable */
@@ -622,6 +626,8 @@ static unsigned int __devinit init_chipset_piix (struct pci_dev *dev, const char
                case PCI_DEVICE_ID_INTEL_82801DB_11:
                case PCI_DEVICE_ID_INTEL_82801EB_11:
                case PCI_DEVICE_ID_INTEL_82801E_11:
+               case PCI_DEVICE_ID_INTEL_ESB_2:
+               case PCI_DEVICE_ID_INTEL_ICH6_2:
                {
                        unsigned int extra = 0;
                        pci_read_config_dword(dev, 0x54, &extra);
@@ -797,6 +803,8 @@ static struct pci_device_id piix_pci_tbl[] = {
 #ifndef CONFIG_SCSI_SATA
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18},
 #endif /* !CONFIG_SCSI_SATA */
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19},
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20},
        { 0, },
 };
 

diff --git a/drivers/ide/pci/piix.h b/drivers/ide/pci/piix.h
index fc8cbd6945676c69b77c003ef745d3f756fd6e75..ab971e9d5e36813942d1ffadc4e3d38c3f4b8ebe 100644 (file)
--- a/drivers/ide/pci/piix.h
+++ b/drivers/ide/pci/piix.h
@@ -266,6 +266,34 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
                .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
                .bootable       = ON_BOARD,
                .extra          = 0,
+       },{     /* 19 */
+               .vendor         = PCI_VENDOR_ID_INTEL,
+               .device         = PCI_DEVICE_ID_INTEL_ESB_2,
+               .name           = "ICH5",
+               .init_setup     = init_setup_piix,
+               .init_chipset   = init_chipset_piix,
+               .init_iops      = NULL,
+               .init_hwif      = init_hwif_piix,
+               .init_dma       = init_dma_piix,
+               .channels       = 2,
+               .autodma        = AUTODMA,
+               .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+               .bootable       = ON_BOARD,
+               .extra          = 0,
+       },{     /* 20 */
+               .vendor         = PCI_VENDOR_ID_INTEL,
+               .device         = PCI_DEVICE_ID_INTEL_ICH6_2,
+               .name           = "ICH6",
+               .init_setup     = init_setup_piix,
+               .init_chipset   = init_chipset_piix,
+               .init_iops      = NULL,
+               .init_hwif      = init_hwif_piix,
+               .init_dma       = init_dma_piix,
+               .channels       = 2,
+               .autodma        = AUTODMA,
+               .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+               .bootable       = ON_BOARD,
+               .extra          = 0,
        },{
                .vendor         = 0,
                .device         = 0,