From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D8A86189F20 for ; Sat, 7 Feb 2026 14:39:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770475184; cv=none; b=KqMax4chm021IabIHfHco4aVmE+E5nzawEkdIFYiUoCt5m8mBcJ6M79+XjqlrpoCta0zHeYH9bBd/mM591kZrGjaNDJTtr8I3u+F3Ht7OT/LGCxbiRUx7FKogBzq0Z7jOGlhF2+eVRWGG2Do2x/I/PajpQUeaFWbLyoLAlDZjrM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770475184; c=relaxed/simple; bh=KvJq2APxhqZZ2HyZ1y6hnvSFDvdjHtItHOmbOCBbcxA=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=tBCINFT5cq7oSGV6eek6JDGpPs2Nd6PmGRrQHUrOCFwo/s3XVdyQvjvr21WiQGuy0b4THrGgx7ajMjUxRjm70c3PcdmebqTWDzI/TGNNwWMY+pPUp1fYtnw3ouJ+WztNtGV6BmpqSsGdkOj9xFzMBfht0fzef5ADETrTMEx0oU8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=b5Yo2SEz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="b5Yo2SEz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18D16C116D0; Sat, 7 Feb 2026 14:39:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770475184; bh=KvJq2APxhqZZ2HyZ1y6hnvSFDvdjHtItHOmbOCBbcxA=; h=Subject:To:Cc:From:Date:From; b=b5Yo2SEzImXR53Y7AMu0cuDRGRXEEBGXvVDEqusQKrSAZW6XiXEaqXPoQ0iGugmvl IJAWs5iVsXwY8ZE/4PhOdb8oxAs2NKAXwPundUHlyEJbwTp9l/QugMNslfG3aUQF+N ppSD5yvK5KAkgao4yMUTlAQvnGBljl6ewhEhRS2U= Subject: FAILED: patch "[PATCH] pmdomain: imx8mp-blk-ctrl: Keep usb phy power domain on for" failed to apply to 6.1-stable tree To: xu.yang_2@nxp.com,ulf.hansson@linaro.org Cc: From: Date: Sat, 07 Feb 2026 15:39:41 +0100 Message-ID: <2026020740-jubilant-willed-0be6@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit 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 . 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 # git commit -s git send-email --to '' --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 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 Fixes: 556f5cf9568a ("soc: imx: add i.MX8MP HSIO blk-ctrl") Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson diff --git a/drivers/pmdomain/imx/imx8mp-blk-ctrl.c b/drivers/pmdomain/imx/imx8mp-blk-ctrl.c index 56bbfee8668d..8fc79f9723f0 100644 --- a/drivers/pmdomain/imx/imx8mp-blk-ctrl.c +++ b/drivers/pmdomain/imx/imx8mp-blk-ctrl.c @@ -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;