From patchwork Mon Nov 23 08:54:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 547413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B6A3F140213 for ; Mon, 23 Nov 2015 19:58:10 +1100 (AEDT) Received: from localhost ([::1]:59282 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0mwq-00014P-Sc for incoming@patchwork.ozlabs.org; Mon, 23 Nov 2015 03:58:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0mvx-0007jb-S6 for qemu-devel@nongnu.org; Mon, 23 Nov 2015 03:57:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0mvt-0000Xr-Q5 for qemu-devel@nongnu.org; Mon, 23 Nov 2015 03:57:13 -0500 Received: from mail-sn1nam02on0052.outbound.protection.outlook.com ([104.47.36.52]:31296 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0mvt-0000Xe-JZ for qemu-devel@nongnu.org; Mon, 23 Nov 2015 03:57:09 -0500 Received: from BL2NAM02FT022.eop-nam02.prod.protection.outlook.com (10.152.76.54) by BL2NAM02HT049.eop-nam02.prod.protection.outlook.com (10.152.76.208) with Microsoft SMTP Server (TLS) id 15.1.337.8; Mon, 23 Nov 2015 08:57:07 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=none action=none header.from=xilinx.com; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by BL2NAM02FT022.mail.protection.outlook.com (10.152.77.153) with Microsoft SMTP Server (TLS) id 15.1.337.8 via Frontend Transport; Mon, 23 Nov 2015 08:57:07 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:56830 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1a0mvq-0004PV-JA; Mon, 23 Nov 2015 00:57:06 -0800 Received: from [127.0.0.1] (port=35319 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1a0mvq-0000mo-DG; Mon, 23 Nov 2015 00:57:06 -0800 Received: from xsj-tvapsmtp02 (xsj-tvapsmtp02.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id tAN8pqlU011611; Mon, 23 Nov 2015 00:51:52 -0800 Received: from [172.19.74.182] (port=39348 helo=xsjalistai50.xlnx.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1a0mvp-0000ml-HO; Mon, 23 Nov 2015 00:57:05 -0800 From: Alistair Francis To: Date: Mon, 23 Nov 2015 00:54:57 -0800 Message-ID: <4f9c6996044339f496e09842d72da7f468bf94df.1448268409.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-21958.005 X-TM-AS-Result: No--9.373-7.0-31-10 X-imss-scan-details: No--9.373-7.0-31-10 X-TMASE-MatchedRID: tVT/TTiLhCDq1YwE48CuW1z+axQLnAVBxnUMdStArZmWwmkrwBSz7/lY oV6p/cSxhVmF9kz2wxLsmLmu+LaZv4bzTO6asfbjQuFiD+xrWCyH7D1bP/FcOr5FKKSYetLBYMq SKEvXhtJPiiF3yvgxQEdWV7qYCXR1lwV2iaAfSWcURSScn+QSXt0H8LFZNFG7bkV4e2xSge7aOt udvKi275knjdO8X+QjuRNoGj5U8KqgX4QsnhRwuDZFEgw6u+Np X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(189998001)(36756003)(105606002)(106466001)(47776003)(48376002)(575784001)(19580395003)(19580405001)(86362001)(50466002)(64026002)(118296001)(71366001)(50986999)(110136002)(85426001)(77096005)(5001960100002)(2351001)(87936001)(81156007)(586003)(11100500001)(50226001)(2950100001)(229853001)(5007970100001)(33646002)(76176999)(5003600100002)(5008740100001)(6806005)(92566002)(5003940100001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2NAM02HT049; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; PTR:unknown-60-96.xilinx.com; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2NAM02HT049; X-Microsoft-Antispam-PRVS: <5db99d30a94243b5ad4cb46efc010edf@BL2NAM02HT049.eop-nam02.prod.protection.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001)(10201501046); SRVR:BL2NAM02HT049; BCL:0; PCL:0; RULEID:; SRVR:BL2NAM02HT049; X-Forefront-PRVS: 07697999E6 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2015 08:57:07.4505 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2NAM02HT049 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.52 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, crosthwaitepeter@gmail.com, edgar.iglesias@gmail.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v4 5/5] xlnx-ep108: Connect the SPI Flash X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Connect the sst25wf080 SPI flash to the EP108 board. Signed-off-by: Alistair Francis --- V4: - Only add one SPI flash V3: - Don't reach into the SoC V2: - Use sst25wf080 instead of m25p80 hw/arm/xlnx-ep108.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c index 2899698..4ead0df 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; Error *err = NULL; object_initialize(&s->soc, sizeof(s->soc), TYPE_XLNX_ZYNQMP); @@ -60,6 +61,21 @@ 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; + DeviceState *flash_dev; + qemu_irq cs_line; + char bus_name[6]; + + snprintf(bus_name, 6, "spi%d", i); + spi_bus = (SSIBus *)qdev_get_child_bus(DEVICE(&s->soc), bus_name); + + flash_dev = ssi_create_slave(spi_bus, "sst25wf080"); + cs_line = qdev_get_gpio_in_named(flash_dev, SSI_GPIO_CS, 0); + + sysbus_connect_irq(SYS_BUS_DEVICE(&s->soc.spi[i]), 1, 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;