From d3854d75b079d389fd408246cb401da4f17e24a3 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: May 07 2018 14:05:08 +0000
Subject: Fix USB-2 on Tegra devices


---

diff --git a/configs/fedora/generic/arm/CONFIG_USB_TEGRA_PHY b/configs/fedora/generic/arm/CONFIG_USB_TEGRA_PHY
new file mode 100644
index 0000000..8f324a3
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_USB_TEGRA_PHY
@@ -0,0 +1 @@
+CONFIG_USB_TEGRA_PHY=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 2ad3fff..77b11ff 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6418,6 +6418,7 @@ CONFIG_USB_STORAGE_USBAT=m
 CONFIG_USB_STV06XX=m
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_SWITCH_FSA9480 is not set
+CONFIG_USB_TEGRA_PHY=m
 # CONFIG_USB_TEST is not set
 CONFIG_USB_TMC=m
 CONFIG_USB_TRANCEVIBRATOR=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 9f22f2e..763fc75 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6394,6 +6394,7 @@ CONFIG_USB_STORAGE_USBAT=m
 CONFIG_USB_STV06XX=m
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_SWITCH_FSA9480 is not set
+CONFIG_USB_TEGRA_PHY=m
 # CONFIG_USB_TEST is not set
 CONFIG_USB_TMC=m
 CONFIG_USB_TRANCEVIBRATOR=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index d1928d0..8f60386 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6900,6 +6900,7 @@ CONFIG_USB_STORAGE_USBAT=m
 CONFIG_USB_STV06XX=m
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_SWITCH_FSA9480 is not set
+CONFIG_USB_TEGRA_PHY=m
 # CONFIG_USB_TEST is not set
 CONFIG_USB_TI_CPPI41_DMA=y
 CONFIG_USB_TMC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 4229228..9a71b6f 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6470,6 +6470,7 @@ CONFIG_USB_STORAGE_USBAT=m
 CONFIG_USB_STV06XX=m
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_SWITCH_FSA9480 is not set
+CONFIG_USB_TEGRA_PHY=m
 # CONFIG_USB_TEST is not set
 CONFIG_USB_TMC=m
 CONFIG_USB_TRANCEVIBRATOR=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index fe20d32..19f9681 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6446,6 +6446,7 @@ CONFIG_USB_STORAGE_USBAT=m
 CONFIG_USB_STV06XX=m
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_SWITCH_FSA9480 is not set
+CONFIG_USB_TEGRA_PHY=m
 # CONFIG_USB_TEST is not set
 CONFIG_USB_TMC=m
 CONFIG_USB_TRANCEVIBRATOR=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 1586226..9f598c8 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6876,6 +6876,7 @@ CONFIG_USB_STORAGE_USBAT=m
 CONFIG_USB_STV06XX=m
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_SWITCH_FSA9480 is not set
+CONFIG_USB_TEGRA_PHY=m
 # CONFIG_USB_TEST is not set
 CONFIG_USB_TI_CPPI41_DMA=y
 CONFIG_USB_TMC=m
diff --git a/kernel.spec b/kernel.spec
index 140b4b4..bd7817c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -591,6 +591,9 @@ Patch310: arm-tegra-fix-nouveau-crash.patch
 # https://patchwork.kernel.org/patch/10346089/
 Patch311: arm-dts-Add-am335x-pocketbeagle.patch
 
+# https://www.spinics.net/lists/linux-tegra/msg32920.html
+Patch312: arm-tegra-USB-driver-dependency-fix.patch
+
 # https://patchwork.kernel.org/patch/10354521/
 # https://patchwork.kernel.org/patch/10354187/
 # https://patchwork.kernel.org/patch/10306793/
@@ -1869,6 +1872,9 @@ fi
 #
 #
 %changelog
+* Sat May  5 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fix USB-2 on Tegra devices
+
 * Fri May 04 2018 Laura Abbott <labbott@redhat.com>
 - Fix for building out of tree modules on powerpc (rhbz 1574604)