Skip to contentSkip to conversation

ARM: tegra: select USB_ULPI from EHCI rather than platform

PATCH Applied Arnd Bergmann 2 participants 2 messages Nov 23, 2015

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
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.

arch/arm/mach-tegra/Kconfig +0 -2
index 11963667c6a9..32239aff1051 100644
@@ -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.
drivers/soc/tegra/Kconfig +0 -4
index 7e35dfe52af5..d0c3c3e085e3 100644
@@ -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
drivers/usb/host/Kconfig +2 -0
index 3bb08870148f..95e72d75e0a0 100644
@@ -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.
#1 lore raw
Quoted 5 lines · Arnd Bergmann

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.

Quoted 7 lines

This removes the 'select' statements from mach-tegra and drivers/soc/tegra and adds them with the device driver that actually needs them.

---
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.

Applied, thanks.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151123/e0c2a08b/attachment.sig>