From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TezkP-0003wX-Ts for qemu-devel@nongnu.org; Sat, 01 Dec 2012 21:57:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TezkN-00068r-Mi for qemu-devel@nongnu.org; Sat, 01 Dec 2012 21:57:37 -0500 Received: from mout.web.de ([212.227.15.4]:56370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TezkN-00068V-CQ for qemu-devel@nongnu.org; Sat, 01 Dec 2012 21:57:35 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 2 Dec 2012 03:57:21 +0100 Message-Id: <1354417042-8818-5-git-send-email-andreas.faerber@web.de> In-Reply-To: <1354417042-8818-1-git-send-email-andreas.faerber@web.de> References: <1354417042-8818-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH RFT 4/5] exynos4210: Add EHCI support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.crosthwaite@xilinx.com, Igor Mitsyanko , Evgeny Voevodin , =?UTF-8?q?Andreas=20F=C3=A4rber?= , kraxel@redhat.com, Maksim Kozlov , walimisdev@gmail.com, Dmitry Solodkiy From: Liming Wang Add EHCI USB host controller to exynos4210. Signed-off-by: Liming Wang [AF: Use type constant] Signed-off-by: Andreas Färber --- hw/exynos4210.c | 7 +++++++ hw/exynos4210_gic.c | 2 +- 2 Dateien geändert, 8 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/hw/exynos4210.c b/hw/exynos4210.c index 00d4db8..35d4936 100644 --- a/hw/exynos4210.c +++ b/hw/exynos4210.c @@ -27,6 +27,7 @@ #include "arm-misc.h" #include "loader.h" #include "exynos4210.h" +#include "usb/hcd-ehci.h" #define EXYNOS4210_CHIPID_ADDR 0x10000000 @@ -72,6 +73,9 @@ /* Display controllers (FIMD) */ #define EXYNOS4210_FIMD0_BASE_ADDR 0x11C00000 +/* EHCI */ +#define EXYNOS4210_EHCI_BASE_ADDR 0x12580000 + static uint8_t chipid_and_omr[] = { 0x11, 0x02, 0x21, 0x43, 0x09, 0x00, 0x00, 0x00 }; @@ -334,5 +338,8 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, s->irq_table[exynos4210_get_irq(11, 2)], NULL); + sysbus_create_simple(TYPE_EXYNOS4210_EHCI, EXYNOS4210_EHCI_BASE_ADDR, + s->irq_table[exynos4210_get_irq(28, 3)]); + return s; } diff --git a/hw/exynos4210_gic.c b/hw/exynos4210_gic.c index 4fea098..959de56 100644 --- a/hw/exynos4210_gic.c +++ b/hw/exynos4210_gic.c @@ -140,7 +140,7 @@ combiner_grp_to_gic_id[64-EXYNOS4210_MAX_EXT_COMBINER_OUT_IRQ][8] = { EXT_GIC_ID_I2C4, EXT_GIC_ID_I2C5, EXT_GIC_ID_I2C6, EXT_GIC_ID_I2C7 }, /* int combiner group 28 */ - { EXT_GIC_ID_SPI0, EXT_GIC_ID_SPI1, EXT_GIC_ID_SPI2 }, + { EXT_GIC_ID_SPI0, EXT_GIC_ID_SPI1, EXT_GIC_ID_SPI2 , EXT_GIC_ID_USB_HOST}, /* int combiner group 29 */ { EXT_GIC_ID_HSMMC0, EXT_GIC_ID_HSMMC1, EXT_GIC_ID_HSMMC2, EXT_GIC_ID_HSMMC3, EXT_GIC_ID_SDMMC }, -- 1.7.10.4