From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjwNN-0003em-SV for qemu-devel@nongnu.org; Wed, 07 Oct 2015 17:36:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjwNE-0008MP-T4 for qemu-devel@nongnu.org; Wed, 07 Oct 2015 17:35:53 -0400 Received: from mail-bn1on0062.outbound.protection.outlook.com ([157.56.110.62]:64467 helo=na01-bn1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjwNE-0008JS-AI for qemu-devel@nongnu.org; Wed, 07 Oct 2015 17:35:44 -0400 From: Alistair Francis Date: Wed, 7 Oct 2015 14:34:02 -0700 Message-ID: <1381679a85ad75a4b80d553d33608cffef3c9868.1444251567.git.alistair.francis@xilinx.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2 5/5] xlnx-ep108: Connect the SPI Flash List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, crosthwaitepeter@gmail.com, edgar.iglesias@gmail.com, alistair.francis@xilinx.com Connect the sst25wf080 SPI flash to the EP108 board. Signed-off-by: Alistair Francis --- 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); + + 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