On Wed, Oct 7, 2015 at 5:01 PM, Peter Crosthwaite
<crosthwaitepe...@gmail.com> wrote:
> On Wed, Oct 7, 2015 at 2:34 PM, Alistair Francis
> <alistair.fran...@xilinx.com> wrote:
>> Connect the sst25wf080 SPI flash to the EP108 board.
>>
>> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com>
>> ---
>> V2:
>> - Use sst25wf080 instead of m25p80
>>
>> hw/arm/xlnx-ep108.c | 20 ++++++++++++++++++++
>> 1 file changed, 20 insertions(+)
>>
>> diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c
>> index 2899698..9755c30 100644
>> --- a/hw/arm/xlnx-ep108.c
>> +++ b/hw/arm/xlnx-ep108.c
>> @@ -33,6 +33,7 @@ static struct arm_boot_info xlnx_ep108_binfo;
>> static void xlnx_ep108_init(MachineState *machine)
>> {
>> XlnxEP108 *s = g_new0(XlnxEP108, 1);
>> + int i, j;
>> Error *err = NULL;
>>
>> object_initialize(&s->soc, sizeof(s->soc), TYPE_XLNX_ZYNQMP);
>> @@ -60,6 +61,25 @@ static void xlnx_ep108_init(MachineState *machine)
>> machine->ram_size);
>> memory_region_add_subregion(get_system_memory(), 0, &s->ddr_ram);
>>
>> + for (i = 0; i < XLNX_ZYNQMP_NUM_SPIS; i++) {
>> + SSIBus *spi_bus;
>> + char bus_name[6];
>> +
>> + snprintf(bus_name, 6, "spi%d", i);
>> + spi_bus = (SSIBus *)qdev_get_child_bus(DEVICE(&s->soc.spi[i]),
>> + bus_name);
>
> So machine level code shouldn't reach into the SoC like this. Instead
> the bus should be passed from the SPI controller to SoC itself, then
> use qdev_get_child_bus on the SoC itself.
I'm not sure what you mean. The board needs multiple buses and I can't
see how it can do that without reaching into the SoC.
Thanks,
Alistair
>
> Regards,
> Peter
>
>> +
>> + for (j = 0; j < XLNX_ZYNQMP_NUM_SPI_FLASHES; ++j) {
>> + DeviceState *flash_dev = ssi_create_slave(spi_bus,
>> "sst25wf080");
>> + qemu_irq cs_line = qdev_get_gpio_in_named(flash_dev,
>> + SSI_GPIO_CS, 0);
>> +
>> + sysbus_connect_irq(SYS_BUS_DEVICE(&s->soc.spi[i]),
>> + i * XLNX_ZYNQMP_NUM_SPI_FLASHES + j,
>> + cs_line);
>> + }
>> + }
>> +
>> xlnx_ep108_binfo.ram_size = machine->ram_size;
>> xlnx_ep108_binfo.kernel_filename = machine->kernel_filename;
>> xlnx_ep108_binfo.kernel_cmdline = machine->kernel_cmdline;
>> --
>> 2.1.4
>>
>
