diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-28 17:44:38 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-28 17:44:38 -0400 |
commit | 24a96ae0e34e743f3ee00501ad38f1cb4aa31429 (patch) | |
tree | 1965a9befbf606dd7aff9591aa4bbd93c4166b92 /drivers/ide/pci/siimage.c | |
parent | 16bb69c14a42e64faef1ec5c724ffaca916347a1 (diff) |
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>
Diffstat (limited to 'drivers/ide/pci/siimage.c')
-rw-r--r-- | drivers/ide/pci/siimage.c | 6 |
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) | |||
521 | writeb(tmpbyte & ~0x20, ioaddr + 0x4A); | 521 | writeb(tmpbyte & ~0x20, ioaddr + 0x4A); |
522 | break; | 522 | break; |
523 | } | 523 | } |
524 | 524 | ||
525 | tmpbyte = readb(ioaddr + 0x4A); | ||
526 | |||
525 | writeb( 0x72, ioaddr + 0xA1); | 527 | writeb( 0x72, ioaddr + 0xA1); |
526 | writew( 0x328A, ioaddr + 0xA2); | 528 | writew( 0x328A, ioaddr + 0xA2); |
527 | writel(0x62DD62DD, ioaddr + 0xA4); | 529 | writel(0x62DD62DD, ioaddr + 0xA4); |
@@ -540,8 +542,6 @@ static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name) | |||
540 | writel(0x00680000, ioaddr + 0x1C8); | 542 | writel(0x00680000, ioaddr + 0x1C8); |
541 | } | 543 | } |
542 | 544 | ||
543 | tmpbyte = readb(ioaddr + 0x4A); | ||
544 | |||
545 | proc_reports_siimage(dev, (tmpbyte>>4), name); | 545 | proc_reports_siimage(dev, (tmpbyte>>4), name); |
546 | return 1; | 546 | return 1; |
547 | } | 547 | } |