From patchwork Tue Oct 19 10:03:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 265211 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 o9JA4Pjm011851 for ; Tue, 19 Oct 2010 10:04:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933903Ab0JSKDk (ORCPT ); Tue, 19 Oct 2010 06:03:40 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:58982 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932197Ab0JSKDi (ORCPT ); Tue, 19 Oct 2010 06:03:38 -0400 Received: by mail-ew0-f46.google.com with SMTP id 20so3148431ewy.19 for ; Tue, 19 Oct 2010 03:03:37 -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=ibOVtebk9uRkkBywU61o5neXXM7Yiezh5XleHFJmxSk=; b=qpJ1vHTBx+VCayMTRmxEX4hX0x8lBaA6yeH9hm6SjnCjVsPCn6DSHNUCpiKZmMH3bC /1W0TxHeN7lIs9aVrsYI0vqrd0L7cMT+53xTvSVq3MGtakq/LgB4Tm/08kIXdJAkmtIx jZci8RcL9eG6UPdX5ji/3DU0vTg3ECOHBv5OY= 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=mUGT3RGRep8K925AHmd9DQ1GLLX6uV/rp5/qRytWnPUkCrLnedIU3bFRHqTKFvdTkK BH6+SCsLUSdN+Ds4K772tZJ+w0p9kFmjwcQRLUhfYNCg54IGC/3JwKuOaD12gdzI5mXS UP6EjPhcSfyJUy9f5RJGz0EQCigqA00Snk4bc= Received: by 10.213.19.145 with SMTP id a17mr1605341ebb.95.1287482617305; Tue, 19 Oct 2010 03:03:37 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id x54sm13838696eeh.5.2010.10.19.03.03.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 19 Oct 2010 03:03:36 -0700 (PDT) From: Felipe Contreras To: linux-usb@vger.kernel.org, linux-omap , linux-main Cc: Greg KH , Felipe Balbi , Tony Lindgren , Felipe Contreras Subject: [PATCH v2 2/3] usb: trivial Kconfig cleanups Date: Tue, 19 Oct 2010 13:03:27 +0300 Message-Id: <1287482608-11320-3-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.3.1.2.g7fe2b In-Reply-To: <1287482608-11320-1-git-send-email-felipe.contreras@gmail.com> References: <1287482608-11320-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, 19 Oct 2010 10:04:26 +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 19a6eb6..c530bc6 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 cfd38ed..20895c4 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 @@ -79,8 +79,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), @@ -90,8 +90,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. @@ -100,8 +100,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 @@ -125,14 +125,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 @@ -140,7 +132,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