piix: fix 82371MX enablebits

According to the datasheet, Intel 82371MX (MPIIX) actually has only a
single IDE channel mapped to the primary or secondary ports depending on
the value of the bit 14 of the IDETIM register at PCI config.  offset 0x6C
(the register at 0x6F which the driver refers to.  doesn't exist).  So,
disguise the controller as dual channel and set enablebits masks/values
such that only either primary or secondary channel is detected enabled.
Also, preclude the IDE probing code from reading PCI BARs, this controller
just doesn't have them (it's not the separate PCI function like the other
PCI controllers), it only decodes the legacy addresses.

[ Alan sayeth " MPIIX does not work with or without the change.  It needs its
  own different driver and not to use setup-pci.  Huge job and since it works
  well with libata who cares.  Ditto the early PIIX chip." ]

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index edb37f3d558d7c99194ba2f0cd72d5b63d553851..236d8fd4e72bbc44a86d672735eeabe8424f7af1 100644 (file)
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -539,13 +539,19 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
        /*  0 */ DECLARE_PIIX_DEV("PIIXa"),
        /*  1 */ DECLARE_PIIX_DEV("PIIXb"),
 
-       {       /* 2 */
+       /*  2 */
+       {       /*
+                * MPIIX actually has only a single IDE channel mapped to
+                * the primary or secondary ports depending on the value
+                * of the bit 14 of the IDETIM register at offset 0x6c
+                */
                .name           = "MPIIX",
                .init_hwif      = init_hwif_piix,
                .channels       = 2,
                .autodma        = NODMA,
-               .enablebits     = {{0x6D,0x80,0x80}, {0x6F,0x80,0x80}},
+               .enablebits     = {{0x6d,0xc0,0x80}, {0x6d,0xc0,0xc0}},
                .bootable       = ON_BOARD,
+               .flags          = IDEPCI_FLAG_ISA_PORTS
        },
 
        /*  3 */ DECLARE_PIIX_DEV("PIIX3"),