Browse Source

ARM: tegra: select USB_ULPI from EHCI rather than platform

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 <arnd@arndb.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Arnd Bergmann 9 years ago
parent
commit
a262e87ff3
3 changed files with 2 additions and 6 deletions
  1. 0 2
      arch/arm/mach-tegra/Kconfig
  2. 0 4
      drivers/soc/tegra/Kconfig
  3. 2 0
      drivers/usb/host/Kconfig

+ 0 - 2
arch/arm/mach-tegra/Kconfig

@@ -12,7 +12,5 @@ config ARCH_TEGRA
 	select ARCH_HAS_RESET_CONTROLLER
 	select ARCH_HAS_RESET_CONTROLLER
 	select RESET_CONTROLLER
 	select RESET_CONTROLLER
 	select SOC_BUS
 	select SOC_BUS
-	select USB_ULPI if USB_PHY
-	select USB_ULPI_VIEWPORT if USB_PHY
 	help
 	help
 	  This enables support for NVIDIA Tegra based systems.
 	  This enables support for NVIDIA Tegra based systems.

+ 0 - 4
drivers/soc/tegra/Kconfig

@@ -57,8 +57,6 @@ if ARM64
 config ARCH_TEGRA_132_SOC
 config ARCH_TEGRA_132_SOC
 	bool "NVIDIA Tegra132 SoC"
 	bool "NVIDIA Tegra132 SoC"
 	select PINCTRL_TEGRA124
 	select PINCTRL_TEGRA124
-	select USB_ULPI if USB_PHY
-	select USB_ULPI_VIEWPORT if USB_PHY
 	help
 	help
 	  Enable support for NVIDIA Tegra132 SoC, based on the Denver
 	  Enable support for NVIDIA Tegra132 SoC, based on the Denver
 	  ARMv8 CPU.  The Tegra132 SoC is similar to the Tegra124 SoC,
 	  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
 config ARCH_TEGRA_210_SOC
 	bool "NVIDIA Tegra210 SoC"
 	bool "NVIDIA Tegra210 SoC"
 	select PINCTRL_TEGRA210
 	select PINCTRL_TEGRA210
-	select USB_ULPI if USB_PHY
-	select USB_ULPI_VIEWPORT if USB_PHY
 	help
 	help
 	  Enable support for the NVIDIA Tegra210 SoC. Also known as Tegra X1,
 	  Enable support for the NVIDIA Tegra210 SoC. Also known as Tegra X1,
 	  the Tegra210 has four Cortex-A57 cores paired with four Cortex-A53
 	  the Tegra210 has four Cortex-A57 cores paired with four Cortex-A53

+ 2 - 0
drivers/usb/host/Kconfig

@@ -220,6 +220,8 @@ config USB_EHCI_TEGRA
        depends on ARCH_TEGRA
        depends on ARCH_TEGRA
        select USB_EHCI_ROOT_HUB_TT
        select USB_EHCI_ROOT_HUB_TT
        select USB_PHY
        select USB_PHY
+	select USB_ULPI
+	select USB_ULPI_VIEWPORT
        help
        help
          This driver enables support for the internal USB Host Controllers
          This driver enables support for the internal USB Host Controllers
          found in NVIDIA Tegra SoCs. The controllers are EHCI compliant.
          found in NVIDIA Tegra SoCs. The controllers are EHCI compliant.