revert multi-omap for omap1/omap2

diff --git a/hw/omap.h b/hw/omap.h
index 46a5ddd..ceaec73 100644 (file)
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -1041,7 +1041,7 @@ struct omap_mpu_state_s {
     /* MPU public TIPB peripherals */
     struct omap_32khz_timer_s *os_timer;
 
-    struct omap_mmc_s *mmc[2];
+    struct omap_mmc_s *mmc;
 
     struct omap_mpuio_s *mpuio;
 

diff --git a/hw/omap1.c b/hw/omap1.c
index 9dfce30..9d065cd 100644 (file)
--- a/hw/omap1.c
+++ b/hw/omap1.c
@@ -4503,7 +4503,7 @@ static void omap1_mpu_reset(void *opaque)
     omap_uart_reset(mpu->uart[0]);
     omap_uart_reset(mpu->uart[1]);
     omap_uart_reset(mpu->uart[2]);
-    omap_mmc_reset(mpu->mmc[0]);
+    omap_mmc_reset(mpu->mmc);
     omap_mpuio_reset(mpu->mpuio);
     omap_gpio_reset(mpu->gpio);
     omap_uwire_reset(mpu->microwire);
@@ -4751,7 +4751,7 @@ struct omap_mpu_state_s *omap310_mpu_init(unsigned long sdram_size,
         fprintf(stderr, "qemu: missing SecureDigital device\n");
         exit(1);
     }
-    s->mmc[0] = omap_mmc_init(0xfffb7800, drives_table[sdindex].bdrv,
+    s->mmc = omap_mmc_init(0xfffb7800, drives_table[sdindex].bdrv,
                     s->irq[1][OMAP_INT_OQN], &s->drq[OMAP_DMA_MMC_TX],
                     omap_findclk(s, "mmc_ck"));
 

diff --git a/hw/omap2.c b/hw/omap2.c
index 4057181..cdfca0c 100644 (file)
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -4781,7 +4781,7 @@ static void omap2_mpu_reset(void *opaque)
     omap_uart_reset(mpu->uart[0]);
     omap_uart_reset(mpu->uart[1]);
     omap_uart_reset(mpu->uart[2]);
-    omap_mmc_reset(mpu->mmc[0]);
+    omap_mmc_reset(mpu->mmc);
     omap_gpif_reset(mpu->gpif);
     omap_mcspi_reset(mpu->mcspi[0]);
     omap_mcspi_reset(mpu->mcspi[1]);
@@ -4967,7 +4967,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(unsigned long sdram_size,
         fprintf(stderr, "qemu: missing SecureDigital device\n");
         exit(1);
     }
-    s->mmc[0] = omap2_mmc_init(omap_l4tao(s->l4, 9), drives_table[sdindex].bdrv,
+    s->mmc = omap2_mmc_init(omap_l4tao(s->l4, 9), drives_table[sdindex].bdrv,
                     s->irq[0][OMAP_INT_24XX_MMC_IRQ],
                     &s->drq[OMAP24XX_DMA_MMC1_TX],
                     omap_findclk(s, "mmc_fclk"), omap_findclk(s, "mmc_iclk"));