[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/17] omap_gpmc: Calculate revision from OMAP model
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 10/17] omap_gpmc: Calculate revision from OMAP model |
Date: |
Thu, 25 Aug 2011 21:05:04 +0100 |
From: Juha Riihimäki <address@hidden>
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_gpmc.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c
index c86e7ed..5c1365c 100644
--- a/hw/omap_gpmc.c
+++ b/hw/omap_gpmc.c
@@ -29,6 +29,7 @@ struct omap_gpmc_s {
qemu_irq irq;
MemoryRegion iomem;
+ uint8_t revision;
uint8_t sysconfig;
uint16_t irqst;
uint16_t irqen;
@@ -163,7 +164,7 @@ static uint64_t omap_gpmc_read(void *opaque,
target_phys_addr_t addr,
switch (addr) {
case 0x000: /* GPMC_REVISION */
- return 0x20;
+ return s->revision;
case 0x010: /* GPMC_SYSCONFIG */
return s->sysconfig;
@@ -409,6 +410,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->revision = cpu_class_omap3(mpu) ? 0x50 : 0x20;
omap_gpmc_reset(s);
return s;
--
1.7.1
- [Qemu-devel] [PATCH 00/17] onenand, omap_gpmc fixes, features, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 01/17] hw/sysbus: Add sysbus_mmio_get_region(), Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 13/17] hw/omap.h: Add OMAP 3630 to omap_mpu_model enumeration, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 10/17] omap_gpmc: Calculate revision from OMAP model,
Peter Maydell <=
- [Qemu-devel] [PATCH 17/17] omap_gpmc: Implement prefetch engine, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 15/17] omap_gpmc: Pull prefetch engine data into sub-struct, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 07/17] omap_gpmc: Wire up the GPMC IRQ correctly, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 12/17] omap_gpmc: Support NAND devices, Peter Maydell, 2011/08/25
- [Qemu-devel] [PATCH 05/17] omap_gpmc: Refactor omap_gpmc_cs_map and omap_gpmc_cs_unmap, Peter Maydell, 2011/08/25
- [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