summary refs log tree commit diff stats
path: root/hw/omap_gpmc.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/omap_gpmc.c
parentde8af7fe0158493baa1c9a5418ac598a18e86027 (diff)
downloadfocaccia-qemu-b5325c2739d9795f9462ef87e4080b792835d70a.tar.gz
focaccia-qemu-b5325c2739d9795f9462ef87e4080b792835d70a.zip
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/omap_gpmc.c')
-rw-r--r--hw/omap_gpmc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c
index 9da8491943..c86e7ed713 100644
--- a/hw/omap_gpmc.c
+++ b/hw/omap_gpmc.c
@@ -399,7 +399,8 @@ static const MemoryRegionOps omap_gpmc_ops = {
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-struct omap_gpmc_s *omap_gpmc_init(target_phys_addr_t base, qemu_irq irq)
+struct omap_gpmc_s *omap_gpmc_init(struct omap_mpu_state_s *mpu,
+                                   target_phys_addr_t base, qemu_irq irq)
 {
     struct omap_gpmc_s *s = (struct omap_gpmc_s *)
             g_malloc0(sizeof(struct omap_gpmc_s));