From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEHkp-0002Xu-J1 for qemu-devel@nongnu.org; Mon, 25 Apr 2011 05:06:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QEHko-0001E2-PM for qemu-devel@nongnu.org; Mon, 25 Apr 2011 05:06:51 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:35500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEHko-0001Be-L7 for qemu-devel@nongnu.org; Mon, 25 Apr 2011 05:06:50 -0400 Received: by mail-wy0-f173.google.com with SMTP id 42so1790864wyb.4 for ; Mon, 25 Apr 2011 02:06:50 -0700 (PDT) From: Dmitry Eremin-Solenikov Date: Mon, 25 Apr 2011 13:06:34 +0400 Message-Id: <1303722395-10791-8-git-send-email-dbaryshkov@gmail.com> In-Reply-To: <1303722395-10791-1-git-send-email-dbaryshkov@gmail.com> References: <1303722395-10791-1-git-send-email-dbaryshkov@gmail.com> Subject: [Qemu-devel] [RESEND][PATCH 8/9] strongarm: add PCMCIA support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Add PCMCIA support to StrongARM SoCs reusing PXA devices. Signed-off-by: Dmitry Eremin-Solenikov --- hw/strongarm.c | 5 ++++- hw/strongarm.h | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hw/strongarm.c b/hw/strongarm.c index de08bdf..dbc253c 100644 --- a/hw/strongarm.c +++ b/hw/strongarm.c @@ -29,6 +29,7 @@ #include "arm-misc.h" #include "sysemu.h" #include "ssi.h" +#include "pcmcia.h" //#define DEBUG @@ -40,7 +41,6 @@ - Implement sleep mode/Wake sources - Implement reset control - Implement memory control regs - - PCMCIA handling - Maybe support MBGNT/MBREQ - DMA channels - GPCLK @@ -1583,6 +1583,9 @@ StrongARMState *sa1110_init(unsigned int sdram_size, const char *rev) qdev_get_gpio_in(s->pic, SA_PIC_SSP), NULL); s->ssp_bus = (SSIBus *)qdev_get_child_bus(s->ssp, "ssi"); + s->pcmcia[1] = pxa2xx_pcmcia_init(0x30000000, 1); + s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000, 0); + return s; } diff --git a/hw/strongarm.h b/hw/strongarm.h index a81b110..d1ce538 100644 --- a/hw/strongarm.h +++ b/hw/strongarm.h @@ -57,6 +57,7 @@ typedef struct { DeviceState *ppc; DeviceState *ssp; SSIBus *ssp_bus; + DeviceState *pcmcia[2]; } StrongARMState; StrongARMState *sa1110_init(unsigned int sdram_size, const char *rev); -- 1.7.4.1