diff mbox

[14/14] s5pc210: Switch to sysbus_init_mmio.

Message ID 1323251225-1072-15-git-send-email-e.voevodin@samsung.com
State New
Headers show

Commit Message

Evgeny Voevodin Dec. 7, 2011, 9:47 a.m. UTC 
Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
---
 hw/s5pc210_cmu.c      |    2 +-
 hw/s5pc210_combiner.c |    2 +-
 hw/s5pc210_fimd.c     |    2 +-
 hw/s5pc210_gic.c      |    4 ++--
 hw/s5pc210_mct.c      |    2 +-
 hw/s5pc210_pwm.c      |    2 +-
 hw/s5pc210_sdhc.c     |    2 +-
 hw/s5pc210_uart.c     |    2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

Comments

Peter Maydell Dec. 7, 2011, 10:41 a.m. UTC | #1 
On 7 December 2011 09:47, Evgeny Voevodin <e.voevodin@samsung.com> wrote:
>
> Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
> ---
>  hw/s5pc210_cmu.c      |    2 +-
>  hw/s5pc210_combiner.c |    2 +-
>  hw/s5pc210_fimd.c     |    2 +-
>  hw/s5pc210_gic.c      |    4 ++--
>  hw/s5pc210_mct.c      |    2 +-
>  hw/s5pc210_pwm.c      |    2 +-
>  hw/s5pc210_sdhc.c     |    2 +-
>  hw/s5pc210_uart.c     |    2 +-
>  8 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/hw/s5pc210_cmu.c b/hw/s5pc210_cmu.c
> index 12fba47..b8f0e5d 100644
> --- a/hw/s5pc210_cmu.c
> +++ b/hw/s5pc210_cmu.c
> @@ -1121,7 +1121,7 @@ static int s5pc210_cmu_init(SysBusDevice *dev)
>     /* memory mapping */
>     memory_region_init_io(&s->iomem, &s5pc210_cmu_ops, s, "s5pc210.cmu",
>                           S5PC210_CMU_REGS_MEM_SIZE);
> -    sysbus_init_mmio_region(dev, &s->iomem);
> +    sysbus_init_mmio(dev, &s->iomem);
>
>     qemu_register_reset(s5pc210_cmu_reset, s);

These changes need to be folded in with the earlier patches, otherwise
they will not compile. Each patch in the series should be correct as it
stands, not broken and fixed up by a later patch.

-- PMM
diff mbox

Patch

diff --git a/hw/s5pc210_cmu.c b/hw/s5pc210_cmu.c
index 12fba47..b8f0e5d 100644
--- a/hw/s5pc210_cmu.c
+++ b/hw/s5pc210_cmu.c
@@ -1121,7 +1121,7 @@  static int s5pc210_cmu_init(SysBusDevice *dev)
     /* memory mapping */
     memory_region_init_io(&s->iomem, &s5pc210_cmu_ops, s, "s5pc210.cmu",
                           S5PC210_CMU_REGS_MEM_SIZE);
-    sysbus_init_mmio_region(dev, &s->iomem);
+    sysbus_init_mmio(dev, &s->iomem);
 
     qemu_register_reset(s5pc210_cmu_reset, s);
 
diff --git a/hw/s5pc210_combiner.c b/hw/s5pc210_combiner.c
index 04ae024..680e761 100644
--- a/hw/s5pc210_combiner.c
+++ b/hw/s5pc210_combiner.c
@@ -352,7 +352,7 @@  static int s5pc210_combiner_init(SysBusDevice *dev)
 
     memory_region_init_io(&s->iomem, &s5pc210_combiner_ops, s,
             "s5pc210-combiner", IIC_REGION_SIZE);
-    sysbus_init_mmio_region(dev, &s->iomem);
+    sysbus_init_mmio(dev, &s->iomem);
 
     s5pc210_combiner_reset(s);
     vmstate_register(NULL, -1, &VMState_S5pc210Combiner, s);
diff --git a/hw/s5pc210_fimd.c b/hw/s5pc210_fimd.c
index b3b01f2..77174ee 100644
--- a/hw/s5pc210_fimd.c
+++ b/hw/s5pc210_fimd.c
@@ -1675,7 +1675,7 @@  static int s5pc210_fimd_init(SysBusDevice *dev)
 
     memory_region_init_io(&s->iomem, &s5pc210_fimd_mmio_ops, s, "s5pc210.fimd",
             FIMD_REGS_SIZE);
-    sysbus_init_mmio_region(dev, &s->iomem);
+    sysbus_init_mmio(dev, &s->iomem);
     s->console = graphic_console_init(s5pc210_fimd_update,
                                       s5pc210_fimd_invalidate, NULL, NULL, s);
 
diff --git a/hw/s5pc210_gic.c b/hw/s5pc210_gic.c
index c6f18d4..4eeeae1 100644
--- a/hw/s5pc210_gic.c
+++ b/hw/s5pc210_gic.c
@@ -386,8 +386,8 @@  static int s5pc210_gic_init(SysBusDevice *dev)
     memory_region_init_io(&s->dist_container, &s5pc210_gic_dist_ops, &s->gic,
             "s5pc210-gic-dist", S5PC210_GIC_DIST_REGION_SIZE);
 
-    sysbus_init_mmio_region(dev, &s->cpu_container);
-    sysbus_init_mmio_region(dev, &s->dist_container);
+    sysbus_init_mmio(dev, &s->cpu_container);
+    sysbus_init_mmio(dev, &s->dist_container);
 
     gic_cpu_write(&s->gic, 1, 0, 1);
     return 0;
diff --git a/hw/s5pc210_mct.c b/hw/s5pc210_mct.c
index 7a7dd84..adb0a2c 100644
--- a/hw/s5pc210_mct.c
+++ b/hw/s5pc210_mct.c
@@ -1465,7 +1465,7 @@  static int s5pc210_mct_init(SysBusDevice *dev)
 
     memory_region_init_io(&s->iomem, &s5pc210_mct_ops, s, "s5pc210-mct",
             MCT_SFR_SIZE);
-    sysbus_init_mmio_region(dev, &s->iomem);
+    sysbus_init_mmio(dev, &s->iomem);
 
     s5pc210_mct_reset(s);
 
diff --git a/hw/s5pc210_pwm.c b/hw/s5pc210_pwm.c
index 5dfaa41..8b280d1 100644
--- a/hw/s5pc210_pwm.c
+++ b/hw/s5pc210_pwm.c
@@ -415,7 +415,7 @@  static int s5pc210_pwm_init(SysBusDevice *dev)
 
     memory_region_init_io(&s->iomem, &s5pc210_pwm_ops, s, "s5pc210-pwm",
             S5PC210_PWM_REG_MEM_SIZE);
-    sysbus_init_mmio_region(dev, &s->iomem);
+    sysbus_init_mmio(dev, &s->iomem);
 
     s5pc210_pwm_reset(s);
 
diff --git a/hw/s5pc210_sdhc.c b/hw/s5pc210_sdhc.c
index dbbb885..8aecf51 100644
--- a/hw/s5pc210_sdhc.c
+++ b/hw/s5pc210_sdhc.c
@@ -1648,7 +1648,7 @@  static int s5pc210_sdhc_init(SysBusDevice *dev)
     sysbus_init_irq(dev, &s->irq);
     memory_region_init_io(&s->iomem, &s5pc210_sdhc_mmio_ops, s, "s5pc210.sdhc",
             SDHC_REG_SIZE);
-    sysbus_init_mmio_region(dev, &s->iomem);
+    sysbus_init_mmio(dev, &s->iomem);
     bd = drive_get_next(IF_SD);
 
     if ((bd == NULL)) {
diff --git a/hw/s5pc210_uart.c b/hw/s5pc210_uart.c
index d1fbddc..3870740 100644
--- a/hw/s5pc210_uart.c
+++ b/hw/s5pc210_uart.c
@@ -644,7 +644,7 @@  static int s5pc210_uart_init(SysBusDevice *dev)
     /* memory mapping */
     memory_region_init_io(&s->iomem, &s5pc210_uart_ops, s, "s5pc210.uart",
                           S5PC210_UART_REGS_MEM_SIZE);
-    sysbus_init_mmio_region(dev, &s->iomem);
+    sysbus_init_mmio(dev, &s->iomem);
 
     sysbus_init_irq(dev, &s->irq);