FAILED: patch "[PATCH] pmdomain: imx: Fix i.MX8MP power notifier" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe 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 72422525f641f68bed6ca3389d29ee3f41fdea33
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072113-ditzy-crested-16d4@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 72422525f641f68bed6ca3389d29ee3f41fdea33 Mon Sep 17 00:00:00 2001
From: Peng Fan <[email protected]>
Date: Wed, 10 Jun 2026 22:39:10 +0800
Subject: [PATCH] pmdomain: imx: Fix i.MX8MP power notifier
Using imx8mm_vpu_power_notifier() for i.MX8MP is wrong, as it ungates the VPU clocks to provide the ADB clock, which is necessary on i.MX8MM, but on i.MX8MP there is a separate gate (bit 3) for the NoC. So add imx8mp_vpu_power_notifier() for i.MX8MP.
drivers/pmdomain/imx/imx8m-blk-ctrl.c +26 -1
@@ -514,9 +514,34 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_vpu_blk_ctl_domain_data[] }, }; +static int imx8mp_vpu_power_notifier (struct notifier_block *nb, +unsigned long action,void *data) +{ + struct imx8m_blk_ctrl *bc = container_of(nb, struct imx8m_blk_ctrl, + power_nb); + +if (action ==GENPD_NOTIFY_ON ) { +/* +* On power up we have no software backchannel to the GPC to +* wait for the ADB handshake to happen, so we just delay for a +* bit. On power down the GPC driver waits for the handshake. +*/ + +udelay (5 ); + +/* set "fuse" bits to enable the VPUs */ +regmap_set_bits (bc->regmap,0x8 ,0xffffffff ); +regmap_set_bits (bc->regmap,0xc ,0xffffffff ); +regmap_set_bits (bc->regmap,0x10 ,0xffffffff ); +regmap_set_bits (bc->regmap,0x14 ,0xffffffff ); + } + +return NOTIFY_OK ; +} +static const struct imx8m_blk_ctrl_data imx8mp_vpu_blk_ctl_dev_data = { .max_reg =0x18 , - .power_notifier_fn = imx8mm_vpu_power_notifier, + .power_notifier_fn = imx8mp_vpu_power_notifier, .domains = imx8mp_vpu_blk_ctl_domain_data, .num_domains =ARRAY_SIZE (imx8mp_vpu_blk_ctl_domain_data), };
Sasha Levin
maintainerPATCH 1/1 pmdomain: imx: Fix i.MX8MP power notifier
From: Peng Fan <[email protected]>
[ Upstream commit 72422525f641f68bed6ca3389d29ee3f41fdea33 ]
Using imx8mm_vpu_power_notifier() for i.MX8MP is wrong, as it ungates the VPU clocks to provide the ADB clock, which is necessary on i.MX8MM, but on i.MX8MP there is a separate gate (bit 3) for the NoC. So add imx8mp_vpu_power_notifier() for i.MX8MP.
--- drivers/soc/imx/imx8m-blk-ctrl.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
drivers/soc/imx/imx8m-blk-ctrl.c +26 -1
@@ -502,9 +502,34 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_vpu_blk_ctl_domain_data[] }, }; +static int imx8mp_vpu_power_notifier (struct notifier_block *nb, +unsigned long action,void *data) +{ + struct imx8m_blk_ctrl *bc = container_of(nb, struct imx8m_blk_ctrl, + power_nb); + +if (action ==GENPD_NOTIFY_ON ) { +/* +* On power up we have no software backchannel to the GPC to +* wait for the ADB handshake to happen, so we just delay for a +* bit. On power down the GPC driver waits for the handshake. +*/ + +udelay (5 ); + +/* set "fuse" bits to enable the VPUs */ +regmap_set_bits (bc->regmap,0x8 ,0xffffffff ); +regmap_set_bits (bc->regmap,0xc ,0xffffffff ); +regmap_set_bits (bc->regmap,0x10 ,0xffffffff ); +regmap_set_bits (bc->regmap,0x14 ,0xffffffff ); + } + +return NOTIFY_OK ; +} +static const struct imx8m_blk_ctrl_data imx8mp_vpu_blk_ctl_dev_data = { .max_reg =0x18 , - .power_notifier_fn = imx8mm_vpu_power_notifier, + .power_notifier_fn = imx8mp_vpu_power_notifier, .domains = imx8mp_vpu_blk_ctl_domain_data, .num_domains =ARRAY_SIZE (imx8mp_vpu_blk_ctl_domain_data), };
Signature · 1 line
2.53.0