FAILED: patch "[PATCH] ARM: dts: imx6qdl-apalis: Fix poweroff on Apalis iMX6" failed to apply to 6.1-stable tree

FAILED: patch "[PATCH] ARM: dts: imx6qdl-apalis: Fix poweroff on Apalis iMX6" failed to apply to 6.1-stable tree

[gregkh]

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 <stable@vger.kernel.org>.

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 83964a29379cb08929a39172780a4c2992bc7c93
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025032458-hammock-twitter-2596@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..

Possible dependencies:



thanks,

greg k-h

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

From 83964a29379cb08929a39172780a4c2992bc7c93 Mon Sep 17 00:00:00 2001
From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
Date: Fri, 10 Jan 2025 16:18:29 +0100
Subject: [PATCH] ARM: dts: imx6qdl-apalis: Fix poweroff on Apalis iMX6

The current solution for powering off the Apalis iMX6 is not functioning
as intended. To resolve this, it is necessary to power off the
vgen2_reg, which will also set the POWER_ENABLE_MOCI signal to a low
state. This ensures the carrier board is properly informed to initiate
its power-off sequence.

The new solution uses the regulator-poweroff driver, which will power
off the regulator during a system shutdown.

Cc: <stable@vger.kernel.org>
Fixes: 4eb56e26f92e ("ARM: dts: imx6q-apalis: Command pmic to standby for poweroff")
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
index dffab5aa8b9c..88be29166c1a 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
@@ -108,6 +108,11 @@ lvds_panel_in: endpoint {
 		};
 	};
 
+	poweroff {
+		compatible = "regulator-poweroff";
+		cpu-supply = <&vgen2_reg>;
+	};
+
 	reg_module_3v3: regulator-module-3v3 {
 		compatible = "regulator-fixed";
 		regulator-always-on;
@@ -236,10 +241,6 @@ &can2 {
 	status = "disabled";
 };
 
-&clks {
-	fsl,pmic-stby-poweroff;
-};
-
 /* Apalis SPI1 */
 &ecspi1 {
 	cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>;
@@ -527,7 +528,6 @@ &i2c2 {
 
 	pmic: pmic@8 {
 		compatible = "fsl,pfuze100";
-		fsl,pmic-stby-poweroff;
 		reg = <0x08>;
 
 		regulators {

[PATCH 6.1.y] ARM: dts: imx6qdl-apalis: Fix poweroff on Apalis iMX6

[Stefan Eichenberger]

From: Stefan Eichenberger <stefan.eichenberger@toradex.com>

The current solution for powering off the Apalis iMX6 is not functioning
as intended. To resolve this, it is necessary to power off the
vgen2_reg, which will also set the POWER_ENABLE_MOCI signal to a low
state. This ensures the carrier board is properly informed to initiate
its power-off sequence.

The new solution uses the regulator-poweroff driver, which will power
off the regulator during a system shutdown.

Cc: <stable@vger.kernel.org>
Fixes: 4eb56e26f92e ("ARM: dts: imx6q-apalis: Command pmic to standby for poweroff")
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
(cherry picked from commit 83964a29379cb08929a39172780a4c2992bc7c93)
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
---
 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 7c17b91f09655..dc170a68c42f6 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -101,6 +101,11 @@ lvds_panel_in: endpoint {
 		};
 	};
 
+	poweroff {
+		compatible = "regulator-poweroff";
+		cpu-supply = <&vgen2_reg>;
+	};
+
 	reg_module_3v3: regulator-module-3v3 {
 		compatible = "regulator-fixed";
 		regulator-always-on;
@@ -220,10 +225,6 @@ &can2 {
 	status = "disabled";
 };
 
-&clks {
-	fsl,pmic-stby-poweroff;
-};
-
 /* Apalis SPI1 */
 &ecspi1 {
 	cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>;
@@ -511,7 +512,6 @@ &i2c2 {
 
 	pmic: pmic@8 {
 		compatible = "fsl,pfuze100";
-		fsl,pmic-stby-poweroff;
 		reg = <0x08>;
 
 		regulators {
-- 
2.45.2

Re: [PATCH 6.1.y] ARM: dts: imx6qdl-apalis: Fix poweroff on Apalis iMX6

[Sasha Levin]

[ Sasha's backport helper bot ]

Hi,

Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it

Found matching upstream commit: 83964a29379cb08929a39172780a4c2992bc7c93

WARNING: Author mismatch between patch and found commit:
Backport author: Stefan Eichenberger<eichest@gmail.com>
Commit author: Stefan Eichenberger<stefan.eichenberger@toradex.com>

Status in newer kernel trees:
6.13.y | Present (different SHA1: 6cf5ac324f87)
6.12.y | Present (different SHA1: bfd4ce01a59f)
6.6.y | Present (different SHA1: 0508efe54ae5)

Note: The patch differs from the upstream commit:
---
1:  83964a29379cb ! 1:  14d3ef9e68a5f ARM: dts: imx6qdl-apalis: Fix poweroff on Apalis iMX6
    @@ Commit message
         Fixes: 4eb56e26f92e ("ARM: dts: imx6q-apalis: Command pmic to standby for poweroff")
         Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
         Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    +    (cherry picked from commit 83964a29379cb08929a39172780a4c2992bc7c93)
    +    Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
     
    - ## arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi ##
    -@@ arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi: lvds_panel_in: endpoint {
    + ## arch/arm/boot/dts/imx6qdl-apalis.dtsi ##
    +@@ arch/arm/boot/dts/imx6qdl-apalis.dtsi: lvds_panel_in: endpoint {
      		};
      	};
      
    @@ arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi: lvds_panel_in: endpoint {
      	reg_module_3v3: regulator-module-3v3 {
      		compatible = "regulator-fixed";
      		regulator-always-on;
    -@@ arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi: &can2 {
    +@@ arch/arm/boot/dts/imx6qdl-apalis.dtsi: &can2 {
      	status = "disabled";
      };
      
    @@ arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi: &can2 {
      /* Apalis SPI1 */
      &ecspi1 {
      	cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>;
    -@@ arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi: &i2c2 {
    +@@ arch/arm/boot/dts/imx6qdl-apalis.dtsi: &i2c2 {
      
      	pmic: pmic@8 {
      		compatible = "fsl,pfuze100";
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y        |  Success    |  Success   |