From patchwork Wed Mar 23 16:45:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102536 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp137359lbc; Wed, 23 Mar 2016 09:46:06 -0700 (PDT) X-Received: by 10.98.10.83 with SMTP id s80mr5615655pfi.120.1458751566425; Wed, 23 Mar 2016 09:46:06 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c77si5336701pfd.225.2016.03.23.09.46.06; Wed, 23 Mar 2016 09:46:06 -0700 (PDT) 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 S932650AbcCWQqC (ORCPT + 29 others); Wed, 23 Mar 2016 12:46:02 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:56189 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932596AbcCWQp7 (ORCPT ); Wed, 23 Mar 2016 12:45:59 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0MaJVA-1aTIOZ2oZM-00JsCG; Wed, 23 Mar 2016 17:45:47 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman , Felipe Balbi Cc: Bin Liu , Peter Chen , Arnd Bergmann , Kishon Vijay Abraham I , Peter Chen , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH] usb: rework CONFIG_USB_COMMON logic Date: Wed, 23 Mar 2016 17:45:08 +0100 Message-Id: <1458751543-2167046-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:xGIzIkAlFuLvx2WwQUxmiWev/pDvj3NFBfxwRSyLC2m6/9a0sLQ hJeuQHNRXJ4n94HZKxtZfyYvc6PLp46x8rejgmKYYB8Zy2LRs/Ohu/kfQJiMRW07M05gy3L hGDdta/jhlwV3oXZq3Fu/TU8FV7S5HjQm1wsrEnpIai4I78LETvxGzss2vabpt40YTx5d7b VnulKVLSihd3KXJcOFWFQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:+pGmYTqG6Fk=:59frKben9Gq8Hpk816lcZO 149xMqdJPNIXh7uN2/xHiZQ3rrx/9nALmdp22AyKUFd1MCozxXwfcZ67tWBc63rWfstQ7xfVV K9c2qAYKLT/A3CwgwPq8roBkQbtsF1b8eQvCvHKlbHhtGPYdU1EGjUoqzdmb5C0AOnE4XsFXt lJSefQJSU7fL+2hqcV6C2MYNErZiyggeq7xo46yzmNl90mOkrQLAT4uh5+ov9aZtTTpvDUTgD qIhJsTSdu3ZbtIh55ETQ2kCnyFGTCmF6D/qF+hNwPlx04fJgJ3k/gKwt0EfXtXcxwO60hxQm7 Z69jQAnuYd3gh4Big8GR9kH4r+UYTyEjKb+ssFHm/zN8iMDAq68UsXPXDvxjgfXE8JoBUVxNY h2Bk6g7AluU5yDUDjD8q9nHG7VOxOdze13Q2zmNaMofiVWRm5Qqmb2kd/SFSl4OLEV3qMJwjn En8HrZTkoAuIdtDgy3lJ0e0C5jyzpl3afry4hJGtIC0e5HbBM7TrfEX2qyx7C/ZzuXITNjbng 50Rhqc9uu11+bAhTWvgXI0T2JC+nD6rPE6cvFuViA97anxB7huwAz8HBY+Vmj+CELvGAbQyfq Ewk8LK9slVG11OC5wdrOqTOw5JkzqfDurJiY9PnQipFXqmXk/VbHMVrZaMfsRI8SY+u1v1pi+ gMOWE//wEGwBPx8V21y336cUzlPlOL15LklI46/c/cQU+kcvUe13dcFGQ8u6fNrSSSy4= 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 Acked-by: Felipe Balbi Reviewed-by: Peter Chen --- I seem to have dropped the ball on this one after my initial submission when it wasn't clear who should merge the patch. Please apply to the USB or the USB gadget tree, whoever gets there first. --- drivers/phy/Kconfig | 3 ++- drivers/usb/Kconfig | 3 +-- drivers/usb/gadget/Kconfig | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) -- 2.7.0 diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 26566db09de0..e92b97cd6056 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -250,7 +250,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