summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap-common/boot-common.c
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 /arch/arm/cpu/armv7/omap-common/boot-common.c
parent3907305fb97c4547af5a03a0107b013ed7e886ca (diff)
downloadblackbird-obmc-uboot-9efaca3e847696ed40fca1dbbc621fcc35b8d94c.tar.gz
blackbird-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 'arch/arm/cpu/armv7/omap-common/boot-common.c')
-rw-r--r--arch/arm/cpu/armv7/omap-common/boot-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 17500f2315..f2f6897eb6 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -159,6 +159,6 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
#ifdef CONFIG_SCSI_AHCI_PLAT
void arch_preboot_os(void)
{
- ahci_reset(DWC_AHSATA_BASE);
+ ahci_reset((void __iomem *)DWC_AHSATA_BASE);
}
#endif
OpenPOWER on IntegriCloud