[Qemu-devel] [RESEND][PATCH 8/9] strongarm: add PCMCIA support

[Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>]

Add PCMCIA support to StrongARM SoCs reusing PXA devices.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 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