arm: xlnx-zynqmp: Add xlnx-dp and xlnx-dpdma
This adds the DP and the DPDMA to the Zynq MP platform. Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Tested-By: Hyun Kwon <hyun.kwon@xilinx.com> Message-id: 1465833014-21982-10-git-send-email-fred.konrad@greensocs.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
58ac482a66
commit
b93dbcdd59
@ -38,6 +38,12 @@
|
|||||||
#define SATA_ADDR 0xFD0C0000
|
#define SATA_ADDR 0xFD0C0000
|
||||||
#define SATA_NUM_PORTS 2
|
#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] = {
|
static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = {
|
||||||
0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000,
|
0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000,
|
||||||
};
|
};
|
||||||
@ -165,6 +171,12 @@ static void xlnx_zynqmp_init(Object *obj)
|
|||||||
TYPE_XILINX_SPIPS);
|
TYPE_XILINX_SPIPS);
|
||||||
qdev_set_parent_bus(DEVICE(&s->spi[i]), sysbus_get_default());
|
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)
|
static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
|
||||||
@ -390,6 +402,24 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
|
|||||||
&error_abort);
|
&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[] = {
|
static Property xlnx_zynqmp_props[] = {
|
||||||
|
@ -26,6 +26,8 @@
|
|||||||
#include "hw/ide/ahci.h"
|
#include "hw/ide/ahci.h"
|
||||||
#include "hw/sd/sdhci.h"
|
#include "hw/sd/sdhci.h"
|
||||||
#include "hw/ssi/xilinx_spips.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 TYPE_XLNX_ZYNQMP "xlnx,zynqmp"
|
||||||
#define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \
|
#define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \
|
||||||
@ -81,6 +83,8 @@ typedef struct XlnxZynqMPState {
|
|||||||
SysbusAHCIState sata;
|
SysbusAHCIState sata;
|
||||||
SDHCIState sdhci[XLNX_ZYNQMP_NUM_SDHCI];
|
SDHCIState sdhci[XLNX_ZYNQMP_NUM_SDHCI];
|
||||||
XilinxSPIPS spi[XLNX_ZYNQMP_NUM_SPIS];
|
XilinxSPIPS spi[XLNX_ZYNQMP_NUM_SPIS];
|
||||||
|
XlnxDPState dp;
|
||||||
|
XlnxDPDMAState dpdma;
|
||||||
|
|
||||||
char *boot_cpu;
|
char *boot_cpu;
|
||||||
ARMCPU *boot_cpu_ptr;
|
ARMCPU *boot_cpu_ptr;
|
||||||
|
Loading…
Reference in New Issue
Block a user