From patchwork Wed Feb 3 22:35:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102849 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp147351lbl; Wed, 3 Feb 2016 15:44:06 -0800 (PST) X-Received: by 10.67.6.168 with SMTP id cv8mr6529679pad.47.1454543046824; Wed, 03 Feb 2016 15:44:06 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m2si12232597pfj.159.2016.02.03.15.44.06; Wed, 03 Feb 2016 15:44:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756120AbcBCXoF (ORCPT + 30 others); Wed, 3 Feb 2016 18:44:05 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:62492 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757056AbcBCWfm (ORCPT ); Wed, 3 Feb 2016 17:35:42 -0500 Received: from wuerfel.localnet ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0M8FCE-1a4UvS37aM-00vyTh; Wed, 03 Feb 2016 23:35:28 +0100 From: Arnd Bergmann To: Felipe Balbi Cc: Bin Liu , Felipe Balbi , balbif@gmail.com, Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] usb: rework CONFIG_USB_COMMON logic Date: Wed, 03 Feb 2016 23:35:26 +0100 Message-ID: <6169754.IJXY8FWj5l@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:hXyYaMJ8oA/3t8QB7c0hI4xPPflwLBoyOff4XAGY1U7oxG92Qlw 7dmTvWRpJBBSqqtH1vCfS7yDVyzsD7IPbxeoQV57b3c75/b9WpsqJfHXy0YnViT0GEm1k3e LL+kj1hgTzKWPd2nqelwPPwYx8dlMM2XGPAqVqrGSqEqyTB8Kv6ncRWnA1j4vWmLc1ErUnH 3CW0us/9aJdRtn4AhK9kw== X-UI-Out-Filterresults: notjunk:1; V01:K0:e+PeEkVWKaY=:M/fuItQxa4H9Y/sM5wz46d GiZTHaT+rr3Scrij0+mpA2SwSPY/YSPDBuSPuRqYgbqW24XTjptUtaAsrHe/Cd3MM/jEbvaWr JpJZZvmLHGOv72cDfRMufICvE/7kqKg3BvZdM+fH/NRhsbHWQiCIAj7DmFwjRezxgj9KGJWbu xwn73r4nw3NgSVfAcAdfFtHxBhfNNUqPxa4qDE3sMBUVrQohXhxaGKBMxbNcA9w8cxPphhBko dvgoN0RRvB2WkCQcoGi/eDZ+5+jvFamzgvSYeQ2479LBcgr5n1erzIhOMnKqOgBeuJdgT+bdn R9wWiKaYmrGIGip5C3CWezijsBsh6uj3o0+/+VgdiRV14X/mquWMZUimdbmAkPy8VUTxYCpgU /y6YU4Sfs6elIZJP0JfBI63ooTrT+24gxA2AJqHLlKVR4ya5pScnHsSBOTSRMmykHuMNfiYZt cNA1NgkXA13fMw4squVZ4TJBQBAzA0V8FLY0Yk9XVNCCJNNpjNutzNRaARzSgIH6kExUkxj8a Hvh0sFOCqDGrwIXzclkT5yLK8rIpa7yfCAQLdQ3m3vl1Y7kQXXCbREeUXkDLSWRTo0Wrzi98N LHydo1gVZCylyIYp/1j2k7YZtvxHh8uqBLpTqprYjph8ePWwlXehNdplJs5AQhYl0fkNhrm05 Uz3onNWce3oJvoxxMhwXGAkq8ANUoBxSw0pVsTfLoWVon9rROyZjXrQsGMYUMag7uxHnZmPAX WapYteFZXJCm3DNY Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The phy-am335x driver selects 'USB_COMMON', but all other drivers use 'depends on' for that symbol, and it depends on USB || USB_GADGET itself, which causes a Kconfig warning: warning: (AM335X_PHY_USB) selects USB_COMMON which has unmet direct dependencies (USB_SUPPORT && (USB || USB_GADGET)) As suggested by Felipe Balbi, this turns the logic around, and makes 'USB_COMMON' selected by everything else that needs it, so we can remove the dependencies. Fixes: 59f042f644c5 ("usb: phy: phy-am335x: bypass first VBUS sensing for host-only mode") Signed-off-by: Arnd Bergmann --- Preliminary for now, I've added it to my patch stack for randconfig tests and will test it overnight to see if any build-time regressions come up. diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index e7e117d5dbbe..df005f5a0e0c 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -249,7 +249,8 @@ config PHY_SUN9I_USB tristate "Allwinner sun9i SoC USB PHY driver" depends on ARCH_SUNXI && HAS_IOMEM && OF depends on RESET_CONTROLLER - depends on USB_COMMON + depends on USB_SUPPORT + select USB_COMMON select GENERIC_PHY help Enable this to support the transceiver that is part of Allwinner diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 8ed451dd651e..8689dcba5201 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -31,8 +31,6 @@ if USB_SUPPORT config USB_COMMON tristate - default y - depends on USB || USB_GADGET config USB_ARCH_HAS_HCD def_bool y @@ -41,6 +39,7 @@ config USB_ARCH_HAS_HCD config USB tristate "Support for Host-side USB" depends on USB_ARCH_HAS_HCD + select USB_COMMON select NLS # for UTF-8 strings ---help--- Universal Serial Bus (USB) is a specification for a serial bus diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index af5d922a8f5d..2057add439f0 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -15,6 +15,7 @@ menuconfig USB_GADGET tristate "USB Gadget Support" + select USB_COMMON select NLS help USB is a master/slave protocol, organized with one master