[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V9 9/9] arm: xlnx-zynqmp: Add xlnx-dp and xlnx-dpdma
From: |
fred . konrad |
Subject: |
[Qemu-devel] [PATCH V9 9/9] arm: xlnx-zynqmp: Add xlnx-dp and xlnx-dpdma |
Date: |
Tue, 7 Jun 2016 22:31:08 +0200 |
From: KONRAD Frederic <address@hidden>
This adds the DP and the DPDMA to the Zynq MP platform.
Signed-off-by: KONRAD Frederic <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Tested-By: Hyun Kwon <address@hidden>
---
hw/arm/xlnx-zynqmp.c | 32 +++++++++++++++++++++++++++++++-
include/hw/arm/xlnx-zynqmp.h | 4 ++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index 308d677..23c7199 100644
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -38,6 +38,12 @@
#define SATA_ADDR 0xFD0C0000
#define SATA_NUM_PORTS 2
+#define DP_ADDR 0xfd4a0000
+#define DP_IRQ 113
+
+#define DPDMA_ADDR 0xfd4c0000
+#define DPDMA_IRQ 116
+
static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = {
0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000,
};
@@ -165,6 +171,12 @@ static void xlnx_zynqmp_init(Object *obj)
TYPE_XILINX_SPIPS);
qdev_set_parent_bus(DEVICE(&s->spi[i]), sysbus_get_default());
}
+
+ object_initialize(&s->dp, sizeof(s->dp), TYPE_XLNX_DP);
+ qdev_set_parent_bus(DEVICE(&s->dp), sysbus_get_default());
+
+ object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA);
+ qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default());
}
static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
@@ -388,8 +400,26 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
**errp)
object_property_add_alias(OBJECT(s), bus_name,
OBJECT(&s->spi[i]), "spi0",
&error_abort);
- g_free(bus_name);
+ g_free(bus_name);
+ }
+
+ object_property_set_bool(OBJECT(&s->dp), true, "realized", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->dp), 0, DP_ADDR);
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->dp), 0, gic_spi[DP_IRQ]);
+
+ object_property_set_bool(OBJECT(&s->dpdma), true, "realized", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
}
+ object_property_set_link(OBJECT(&s->dp), OBJECT(&s->dpdma), "dpdma",
+ &error_abort);
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->dpdma), 0, DPDMA_ADDR);
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->dpdma), 0, gic_spi[DPDMA_IRQ]);
}
static Property xlnx_zynqmp_props[] = {
diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h
index 68f6eb0..c2931bf 100644
--- a/include/hw/arm/xlnx-zynqmp.h
+++ b/include/hw/arm/xlnx-zynqmp.h
@@ -26,6 +26,8 @@
#include "hw/ide/ahci.h"
#include "hw/sd/sdhci.h"
#include "hw/ssi/xilinx_spips.h"
+#include "hw/dma/xlnx_dpdma.h"
+#include "hw/display/xlnx_dp.h"
#define TYPE_XLNX_ZYNQMP "xlnx,zynqmp"
#define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \
@@ -81,6 +83,8 @@ typedef struct XlnxZynqMPState {
SysbusAHCIState sata;
SDHCIState sdhci[XLNX_ZYNQMP_NUM_SDHCI];
XilinxSPIPS spi[XLNX_ZYNQMP_NUM_SPIS];
+ XlnxDPState dp;
+ XlnxDPDMAState dpdma;
char *boot_cpu;
ARMCPU *boot_cpu_ptr;
--
1.8.3.1
- [Qemu-devel] [PATCH V9 0/9] Xilinx DisplayPort., fred . konrad, 2016/06/07
- [Qemu-devel] [PATCH V9 1/9] i2cbus: remove unused dev field, fred . konrad, 2016/06/07
- [Qemu-devel] [PATCH V9 6/9] hw/i2c-ddc.c: Implement DDC I2C slave, fred . konrad, 2016/06/07
- [Qemu-devel] [PATCH V9 3/9] i2c: Factor our send() and recv() common logic, fred . konrad, 2016/06/07
- [Qemu-devel] [PATCH V9 2/9] i2c: implement broadcast write, fred . konrad, 2016/06/07
- [Qemu-devel] [PATCH V9 4/9] introduce aux-bus, fred . konrad, 2016/06/07
- [Qemu-devel] [PATCH V9 9/9] arm: xlnx-zynqmp: Add xlnx-dp and xlnx-dpdma,
fred . konrad <=
- [Qemu-devel] [PATCH V9 5/9] introduce dpcd module, fred . konrad, 2016/06/07
- [Qemu-devel] [PATCH V9 7/9] introduce xlnx-dpdma, fred . konrad, 2016/06/07
- [Qemu-devel] [PATCH V9 8/9] introduce xlnx-dp, fred . konrad, 2016/06/07
- Re: [Qemu-devel] [PATCH V9 0/9] Xilinx DisplayPort., Alistair Francis, 2016/06/07