[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 21/22] ppc/ppc405: Use an explicit I2C object
From: |
Cédric Le Goater |
Subject: |
[PATCH v3 21/22] ppc/ppc405: Use an explicit I2C object |
Date: |
Mon, 8 Aug 2022 12:27:33 +0200 |
Having an explicit I2C model object will help if one day we want to
add I2C devices on the bus from the machine init routine.
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/ppc/ppc405.h | 2 ++
hw/ppc/ppc405_uc.c | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/ppc/ppc405.h b/hw/ppc/ppc405.h
index 8e67ad0b72c3..56881b181ba1 100644
--- a/hw/ppc/ppc405.h
+++ b/hw/ppc/ppc405.h
@@ -28,6 +28,7 @@
#include "qom/object.h"
#include "hw/ppc/ppc4xx.h"
#include "hw/intc/ppc-uic.h"
+#include "hw/i2c/ppc4xx_i2c.h"
#define PPC405EP_SDRAM_BASE 0x00000000
#define PPC405EP_NVRAM_BASE 0xF0000000
@@ -241,6 +242,7 @@ struct Ppc405SoCState {
Ppc405OcmState ocm;
Ppc405GpioState gpio;
Ppc405DmaState dma;
+ PPC4xxI2CState i2c;
Ppc405EbcState ebc;
Ppc405OpbaState opba;
Ppc405PobState pob;
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index d80e22d265c8..111ebbdb7865 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -1354,6 +1354,8 @@ static void ppc405_soc_instance_init(Object *obj)
object_initialize_child(obj, "dma", &s->dma, TYPE_PPC405_DMA);
+ object_initialize_child(obj, "i2c", &s->i2c, TYPE_PPC4xx_I2C);
+
object_initialize_child(obj, "ebc", &s->ebc, TYPE_PPC405_EBC);
object_initialize_child(obj, "opba", &s->opba, TYPE_PPC405_OPBA);
@@ -1442,8 +1444,12 @@ static void ppc405_soc_realize(DeviceState *dev, Error
**errp)
}
/* I2C controller */
- sysbus_create_simple(TYPE_PPC4xx_I2C, 0xef600500,
- qdev_get_gpio_in(DEVICE(&s->uic), 2));
+ if (!sysbus_realize(SYS_BUS_DEVICE(&s->i2c), errp)) {
+ return;
+ }
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c), 0, 0xef600500);
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c), 0,
+ qdev_get_gpio_in(DEVICE(&s->uic), 2));
/* GPIO */
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpio), errp)) {
--
2.37.1
- [PATCH v3 11/22] ppc/ppc405: QOM'ify OCM, (continued)
- [PATCH v3 11/22] ppc/ppc405: QOM'ify OCM, Cédric Le Goater, 2022/08/08
- [PATCH v3 12/22] ppc/ppc405: QOM'ify GPIO, Cédric Le Goater, 2022/08/08
- [PATCH v3 15/22] ppc/ppc405: QOM'ify OPBA, Cédric Le Goater, 2022/08/08
- [PATCH v3 13/22] ppc/ppc405: QOM'ify DMA, Cédric Le Goater, 2022/08/08
- [PATCH v3 17/22] ppc/ppc405: QOM'ify PLB, Cédric Le Goater, 2022/08/08
- [PATCH v3 18/22] ppc/ppc405: QOM'ify MAL, Cédric Le Goater, 2022/08/08
- [PATCH v3 16/22] ppc/ppc405: QOM'ify POB, Cédric Le Goater, 2022/08/08
- [PATCH v3 21/22] ppc/ppc405: Use an explicit I2C object,
Cédric Le Goater <=
- [PATCH v3 22/22] ppc/ppc4xx: Fix sdram trace events, Cédric Le Goater, 2022/08/08
- [PATCH v3 19/22] ppc/ppc405: QOM'ify FPGA, Cédric Le Goater, 2022/08/08
- [PATCH v3 20/22] ppc/ppc405: Use an explicit PPCUIC object, Cédric Le Goater, 2022/08/08
- Re: [PATCH v3 00/22] ppc: QOM'ify 405 board, BALATON Zoltan, 2022/08/08