[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 54/60] ppc/ppc405: Use an explicit I2C object
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 54/60] ppc/ppc405: Use an explicit I2C object |
Date: |
Wed, 31 Aug 2022 15:50:28 -0300 |
From: Cédric Le Goater <clg@kaod.org>
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>
[balaton: Symplify sysbus device casts for readibility]
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id:
<68eb8b5ac408ca8cc981ebf53a3e154c0d34c7f6.1660746880.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
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 67f4c14f50..efa29fdfb1 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
@@ -215,6 +216,7 @@ struct Ppc405SoCState {
Ppc405OcmState ocm;
Ppc405GpioState gpio;
Ppc405DmaState dma;
+ PPC4xxI2CState i2c;
Ppc4xxEbcState ebc;
Ppc405OpbaState opba;
Ppc405PobState pob;
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index dc17d5bdb5..189f49a138 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -1096,6 +1096,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_PPC4xx_EBC);
object_initialize_child(obj, "opba", &s->opba, TYPE_PPC405_OPBA);
@@ -1188,8 +1190,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));
+ sbd = SYS_BUS_DEVICE(&s->i2c);
+ if (!sysbus_realize(sbd, errp)) {
+ return;
+ }
+ sysbus_mmio_map(sbd, 0, 0xef600500);
+ sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(DEVICE(&s->uic), 2));
/* GPIO */
sbd = SYS_BUS_DEVICE(&s->gpio);
--
2.37.2
- [PULL 44/60] ppc/ppc405: QOM'ify OPBA, (continued)
- [PULL 44/60] ppc/ppc405: QOM'ify OPBA, Daniel Henrique Barboza, 2022/08/31
- [PULL 45/60] ppc/ppc405: QOM'ify POB, Daniel Henrique Barboza, 2022/08/31
- [PULL 46/60] ppc/ppc405: QOM'ify PLB, Daniel Henrique Barboza, 2022/08/31
- [PULL 47/60] ppc/ppc405: QOM'ify MAL, Daniel Henrique Barboza, 2022/08/31
- [PULL 49/60] ppc4xx: Rename ppc405-plb to ppc4xx-plb, Daniel Henrique Barboza, 2022/08/31
- [PULL 48/60] ppc4xx: Move PLB model to ppc4xx_devs.c, Daniel Henrique Barboza, 2022/08/31
- [PULL 50/60] ppc4xx: Move EBC model to ppc4xx_devs.c, Daniel Henrique Barboza, 2022/08/31
- [PULL 51/60] ppc4xx: Rename ppc405-ebc to ppc4xx-ebc, Daniel Henrique Barboza, 2022/08/31
- [PULL 52/60] ppc/ppc405: Use an embedded PPCUIC model in SoC state, Daniel Henrique Barboza, 2022/08/31
- [PULL 53/60] hw/intc/ppc-uic: Convert ppc-uic to a PPC4xx DCR device, Daniel Henrique Barboza, 2022/08/31
- [PULL 54/60] ppc/ppc405: Use an explicit I2C object,
Daniel Henrique Barboza <=
- [PULL 55/60] ppc/ppc405: QOM'ify FPGA, Daniel Henrique Barboza, 2022/08/31
- [PULL 56/60] ppc405: Move machine specific code to ppc405_boards.c, Daniel Henrique Barboza, 2022/08/31
- [PULL 57/60] hw/ppc/sam3460ex: Remove PPC405 dependency from sam460ex, Daniel Henrique Barboza, 2022/08/31
- [PULL 58/60] hw/ppc/Kconfig: Move imply before select, Daniel Henrique Barboza, 2022/08/31
- [PULL 59/60] ppc/ppc4xx: Fix sdram trace events, Daniel Henrique Barboza, 2022/08/31
- [PULL 60/60] ppc4xx: Fix code style problems reported by checkpatch, Daniel Henrique Barboza, 2022/08/31
- Re: [PULL 00/60] ppc queue, BALATON Zoltan, 2022/08/31