From patchwork Mon Aug 6 03:25:37 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: 175253 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 2304A2C0080 for ; Mon, 6 Aug 2012 13:27:30 +1000 (EST) Received: from localhost ([::1]:58497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyDya-0005V7-4Q for incoming@patchwork.ozlabs.org; Sun, 05 Aug 2012 23:27:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyDy2-0004GT-97 for qemu-devel@nongnu.org; Sun, 05 Aug 2012 23:26:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SyDy1-0001kb-8s for qemu-devel@nongnu.org; Sun, 05 Aug 2012 23:26:54 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:48990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyDy1-0001Fv-2z for qemu-devel@nongnu.org; Sun, 05 Aug 2012 23:26:53 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so4593527pbb.4 for ; Sun, 05 Aug 2012 20:26:52 -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=XJjLsrMYVSY9QSxZ6o/rZcdRTvpFBCzk7uXZHptdQco=; b=oJ0yfe6nAagAx/vNckCHaPtn5M/eVF1kVIyqh/sDFJPvSOiF4jKkQ1ifVNVg7lMaHL ikM1HyBWoqIphDDjBoQ5kXPeHAGJEXUfGCxFKfMG9W050eDiVyvai7ZPK1HhXgGr4RGe 2Cyi4Ihhsgitb/WVN2bCmbsxEr0wiMTRaBTykZNSWEsRDrsTxFi1iC3OUraBGYti704H uGhAM/q+GJtvjCkHDEfyLfRvt0zuxbOB+HER91hBO7GdDvHnQvNJH0jfsc1gdwuafEpp ai+ui5IdKdARTe5KMktOaMJPjD7AnSVhk4TXQvjcf2nL3Lz1D/zVRVOaeneQ7kXg++Sz FA3w== Received: by 10.68.232.229 with SMTP id tr5mr15540231pbc.101.1344223612747; Sun, 05 Aug 2012 20:26:52 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id nk3sm7985429pbc.27.2012.08.05.20.26.48 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Aug 2012 20:26:52 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, i.mitsyanko@samsung.com Date: Mon, 6 Aug 2012 13:25:37 +1000 Message-Id: <81488be221441dd7647929899cf3d7acf0005831.1344223191.git.peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQk23mbZcsFVsajgZxsEfKZYuZ9Fg/t/ZlFIjLijldo4u7DZmX7Wy0QtY1xNtxVVlwjotPNK X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 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 v6 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;