From patchwork Mon Aug 6 03:25:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v6,4/4] xilinx_zynq: Added SD controllers Date: Sun, 05 Aug 2012 17:25:37 -0000 From: "Peter A. G. Crosthwaite" X-Patchwork-Id: 175253 Message-Id: <81488be221441dd7647929899cf3d7acf0005831.1344223191.git.peter.crosthwaite@petalogix.com> To: qemu-devel@nongnu.org, i.mitsyanko@samsung.com 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 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;