From patchwork Sat Jun 5 10:40:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chen huacai X-Patchwork-Id: 54770 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4F927B7D2E for ; Sat, 5 Jun 2010 20:43:18 +1000 (EST) Received: from localhost ([127.0.0.1]:47076 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKqq6-0005lj-UV for incoming@patchwork.ozlabs.org; Sat, 05 Jun 2010 06:42:55 -0400 Received: from [140.186.70.92] (port=44244 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKqmI-0003nS-D7 for qemu-devel@nongnu.org; Sat, 05 Jun 2010 06:39:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKqmB-0006yY-6X for qemu-devel@nongnu.org; Sat, 05 Jun 2010 06:38:55 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:40136) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKqmB-0006yR-20 for qemu-devel@nongnu.org; Sat, 05 Jun 2010 06:38:51 -0400 Received: by pvg12 with SMTP id 12so955787pvg.4 for ; Sat, 05 Jun 2010 03:38:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=0pm/AXodEvWwfpnnEb0riP/iiNCtefbCz2tKoSpdlx8=; b=MRvyR0RXzfoD8FC1r/MEhiMZO4UuDyf6egPffw8JZZEg0+2htDq9IImUZS/H6/5n25 ksyMt0yfzjuCmrkUSqtyCqXZTX+UbyIVGIcAyvqAE8pu3oPyB7/ZyPAadzY7aod4M1Qu KCyauCuph+4UAcu2C+2fKNfsDyMIPsF2WISZk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=b2P2V5r2QJtyfj/Pn763I0JToukpMKMC9T7EK0N1vHMEsLQKlGCdqDtsKJvUJIACKu ++lPPodVzdjwXbkKp29lRlhaxilAITAQI/HqgYwm+0inj3/2d+k4670Gv3SFFBC8T9TO GvIWCTIR9GeAud5FB97LomV25OkOVJOM0e1zI= Received: by 10.142.196.19 with SMTP id t19mr8995802wff.306.1275734329950; Sat, 05 Jun 2010 03:38:49 -0700 (PDT) Received: from localhost.localdomain ([211.69.198.200]) by mx.google.com with ESMTPS id 23sm1527589pzk.10.2010.06.05.03.38.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 05 Jun 2010 03:38:49 -0700 (PDT) From: Huacai Chen To: aurelien@aurel32.net Date: Sat, 5 Jun 2010 18:40:22 +0800 Message-Id: <1275734422-5151-1-git-send-email-zltjiangshi@gmail.com> X-Mailer: git-send-email 1.7.0.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: blauwirbel@gmail.com, yamahata@valinux.co.jp, qemu-devel@nongnu.org, Huacai Chen Subject: [Qemu-devel] [PATCH v4 4/7] MIPS: Initial support of VIA USB controller used by fulong mini pc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Huacai Chen --- hw/usb-uhci.c | 29 +++++++++++++++++++++++++++++ hw/usb-uhci.h | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 624d55b..91d827e 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -1149,6 +1149,25 @@ static int usb_uhci_piix4_initfn(PCIDevice *dev) pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL); pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371AB_2); + pci_set_byte(pci_conf + PCI_LATENCY_TIMER, 0x16); + + /* USB misc control 1/2 */ + pci_set_long(pci_conf + 0x40,0x00001000); + /* PM capability */ + pci_set_long(pci_conf + 0x80,0x00020001); + /* USB legacy support */ + pci_set_long(pci_conf + 0xc0,0x00002000); + + return usb_uhci_common_initfn(s); +} + +static int usb_uhci_vt82c686b_initfn(PCIDevice *dev) +{ + UHCIState *s = DO_UPCAST(UHCIState, dev, dev); + uint8_t *pci_conf = s->dev.config; + + pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_VIA); + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_UHCI); return usb_uhci_common_initfn(s); } @@ -1164,6 +1183,11 @@ static PCIDeviceInfo uhci_info[] = { .qdev.vmsd = &vmstate_uhci, .init = usb_uhci_piix4_initfn, },{ + .qdev.name = "vt82c686b-usb-uhci", + .qdev.size = sizeof(UHCIState), + .qdev.vmsd = &vmstate_uhci, + .init = usb_uhci_vt82c686b_initfn, + },{ /* end of list */ } }; @@ -1183,3 +1207,8 @@ void usb_uhci_piix4_init(PCIBus *bus, int devfn) { pci_create_simple(bus, devfn, "piix4-usb-uhci"); } + +void usb_uhci_vt82c686b_init(PCIBus *bus, int devfn) +{ + pci_create_simple(bus, devfn, "vt82c686b-usb-uhci"); +} diff --git a/hw/usb-uhci.h b/hw/usb-uhci.h index 911948e..3e4d377 100644 --- a/hw/usb-uhci.h +++ b/hw/usb-uhci.h @@ -5,5 +5,6 @@ void usb_uhci_piix3_init(PCIBus *bus, int devfn); void usb_uhci_piix4_init(PCIBus *bus, int devfn); +void usb_uhci_vt82c686b_init(PCIBus *bus, int devfn); #endif