summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-28 23:44:38 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-28 23:44:38 +0200
commit24a96ae0e34e743f3ee00501ad38f1cb4aa31429 (patch)
tree1965a9befbf606dd7aff9591aa4bbd93c4166b92
parent16bb69c14a42e64faef1ec5c724ffaca916347a1 (diff)
downloadlinux-next-24a96ae0e34e743f3ee00501ad38f1cb4aa31429.tar.gz
siimage: do clocking register posting earlier in setup_mmio_siimage()
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>
-rw-r--r--drivers/ide/pci/siimage.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 076a476c3e3d..f0c4234bacab 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -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;
}