v5.5.1

3 files changed, 5 insertions, 39 deletions

diff --git a/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch b/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch
deleted file mode 100644
index 73516b006..000000000
--- a/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 406d27321583d444cd2067dc1130c1260b072576 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Mon, 20 Jan 2020 13:48:55 +0000
-Subject: [PATCH] usb: host: xhci-tegra: set MODULE_FIRMWARE for tegra186
-
-Set the MODULE_FIRMWARE for tegra186, it's registered for 124/210 and
-ensures the firmware is available at the appropriate time such as in
-the initrd, else if the firmware is unavailable the driver fails with
-the following errors:
-
-tegra-xusb 3530000.usb: Direct firmware load for nvidia/tegra186/xusb.bin failed with error -2
-tegra-xusb 3530000.usb: failed to request firmware: -2
-tegra-xusb 3530000.usb: failed to load firmware: -2
-tegra-xusb: probe of 3530000.usb failed with error -2
-
-Fixes: 5f9be5f3f899 ("usb: host: xhci-tegra: Add Tegra186 XUSB support")
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
----
- drivers/usb/host/xhci-tegra.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index bf9065438320..7b0d175ad708 100644
---- a/drivers/usb/host/xhci-tegra.c
-+++ b/drivers/usb/host/xhci-tegra.c
-@@ -1432,6 +1432,7 @@ MODULE_FIRMWARE("nvidia/tegra210/xusb.bin");
- 
- static const char * const tegra186_supply_names[] = {
- };
-+MODULE_FIRMWARE("nvidia/tegra186/xusb.bin");
- 
- static const struct tegra_xusb_phy_type tegra186_phy_types[] = {
- 	{ .name = "usb3", .num = 3, },
--- 
-2.24.1
-
diff --git a/kernel.spec b/kernel.spec
index e8f39154d..7c9ddcc2f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -89,7 +89,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -830,8 +830,6 @@ Patch320: arm64-tegra-jetson-tx1-fixes.patch
 # https://www.spinics.net/lists/linux-tegra/msg43110.html
 Patch321: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch
 
-Patch322: arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch
-
 # 400 - IBM (ppc/s390x) patches
 
 # 500 - Temp fixes/CVEs etc
@@ -2886,6 +2884,9 @@ fi
 #
 #
 %changelog
+* Sun Feb 02 2020 Peter Robinson <pbrobinson@gmail.com> - 5.5.1-200
+- Linux v5.5.1
+
 * Tue Jan 28 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-200
 - Linux v5.5
 
diff --git a/sources b/sources
index 3df436dea..4e428edaa 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (linux-5.5.tar.xz) = fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86
+SHA512 (patch-5.5.1.xz) = beef937378945a577a7172f5b322e888c5f36156dfa82ef28e50ee3f5347ca190e8281e6c86fb50a607ceee2155f567e20b9a2a908a41efaf50616fc3c083041