From patchwork Thu Jun 14 02:20: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: 164786 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 B541BB7031 for ; Thu, 14 Jun 2012 12:12:44 +1000 (EST) Received: from localhost ([::1]:39021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SezYA-0007e4-Go for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2012 22:12:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SezXG-0005h1-Rg for qemu-devel@nongnu.org; Wed, 13 Jun 2012 22:11:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SezXF-0000H7-6X for qemu-devel@nongnu.org; Wed, 13 Jun 2012 22:11:46 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:49877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SezXF-0000Fi-0W for qemu-devel@nongnu.org; Wed, 13 Jun 2012 22:11:45 -0400 Received: by mail-pz0-f45.google.com with SMTP id n2so813055dad.4 for ; Wed, 13 Jun 2012 19:11:44 -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=+Zg4RlwHFwL6uSlXBECS84upM0LgJhSOV/ZEwn9TDWo=; b=kXOWmU+hYXK/hzTb7lHV7BziaS+lfMJM+J9g4PjQgCBn0AsnTuV0BDOzszfdj5tCRp 5dQi+zEBhh2vU6EmmGdINY6tWJpo0eeeAAyCfB2V5aHJTNOXdYbiAq+TCs9orbnBYOGM RQYsaPeD/phtXGiTfv2XTQ7RAjg6jN5uG4QpSVeF489IhammFFX9hD46rPp5yJ3flpgI SZPT04NbFQlxb+lXfaDllP7Cr0Zj8GzAP25gGbsdOdZfT/4931ytEDNZCngfDnPLU7G1 z85h8WEz+geWNRE30t7BNP53o3u6diNHyVApqxcMDk7EenHuVPPRFApfAq0UlqQZiy0I IQew== Received: by 10.68.226.99 with SMTP id rr3mr2294436pbc.48.1339639904022; Wed, 13 Jun 2012 19:11:44 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id gh10sm7730287pbc.19.2012.06.13.19.11.39 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 13 Jun 2012 19:11:43 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, i.mitsyanko@samsung.com Date: Thu, 14 Jun 2012 12:20:37 +1000 Message-Id: <1f278a3abccaf7afa4bd9f1ff697fa49ca1b50e6.1339639696.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: ALoCoQk62hW6ScgPOISH+HGA4G2/kp5mz7WEsDwlAhhMOvs0fzhHqH2m81FdugCAOhKEJL66ywNw X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.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 v1 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 --- changed from v3: fixed indentation tweaked commit msg hw/xilinx_zynq.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index 7e6c273..e684832 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -130,6 +130,18 @@ 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;