From 6333f807a7cdf1d15017b4ca78dc0d312005be82 Mon Sep 17 00:00:00 2001
From: Jeremy Linton <jeremy.linton@arm.com>
Date: Nov 04 2021 20:12:50 +0000
Subject: Add isp1760 patch from upstream.


Some Arm devices (corestone) use the isp1760 as their boot
device. This patch is upstream, but needs to be added here
until the next release.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>

---

diff --git a/0001-fix-90kernel-modules-add-isp1760-USB-controller.patch b/0001-fix-90kernel-modules-add-isp1760-USB-controller.patch
new file mode 100644
index 0000000..333a62f
--- /dev/null
+++ b/0001-fix-90kernel-modules-add-isp1760-USB-controller.patch
@@ -0,0 +1,32 @@
+From 15398458685d376fef56b1bf6fe09ae7c68324c1 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Sat, 16 Oct 2021 10:41:24 +0100
+Subject: [PATCH] fix(90kernel-modules): add isp1760 USB controller
+
+Like the dwc/chipidea controllers the isp1760 can act in either
+host or gadget mode so it ends up in it's own directory. Add this
+driver into the initrd as it's part of some arm platforms and
+is needed to be able to boot off USB storage.
+
+Fixes issue #1619
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ modules.d/90kernel-modules/module-setup.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index a1aba71b..68358bb5 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -96,6 +96,7 @@ installkernel() {
+                 "=drivers/usb/dwc2" \
+                 "=drivers/usb/dwc3" \
+                 "=drivers/usb/host" \
++                "=drivers/usb/isp1760" \
+                 "=drivers/usb/misc" \
+                 "=drivers/usb/musb" \
+                 "=drivers/usb/phy" \
+-- 
+2.32.0
+
diff --git a/dracut.spec b/dracut.spec
index 4454e95..6f53b93 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -5,7 +5,7 @@
 # strip the automatically generated dep here and instead co-own the
 # directory.
 %global __requires_exclude pkg-config
-%define dist_free_release 6
+%define dist_free_release 7
 
 Name: dracut
 Version: 055
@@ -52,6 +52,8 @@ Patch4: 0001-fix-90kernel-modules-add-Type-C-USB-drivers-for-gene.patch
 Patch5: 0001-fix-kernel-modules-add-blk_mq_alloc_disk-and-blk_cle.patch
 # Network manager: disable tty output if the console is not usable
 Patch6: https://github.com/dracutdevs/dracut/pull/1611.patch#/0001-fix-network-manager-disable-tty-if-no-console.patch
+# Add support for isp1760 usb device used as the boot drive on arm/corestone
+Patch7: 0001-fix-90kernel-modules-add-isp1760-USB-controller.patch
 
 BuildRequires: bash
 BuildRequires: git-core
@@ -505,6 +507,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
 
 %changelog
+* Thu Nov  4 2021 Jeremy Linton <jeremy.linton@arm.com> - 055-7
+- Backport Upstream: 15398458 fix(90kernel-modules): add isp1760 USB controller
+
 * Tue Oct 26 2021 Olivier Lemasle <o.lemasle@gmail.com> - 055-6
 - Backport PR #1611 to fix network manager when console is not usable