Re: [Qemu-devel] [PATCH v2 1/6] arm: Uniquely name imx25 I2C buses.

[Alastair D'Silva]

On Wed, 2016-11-30 at 09:18 +0100, Cédric Le Goater wrote:
> On 11/30/2016 06:36 AM, Alastair D'Silva wrote:
> > From: Alastair D'Silva <address@hidden>
> > 
> > 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 <address@hidden>
> > ---
> >  hw/arm/imx25_pdk.c | 4 +---
> >  hw/i2c/imx_i2c.c   | 6 +++++-
> >  2 files changed, 6 insertions(+), 4 deletions(-)
> > 
> > diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
> > index 025b608..c6f04d3 100644
> > --- a/hw/arm/imx25_pdk.c
> > +++ b/hw/arm/imx25_pdk.c
> > @@ -138,9 +138,7 @@ static void imx25_pdk_init(MachineState
> > *machine)
> >           * We add it here (only on qtest usage) to be able to do a
> > bit
> >           * of simple qtest. See "make check" for details.
> >           */
> > -        i2c_create_slave((I2CBus *)qdev_get_child_bus(DEVICE(&s-
> > >soc.i2c[0]),
> > -                                                      "i2c"),
> > -                         "ds1338", 0x68);
> > +        i2c_create_slave(s->soc.i2c[0].bus, "ds1338", 0x68);
> >      }
> >  }
> >  
> > 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;
> 
> hmm, the static is ugly :/ 
> 
> Isn't there other ways to achieve this naming ? 
> 
> Thanks,
> 
> C.  
> 

I'm not seeing an obvious way around it. The busses are realized
independently (so I can't implement what we do with the aspeed i2c
busses), and it is named before fsl-imx25:fsl_imx25_realize() can apply
specific properties to the bus.

If you have any suggestions, I'm all ears.


-- 
Alastair D'Silva
Open Source Developer
Linux Technology Centre, IBM Australia
mob: 0423 762 819