From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 28 Apr 2025 08:32:58 +0000 (+0200)
Subject: Merge 6.15-rc4 into usb-next
X-Git-Tag: v6.16-rc1~28^2~66
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=615dca38c2eae55aff80050275931c87a812b48c;p=linux-block.git

Merge 6.15-rc4 into usb-next

We need the USB fixes in here as well, and this resolves the following
merge conflicts that were reported in linux-next:

	drivers/usb/chipidea/ci_hdrc_imx.c
	drivers/usb/host/xhci.h

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

615dca38c2eae55aff80050275931c87a812b48c
diff --cc drivers/usb/chipidea/ci_hdrc_imx.c
index c34298ccc399,4f8bfd242b59..780f4d151345
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@@ -338,16 -336,13 +338,23 @@@ static int ci_hdrc_imx_notify_event(str
  	return ret;
  }
  
 +static irqreturn_t ci_wakeup_irq_handler(int irq, void *data)
 +{
 +	struct ci_hdrc_imx_data *imx_data = data;
 +
 +	disable_irq_nosync(irq);
 +	pm_runtime_resume(&imx_data->ci_pdev->dev);
 +
 +	return IRQ_HANDLED;
 +}
 +
+ static void ci_hdrc_imx_disable_regulator(void *arg)
+ {
+ 	struct ci_hdrc_imx_data *data = arg;
+ 
+ 	regulator_disable(data->hsic_pad_regulator);
+ }
+ 
  static int ci_hdrc_imx_probe(struct platform_device *pdev)
  {
  	struct ci_hdrc_imx_data *data;