* [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding doc
2020-09-11 3:30 [PATCH 0/4] imx: support i.MX7ULP HSRUN mode peng.fan
@ 2020-09-11 3:30 ` peng.fan
2020-09-11 7:19 ` Aisheng Dong
2020-09-11 3:30 ` [PATCH 2/4] ARM: dts: imx7ulp: add pmc node peng.fan
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: peng.fan @ 2020-09-11 3:30 UTC (permalink / raw)
To: shawnguo, s.hauer, festevam, abel.vesa, robh+dt
Cc: kernel, linux-imx, Anson.Huang, linux-arm-kernel, linux-kernel,
aisheng.dong, devicetree, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
Add i.MX7ULP Power Management Controller binding doc
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
.../bindings/arm/freescale/imx7ulp-pmc.yaml | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
diff --git a/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml b/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
new file mode 100644
index 000000000000..33a31d87dd62
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/freescale/imx7ulp-pmc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: i.MX7ULP Power Management Controller(PMC) Device Tree Bindings
+
+maintainers:
+ - Peng Fan <peng.fan@nxp.com>
+
+properties:
+ compatible:
+ items:
+ - enum:
+ - fsl,imx7ulp-pmc-m4
+ - fsl,imx7ulp-pmc-a7
+
+ reg:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+
+additionalProperties: false
+
+examples:
+ - |
+ pmc0: pmc-m4@410a1000 {
+ compatible = "fsl,imx7ulp-pmc-m4";
+ reg = <0x410a1000 0x1000>;
+ };
--
2.28.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* RE: [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding doc
2020-09-11 3:30 ` [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding doc peng.fan
@ 2020-09-11 7:19 ` Aisheng Dong
2020-09-11 7:45 ` Peng Fan
2020-09-13 2:57 ` Shawn Guo
0 siblings, 2 replies; 10+ messages in thread
From: Aisheng Dong @ 2020-09-11 7:19 UTC (permalink / raw)
To: Peng Fan, shawnguo, s.hauer, festevam, Abel Vesa, robh+dt
Cc: kernel, dl-linux-imx, Anson Huang, linux-arm-kernel,
linux-kernel, devicetree
> From: Peng Fan <peng.fan@nxp.com>
> Sent: Friday, September 11, 2020 11:31 AM
>
> Add i.MX7ULP Power Management Controller binding doc
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> .../bindings/arm/freescale/imx7ulp-pmc.yaml | 33 +++++++++++++++++++
> 1 file changed, 33 insertions(+)
> create mode 100644
> Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
I wonder if we can merge it into the exist imx7ulp pm binding doc.
Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.yaml
>
> diff --git
> a/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> b/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> new file mode 100644
> index 000000000000..33a31d87dd62
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> @@ -0,0 +1,33 @@
> +# SPDX-License-Identifier: GPL-2.0
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/arm/freescale/imx7ulp-pmc.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: i.MX7ULP Power Management Controller(PMC) Device Tree Bindings
> +
> +maintainers:
> + - Peng Fan <peng.fan@nxp.com>
> +
> +properties:
> + compatible:
> + items:
> + - enum:
> + - fsl,imx7ulp-pmc-m4
> + - fsl,imx7ulp-pmc-a7
Can we change to the exist naming pattern which also align with HW reference manual?
e.g.
fsl,imx7ulp-pmc0
fsl,imx7ulp-pmc1
Aligned with:
fsl,imx7ulp-smc1
fsl,imx7ulp-pcc2
fsl,imx7ulp-scg1
Regards
Aisheng
> +
> + reg:
> + maxItems: 1
> +
> +required:
> + - compatible
> + - reg
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + pmc0: pmc-m4@410a1000 {
> + compatible = "fsl,imx7ulp-pmc-m4";
> + reg = <0x410a1000 0x1000>;
> + };
> --
> 2.28.0
^ permalink raw reply [flat|nested] 10+ messages in thread* RE: [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding doc
2020-09-11 7:19 ` Aisheng Dong
@ 2020-09-11 7:45 ` Peng Fan
2020-09-11 10:02 ` Aisheng Dong
2020-09-13 2:50 ` Shawn Guo
2020-09-13 2:57 ` Shawn Guo
1 sibling, 2 replies; 10+ messages in thread
From: Peng Fan @ 2020-09-11 7:45 UTC (permalink / raw)
To: Aisheng Dong, shawnguo, s.hauer, festevam, Abel Vesa, robh+dt
Cc: kernel, dl-linux-imx, Anson Huang, linux-arm-kernel,
linux-kernel, devicetree
> Subject: RE: [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding doc
>
> > From: Peng Fan <peng.fan@nxp.com>
> > Sent: Friday, September 11, 2020 11:31 AM
> >
> > Add i.MX7ULP Power Management Controller binding doc
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> > .../bindings/arm/freescale/imx7ulp-pmc.yaml | 33
> +++++++++++++++++++
> > 1 file changed, 33 insertions(+)
> > create mode 100644
> > Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
>
> I wonder if we can merge it into the exist imx7ulp pm binding doc.
> Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.yaml
Not sure about this.
>
> >
> > diff --git
> > a/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> > b/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> > new file mode 100644
> > index 000000000000..33a31d87dd62
> > --- /dev/null
> > +++
> b/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> > @@ -0,0 +1,33 @@
> > +# SPDX-License-Identifier: GPL-2.0
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/arm/freescale/imx7ulp-pmc.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: i.MX7ULP Power Management Controller(PMC) Device Tree Bindings
> > +
> > +maintainers:
> > + - Peng Fan <peng.fan@nxp.com>
> > +
> > +properties:
> > + compatible:
> > + items:
> > + - enum:
> > + - fsl,imx7ulp-pmc-m4
> > + - fsl,imx7ulp-pmc-a7
>
> Can we change to the exist naming pattern which also align with HW
> reference manual?
> e.g.
> fsl,imx7ulp-pmc0
> fsl,imx7ulp-pmc1
This was rejected by Shawn before.
https://patchwork.kernel.org/patch/11390591/
Thanks,
Peng.
>
> Aligned with:
> fsl,imx7ulp-smc1
> fsl,imx7ulp-pcc2
> fsl,imx7ulp-scg1
>
> Regards
> Aisheng
>
> > +
> > + reg:
> > + maxItems: 1
> > +
> > +required:
> > + - compatible
> > + - reg
> > +
> > +additionalProperties: false
> > +
> > +examples:
> > + - |
> > + pmc0: pmc-m4@410a1000 {
> > + compatible = "fsl,imx7ulp-pmc-m4";
> > + reg = <0x410a1000 0x1000>;
> > + };
> > --
> > 2.28.0
^ permalink raw reply [flat|nested] 10+ messages in thread* RE: [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding doc
2020-09-11 7:45 ` Peng Fan
@ 2020-09-11 10:02 ` Aisheng Dong
2020-09-13 2:50 ` Shawn Guo
1 sibling, 0 replies; 10+ messages in thread
From: Aisheng Dong @ 2020-09-11 10:02 UTC (permalink / raw)
To: Peng Fan, shawnguo, s.hauer, festevam, Abel Vesa, robh+dt
Cc: kernel, dl-linux-imx, Anson Huang, linux-arm-kernel,
linux-kernel, devicetree
> From: Peng Fan <peng.fan@nxp.com>
> Sent: Friday, September 11, 2020 3:45 PM
>
> > Subject: RE: [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding
> > doc
> >
> > > From: Peng Fan <peng.fan@nxp.com>
> > > Sent: Friday, September 11, 2020 11:31 AM
> > >
> > > Add i.MX7ULP Power Management Controller binding doc
> > >
> > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > ---
> > > .../bindings/arm/freescale/imx7ulp-pmc.yaml | 33
> > +++++++++++++++++++
> > > 1 file changed, 33 insertions(+)
> > > create mode 100644
> > > Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> >
> > I wonder if we can merge it into the exist imx7ulp pm binding doc.
> > Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.yaml
>
> Not sure about this.
>
If not merge, we probably need change the name of existing pm binding doc to avoid confusing.
e.g.
fsl,imx7ulp-pm.yaml -> fsl,imx7ulp-smc.yaml.
> >
> > >
> > > diff --git
> > > a/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> > > b/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> > > new file mode 100644
> > > index 000000000000..33a31d87dd62
> > > --- /dev/null
> > > +++
> > b/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> > > @@ -0,0 +1,33 @@
> > > +# SPDX-License-Identifier: GPL-2.0
> > > +%YAML 1.2
> > > +---
> > > +$id: http://devicetree.org/schemas/arm/freescale/imx7ulp-pmc.yaml#
> > > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > > +
> > > +title: i.MX7ULP Power Management Controller(PMC) Device Tree
> > > +Bindings
> > > +
> > > +maintainers:
> > > + - Peng Fan <peng.fan@nxp.com>
> > > +
> > > +properties:
> > > + compatible:
> > > + items:
> > > + - enum:
> > > + - fsl,imx7ulp-pmc-m4
> > > + - fsl,imx7ulp-pmc-a7
> >
> > Can we change to the exist naming pattern which also align with HW
> > reference manual?
> > e.g.
> > fsl,imx7ulp-pmc0
> > fsl,imx7ulp-pmc1
>
> This was rejected by Shawn before.
> https://patchwork.kernel.org/patch/11390591/
I didn't see NACK from Shawn from above URL.
Shawn seemed to just ask for some clarifications why need number suffix.
Am I missed something?
Regards
Aisheng
>
> Thanks,
> Peng.
>
> >
> > Aligned with:
> > fsl,imx7ulp-smc1
> > fsl,imx7ulp-pcc2
> > fsl,imx7ulp-scg1
> >
> > Regards
> > Aisheng
> >
> > > +
> > > + reg:
> > > + maxItems: 1
> > > +
> > > +required:
> > > + - compatible
> > > + - reg
> > > +
> > > +additionalProperties: false
> > > +
> > > +examples:
> > > + - |
> > > + pmc0: pmc-m4@410a1000 {
> > > + compatible = "fsl,imx7ulp-pmc-m4";
> > > + reg = <0x410a1000 0x1000>;
> > > + };
> > > --
> > > 2.28.0
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding doc
2020-09-11 7:45 ` Peng Fan
2020-09-11 10:02 ` Aisheng Dong
@ 2020-09-13 2:50 ` Shawn Guo
1 sibling, 0 replies; 10+ messages in thread
From: Shawn Guo @ 2020-09-13 2:50 UTC (permalink / raw)
To: Peng Fan
Cc: Aisheng Dong, s.hauer, festevam, Abel Vesa, robh+dt, kernel,
dl-linux-imx, Anson Huang, linux-arm-kernel, linux-kernel,
devicetree
On Fri, Sep 11, 2020 at 07:45:20AM +0000, Peng Fan wrote:
> > b/Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
> > > @@ -0,0 +1,33 @@
> > > +# SPDX-License-Identifier: GPL-2.0
> > > +%YAML 1.2
> > > +---
> > > +$id: http://devicetree.org/schemas/arm/freescale/imx7ulp-pmc.yaml#
> > > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > > +
> > > +title: i.MX7ULP Power Management Controller(PMC) Device Tree Bindings
> > > +
> > > +maintainers:
> > > + - Peng Fan <peng.fan@nxp.com>
> > > +
> > > +properties:
> > > + compatible:
> > > + items:
> > > + - enum:
> > > + - fsl,imx7ulp-pmc-m4
> > > + - fsl,imx7ulp-pmc-a7
> >
> > Can we change to the exist naming pattern which also align with HW
> > reference manual?
> > e.g.
> > fsl,imx7ulp-pmc0
> > fsl,imx7ulp-pmc1
>
> This was rejected by Shawn before.
> https://patchwork.kernel.org/patch/11390591/
Oh, I'm fine with the naming if pmc0 and pmc1 are different HW block
rather than two instances of the same block.
Shawn
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding doc
2020-09-11 7:19 ` Aisheng Dong
2020-09-11 7:45 ` Peng Fan
@ 2020-09-13 2:57 ` Shawn Guo
1 sibling, 0 replies; 10+ messages in thread
From: Shawn Guo @ 2020-09-13 2:57 UTC (permalink / raw)
To: Aisheng Dong
Cc: Peng Fan, s.hauer, festevam, Abel Vesa, robh+dt, kernel,
dl-linux-imx, Anson Huang, linux-arm-kernel, linux-kernel,
devicetree
On Fri, Sep 11, 2020 at 07:19:59AM +0000, Aisheng Dong wrote:
> > From: Peng Fan <peng.fan@nxp.com>
> > Sent: Friday, September 11, 2020 11:31 AM
> >
> > Add i.MX7ULP Power Management Controller binding doc
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> > .../bindings/arm/freescale/imx7ulp-pmc.yaml | 33 +++++++++++++++++++
> > 1 file changed, 33 insertions(+)
> > create mode 100644
> > Documentation/devicetree/bindings/arm/freescale/imx7ulp-pmc.yaml
>
> I wonder if we can merge it into the exist imx7ulp pm binding doc.
> Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.yaml
+1
Shawn
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/4] ARM: dts: imx7ulp: add pmc node
2020-09-11 3:30 [PATCH 0/4] imx: support i.MX7ULP HSRUN mode peng.fan
2020-09-11 3:30 ` [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding doc peng.fan
@ 2020-09-11 3:30 ` peng.fan
2020-09-11 3:30 ` [PATCH 3/4] ARM: imx: imx7ulp: support HSRUN mode peng.fan
2020-09-11 3:30 ` [PATCH 4/4] ARM: imx: cpuidle-imx7ulp: Stop mode disallowed when HSRUN peng.fan
3 siblings, 0 replies; 10+ messages in thread
From: peng.fan @ 2020-09-11 3:30 UTC (permalink / raw)
To: shawnguo, s.hauer, festevam, abel.vesa, robh+dt
Cc: kernel, linux-imx, Anson.Huang, linux-arm-kernel, linux-kernel,
aisheng.dong, devicetree, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
Add i.MX7ULP pmc node for m4 and a7.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
arch/arm/boot/dts/imx7ulp.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/imx7ulp.dtsi b/arch/arm/boot/dts/imx7ulp.dtsi
index b7ea37ad4e55..d5d67e3db123 100644
--- a/arch/arm/boot/dts/imx7ulp.dtsi
+++ b/arch/arm/boot/dts/imx7ulp.dtsi
@@ -286,6 +286,11 @@ pcc2: clock-controller@403f0000 {
assigned-clock-parents = <&scg1 IMX7ULP_CLK_SOSC_BUS_CLK>;
};
+ pmc1: pmc-a7@40400000 {
+ compatible = "fsl,imx7ulp-pmc-a7";
+ reg = <0x40400000 0x1000>;
+ };
+
smc1: clock-controller@40410000 {
compatible = "fsl,imx7ulp-smc1";
reg = <0x40410000 0x1000>;
@@ -447,6 +452,11 @@ m4aips1: bus@41080000 {
reg = <0x41080000 0x80000>;
ranges;
+ pmc0: pmc-m4@410a1000 {
+ compatible = "fsl,imx7ulp-pmc-m4";
+ reg = <0x410a1000 0x1000>;
+ };
+
sim: sim@410a3000 {
compatible = "fsl,imx7ulp-sim", "syscon";
reg = <0x410a3000 0x1000>;
--
2.28.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/4] ARM: imx: imx7ulp: support HSRUN mode
2020-09-11 3:30 [PATCH 0/4] imx: support i.MX7ULP HSRUN mode peng.fan
2020-09-11 3:30 ` [PATCH 1/4] dt-bindings: fsl: add i.MX7ULP PMC binding doc peng.fan
2020-09-11 3:30 ` [PATCH 2/4] ARM: dts: imx7ulp: add pmc node peng.fan
@ 2020-09-11 3:30 ` peng.fan
2020-09-11 3:30 ` [PATCH 4/4] ARM: imx: cpuidle-imx7ulp: Stop mode disallowed when HSRUN peng.fan
3 siblings, 0 replies; 10+ messages in thread
From: peng.fan @ 2020-09-11 3:30 UTC (permalink / raw)
To: shawnguo, s.hauer, festevam, abel.vesa, robh+dt
Cc: kernel, linux-imx, Anson.Huang, linux-arm-kernel, linux-kernel,
aisheng.dong, devicetree, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
Configure PMPROT to let ARM core could run into HSRUN mode.
In LDO-enabled mode, HSRUN mode is not allowed, so add a check before
configure PMPROT.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
arch/arm/mach-imx/pm-imx7ulp.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm/mach-imx/pm-imx7ulp.c b/arch/arm/mach-imx/pm-imx7ulp.c
index 2e756d8191fa..543ac69f5f70 100644
--- a/arch/arm/mach-imx/pm-imx7ulp.c
+++ b/arch/arm/mach-imx/pm-imx7ulp.c
@@ -11,6 +11,10 @@
#include "common.h"
+#define PMC0_CTRL 0x28
+#define BM_CTRL_LDOEN BIT(31)
+
+#define SMC_PMPROT 0x8
#define SMC_PMCTRL 0x10
#define BP_PMCTRL_PSTOPO 16
#define PSTOPO_PSTOP3 0x3
@@ -25,7 +29,10 @@
#define BM_PMCTRL_RUNM (3 << BP_PMCTRL_RUNM)
#define BM_PMCTRL_STOPM (7 << BP_PMCTRL_STOPM)
+#define BM_PMPROT_AHSRUN BIT(7)
+
static void __iomem *smc1_base;
+static void __iomem *pmc0_base;
int imx7ulp_set_lpm(enum ulp_cpu_pwr_mode mode)
{
@@ -65,5 +72,13 @@ void __init imx7ulp_pm_init(void)
of_node_put(np);
WARN_ON(!smc1_base);
+ np = of_find_compatible_node(NULL, NULL, "fsl,imx7ulp-pmc-m4");
+ pmc0_base = of_iomap(np, 0);
+ WARN_ON(!pmc0_base);
+ of_node_put(np);
+
+ if (!(readl_relaxed(pmc0_base + PMC0_CTRL) & BM_CTRL_LDOEN))
+ writel_relaxed(BM_PMPROT_AHSRUN, smc1_base + SMC_PMPROT);
+
imx7ulp_set_lpm(ULP_PM_RUN);
}
--
2.28.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/4] ARM: imx: cpuidle-imx7ulp: Stop mode disallowed when HSRUN
2020-09-11 3:30 [PATCH 0/4] imx: support i.MX7ULP HSRUN mode peng.fan
` (2 preceding siblings ...)
2020-09-11 3:30 ` [PATCH 3/4] ARM: imx: imx7ulp: support HSRUN mode peng.fan
@ 2020-09-11 3:30 ` peng.fan
3 siblings, 0 replies; 10+ messages in thread
From: peng.fan @ 2020-09-11 3:30 UTC (permalink / raw)
To: shawnguo, s.hauer, festevam, abel.vesa, robh+dt
Cc: kernel, linux-imx, Anson.Huang, linux-arm-kernel, linux-kernel,
aisheng.dong, devicetree, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
When cpu runs in HSRUN mode, cpuidle is not allowed to run into
Stop mode. So add imx7ulp_get_mode to get thr cpu run mode,
and use WAIT mode instead, when cpu in HSRUN mode.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
arch/arm/mach-imx/common.h | 1 +
arch/arm/mach-imx/cpuidle-imx7ulp.c | 14 +++++++++++---
arch/arm/mach-imx/pm-imx7ulp.c | 10 ++++++++++
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index 72c3fcc32910..707ac650f1c2 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -103,6 +103,7 @@ void imx6_set_int_mem_clk_lpm(bool enable);
void imx6sl_set_wait_clk(bool enter);
int imx_mmdc_get_ddr_type(void);
int imx7ulp_set_lpm(enum ulp_cpu_pwr_mode mode);
+u32 imx7ulp_get_mode(void);
void imx_cpu_die(unsigned int cpu);
int imx_cpu_kill(unsigned int cpu);
diff --git a/arch/arm/mach-imx/cpuidle-imx7ulp.c b/arch/arm/mach-imx/cpuidle-imx7ulp.c
index ca86c967d19e..e7009d10b331 100644
--- a/arch/arm/mach-imx/cpuidle-imx7ulp.c
+++ b/arch/arm/mach-imx/cpuidle-imx7ulp.c
@@ -15,10 +15,18 @@
static int imx7ulp_enter_wait(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
{
- if (index == 1)
+ u32 mode;
+
+ if (index == 1) {
imx7ulp_set_lpm(ULP_PM_WAIT);
- else
- imx7ulp_set_lpm(ULP_PM_STOP);
+ } else {
+ mode = imx7ulp_get_mode();
+
+ if (mode == 3)
+ imx7ulp_set_lpm(ULP_PM_WAIT);
+ else
+ imx7ulp_set_lpm(ULP_PM_STOP);
+ }
cpu_do_idle();
diff --git a/arch/arm/mach-imx/pm-imx7ulp.c b/arch/arm/mach-imx/pm-imx7ulp.c
index 543ac69f5f70..eb1578f0bfa5 100644
--- a/arch/arm/mach-imx/pm-imx7ulp.c
+++ b/arch/arm/mach-imx/pm-imx7ulp.c
@@ -63,6 +63,16 @@ int imx7ulp_set_lpm(enum ulp_cpu_pwr_mode mode)
return 0;
}
+u32 imx7ulp_get_mode(void)
+{
+ u32 mode;
+
+ mode = readl_relaxed(smc1_base + SMC_PMCTRL) & BM_PMCTRL_RUNM;
+ mode >>= BP_PMCTRL_RUNM;
+
+ return mode;
+}
+
void __init imx7ulp_pm_init(void)
{
struct device_node *np;
--
2.28.0
^ permalink raw reply related [flat|nested] 10+ messages in thread