From patchwork Thu Jul 5 04:04:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 169068 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4C0CA2C0084 for ; Thu, 5 Jul 2012 14:06:10 +1000 (EST) Received: from localhost ([::1]:49598 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmdKS-0000a7-3d for incoming@patchwork.ozlabs.org; Thu, 05 Jul 2012 00:06:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmdKB-0000OS-QA for qemu-devel@nongnu.org; Thu, 05 Jul 2012 00:05:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmdK8-0006Ku-Bi for qemu-devel@nongnu.org; Thu, 05 Jul 2012 00:05:51 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:52920) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmdK8-0006KI-1c for qemu-devel@nongnu.org; Thu, 05 Jul 2012 00:05:48 -0400 Received: by obbta14 with SMTP id ta14so12878158obb.4 for ; Wed, 04 Jul 2012 21:05:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=9O08kgBs9iqcVeeZZEGUxFzIBC+VszxC4JSuDBGaMgk=; b=lTSwq7ndtQXNhyWl5tW2PgjNLa3P6j/BssS360AuX4OaHnSoiNL+z3pyTQBFC0/V1Z bY0naZamHToy0r/SPPk/b3I8K20Pud5A881Nrt5zBa3dE+b8dwQ2QgsYzL4SOy6igpgM tWwR4yLJqX9I2GfX8GS+AngBtrdcqfrxSUGXPaZFdd2iPMB/X1ZjH4bEhTemzoBygrsS OXNwXS2YajeCL6cj4b7IS9+ZNE6iW2cs8sIHICSTgLr9lSBYp+RZT1HRbRsAv6PZI5dF 9RnDad8W501u1csmzQdpfofDkHpYFpDbSd0eZyGsbI5K98WI6NnxaHj7suK+2kop4dTe dx3w== Received: by 10.50.41.195 with SMTP id h3mr14924823igl.34.1341461145915; Wed, 04 Jul 2012 21:05:45 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id nh8sm12467372igc.1.2012.07.04.21.05.41 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Jul 2012 21:05:45 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, i.mitsyanko@samsung.com Date: Thu, 5 Jul 2012 14:04:02 +1000 Message-Id: <76fe1dffb7e672b0248fa77f2c9ec1e9ec53692a.1341457220.git.peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQmp6PMond7+bsD3vI45Wj7drpDc7lD/LU3PX2oTuqW6e4Jt2PLEK4XPo3FneQXzrOWHbxB0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 Cc: peter.maydell@linaro.org, e.voevodin@samsung.com, peter.crosthwaite@petalogix.com, kyungmin.park@samsung.com, d.solodkiy@samsung.com, edgar.iglesias@gmail.com, m.kozlov@samsung.com, john.williams@petalogix.com Subject: [Qemu-devel] [PATCH v5 4/4] xilinx_zynq: Added SD controllers 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 The Xilinx Zynq device has two SDHCI controllers. Added to the machine model. Signed-off-by: Peter A. G. Crosthwaite Reviewed-by: Peter Maydell --- changed from v4: removed redundant braces changed from v3: fixed indentation tweaked commit msg hw/xilinx_zynq.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index 7e6c273..a7feabe 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -130,6 +130,16 @@ static void zynq_init(ram_addr_t ram_size, const char *boot_device, } } + dev = qdev_create(NULL, "sdhci"); + qdev_init_nofail(dev); + sysbus_mmio_map(sysbus_from_qdev(dev), 0, 0xE0100000); + sysbus_connect_irq(sysbus_from_qdev(dev), 0, pic[56-IRQ_OFFSET]); + + dev = qdev_create(NULL, "sdhci"); + qdev_init_nofail(dev); + sysbus_mmio_map(sysbus_from_qdev(dev), 0, 0xE0101000); + sysbus_connect_irq(sysbus_from_qdev(dev), 0, pic[79-IRQ_OFFSET]); + zynq_binfo.ram_size = ram_size; zynq_binfo.kernel_filename = kernel_filename; zynq_binfo.kernel_cmdline = kernel_cmdline;