From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7HSa-0007t8-8Y for qemu-devel@nongnu.org; Thu, 17 Nov 2016 02:50:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7HSX-0001fZ-5C for qemu-devel@nongnu.org; Thu, 17 Nov 2016 02:50:16 -0500 Received: from 5.mo7.mail-out.ovh.net ([178.32.120.239]:44962) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c7HSW-0001fG-VJ for qemu-devel@nongnu.org; Thu, 17 Nov 2016 02:50:13 -0500 Received: from player697.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id 1A96220039 for ; Thu, 17 Nov 2016 08:50:10 +0100 (CET) References: <1479357400-17441-1-git-send-email-alastair@au1.ibm.com> <1479357400-17441-2-git-send-email-alastair@au1.ibm.com> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: <9051f1ab-de5b-3f66-eda1-bc0b6c46d691@kaod.org> Date: Thu, 17 Nov 2016 08:50:01 +0100 MIME-Version: 1.0 In-Reply-To: <1479357400-17441-2-git-send-email-alastair@au1.ibm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/4] arm: Uniquely name imx25 I2C buses. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alastair D'Silva , qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, Peter Maydell , Andrew Jeffery , Joel Stanley , Alastair D'Silva Hello, On 11/17/2016 05:36 AM, Alastair D'Silva wrote: > From: Alastair D'Silva > > The imx25 chip provides 3 i2c buses, but they have all been named > "i2c", which makes it difficult to predict which bus a device will > be connected to when specified on the command line. > > This patch addresses the issue by naming the buses uniquely: > i2c.0 i2c.1 i2c.2 > > Signed-off-by: Alastair D'Silva > --- > hw/arm/imx25_pdk.c | 2 +- > hw/i2c/imx_i2c.c | 6 +++++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c > index 025b608..1f7512c 100644 > --- a/hw/arm/imx25_pdk.c > +++ b/hw/arm/imx25_pdk.c > @@ -139,7 +139,7 @@ static void imx25_pdk_init(MachineState *machine) > * of simple qtest. See "make check" for details. > */ > i2c_create_slave((I2CBus *)qdev_get_child_bus(DEVICE(&s->soc.i2c[0]), > - "i2c"), > + "i2c.0"), > "ds1338", 0x68); or just : i2c_create_slave(s->soc.i2c[0].bus, "ds1338", 0x68); ? C. > } > } > diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c > index 37e5a62..7be10fb 100644 > --- a/hw/i2c/imx_i2c.c > +++ b/hw/i2c/imx_i2c.c > @@ -305,12 +305,16 @@ static const VMStateDescription imx_i2c_vmstate = { > static void imx_i2c_realize(DeviceState *dev, Error **errp) > { > IMXI2CState *s = IMX_I2C(dev); > + static int bus_count; > + char name[16]; > + > + snprintf(name, sizeof(name), "i2c.%d", bus_count++); > > memory_region_init_io(&s->iomem, OBJECT(s), &imx_i2c_ops, s, TYPE_IMX_I2C, > IMX_I2C_MEM_SIZE); > sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); > sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); > - s->bus = i2c_init_bus(DEVICE(dev), "i2c"); > + s->bus = i2c_init_bus(DEVICE(dev), name); > } > > static void imx_i2c_class_init(ObjectClass *klass, void *data) >