omap_gpmc: Calculate revision from OMAP model

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>
This commit is contained in:
Juha Riihimäki 2011-08-28 16:22:19 +00:00 committed by Peter Maydell
parent b5325c2739
commit 7c470ff1eb
1 changed files with 3 additions and 1 deletions

View File

@ -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;