aboutsummaryrefslogtreecommitdiff
path: root/hw/omap2.c
diff options
context:
space:
mode:
authorJuha Riihimäki <juha.riihimaki@nokia.com>2011-08-28 16:22:19 +0000
committerPeter Maydell <peter.maydell@linaro.org>2011-08-28 16:37:12 +0000
commitb5325c2739d9795f9462ef87e4080b792835d70a (patch)
tree8b30d736c89dd32f999923a8660d51e5f234e9ef /hw/omap2.c
parentde8af7fe0158493baa1c9a5418ac598a18e86027 (diff)
downloadqemu-b5325c2739d9795f9462ef87e4080b792835d70a.zip
qemu-b5325c2739d9795f9462ef87e4080b792835d70a.tar.gz
qemu-b5325c2739d9795f9462ef87e4080b792835d70a.tar.bz2
omap_gpmc: Take omap_mpu_state* in omap_gpmc_init
Take a pointer to the omap mpu state struct in omap_gpmc_init. Some details of GPMC behaviour depend on the OMAP version we are a part of. Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com> [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio <riku.voipio@iki.fi> [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/omap2.c')
-rw-r--r--hw/omap2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/omap2.c b/hw/omap2.c
index 7e5820a..0feb7a5 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -2402,7 +2402,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(unsigned long sdram_size,
sysbus_mmio_map(busdev, 4, omap_l4_region_base(ta, 5));
s->sdrc = omap_sdrc_init(0x68009000);
- s->gpmc = omap_gpmc_init(0x6800a000, s->irq[0][OMAP_INT_24XX_GPMC_IRQ]);
+ s->gpmc = omap_gpmc_init(s, 0x6800a000, s->irq[0][OMAP_INT_24XX_GPMC_IRQ]);
dinfo = drive_get(IF_SD, 0, 0);
if (!dinfo) {