[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/18] omap_gpmc: Take omap_mpu_state* in omap_gp
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 10/18] omap_gpmc: Take omap_mpu_state* in omap_gpmc_init |
Date: |
Sun, 28 Aug 2011 17:57:00 +0100 |
From: Juha Riihimäki <address@hidden>
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 <address@hidden>
[Riku Voipio: Fixes and restructuring patchset]
Signed-off-by: Riku Voipio <address@hidden>
[Peter Maydell: More fixes and cleanups for upstream submission]
Signed-off-by: Peter Maydell <address@hidden>
---
hw/omap.h | 3 ++-
hw/omap2.c | 2 +-
hw/omap_gpmc.c | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/omap.h b/hw/omap.h
index 47c8629..8509c82 100644
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -118,7 +118,8 @@ void omap_sdrc_reset(struct omap_sdrc_s *s);
/* OMAP2 general purpose memory controller */
struct omap_gpmc_s;
-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);
void omap_gpmc_reset(struct omap_gpmc_s *s);
void omap_gpmc_attach(struct omap_gpmc_s *s, int cs, MemoryRegion *iomem);
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) {
diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c
index 9da8491..c86e7ed 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));
--
1.7.1
- [Qemu-devel] [PATCH v2 03/18] hw/onenand: Qdevify, (continued)
- [Qemu-devel] [PATCH v2 03/18] hw/onenand: Qdevify, Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 13/18] omap_gpmc: Support NAND devices, Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 04/18] hw/onenand: Minor spacing fixes, Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 12/18] omap_gpmc: Reindent misindented switch statements, Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 02/18] hw/onenand: Remove unnecessary argument from onenand_command(), Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 11/18] omap_gpmc: Calculate revision from OMAP model, Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 07/18] omap_gpmc: GPMC_IRQSTATUS is write-one-to-clear, Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 08/18] omap_gpmc: Wire up the GPMC IRQ correctly, Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 00/18] onenand, omap_gpmc fixes, features, Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 16/18] omap_gpmc: Pull prefetch engine data into sub-struct, Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 10/18] omap_gpmc: Take omap_mpu_state* in omap_gpmc_init,
Peter Maydell <=
- [Qemu-devel] [PATCH v2 18/18] omap_gpmc: Implement prefetch engine, Peter Maydell, 2011/08/28
- [Qemu-devel] [PATCH v2 17/18] omap: Wire up the DMA request line to the GPMC, Peter Maydell, 2011/08/28
- Re: [Qemu-devel] [PATCH v2 00/18] onenand, omap_gpmc fixes, features, Edgar E. Iglesias, 2011/08/30