From patchwork Sat Feb 16 23:03:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 14929 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D620823F72 for ; Sat, 16 Feb 2013 23:04:39 +0000 (UTC) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by fiordland.canonical.com (Postfix) with ESMTP id 13680A181D2 for ; Sat, 16 Feb 2013 23:04:38 +0000 (UTC) Received: by mail-vb0-f50.google.com with SMTP id ft2so2832935vbb.23 for ; Sat, 16 Feb 2013 15:04:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id:x-provags-id:x-gm-message-state; bh=u5BJktaFOBGDfaylnlbd5oWEVRoF3+fEoCWRaleqs6k=; b=WNS8KC76FxZYDXtZb8TMp7SR1zYP3HwApyLdY4aOWFxM1KkwEl53xrqFZtuJouKzRY +bArTiNSkdL8UZXrerTzc9NMJvZNMVwkI6PKvZK/t28FFUhi+c52lfMUC+2Y4CbvWz+N gflaY6+jzG9QbhnOlY27dlnQmdTJa2DynJg1IUiJNUJjNn3hWXsqM6S4FSafAOewHJ83 Aj/H90IVgFheE6M0oX+7ERTxx8DRM9o++wjJ8MvZf64j7Y4curkXM+I6WX6A5uKI/6Q3 Ewtob/vCHcOw3H8Had9b6KwP1mt0GPMIQ6fCbZqScRbv17P8eeABNK9JEGg68x4DsPW6 Anyw== X-Received: by 10.52.93.235 with SMTP id cx11mr8002425vdb.51.1361055878370; Sat, 16 Feb 2013 15:04:38 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp26570veb; Sat, 16 Feb 2013 15:04:36 -0800 (PST) X-Received: by 10.14.219.7 with SMTP id l7mr1585033eep.12.1361055876194; Sat, 16 Feb 2013 15:04:36 -0800 (PST) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.187]) by mx.google.com with ESMTPS id d42si24091051eep.260.2013.02.16.15.04.35 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 16 Feb 2013 15:04:36 -0800 (PST) Received-SPF: neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.187; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.localnet (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0M1kWE-1V0c970QYc-00t6YT; Sun, 17 Feb 2013 00:03:51 +0100 From: Arnd Bergmann To: Ezequiel Garcia Subject: [PATCH] USB: update host controller Kconfig entries Date: Sat, 16 Feb 2013 23:03:47 +0000 User-Agent: KMail/1.12.2 (Linux/3.8.0-6-generic; KDE/4.3.2; x86_64; ; ) Cc: Greg KH , Andrew Lunn , Jason Cooper , patches@linaro.org, Manjunath Goudar , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tony Prisk References: <201302152158.23446.arnd@arndb.de> <1360966349-1242560-2-git-send-email-arnd@arndb.de> <20130216141924.GA2473@localhost> In-Reply-To: <20130216141924.GA2473@localhost> MIME-Version: 1.0 Message-Id: <201302162303.48174.arnd@arndb.de> X-Provags-ID: V02:K0:B+ym1rgjHZ+q27zp6hsAA7wr3NTEvdkSY+qBRvwg0TX 6izgS6k6L+E4hwyqApGtoDpq64qofCNDEKOb/mr8WTdqMDFllA Wq8iCgvvh1l22W4g7MVRFsxOEeBqIeM/U2R97jEUk5lQfYC+LM gzVnIKV38MLw1je+Ccr3qRHkdQdSCUWRh5V2JYUyldh2YiAIhZ LHVGnxU6cv3CG2MTd3lq9iJp7KBbt7Ep84TKcyMIcAMwsO1Sm7 y7OfFRZwIPIaIk7cCmxA+80uA3F6qKOWd5b70ZpCHl048tC2AQ foQFSQ/opMS6szuGLNfgWr1kVJaUmXAFumJ6jtrKA8hG8ie9vf 1BTcAKqGGvQ+fqZel8w8= X-Gm-Message-State: ALoCoQkUM++ItbH3Xa4OcwOVZ9/HP4yDrS+3sQaRLqVO4Vj+Ksubk1noTgUU9PwtrsEslcMM0jCX On Saturday 16 February 2013, Ezequiel Garcia wrote: > > s/Morvell/Marvell > > Just this tiny nitpick. Thanks for pointing this out! Tony Prisk had another comment about the VT8500 patch, so I figured it would be good to update both here, and I found a few more outdated changeset comments about drivers that have become used on more platforms now. Greg, please apply to whichever release you see fit. This is based on your current usb-next branch. Arnd 8<----------- Subject: USB: update host controller Kconfig entries The recent patches from Manjunath Goudar introduced two small mistakes in the Kconfig help text for the new options. Let's fix those and the other entries that have become stale over time. Signed-off-by: Arnd Bergmann --- drivers/usb/host/Kconfig | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 7ac6f48..245da35 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -163,23 +163,28 @@ config USB_EHCI_HCD_OMAP OMAP3 and later chips. config USB_EHCI_HCD_ORION - tristate "Support for Marvell Orion on-chip EHCI USB controller" + tristate "Support for Marvell EBU on-chip EHCI USB controller" depends on USB_EHCI_HCD && PLAT_ORION default y ---help--- Enables support for the on-chip EHCI controller on - Morvell Orion chips. + Marvell's embedded ARM SoCs, including Orion, + Kirkwood, Dove, Armada XP, Armada 370. + This is different from the EHCI implementation on + Marvell's mobile PXA and MMP SoC, see USB_EHCI_MV + for those. + config USB_EHCI_HCD_VT8500 - tristate "Support for VT8500 on-chip EHCI USB controller" + tristate "Support for VIA/Wondermedia on-chip EHCI USB controller" depends on USB_EHCI_HCD && ARCH_VT8500 default y ---help--- Enables support for the on-chip EHCI controller on - VT8500 chips. + VIA VT8500 and Wondermedia WM8x50 chips. config USB_EHCI_MSM - bool "Support for MSM on-chip EHCI USB controller" + bool "Support for Qualcomm QSD/MSM on-chip EHCI USB controller" depends on USB_EHCI_HCD && ARCH_MSM select USB_EHCI_ROOT_HUB_TT select USB_MSM_OTG @@ -215,10 +220,11 @@ config USB_EHCI_SH If you use the PCI EHCI controller, this option is not necessary. config USB_EHCI_S5P - boolean "S5P EHCI support" - depends on USB_EHCI_HCD && PLAT_S5P - help - Enable support for the S5P SOC's on-chip EHCI controller. + boolean "EHCI support for Samsung S5P/EXYNOS SoC Series" + depends on USB_EHCI_HCD && PLAT_S5P + help + Enable support for the Samsung S5Pxxxx and Exynos3/4/5 SOC's + on-chip EHCI controller. config USB_EHCI_MV bool "EHCI support for Marvell on-chip controller" @@ -228,6 +234,8 @@ config USB_EHCI_MV Enables support for Marvell (including PXA and MMP series) on-chip USB SPH and OTG controller. SPH is a single port host, and it can only be EHCI host. OTG is controller that can switch to host mode. + Note that there is a separate driver for Marvell's embedded ARM + SoCs, see USB_EHCI_HCD_ORION for those. config USB_W90X900_EHCI bool "W90X900(W90P910) EHCI support"