From patchwork Mon Jun 13 10:54:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhao xiao qiang X-Patchwork-Id: 9172693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0C354604DB for ; Mon, 13 Jun 2016 11:04:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2E63200F5 for ; Mon, 13 Jun 2016 11:04:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E56CB20499; Mon, 13 Jun 2016 11:04:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 87556200F5 for ; Mon, 13 Jun 2016 11:04:44 +0000 (UTC) Received: from localhost ([::1]:55326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPff-0003mH-MP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 13 Jun 2016 07:04:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPWs-0004YF-5E for qemu-devel@nongnu.org; Mon, 13 Jun 2016 06:55:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCPWg-0003Ij-Tw for qemu-devel@nongnu.org; Mon, 13 Jun 2016 06:55:36 -0400 Received: from m50-134.163.com ([123.125.50.134]:47874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPWe-0003GC-4R; Mon, 13 Jun 2016 06:55:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=V9I94wK7MIdkAa/jrv rNwtlH46doMmSfpyERYIf+joM=; b=EvQCDjE+Zl7khk3FMaEroq3qRHr8gvUaZV ttmiPBoiOPSkziB9HGYTiyt5hMvWVkuBczqzg2zliMc8xgyCH0BSvhnq2d/8GS8H uWhEsUX78RCXVNDO23p6r0YHEJQMx3hECQ7TyJ/LBoSt3d1vWfBdE0SYW1JbWu1n jHlh219Xk= Received: from localhost.localdomain (unknown [101.254.142.162]) by smtp4 (Coremail) with SMTP id DtGowADHQpfkkF5X+0_jBA--.36165S5; Mon, 13 Jun 2016 18:54:32 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Mon, 13 Jun 2016 18:54:06 +0800 Message-Id: <1465815255-21776-4-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465815255-21776-1-git-send-email-zxq_yx_007@163.com> References: <1465815255-21776-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: DtGowADHQpfkkF5X+0_jBA--.36165S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxZw1Dtr4DJF17Zr1xCrW7urg_yoW5AFyfpF 9xtFn3GrWkJFs7XrZaqr4DCFs5Xw4kK348tr13Jwnavr1DuwsIyw4vyF4Yv34UG392ya13 XayrJFy8GF48AaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jlg4hUUUUU= X-Originating-IP: [101.254.142.162] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbBEgiHxlZXyT3J5wAAsA X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.134 Subject: [Qemu-devel] [RESEND PATCH 03/12] hw/i2c: QOM'ify omap_i2c.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: i.mitsyanko@gmail.com, peter.maydell@linaro.org, qemu-arm@nongnu.org, zhaoshenglong@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP * Split the omap_i2c_init into an instance_init and realize function * Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao --- hw/i2c/omap_i2c.c | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index 67fbbff..f7c92ea 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -22,6 +22,7 @@ #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" +#include "qapi/error.h" #define TYPE_OMAP_I2C "omap_i2c" #define OMAP_I2C(obj) OBJECT_CHECK(OMAPI2CState, (obj), TYPE_OMAP_I2C) @@ -445,29 +446,35 @@ static const MemoryRegionOps omap_i2c_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int omap_i2c_init(SysBusDevice *sbd) +static void omap_i2c_init(Object *obj) { - DeviceState *dev = DEVICE(sbd); - OMAPI2CState *s = OMAP_I2C(dev); - - if (!s->fclk) { - error_report("omap_i2c: fclk not connected"); - return -1; - } - if (s->revision >= OMAP2_INTR_REV && !s->iclk) { - /* Note that OMAP1 doesn't have a separate interface clock */ - error_report("omap_i2c: iclk not connected"); - return -1; - } + DeviceState *dev = DEVICE(obj); + OMAPI2CState *s = OMAP_I2C(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); sysbus_init_irq(sbd, &s->irq); sysbus_init_irq(sbd, &s->drq[0]); sysbus_init_irq(sbd, &s->drq[1]); - memory_region_init_io(&s->iomem, OBJECT(s), &omap_i2c_ops, s, "omap.i2c", - (s->revision < OMAP2_INTR_REV) ? 0x800 : 0x1000); sysbus_init_mmio(sbd, &s->iomem); s->bus = i2c_init_bus(dev, NULL); - return 0; +} + +static void omap_i2c_realize(DeviceState *dev, Error **errp) +{ + OMAPI2CState *s = OMAP_I2C(dev); + + memory_region_init_io(&s->iomem, OBJECT(dev), &omap_i2c_ops, s, "omap.i2c", + (s->revision < OMAP2_INTR_REV) ? 0x800 : 0x1000); + + if (!s->fclk) { + error_setg(errp, "omap_i2c: fclk not connected"); + return; + } + if (s->revision >= OMAP2_INTR_REV && !s->iclk) { + /* Note that OMAP1 doesn't have a separate interface clock */ + error_setg(errp, "omap_i2c: iclk not connected"); + return; + } } static Property omap_i2c_properties[] = { @@ -480,18 +487,19 @@ static Property omap_i2c_properties[] = { static void omap_i2c_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = omap_i2c_init; + dc->props = omap_i2c_properties; dc->reset = omap_i2c_reset; /* Reason: pointer properties "iclk", "fclk" */ dc->cannot_instantiate_with_device_add_yet = true; + dc->realize = omap_i2c_realize; } static const TypeInfo omap_i2c_info = { .name = TYPE_OMAP_I2C, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(OMAPI2CState), + .instance_init = omap_i2c_init, .class_init = omap_i2c_class_init, };