Kconfig: fix TEGRA_USB_SHARED_PAD dependency

tegra_usb_pad_ctrl driver supports NVIDIA Tegra210 and former
chips. For Tegra186 and later chips, there will be pinctrl-*
driver to take care of XUSB PADCTL and UPHY Lane/PLL programming.

bug 200084946

Change-Id: I5a289c75ec72419973bcd5967d856ad84cb03f9d
Signed-off-by: JC Kuo <jckuo@nvidia.com>
Reviewed-on: http://git-master/r/714162
Reviewed-by: WK Tsai <wtsai@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index a730a873a2b28c5358e984cadd4b4cdfdb330636..5fbeb7e9b7040d08eb2310891ca27e116d6cc587 100644 (file)
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -8,7 +8,6 @@ config PCI_TEGRA
     default n
     depends on PLATFORM_TEGRA
     select PCI
-    select TEGRA_USB_SHARED_PAD
     select ARCH_TEGRA_HAS_PCIE
     help
       Say Y here if you want support for the PCIe host controller found

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 20b74cdd1252374dcf6baf0c15f074bdece48037..7b537e33b9fe2a7b7fcba4c0c557fd632f0f9d08 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -59,7 +59,6 @@ config USB_ARCH_HAS_XHCI
 menuconfig USB_SUPPORT
        bool "USB support"
        depends on HAS_IOMEM
-       select TEGRA_USB_SHARED_PAD
        default y
        ---help---
          This option adds core support for Universal Serial Bus (USB).
@@ -73,7 +72,8 @@ config USB_COMMON
        depends on USB || USB_GADGET
 
 config TEGRA_USB_SHARED_PAD
-       bool "Enable shared pad control"
+       bool "Enable shared pad control for Tegra11x/Tegra12x/Tegra13x/Tegra21x"
+       default y if (ARCH_TEGRA_11x_SOC || ARCH_TEGRA_12x_SOC || ARCH_TEGRA_13x_SOC || ARCH_TEGRA_21x_SOC)
        ---help---
          Add shared pad controls for pcie and usb