From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754230AbbKWNwL (ORCPT ); Mon, 23 Nov 2015 08:52:11 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:62343 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753665AbbKWNwC (ORCPT ); Mon, 23 Nov 2015 08:52:02 -0500 From: Arnd Bergmann To: Stephen Warren , Thierry Reding , Alexandre Courbot Cc: Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH] ARM: tegra: select USB_ULPI from EHCI rather than platform Date: Mon, 23 Nov 2015 14:51:29 +0100 Message-ID: <8693901.Fc4bDK8zzK@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:/emhmMeA1OoH/PDfZEUkkEg37URytR17RoVsgNabzgBA0Fca8iw g51dLa1mmK8jRzCqpj2vjMC9XP866Ee7Yp2gS5YjxRTGxFeKMQnyq7V8oXrT22YT8uS/fUI Cy1j8JJ3T/zZTjXe7IPMeRsZXwNVD+4ivx2IljUdFh8HavwO1H8U33P5Gt/ohahclLE4eHj BKgUih9w90yprAvy7Xlbg== X-UI-Out-Filterresults: notjunk:1;V01:K0:wPrPn/zDF8M=:xjoTD7UesB3D1YzqzyDuDe YvOpbasV9EXmPkI4C4/4xj1cu2L9SUDVMKG9E82zR2aCTKqMZNyiPtRmKkZzBC88e1cYyp76C gPM6tMYQc8w3f5ZnnK19IjbN1YdmJxCR5PorveOUHaoTKsQ6DukhppQ5INA3DAyJkeNJ9O7EV AG/ABhF2qaCo85gE64a/wfVEV4q+WIOUGHTfeGhyjozrihfC0RWAvnveQcrzHBeVPIAlbmtON 9Ho2byEwJLlHSXlVuaUjCdutB9F4P5Tp8dPIVKqL/ntLS4v3Dqhy2xssMXVHJJe9zD+JWQgFY 0aHLIvjZtXQyagz4OFpk6rqT0VHxYZnBKNMaExbsZiqzd/NsjZsLxBqOgKXG1VklIryZfCAal i8vdZ1p4cO62VgEE1Bt0zTy+dlpDLTLcuCEoh597e9Sw1DPsxANB/PU1bMm0vDFHt+8qJrCx/ 1WwoC9x183C49CuAFL29cZkwSJpjo0tIAxG50WL5uVVi8xhzmJaS1ZfF5AmLwxUeCwrYYmpoS 0vvJ70ndF/y/lRaO+3rFFeIE7WCmsRrZKYv7z4z0vmKI08VzlJaHLYikWITEG/qL+FbMZuOee m21Kj5CdtVauDV1Pm8d1VvRV7RneljvQKZb68vLUJouCsFkE19Zpi1z6VJWj06QDslbmuWMre uXy2farEzczRYQgSJ3gkPAcbnWms649gDQBWF9dwWAwxe4NEbq5963bv73njFCwCcnv9YGGuq B5qpSLCutJrN5kvy Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For historic reasons, the tegra platform selects USB_ULPI from architecture code, but that hasn't really made sense for a long time, as the only user of that code is the Tegra EHCI driver that has its own Kconfig symbol. This removes the 'select' statements from mach-tegra and drivers/soc/tegra and adds them with the device driver that actually needs them. Signed-off-by: Arnd Bergmann --- Tegra maintainers, can you pick this up for 4.5? There is no real bug here, but I found this when looking at something else in drivers/usb/phy. diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 11963667c6a9..32239aff1051 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -12,7 +12,5 @@ menuconfig ARCH_TEGRA select ARCH_HAS_RESET_CONTROLLER select RESET_CONTROLLER select SOC_BUS - select USB_ULPI if USB_PHY - select USB_ULPI_VIEWPORT if USB_PHY help This enables support for NVIDIA Tegra based systems. diff --git a/drivers/soc/tegra/Kconfig b/drivers/soc/tegra/Kconfig index 7e35dfe52af5..d0c3c3e085e3 100644 --- a/drivers/soc/tegra/Kconfig +++ b/drivers/soc/tegra/Kconfig @@ -57,8 +57,6 @@ if ARM64 config ARCH_TEGRA_132_SOC bool "NVIDIA Tegra132 SoC" select PINCTRL_TEGRA124 - select USB_ULPI if USB_PHY - select USB_ULPI_VIEWPORT if USB_PHY help Enable support for NVIDIA Tegra132 SoC, based on the Denver ARMv8 CPU. The Tegra132 SoC is similar to the Tegra124 SoC, @@ -68,8 +66,6 @@ config ARCH_TEGRA_132_SOC config ARCH_TEGRA_210_SOC bool "NVIDIA Tegra210 SoC" select PINCTRL_TEGRA210 - select USB_ULPI if USB_PHY - select USB_ULPI_VIEWPORT if USB_PHY help Enable support for the NVIDIA Tegra210 SoC. Also known as Tegra X1, the Tegra210 has four Cortex-A57 cores paired with four Cortex-A53 diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 3bb08870148f..95e72d75e0a0 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -220,6 +220,8 @@ config USB_EHCI_TEGRA depends on ARCH_TEGRA select USB_EHCI_ROOT_HUB_TT select USB_PHY + select USB_ULPI + select USB_ULPI_VIEWPORT help This driver enables support for the internal USB Host Controllers found in NVIDIA Tegra SoCs. The controllers are EHCI compliant.