From patchwork Wed Dec 7 09:47:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 129932 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 E4BE81007D2 for ; Wed, 7 Dec 2011 21:35:59 +1100 (EST) Received: from localhost ([::1]:54238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYE7i-0003PK-Av for incoming@patchwork.ozlabs.org; Wed, 07 Dec 2011 04:49:10 -0500 Received: from eggs.gnu.org ([140.186.70.92]:56091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYE6k-0001Cq-El for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:48:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RYE6i-00022l-3K for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:48:10 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:17620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYE6h-00022T-Sn for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:48:08 -0500 Received: from euspt1 (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0LVT00CQ2V865Z@mailout1.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 07 Dec 2011 09:48:06 +0000 (GMT) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.8.48]) by spt1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LVT00GNZV7ATA@spt1.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 07 Dec 2011 09:48:06 +0000 (GMT) Date: Wed, 07 Dec 2011 13:47:05 +0400 From: Evgeny Voevodin In-reply-to: <1323251225-1072-1-git-send-email-e.voevodin@samsung.com> To: qemu-devel@nongnu.org Message-id: <1323251225-1072-15-git-send-email-e.voevodin@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.4.1 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT References: <1323251225-1072-1-git-send-email-e.voevodin@samsung.com> X-detected-operating-system: by eggs.gnu.org: Solaris 9.1 X-Received-From: 210.118.77.11 Cc: d.solodkiy@samsung.com, Evgeny Voevodin Subject: [Qemu-devel] [PATCH 14/14] s5pc210: Switch to sysbus_init_mmio. 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 Signed-off-by: Evgeny Voevodin --- 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); 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);