On 00:12 Mon 31 Jan , Edgar E. Iglesias wrote: > From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com> > > Connect the ZynqMP CRF - Clock Reset FPD device. > > Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
Reviewed-by: Luc Michel <l...@lmichel.fr> > --- > include/hw/arm/xlnx-zynqmp.h | 2 ++ > hw/arm/xlnx-zynqmp.c | 16 ++++++++++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h > index 99ceb8a609..d5a3ad3df2 100644 > --- a/include/hw/arm/xlnx-zynqmp.h > +++ b/include/hw/arm/xlnx-zynqmp.h > @@ -38,6 +38,7 @@ > #include "hw/dma/xlnx_csu_dma.h" > #include "hw/nvram/xlnx-bbram.h" > #include "hw/nvram/xlnx-zynqmp-efuse.h" > +#include "hw/misc/xlnx-zynqmp-crf.h" > > #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp" > OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP) > @@ -122,6 +123,7 @@ struct XlnxZynqMPState { > XlnxZDMA gdma[XLNX_ZYNQMP_NUM_GDMA_CH]; > XlnxZDMA adma[XLNX_ZYNQMP_NUM_ADMA_CH]; > XlnxCSUDMA qspi_dma; > + XlnxZynqMPCRF crf; > > char *boot_cpu; > ARMCPU *boot_cpu_ptr; > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index ba44e95899..857d3c9636 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -51,6 +51,9 @@ > #define QSPI_IRQ 15 > #define QSPI_DMA_ADDR 0xff0f0800 > > +#define CRF_ADDR 0xfd1a0000 > +#define CRF_IRQ 120 > + > #define SERDES_ADDR 0xfd400000 > #define SERDES_SIZE 0x20000 > > @@ -279,6 +282,18 @@ static void xlnx_zynqmp_create_efuse(XlnxZynqMPState *s, > qemu_irq *gic) > sysbus_connect_irq(sbd, 0, gic[EFUSE_IRQ]); > } > > +static void xlnx_zynqmp_create_crf(XlnxZynqMPState *s, qemu_irq *gic) > +{ > + SysBusDevice *sbd; > + > + object_initialize_child(OBJECT(s), "crf", &s->crf, TYPE_XLNX_ZYNQMP_CRF); > + sbd = SYS_BUS_DEVICE(&s->crf); > + > + sysbus_realize(sbd, &error_fatal); > + sysbus_mmio_map(sbd, 0, CRF_ADDR); > + sysbus_connect_irq(sbd, 0, gic[CRF_IRQ]); > +} > + > static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState *s) > { > static const struct UnimpInfo { > @@ -682,6 +697,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error > **errp) > > xlnx_zynqmp_create_bbram(s, gic_spi); > xlnx_zynqmp_create_efuse(s, gic_spi); > + xlnx_zynqmp_create_crf(s, gic_spi); > xlnx_zynqmp_create_unimp_mmio(s); > > for (i = 0; i < XLNX_ZYNQMP_NUM_GDMA_CH; i++) { > -- > 2.25.1 > --