diff --git a/patches.suse/Revert-usb-phy-generic-Get-the-vbus-supply.patch b/patches.suse/Revert-usb-phy-generic-Get-the-vbus-supply.patch new file mode 100644 index 0000000..86b1593 --- /dev/null +++ b/patches.suse/Revert-usb-phy-generic-Get-the-vbus-supply.patch @@ -0,0 +1,40 @@ +From fdada0db0b2ae2addef4ccafe50937874dbeeebe Mon Sep 17 00:00:00 2001 +From: Alexander Stein +Date: Thu, 14 Mar 2024 10:26:27 +0100 +Subject: [PATCH] Revert "usb: phy: generic: Get the vbus supply" +Git-commit: fdada0db0b2ae2addef4ccafe50937874dbeeebe +Patch-mainline: v6.9-rc2 +References: git-fixes + +This reverts commit 75fd6485cccef269ac9eb3b71cf56753341195ef. +This patch was applied twice by accident, causing probe failures. +Revert the accident. + +Signed-off-by: Alexander Stein +Fixes: 75fd6485ccce ("usb: phy: generic: Get the vbus supply") +Cc: stable +Reviewed-by: Sean Anderson +Link: https://lore.kernel.org/r/20240314092628.1869414-1-alexander.stein@ew.tq-group.com +Signed-off-by: Greg Kroah-Hartman +Acked-by: Takashi Iwai + +--- + drivers/usb/phy/phy-generic.c | 7 ------- + 1 file changed, 7 deletions(-) + +--- a/drivers/usb/phy/phy-generic.c ++++ b/drivers/usb/phy/phy-generic.c +@@ -268,13 +268,6 @@ int usb_phy_gen_create_phy(struct device + return -EPROBE_DEFER; + } + +- nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus"); +- if (PTR_ERR(nop->vbus_draw) == -ENODEV) +- nop->vbus_draw = NULL; +- if (IS_ERR(nop->vbus_draw)) +- return dev_err_probe(dev, PTR_ERR(nop->vbus_draw), +- "could not get vbus regulator\n"); +- + nop->dev = dev; + nop->phy.dev = nop->dev; + nop->phy.label = "nop-xceiv"; diff --git a/series.conf b/series.conf index cfb7835..394a96b 100644 --- a/series.conf +++ b/series.conf @@ -46229,6 +46229,7 @@ patches.suse/usb-dwc2-gadget-Fix-exiting-from-clock-gating.patch patches.suse/usb-dwc2-gadget-LPM-flow-fix.patch patches.suse/usb-cdc-wdm-close-race-between-read-and-workqueue.patch + patches.suse/Revert-usb-phy-generic-Get-the-vbus-supply.patch patches.suse/usb-dwc3-Properly-set-system-wakeup.patch patches.suse/usb-typec-Return-size-of-buffer-if-pd_set-operation-.patch patches.suse/usb-typec-ucsi-Clear-EVENT_PENDING-under-PPM-lock.patch