[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/7] arm: Uniquely name imx25 I2C buses.
From: |
Alastair D'Silva |
Subject: |
[Qemu-devel] [PATCH v3 1/7] arm: Uniquely name imx25 I2C buses. |
Date: |
Fri, 2 Dec 2016 16:46:11 +1100 |
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-bus.0 i2c-bus.1 i2c-bus.2
Signed-off-by: Alastair D'Silva <address@hidden>
---
hw/arm/imx25_pdk.c | 4 +---
hw/i2c/imx_i2c.c | 2 +-
2 files changed, 2 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..6c81b98 100644
--- a/hw/i2c/imx_i2c.c
+++ b/hw/i2c/imx_i2c.c
@@ -310,7 +310,7 @@ static void imx_i2c_realize(DeviceState *dev, Error **errp)
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), NULL);
}
static void imx_i2c_class_init(ObjectClass *klass, void *data)
--
2.9.3
- [Qemu-devel] [PATCH v3 0/7] Add support for the Epson RX8900 RTC to the aspeed board, Alastair D'Silva, 2016/12/02
- [Qemu-devel] [PATCH v3 3/7] hw/i2c: Add a NULL check for i2c slave init callbacks, Alastair D'Silva, 2016/12/02
- [Qemu-devel] [PATCH v3 1/7] arm: Uniquely name imx25 I2C buses.,
Alastair D'Silva <=
- [Qemu-devel] [PATCH v3 4/7] qtest: Support named interrupts, Alastair D'Silva, 2016/12/02
- [Qemu-devel] [PATCH v3 2/7] hw/arm: remove trailing whitespace, Alastair D'Silva, 2016/12/02
- [Qemu-devel] [PATCH v3 7/7] arm: Add an RX8900 RTC to the ASpeed board, Alastair D'Silva, 2016/12/02
- [Qemu-devel] [PATCH v3 6/7] tests: Test all implemented RX8900 functionality, Alastair D'Silva, 2016/12/02
- [Qemu-devel] [PATCH v3 5/7] hw/timer: Add Epson RX8900 RTC support, Alastair D'Silva, 2016/12/02