From: Bartlomiej Zolnierkiewicz Date: Mon, 28 Apr 2008 21:44:38 +0000 (+0200) Subject: siimage: do clocking register posting earlier in setup_mmio_siimage() X-Git-Tag: v2.6.26-rc1~688^2~26 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=24a96ae0e34e743f3ee00501ad38f1cb4aa31429;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 076a476c3e3..f0c4234baca 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; }