siimage: do clocking register posting earlier in setup_mmio_siimage()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Mon, 28 Apr 2008 21:44:38 +0000 (23:44 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Mon, 28 Apr 2008 21:44:38 +0000 (23:44 +0200)
Do clocking register posting earlier in setup_mmio_siimage()
to match code in init_chipset_siimage().

This is a preparation for the next patch which merges PCI and MMIO
code paths together.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/pci/siimage.c

index 076a476c3e3d979b11cbfe0f739ec800c645dc74..f0c4234bacabd7fa6667209db76c39f0555230fc 100644 (file)
@@ -521,7 +521,9 @@ static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name)
                        writeb(tmpbyte & ~0x20, ioaddr + 0x4A);
                        break;
        }
-       
+
+       tmpbyte = readb(ioaddr + 0x4A);
+
        writeb(      0x72, ioaddr + 0xA1);
        writew(    0x328A, ioaddr + 0xA2);
        writel(0x62DD62DD, ioaddr + 0xA4);
@@ -540,8 +542,6 @@ static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name)
                writel(0x00680000, ioaddr + 0x1C8);
        }
 
-       tmpbyte = readb(ioaddr + 0x4A);
-
        proc_reports_siimage(dev, (tmpbyte>>4), name);
        return 1;
 }