From patchwork Thu Aug 25 20:05:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 111657 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7E600B70C0 for ; Fri, 26 Aug 2011 06:05:47 +1000 (EST) Received: from localhost ([::1]:32974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwgBL-0002tq-59 for incoming@patchwork.ozlabs.org; Thu, 25 Aug 2011 16:05:43 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwgAx-0001gC-I1 for qemu-devel@nongnu.org; Thu, 25 Aug 2011 16:05:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwgAw-0004U9-7O for qemu-devel@nongnu.org; Thu, 25 Aug 2011 16:05:19 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:42779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwgAv-0004U0-TQ for qemu-devel@nongnu.org; Thu, 25 Aug 2011 16:05:18 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QwgAp-0005LN-Fb; Thu, 25 Aug 2011 21:05:11 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 25 Aug 2011 21:05:04 +0100 Message-Id: <1314302711-20498-11-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1314302711-20498-1-git-send-email-peter.maydell@linaro.org> References: <1314302711-20498-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH 10/17] omap_gpmc: Calculate revision from OMAP model X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Juha Riihimäki Signed-off-by: Juha Riihimäki [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell --- 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;