summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2015-04-17 09:19:01 -0500
committerTom Rini <trini@konsulko.com>2015-04-18 16:54:29 -0400
commit9efaca3e847696ed40fca1dbbc621fcc35b8d94c (patch)
tree2d97706c0a7393f5c716cecb46c1869131a507bd /board
parent3907305fb97c4547af5a03a0107b013ed7e886ca (diff)
downloadtalos-obmc-uboot-9efaca3e847696ed40fca1dbbc621fcc35b8d94c.tar.gz
talos-obmc-uboot-9efaca3e847696ed40fca1dbbc621fcc35b8d94c.zip
ahci: mmio_base is a virtual address
Don't store it in a u32. Don't dereference the bus address as if it were a virtual address (fixes 284231e49a2b4 ("ahci: Support splitting of read transactions into multiple chunks")). Fixes crash on boot in MPC8641HPCN_36BIT target. Signed-off-by: Scott Wood <scottwood@freescale.com> Cc: Vadim Bendebury <vbendeb@chromium.org> Acked-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'board')
-rw-r--r--board/highbank/highbank.c2
-rw-r--r--board/sunxi/ahci.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index fc2385cf31..ba1beb5bbc 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -57,7 +57,7 @@ void scsi_init(void)
u32 reg = readl(HB_SREG_A9_PWRDOM_STAT);
if (reg & PWRDOM_STAT_SATA) {
- ahci_init(HB_AHCI_BASE);
+ ahci_init((void __iomem *)HB_AHCI_BASE);
scsi_scan(1);
}
}
diff --git a/board/sunxi/ahci.c b/board/sunxi/ahci.c
index b7f0dda205..6d51b9b8e9 100644
--- a/board/sunxi/ahci.c
+++ b/board/sunxi/ahci.c
@@ -83,5 +83,5 @@ void scsi_init(void)
if (sunxi_ahci_phy_init(SUNXI_SATA_BASE) < 0)
return;
- ahci_init(SUNXI_SATA_BASE);
+ ahci_init((void __iomem *)SUNXI_SATA_BASE);
}
OpenPOWER on IntegriCloud