From patchwork Fri Jan 7 19:22:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 465131 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 p07JMo3A031295 for ; Fri, 7 Jan 2011 19:22:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753137Ab1AGTWo (ORCPT ); Fri, 7 Jan 2011 14:22:44 -0500 Received: from na3sys009aog112.obsmtp.com ([74.125.149.207]:42875 "EHLO na3sys009aog112.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752862Ab1AGTWn (ORCPT ); Fri, 7 Jan 2011 14:22:43 -0500 Received: from source ([209.85.215.42]) by na3sys009aob112.postini.com ([74.125.148.12]) with SMTP ID DSNKTSdoApvLX1NzBBQcIiETLyO/TusGHq6X@postini.com; Fri, 07 Jan 2011 11:22:43 PST Received: by mail-ew0-f42.google.com with SMTP id 1so7394222ewy.1 for ; Fri, 07 Jan 2011 11:22:42 -0800 (PST) Received: by 10.213.32.204 with SMTP id e12mr1737550ebd.19.1294428162153; Fri, 07 Jan 2011 11:22:42 -0800 (PST) Received: from localhost (cs181221087.pp.htv.fi [82.181.221.87]) by mx.google.com with ESMTPS id t50sm2421758eeh.0.2011.01.07.11.22.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 07 Jan 2011 11:22:41 -0800 (PST) Date: Fri, 7 Jan 2011 21:22:38 +0200 From: Felipe Balbi To: "Premi, Sanjeev" Cc: Tony Lindgren , Russell King - ARM Linux , "Balbi, Felipe" , "linux-omap@vger.kernel.org" , Greg KH , Linux USB Mailing List Subject: Re: Latest config warning Message-ID: <20110107192238.GD2272@legolas.emea.dhcp.ti.com> Reply-To: balbi@ti.com References: <20110107113506.GK1198@n2100.arm.linux.org.uk> <20110107164748.GC880@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) 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.6 (demeter1.kernel.org [140.211.167.41]); Fri, 07 Jan 2011 19:22:51 +0000 (UTC) diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 5a7c8f1..558cf4d 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -10,8 +10,6 @@ menuconfig USB_SUPPORT This option adds core support for Universal Serial Bus (USB). You will also need drivers from the following menu to make use of it. -if USB_SUPPORT - # Host-side USB depends on having a host controller # NOTE: dummy_hcd is always an option, but it's ignored here ... # NOTE: SL-811 option should be board-specific ... @@ -70,6 +68,8 @@ config USB_ARCH_HAS_EHCI default y if ARCH_CNS3XXX default PCI +if USB_SUPPORT + # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface. config USB tristate "Support for Host-side USB" The idea is that ARCHs can select USB_ARCH_HAS_* without having to enable USB_SUPPORT. Currently, there's a big mess of conditional default values on all USB_ARCH_HAS_* entries: config USB_ARCH_HAS_EHCI boolean default y if PPC_83xx default y if PPC_MPC512x default y if SOC_AU1200 default y if ARCH_IXP4XX default y if ARCH_W90X900 default y if ARCH_AT91SAM9G45 default y if ARCH_MXC default y if ARCH_OMAP3 default y if ARCH_CNS3XXX default PCI IMHO it's much better to have something like: diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 5a7c8f1..ac137d1 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -10,8 +10,6 @@ menuconfig USB_SUPPORT This option adds core support for Universal Serial Bus (USB). You will also need drivers from the following menu to make use of it. -if USB_SUPPORT - # Host-side USB depends on having a host controller # NOTE: dummy_hcd is always an option, but it's ignored here ... # NOTE: SL-811 option should be board-specific ... @@ -59,16 +57,9 @@ config USB_ARCH_HAS_OHCI # some non-PCI hcds implement EHCI config USB_ARCH_HAS_EHCI boolean - default y if PPC_83xx - default y if PPC_MPC512x - default y if SOC_AU1200 - default y if ARCH_IXP4XX - default y if ARCH_W90X900 - default y if ARCH_AT91SAM9G45 - default y if ARCH_MXC - default y if ARCH_OMAP3 - default y if ARCH_CNS3XXX - default PCI + default n + +if USB_SUPPORT # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface. config USB