Commit 24a96ae0e34e743f3ee00501ad38f1cb4aa31429
1 parent
16bb69c14a
Exists in
master
and in
20 other branches
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>
Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff
drivers/ide/pci/siimage.c
| ... | ... | @@ -521,7 +521,9 @@ |
| 521 | 521 | writeb(tmpbyte & ~0x20, ioaddr + 0x4A); |
| 522 | 522 | break; |
| 523 | 523 | } |
| 524 | - | |
| 524 | + | |
| 525 | + tmpbyte = readb(ioaddr + 0x4A); | |
| 526 | + | |
| 525 | 527 | writeb( 0x72, ioaddr + 0xA1); |
| 526 | 528 | writew( 0x328A, ioaddr + 0xA2); |
| 527 | 529 | writel(0x62DD62DD, ioaddr + 0xA4); |
| ... | ... | @@ -539,8 +541,6 @@ |
| 539 | 541 | writel(0x00680000, ioaddr + 0x148); |
| 540 | 542 | writel(0x00680000, ioaddr + 0x1C8); |
| 541 | 543 | } |
| 542 | - | |
| 543 | - tmpbyte = readb(ioaddr + 0x4A); | |
| 544 | 544 | |
| 545 | 545 | proc_reports_siimage(dev, (tmpbyte>>4), name); |
| 546 | 546 | return 1; |