[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/17] omap: Wire up the DMA request line to the GPM
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 16/17] omap: Wire up the DMA request line to the GPMC |
Date: |
Thu, 25 Aug 2011 21:05:10 +0100 |
Signed-off-by: Peter Maydell <address@hidden>
---
hw/omap.h | 3 ++-
hw/omap2.c | 3 ++-
hw/omap_gpmc.c | 5 ++++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/omap.h b/hw/omap.h
index 81f5544..d9ab006 100644
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -119,7 +119,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(struct omap_mpu_state_s *mpu,
- target_phys_addr_t base, qemu_irq irq);
+ target_phys_addr_t base,
+ qemu_irq irq, qemu_irq drq);
void omap_gpmc_reset(struct omap_gpmc_s *s);
void omap_gpmc_attach(struct omap_gpmc_s *s, int cs, MemoryRegion *iomem);
void omap_gpmc_attach_nand(struct omap_gpmc_s *s, int cs, DeviceState *nand);
diff --git a/hw/omap2.c b/hw/omap2.c
index 0feb7a5..ca088d9 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -2402,7 +2402,8 @@ 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(s, 0x6800a000, s->irq[0][OMAP_INT_24XX_GPMC_IRQ]);
+ s->gpmc = omap_gpmc_init(s, 0x6800a000, s->irq[0][OMAP_INT_24XX_GPMC_IRQ],
+ s->drq[OMAP24XX_DMA_GPMC]);
dinfo = drive_get(IF_SD, 0, 0);
if (!dinfo) {
diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c
index 158c097..be309fe 100644
--- a/hw/omap_gpmc.c
+++ b/hw/omap_gpmc.c
@@ -27,6 +27,7 @@
/* General-Purpose Memory Controller */
struct omap_gpmc_s {
qemu_irq irq;
+ qemu_irq drq;
MemoryRegion iomem;
int accept_256;
@@ -564,7 +565,8 @@ static const MemoryRegionOps omap_gpmc_ops = {
};
struct omap_gpmc_s *omap_gpmc_init(struct omap_mpu_state_s *mpu,
- target_phys_addr_t base, qemu_irq irq)
+ target_phys_addr_t base,
+ qemu_irq irq, qemu_irq drq)
{
int cs;
struct omap_gpmc_s *s = (struct omap_gpmc_s *)
@@ -574,6 +576,7 @@ struct omap_gpmc_s *omap_gpmc_init(struct omap_mpu_state_s
*mpu,
memory_region_add_subregion(get_system_memory(), base, &s->iomem);
s->irq = irq;
+ s->drq = drq;
s->accept_256 = cpu_is_omap3630(mpu);
s->revision = cpu_class_omap3(mpu) ? 0x50 : 0x20;
omap_gpmc_reset(s);
--
1.7.1
- [Qemu-devel] [PATCH 11/17] omap_gpmc: Reindent misindented switch statements, (continued)
- [Qemu-devel] [PATCH 11/17] omap_gpmc: Reindent misindented switch statements, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 06/17] omap_gpmc: GPMC_IRQSTATUS is write-one-to-clear, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 04/17] omap_gpmc: Clean up omap_gpmc_attach MemoryRegion conversion, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 03/17] hw/onenand: Minor spacing fixes, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 14/17] omap_gpmc: Accept a zero mask field on omap3630, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 09/17] omap_gpmc: Take omap_mpu_state* in omap_gpmc_init, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 02/17] hw/onenand: Qdevify, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 16/17] omap: Wire up the DMA request line to the GPMC,
Peter Maydell <=
- [Qemu-devel] [PATCH 08/17] omap_gpmc: Fix handling of FIFOTHRESHOLDSTATUS bit, Peter Maydell, 2011/08/25
- Re: [Qemu-devel] [PATCH 00/17] onenand, omap_gpmc fixes, features, Edgar E. Iglesias, 2011/08/26
- Re: [Qemu-devel] [PATCH 00/17] onenand, omap_gpmc fixes, features, Edgar E. Iglesias, 2011/08/28