From patchwork Thu Jan 28 16:20:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101055 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp576552lbb; Thu, 28 Jan 2016 08:22:41 -0800 (PST) X-Received: by 10.66.197.131 with SMTP id iu3mr5810356pac.57.1453998161405; Thu, 28 Jan 2016 08:22:41 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xp4si17775426pab.1.2016.01.28.08.22.41; Thu, 28 Jan 2016 08:22:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-usb-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-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965724AbcA1QWi (ORCPT + 4 others); Thu, 28 Jan 2016 11:22:38 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:53544 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965208AbcA1QWh (ORCPT ); Thu, 28 Jan 2016 11:22:37 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0Lo18K-1Zrzch2h8C-00fxVV; Thu, 28 Jan 2016 17:21:55 +0100 From: Arnd Bergmann To: Felipe Balbi Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Felipe Balbi , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Jarzmik , Haojian Zhuang , Daniel Mack , Imre Kaloz , Krzysztof Halasa , Greg Kroah-Hartman , Nikhil Badola , Alan Stern , Chunfeng Yun Subject: [PATCH 4/7] usb: fsl: drop USB_FSL_MPH_DR_OF Kconfig symbol Date: Thu, 28 Jan 2016 17:20:54 +0100 Message-Id: <1453998087-3489894-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1453997722-3489596-1-git-send-email-arnd@arndb.de> References: <1453997722-3489596-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:8kHH1nQpuIDOuLuiwTEBv0VdzUTlszuQkeyyVtfroKVoLvv35Je FnX8ZqgkaLiCkvTjn5yYCSzFE+rZbvoHQ2tgQ++vrMgtH83xRGK0XFGHFwSlu1co0kZRhyW sTCkgB/dl3CIp1XIvIBj7jKHM4pwZ3mwf0tm6069wIXB9ZmvXBSvhwwp6uPgWFBh9+ToI7X UiO9R9+r+fSfAmSc3SbOA== X-UI-Out-Filterresults: notjunk:1; V01:K0:/W2gVPY3/gw=:Ccr2/2tTb7fJ3/liH26sE6 6DMEztQfclWzLLLL7igLP/RA/hfVNqIdPjp/BwRiBnkfoMBJsoKxutwmVRjNZdIN+I1WCzSp2 C1XdsCZoJmx1npHiansMVc+yCCePhl3HaSROqW7pkCDsB2eQ60uQOzQZtq17G/PNKfP6u4+Wt RzehvhxfP5IXr21lBuF7kbehbTCrwI5V6SkVG8ntc+iN3VUHjc9/JGSskacNbAEtUl371ykR3 87NVRTcE3hnAbjxceGf8QgitvexLkkpyDPZh3/+zt+nLNljkUpt2uNJYWDAivpfHjjNrIf4Gk 5AY9HEtEwHJPva+8XsbH9dDqCwDQptVcyF8V3Yte/IAr+w/+ey1kXqpyLX1/RjHeulWUK5/XO SJOpvg6PeBobsdOVwJ/jYjeYZu4DBOa2DhhxHVEZXyBWaCAmLXM/EINw0FrLAqsHKuJNW3sT9 0MlqKHlvqOj6aXcjHLefX3BXv/5ohVwcsfNtha2G1Eh8wpUa9kIgKxu5qLCNKS0VbMhwyeeY9 l4Uxcc2nK8hwRCN+7MWYnePBz3X6JBVMkncANsxDat3hjiQ/DTqCQcIhtawui5O1+b/KmR3Ga qD0fTBp1VQI+cN31I16WiNLoBkguQ9NWddfo6Z2NtGqt8DjTBkmg9OsP4JEEb13aWSJB8lMkj sdOGM014L9BTrbNd868wLEf8xA3Hv/hrDEKQ7uss2DPzjyqemSpZVTITQsrKa/skztu0= Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The USB_FSL_MPH_DR_OF symbol is used to ensure the code that interprets the DR device node is built whenever one of the two drivers (EHCI or UDC) for the platform is enabled. However, if CONFIG_USB is disabled and we only support gadget mode, this causes a Kconfig warning: warning: (USB_FSL_USB2) selects USB_FSL_MPH_DR_OF which has unmet direct dependencies (USB_SUPPORT && USB) We can avoid this warning by simply no longer using the symbol, and making sure we enter the drivers/usb/host/ directory when the UDC driver is enabled that needs the file, and then we use Makefile syntax to ensure the file is built-in if needed. There is currently a dependency on CONFIG_OF, but this is redundant, as we already know that this is set unconditionally for the platforms that use this driver. Signed-off-by: Arnd Bergmann --- drivers/usb/Makefile | 2 +- drivers/usb/gadget/udc/Kconfig | 1 - drivers/usb/host/Kconfig | 4 ---- drivers/usb/host/Makefile | 3 ++- 4 files changed, 3 insertions(+), 7 deletions(-) -- 2.7.0 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index d5c57f1e98fd..dca78565eb55 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -26,7 +26,7 @@ obj-$(CONFIG_USB_U132_HCD) += host/ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ obj-$(CONFIG_USB_IMX21_HCD) += host/ -obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/ +obj-$(CONFIG_USB_FSL_USB2) += host/ obj-$(CONFIG_USB_FOTG210_HCD) += host/ obj-$(CONFIG_USB_MAX3421_HCD) += host/ diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig index 753c29bd11ad..d38cd69b470e 100644 --- a/drivers/usb/gadget/udc/Kconfig +++ b/drivers/usb/gadget/udc/Kconfig @@ -74,7 +74,6 @@ config USB_BCM63XX_UDC config USB_FSL_USB2 tristate "Freescale Highspeed USB DR Peripheral Controller" depends on FSL_SOC || ARCH_MXC - select USB_FSL_MPH_DR_OF if OF help Some of Freescale PowerPC and i.MX processors have a High Speed Dual-Role(DR) USB controller, which supports device mode. diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 1f117c360ebb..2f73cc5fab71 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -121,9 +121,6 @@ config USB_EHCI_TT_NEWSCHED If unsure, say Y. -config USB_FSL_MPH_DR_OF - tristate - if USB_EHCI_HCD config USB_EHCI_PCI @@ -156,7 +153,6 @@ config USB_EHCI_FSL tristate "Support for Freescale PPC on-chip EHCI USB controller" depends on FSL_SOC select USB_EHCI_ROOT_HUB_TT - select USB_FSL_MPH_DR_OF if OF ---help--- Variation of ARC USB block used in some Freescale chips. diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 65a06b4382bf..a9ddd3c9ec94 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -74,7 +74,8 @@ obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o -obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o +obj-$(CONFIG_USB_FSL_USB2) += fsl-mph-dr-of.o +obj-$(CONFIG_USB_EHCI_FSL) += fsl-mph-dr-of.o obj-$(CONFIG_USB_EHCI_FSL) += ehci-fsl.o obj-$(CONFIG_USB_HCD_BCMA) += bcma-hcd.o obj-$(CONFIG_USB_HCD_SSB) += ssb-hcd.o