Skip to contentSkip to conversation

FAILED: patch "[PATCH] pmdomain: imx8mp-blk-ctrl: Keep usb phy power domain on for" failed to apply to 6.1-stable tree

PATCH New [email protected] 2 participants 2 messages Feb 7

Subsystems (3)
Stable branch Arm i.MX and Layerscape Generic PM domains
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x e2c4c5b2bbd4f688a0f9f6da26cdf6d723c53478
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026020740-jubilant-willed-0be6@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..

Possible dependencies:

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From e2c4c5b2bbd4f688a0f9f6da26cdf6d723c53478 Mon Sep 17 00:00:00 2001
From: Xu Yang <[email protected]>
Date: Wed, 4 Feb 2026 19:11:42 +0800
Subject: [PATCH] pmdomain: imx8mp-blk-ctrl: Keep usb phy power domain on for
system wakeup

USB system wakeup need its PHY on, so add the GENPD_FLAG_ACTIVE_WAKEUP flags to USB PHY genpd configuration.

Signed-off-by Xu Yang <[email protected]>
Fixes 556f5cf9568a ("soc: imx: add i.MX8MP HSIO blk-ctrl")
Cc [email protected]
Signed-off-by Ulf Hansson <[email protected]>
drivers/pmdomain/imx/imx8mp-blk-ctrl.c +4 -0
index 56bbfee8668d..8fc79f9723f0 100644
@@ -53,6 +53,7 @@ struct imx8mp_blk_ctrl_domain_data {
 	const char * const *path_names;
 	int num_paths;
 	const char *gpc_name;
+	const unsigned int flags;
 };
 
 #define DOMAIN_MAX_CLKS 3

@@ -265,10 +266,12 @@ static const struct imx8mp_blk_ctrl_domain_data imx8mp_hsio_domain_data[] = {
 	[IMX8MP_HSIOBLK_PD_USB_PHY1] = {
 		.name = "hsioblk-usb-phy1",
 		.gpc_name = "usb-phy1",
+		.flags = GENPD_FLAG_ACTIVE_WAKEUP,
 	},
 	[IMX8MP_HSIOBLK_PD_USB_PHY2] = {
 		.name = "hsioblk-usb-phy2",
 		.gpc_name = "usb-phy2",
+		.flags = GENPD_FLAG_ACTIVE_WAKEUP,
 	},
 	[IMX8MP_HSIOBLK_PD_PCIE] = {
 		.name = "hsioblk-pcie",

@@ -724,6 +727,7 @@ static int imx8mp_blk_ctrl_probe(struct platform_device *pdev)
 		domain->genpd.name = data->name;
 		domain->genpd.power_on = imx8mp_blk_ctrl_power_on;
 		domain->genpd.power_off = imx8mp_blk_ctrl_power_off;
+		domain->genpd.flags = data->flags;
 		domain->bc = bc;
 		domain->id = i;
maintainer
#1 lore raw

PATCH 1/1 pmdomain: imx8mp-blk-ctrl: Keep usb phy power domain on for system wakeup

From: Xu Yang <[email protected]>

[ Upstream commit e2c4c5b2bbd4f688a0f9f6da26cdf6d723c53478 ]

USB system wakeup need its PHY on, so add the GENPD_FLAG_ACTIVE_WAKEUP flags to USB PHY genpd configuration.

Signed-off-by Xu Yang <[email protected]>
Fixes 556f5cf9568a ("soc: imx: add i.MX8MP HSIO blk-ctrl")
Cc [email protected]
Signed-off-by Ulf Hansson <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
---
 drivers/soc/imx/imx8mp-blk-ctrl.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/soc/imx/imx8mp-blk-ctrl.c +4 -0
index 9bc536ee1395f..104b39b7194f5 100644
@@ -42,6 +42,7 @@ struct imx8mp_blk_ctrl_domain_data {
 	const char * const *path_names;
 	int num_paths;
 	const char *gpc_name;
+	const unsigned int flags;
 };
 
 #define DOMAIN_MAX_CLKS 2

@@ -166,10 +167,12 @@ static const struct imx8mp_blk_ctrl_domain_data imx8mp_hsio_domain_data[] = {
 	[IMX8MP_HSIOBLK_PD_USB_PHY1] = {
 		.name = "hsioblk-usb-phy1",
 		.gpc_name = "usb-phy1",
+		.flags = GENPD_FLAG_ACTIVE_WAKEUP,
 	},
 	[IMX8MP_HSIOBLK_PD_USB_PHY2] = {
 		.name = "hsioblk-usb-phy2",
 		.gpc_name = "usb-phy2",
+		.flags = GENPD_FLAG_ACTIVE_WAKEUP,
 	},
 	[IMX8MP_HSIOBLK_PD_PCIE] = {
 		.name = "hsioblk-pcie",

@@ -596,6 +599,7 @@ static int imx8mp_blk_ctrl_probe(struct platform_device *pdev)
 		domain->genpd.name = data->name;
 		domain->genpd.power_on = imx8mp_blk_ctrl_power_on;
 		domain->genpd.power_off = imx8mp_blk_ctrl_power_off;
+		domain->genpd.flags = data->flags;
 		domain->bc = bc;
 		domain->id = i;
Signature · 1 line
2.51.0