From patchwork Sun Dec 2 02:57:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 203182 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 B41B22C0081 for ; Sun, 2 Dec 2012 14:20:47 +1100 (EST) Received: from localhost ([::1]:59569 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tezl8-00066Z-VL for incoming@patchwork.ozlabs.org; Sat, 01 Dec 2012 21:58:22 -0500 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 Received: from localhost.localdomain ([62.157.70.37]) by smtp.web.de (mrweb003) with ESMTPSA (Nemesis) id 0M09eO-1TM6Pg49iW-00uWex; Sun, 02 Dec 2012 03:57:33 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 2 Dec 2012 03:57:21 +0100 Message-Id: <1354417042-8818-5-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.10.4 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 X-Provags-ID: V02:K0:vRmDkbkZSV3HTQauGSkc4AU9TUR8yCmSNqcsFW718Kc PvnUSk4RrN5kgiEB7EbWf55pYVEWlkJOF/+6lJcuBfUWLlh2y8 ro5MP2MbZCaQR3sLx4YFYnQJt9p7tSH9yko+xFMuMvJwCxcKCm fsF+VyMVmKmUU3H/lsGhQecOf3iHBDkHEp9zCxdc2rbxJcfzXN bn5G8NavNmaogsMZ+kdtg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.15.4 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 Subject: [Qemu-devel] [PATCH RFT 4/5] exynos4210: Add EHCI support 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 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 Reviewed-by: Igor Mitsyanko --- 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 },