diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-20 19:16:34 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-20 19:16:34 +0100 |
| commit | 341f9a188d803738ebb71c5701a9ce4a9cbfddf9 (patch) | |
| tree | 6bd21c680c9566340b026c1d4feb9aba6edb06e4 | |
| parent | 278eea7635a9893cc39aaf57f1ea0c6f1674316b (diff) | |
| parent | 75f4244234c4836d4774419b886b685650e14ac2 (diff) | |
| download | kernel-341f9a188d803738ebb71c5701a9ce4a9cbfddf9.tar.gz kernel-341f9a188d803738ebb71c5701a9ce4a9cbfddf9.tar.xz kernel-341f9a188d803738ebb71c5701a9ce4a9cbfddf9.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
| -rw-r--r-- | arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch | 36 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 8 |
3 files changed, 45 insertions, 1 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 new file mode 100644 index 000000000..73516b006 --- /dev/null +++ b/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch @@ -0,0 +1,36 @@ +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 + @@ -1 +1 @@ -ab7541c3addd344939e76d0636da0048ce24f2db +def9d2780727cec3313ed3522d0123158d87224d diff --git a/kernel.spec b/kernel.spec index 0d4a156e9..4cbd859e9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -847,6 +847,8 @@ 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 @@ -2908,6 +2910,12 @@ fi # # %changelog +* Mon Jan 20 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc7.git0.1 +- Linux v5.5-rc7 + +* Mon Jan 20 2020 Justin M. Forbes <jforbes@fedoraproject.org> +- Disable debugging options. + * Fri Jan 17 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc6.git3.1 - Linux v5.5-rc6-143-gab7541c3addd |