drop queue-6.1/usb-misc-onboard-hub-add-support-for-microchip-usb5744.patch

diff --git a/queue-6.1/series b/queue-6.1/series
index 0675a7e4a4ac047c9f28b00738375e0bd4ec6f05..5825a2a40eb10daec9ced26247b37e4aca2215d6 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -60,7 +60,6 @@ md-fix-bi_status-reporting-in-md_end_clone_io.patch
 bcache-fixup-multi-threaded-bch_sectors_dirty_init-wake-up-race.patch
 io_uring-fs-consider-link-flags-when-getting-path-for-linkat.patch
 s390-dasd-protect-device-queue-against-concurrent-access.patch
-usb-misc-onboard-hub-add-support-for-microchip-usb5744.patch
 usb-serial-option-add-luat-air72-u-series-products.patch
 hv_netvsc-fix-race-of-netvsc-and-vf-register_netdevice.patch
 hv_netvsc-fix-race-of-register_netdevice_notifier-and-vf-register.patch

diff --git a/queue-6.1/usb-misc-onboard-hub-add-support-for-microchip-usb5744.patch b/queue-6.1/usb-misc-onboard-hub-add-support-for-microchip-usb5744.patch
deleted file mode 100644 (file)
index 2f89379..0000000
--- a/queue-6.1/usb-misc-onboard-hub-add-support-for-microchip-usb5744.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 6972b38ca05235f6142715db7062ecc87a422e22 Mon Sep 17 00:00:00 2001
-From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-Date: Mon, 13 Nov 2023 15:59:21 +0100
-Subject: usb: misc: onboard-hub: add support for Microchip USB5744
-
-From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-
-commit 6972b38ca05235f6142715db7062ecc87a422e22 upstream.
-
-Add support for the Microchip USB5744 USB3.0 and USB2.0 Hub.
-
-The Microchip USB5744 supports two power supplies, one for 1V2 and one
-for 3V3. According to the datasheet there is no need for a delay between
-power on and reset, so this value is set to 0.
-
-Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
-Cc: stable <stable@kernel.org>
-Acked-by: Matthias Kaehlcke <mka@chromium.org>
-Link: https://lore.kernel.org/r/20231113145921.30104-3-francesco@dolcini.it
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/misc/onboard_usb_hub.c |    2 ++
- drivers/usb/misc/onboard_usb_hub.h |    7 +++++++
- 2 files changed, 9 insertions(+)
-
---- a/drivers/usb/misc/onboard_usb_hub.c
-+++ b/drivers/usb/misc/onboard_usb_hub.c
-@@ -412,6 +412,8 @@ static const struct usb_device_id onboar
-       { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2412) }, /* USB2412 USB 2.0 */
-       { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2514) }, /* USB2514B USB 2.0 */
-       { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2517) }, /* USB2517 USB 2.0 */
-+      { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2744) }, /* USB5744 USB 2.0 */
-+      { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x5744) }, /* USB5744 USB 3.0 */
-       { USB_DEVICE(VENDOR_ID_REALTEK, 0x0411) }, /* RTS5411 USB 3.1 */
-       { USB_DEVICE(VENDOR_ID_REALTEK, 0x5411) }, /* RTS5411 USB 2.1 */
-       { USB_DEVICE(VENDOR_ID_REALTEK, 0x0414) }, /* RTS5414 USB 3.2 */
---- a/drivers/usb/misc/onboard_usb_hub.h
-+++ b/drivers/usb/misc/onboard_usb_hub.h
-@@ -14,6 +14,11 @@ static const struct onboard_hub_pdata mi
-       .reset_us = 1,
- };
- 
-+static const struct onboard_hub_pdata microchip_usb5744_data = {
-+      .reset_us = 0,
-+      .num_supplies = 2,
-+};
-+
- static const struct onboard_hub_pdata realtek_rts5411_data = {
-       .reset_us = 0,
- };
-@@ -34,6 +39,8 @@ static const struct of_device_id onboard
-       { .compatible = "usb424,2412", .data = &microchip_usb424_data, },
-       { .compatible = "usb424,2514", .data = &microchip_usb424_data, },
-       { .compatible = "usb424,2517", .data = &microchip_usb424_data, },
-+      { .compatible = "usb424,2744", .data = &microchip_usb5744_data, },
-+      { .compatible = "usb424,5744", .data = &microchip_usb5744_data, },
-       { .compatible = "usb451,8140", .data = &ti_tusb8041_data, },
-       { .compatible = "usb451,8142", .data = &ti_tusb8041_data, },
-       { .compatible = "usb5e3,608", .data = &genesys_gl850g_data, },