From patchwork Tue Nov 2 00:14:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 296222 X-Patchwork-Delegate: me@felipebalbi.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA20FVYF026420 for ; Tue, 2 Nov 2010 00:15:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753310Ab0KBAPA (ORCPT ); Mon, 1 Nov 2010 20:15:00 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:53056 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752833Ab0KBAO7 (ORCPT ); Mon, 1 Nov 2010 20:14:59 -0400 Received: by mail-fx0-f46.google.com with SMTP id 16so5413817fxm.19 for ; Mon, 01 Nov 2010 17:14:58 -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:in-reply-to:references; bh=xECvJXe43P9iia5M4MsowUpr4NrQkC2Q8CkSxZc2NTo=; b=ZJM7GeMg9edQC7CSbf485KwllyxD+xKl4yCi45qr/KlfdSwDRqtWjxlWa2zn/3I2Hr eVHb3K5Zp3EULXdLE4PqoTHa7Y/MS9KvXOnX6V5R8a/I3Qb8kEqlh/R2G2dvHXRaKCr6 Myev5sI+WuUTM4b+CylBww8UZB2RQhpqXvj9g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=AHkQWm47S31ZlDsGKt2xwz5G/uWMSmac7xPyK2joEqpFs9HgS6hDlPXTUKzjCF4zGR 7qyOb5m5MftDZKGLBuaKMF0LB1eI5boQJtvibxOevLkBwgRWX9DgF5GjZHkXb/IyZ2IF PjYTO3D4fa1aM9dIcZx4VWF46NOdkHRO+BiWI= Received: by 10.223.107.70 with SMTP id a6mr4779878fap.113.1288656898596; Mon, 01 Nov 2010 17:14:58 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id a25sm2758935fab.37.2010.11.01.17.14.45 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 01 Nov 2010 17:14:58 -0700 (PDT) From: Felipe Contreras To: linux-usb Cc: linux-main , linux-omap , Felipe Balbi , Greg KH , Felipe Contreras , Greg Kroah-Hartman , David Brownell , Alan Stern , Anand Gadiyar , linux-usb@vger.kernel.org Subject: [PATCH v3 1/2] usb: trivial Kconfig cleanups Date: Tue, 2 Nov 2010 02:14:12 +0200 Message-Id: <1288656853-4625-2-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.3.2.2.g0dc5c In-Reply-To: <1288656853-4625-1-git-send-email-felipe.contreras@gmail.com> References: <1288656853-4625-1-git-send-email-felipe.contreras@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 02 Nov 2010 00:15:31 +0000 (UTC) diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index 9eed5b5..8f57a26 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig @@ -110,8 +110,6 @@ config USB_OTG bool depends on USB && EXPERIMENTAL depends on USB_SUSPEND - default n - config USB_OTG_WHITELIST bool "Rely on OTG Targeted Peripherals List" @@ -139,4 +137,3 @@ config USB_OTG_BLACKLIST_HUB external hubs. OTG hosts are allowed to reduce hardware and software costs by not supporting external hubs. So are "Embedded Hosts" that don't offer OTG support. - diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index b739ca8..75733cd 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -125,7 +125,6 @@ choice config USB_GADGET_AT91 boolean "Atmel AT91 USB Device Port" depends on ARCH_AT91 && !ARCH_AT91SAM9RL && !ARCH_AT91CAP9 && !ARCH_AT91SAM9G45 - select USB_GADGET_SELECTED help Many Atmel AT91 processors (such as the AT91RM2000) have a full speed USB Device Port with support for five configurable @@ -139,6 +138,7 @@ config USB_AT91 tristate depends on USB_GADGET_AT91 default USB_GADGET + select USB_GADGET_SELECTED config USB_GADGET_ATMEL_USBA boolean "Atmel USBA" diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 341a37a..f0e0495 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -8,12 +8,12 @@ comment "Enable Host or Gadget support to see Inventra options" # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller config USB_MUSB_HDRC + tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)' depends on (USB || USB_GADGET) depends on (ARM || (BF54x && !BF544) || (BF52x && !BF522 && !BF523)) select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN) select TWL4030_USB if MACH_OMAP_3430SDP select USB_OTG_UTILS - tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)' help Say Y here if your system has a dual role high speed USB controller based on the Mentor Graphics silicon IP. Then @@ -93,8 +93,8 @@ choice # use USB_MUSB_HDRC_HCD not USB_MUSB_HOST to #ifdef host side support; # OTG needs both roles, not just USB_MUSB_HOST. config USB_MUSB_HOST - depends on USB bool "USB Host" + depends on USB help Say Y here if your system supports the USB host role. If it has a USB "A" (rectangular), "Mini-A" (uncommon), @@ -104,8 +104,8 @@ config USB_MUSB_HOST # use USB_GADGET_MUSB_HDRC not USB_MUSB_PERIPHERAL to #ifdef peripheral # side support ... OTG needs both roles config USB_MUSB_PERIPHERAL - depends on USB_GADGET bool "USB Peripheral (gadget stack)" + depends on USB_GADGET select USB_GADGET_MUSB_HDRC help Say Y here if your system supports the USB peripheral role. @@ -114,8 +114,8 @@ config USB_MUSB_PERIPHERAL (With a "Mini-AB" connector, you should enable USB OTG.) config USB_MUSB_OTG - depends on USB && USB_GADGET && PM && EXPERIMENTAL bool "Both host and peripheral: USB OTG (On The Go) Device" + depends on USB && USB_GADGET && PM && EXPERIMENTAL select USB_GADGET_MUSB_HDRC select USB_OTG help @@ -139,14 +139,6 @@ config USB_MUSB_OTG endchoice -# enable peripheral support (including with OTG) -config USB_GADGET_MUSB_HDRC - bool - depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG) -# default y -# select USB_GADGET_DUALSPEED -# select USB_GADGET_SELECTED - # enables host support (including with OTG) config USB_MUSB_HDRC_HCD bool @@ -154,7 +146,6 @@ config USB_MUSB_HDRC_HCD select USB_OTG if USB_GADGET_MUSB_HDRC default y - config MUSB_PIO_ONLY bool 'Disable DMA (always use PIO)' depends on USB_MUSB_HDRC