ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/mps2-tz: Instantiate SPI controllers 

The SPI controllers in the MPS2 AN505 board are PL022s.
We have a model of the PL022, so create these devices.

We don't currently model the LCD controller that sits behind
one of the PL022s; the others are intended to control devices
that sit on the FPGA's general purpose SPI connector or
"shield" expansion connectors.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20180820141116.9118-22-peter.maydell@linaro.org
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Peter Maydell 2018-08-24 13:17:47 +01:00
parent 7d3912f54e
commit 0d49759b97
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/arm/mps2-tz.c
View File

@ -48,6 +48,7 @@
#include "hw/misc/tz-msc.h" #include "hw/misc/tz-msc.h"
#include "hw/arm/iotkit.h" #include "hw/arm/iotkit.h"
#include "hw/dma/pl080.h" #include "hw/dma/pl080.h"
#include "hw/ssi/pl022.h"
#include "hw/devices.h" #include "hw/devices.h"
#include "net/net.h" #include "net/net.h"
#include "hw/core/split-irq.h" #include "hw/core/split-irq.h"
@ -73,7 +74,7 @@ typedef struct {
MPS2FPGAIO fpgaio; MPS2FPGAIO fpgaio;
TZPPC ppc[5]; TZPPC ppc[5];
TZMPC ssram_mpc[3]; TZMPC ssram_mpc[3];
UnimplementedDeviceState spi[5]; PL022State spi[5];
UnimplementedDeviceState i2c[4]; UnimplementedDeviceState i2c[4];
UnimplementedDeviceState i2s_audio; UnimplementedDeviceState i2s_audio;
UnimplementedDeviceState gpio[4]; UnimplementedDeviceState gpio[4];
@ -324,6 +325,31 @@ static MemoryRegion *make_dma(MPS2TZMachineState *mms, void *opaque,
return sysbus_mmio_get_region(s, 0); return sysbus_mmio_get_region(s, 0);
} }
static MemoryRegion *make_spi(MPS2TZMachineState *mms, void *opaque,
const char *name, hwaddr size)
{
/*
* The AN505 has five PL022 SPI controllers.
* One of these should have the LCD controller behind it; the others
* are connected only to the FPGA's "general purpose SPI connector"
* or "shield" expansion connectors.
* Note that if we do implement devices behind SPI, the chip select
* lines are set via the "MISC" register in the MPS2 FPGAIO device.
*/
PL022State *spi = opaque;
int i = spi - &mms->spi[0];
DeviceState *iotkitdev = DEVICE(&mms->iotkit);
SysBusDevice *s;
sysbus_init_child_obj(OBJECT(mms), name, spi, sizeof(mms->spi[0]),
TYPE_PL022);
object_property_set_bool(OBJECT(spi), true, "realized", &error_fatal);
s = SYS_BUS_DEVICE(spi);
sysbus_connect_irq(s, 0,
qdev_get_gpio_in_named(iotkitdev, "EXP_IRQ", 51 + i));
return sysbus_mmio_get_region(s, 0);
}
static void mps2tz_common_init(MachineState *machine) static void mps2tz_common_init(MachineState *machine)
{ {
MPS2TZMachineState *mms = MPS2TZ_MACHINE(machine); MPS2TZMachineState *mms = MPS2TZ_MACHINE(machine);
@ -422,11 +448,11 @@ static void mps2tz_common_init(MachineState *machine)
}, { }, {
.name = "apb_ppcexp1", .name = "apb_ppcexp1",
.ports = { .ports = {
{ "spi0", make_unimp_dev, &mms->spi[0], 0x40205000, 0x1000 }, { "spi0", make_spi, &mms->spi[0], 0x40205000, 0x1000 },
{ "spi1", make_unimp_dev, &mms->spi[1], 0x40206000, 0x1000 }, { "spi1", make_spi, &mms->spi[1], 0x40206000, 0x1000 },
{ "spi2", make_unimp_dev, &mms->spi[2], 0x40209000, 0x1000 }, { "spi2", make_spi, &mms->spi[2], 0x40209000, 0x1000 },
{ "spi3", make_unimp_dev, &mms->spi[3], 0x4020a000, 0x1000 }, { "spi3", make_spi, &mms->spi[3], 0x4020a000, 0x1000 },
{ "spi4", make_unimp_dev, &mms->spi[4], 0x4020b000, 0x1000 }, { "spi4", make_spi, &mms->spi[4], 0x4020b000, 0x1000 },
{ "uart0", make_uart, &mms->uart[0], 0x40200000, 0x1000 }, { "uart0", make_uart, &mms->uart[0], 0x40200000, 0x1000 },
{ "uart1", make_uart, &mms->uart[1], 0x40201000, 0x1000 }, { "uart1", make_uart, &mms->uart[1], 0x40201000, 0x1000 },
{ "uart2", make_uart, &mms->uart[2], 0x40202000, 0x1000 }, { "uart2", make_uart, &mms->uart[2], 0x40202000, 0x1000 },