* [PATCH v1 2/5] ARM: imx6: register pm_power_off handler if "fsl, pmic_stby_poweroff" is set
2017-05-29 17:09 [PATCH v1 1/5] ARM: imx6q: provide documentation for new fsl, pmic_stby_poweroff property Oleksij Rempel
@ 2017-05-29 17:09 ` Oleksij Rempel
2017-05-29 17:09 ` [PATCH v1 3/5] regulator: pfuze100: add fsl, pmic_stby_poweroff property Oleksij Rempel
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Oleksij Rempel @ 2017-05-29 17:09 UTC (permalink / raw)
To: linux-arm-kernel
One of the Freescale recommended sequences for power off with external
PMIC is the following:
...
3. SoC is programming PMIC for power off when standby is asserted.
4. In CCM STOP mode, Standby is asserted, PMIC gates SoC supplies.
See:
http://www.nxp.com/assets/documents/data/en/reference-manuals/IMX6DQRM.pdf
page 5083
This patch implements step 4. of this sequence.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: kernel at pengutronix.de
Cc: linux-arm-kernel at lists.infradead.org
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-clk at vger.kernel.org
Cc: devicetree at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/mach-imx/pm-imx6.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index e61b1d1027e1..fd7b95f340e5 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -27,6 +27,8 @@
#include <asm/proc-fns.h>
#include <asm/suspend.h>
#include <asm/tlb.h>
+#include <linux/kallsyms.h>
+#include <linux/regulator/machine.h>
#include "common.h"
#include "hardware.h"
@@ -602,6 +604,31 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata
IMX6Q_GPR1_GINT);
}
+static void imx6_pm_poweroff(void)
+{
+ imx6_set_lpm(STOP_POWER_OFF);
+ cpu_suspend(0, imx6q_suspend_finish);
+
+ mdelay(1000);
+
+ pr_emerg("Unable to poweroff system\n");
+}
+
+static int imx6_pm_poweroff_probe(void)
+{
+ char symname[KSYM_NAME_LEN];
+
+ if (pm_power_off) {
+ lookup_symbol_name((ulong)pm_power_off, symname);
+ pr_warn("%s: pm_power_off already claimed %p %s!\n",
+ __func__, pm_power_off, symname);
+ return -EBUSY;
+ }
+
+ pm_power_off = imx6_pm_poweroff;
+ return 0;
+}
+
void __init imx6_pm_ccm_init(const char *ccm_compat)
{
struct device_node *np;
@@ -618,6 +645,9 @@ void __init imx6_pm_ccm_init(const char *ccm_compat)
val = readl_relaxed(ccm_base + CLPCR);
val &= ~BM_CLPCR_LPM;
writel_relaxed(val, ccm_base + CLPCR);
+
+ if (of_property_read_bool(np, "fsl,pmic_stby_poweroff"))
+ imx6_pm_poweroff_probe();
}
void __init imx6q_pm_init(void)
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v1 3/5] regulator: pfuze100: add fsl, pmic_stby_poweroff property
2017-05-29 17:09 [PATCH v1 1/5] ARM: imx6q: provide documentation for new fsl, pmic_stby_poweroff property Oleksij Rempel
2017-05-29 17:09 ` [PATCH v1 2/5] ARM: imx6: register pm_power_off handler if "fsl, pmic_stby_poweroff" is set Oleksij Rempel
@ 2017-05-29 17:09 ` Oleksij Rempel
2017-05-29 17:09 ` [PATCH v1 4/5] regulator: pfuze100-regulator: provide pm_power_off_prepare handler Oleksij Rempel
2017-05-29 17:09 ` [PATCH v1 5/5] ARM: dts: imx6: RIoTboard provide Standby to PowerOff option Oleksij Rempel
3 siblings, 0 replies; 8+ messages in thread
From: Oleksij Rempel @ 2017-05-29 17:09 UTC (permalink / raw)
To: linux-arm-kernel
Document the new optional "fsl,pmic_stby_poweroff" property.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: kernel at pengutronix.de
Cc: linux-arm-kernel at lists.infradead.org
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-kernel at vger.kernel.org
Cc: devicetree at vger.kernel.org
---
Documentation/devicetree/bindings/regulator/pfuze100.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/regulator/pfuze100.txt b/Documentation/devicetree/bindings/regulator/pfuze100.txt
index 9b40db88f637..a2e00ca28bd3 100644
--- a/Documentation/devicetree/bindings/regulator/pfuze100.txt
+++ b/Documentation/devicetree/bindings/regulator/pfuze100.txt
@@ -4,6 +4,10 @@ Required properties:
- compatible: "fsl,pfuze100", "fsl,pfuze200", "fsl,pfuze3000"
- reg: I2C slave address
+Optional properties:
+- fsl,pmic_stby_poweroff: if present, configure the PMIC to shutdown all
+ power rails when PMIC_STBY_REQ line is asserted during the power off sequence.
+
Required child node:
- regulators: This is the list of child nodes that specify the regulator
initialization data for defined regulators. Please refer to below doc
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v1 4/5] regulator: pfuze100-regulator: provide pm_power_off_prepare handler
2017-05-29 17:09 [PATCH v1 1/5] ARM: imx6q: provide documentation for new fsl, pmic_stby_poweroff property Oleksij Rempel
2017-05-29 17:09 ` [PATCH v1 2/5] ARM: imx6: register pm_power_off handler if "fsl, pmic_stby_poweroff" is set Oleksij Rempel
2017-05-29 17:09 ` [PATCH v1 3/5] regulator: pfuze100: add fsl, pmic_stby_poweroff property Oleksij Rempel
@ 2017-05-29 17:09 ` Oleksij Rempel
2017-05-29 19:02 ` kbuild test robot
2017-05-29 17:09 ` [PATCH v1 5/5] ARM: dts: imx6: RIoTboard provide Standby to PowerOff option Oleksij Rempel
3 siblings, 1 reply; 8+ messages in thread
From: Oleksij Rempel @ 2017-05-29 17:09 UTC (permalink / raw)
To: linux-arm-kernel
On some boards the SoC can use one pin "PMIC_STBY_REQ" to notify th PMIC
about state changes. In this case internal state of PMIC must be
preconfigured for upcomming state change.
It works fine with the current regulator framework, except with the
power-off case.
This patch is providing an optional pm_power_off_prepare handler
which will configure the PMIC_StandBy state to disable all power lines.
In my power consumption test on RIoTBoard, I got the following results:
poweroff without this patch: 320 mA
poweroff with this patch: 2 mA
suspend to ram: 40 mA
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: kernel at pengutronix.de
Cc: linux-arm-kernel at lists.infradead.org
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: linux-kernel at vger.kernel.org
---
drivers/regulator/pfuze100-regulator.c | 80 ++++++++++++++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index e193bbbb8ffc..36ff29dc93dc 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -28,6 +28,7 @@
#include <linux/regulator/pfuze100.h>
#include <linux/i2c.h>
#include <linux/slab.h>
+#include <linux/kallsyms.h>
#include <linux/regmap.h>
#define PFUZE_NUMREGS 128
@@ -41,11 +42,17 @@
#define PFUZE100_FABID 0x4
#define PFUZE100_SW1ABVOL 0x20
+#define PFUZE100_SW1ABMODE 0x23
#define PFUZE100_SW1CVOL 0x2e
+#define PFUZE100_SW1CMODE 0x31
#define PFUZE100_SW2VOL 0x35
+#define PFUZE100_SW2MODE 0x38
#define PFUZE100_SW3AVOL 0x3c
+#define PFUZE100_SW3AMODE 0x3f
#define PFUZE100_SW3BVOL 0x43
+#define PFUZE100_SW3BMODE 0x46
#define PFUZE100_SW4VOL 0x4a
+#define PFUZE100_SW4MODE 0x4d
#define PFUZE100_SWBSTCON1 0x66
#define PFUZE100_VREFDDRCON 0x6a
#define PFUZE100_VSNVSVOL 0x6b
@@ -56,6 +63,13 @@
#define PFUZE100_VGEN5VOL 0x70
#define PFUZE100_VGEN6VOL 0x71
+#define PFUZE100_SWxMODE_MASK 0xf
+#define PFUZE100_SWxMODE_APS_APS 0x8
+#define PFUZE100_SWxMODE_APS_OFF 0x4
+
+#define PFUZE100_VGENxLPWR BIT(6)
+#define PFUZE100_VGENxSTBY BIT(5)
+
enum chips { PFUZE100, PFUZE200, PFUZE3000 = 3 };
struct pfuze_regulator {
@@ -465,6 +479,68 @@ static inline struct device_node *match_of_node(int index)
}
#endif
+static struct pfuze_chip *syspm_pfuze_chip;
+
+static void pfuze_poweroff_pre(void)
+{
+ dev_info(syspm_pfuze_chip->dev, "Configure standy mode for poweroff");
+
+ /* Switch from default mode: APS/APS to APS/Off */
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_SW1ABMODE,
+ PFUZE100_SWxMODE_MASK, PFUZE100_SWxMODE_APS_OFF);
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_SW1CMODE,
+ PFUZE100_SWxMODE_MASK, PFUZE100_SWxMODE_APS_OFF);
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_SW2MODE,
+ PFUZE100_SWxMODE_MASK, PFUZE100_SWxMODE_APS_OFF);
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_SW3AMODE,
+ PFUZE100_SWxMODE_MASK, PFUZE100_SWxMODE_APS_OFF);
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_SW3BMODE,
+ PFUZE100_SWxMODE_MASK, PFUZE100_SWxMODE_APS_OFF);
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_SW4MODE,
+ PFUZE100_SWxMODE_MASK, PFUZE100_SWxMODE_APS_OFF);
+
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_VGEN1VOL,
+ PFUZE100_VGENxLPWR | PFUZE100_VGENxSTBY,
+ PFUZE100_VGENxSTBY);
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_VGEN2VOL,
+ PFUZE100_VGENxLPWR | PFUZE100_VGENxSTBY,
+ PFUZE100_VGENxSTBY);
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_VGEN3VOL,
+ PFUZE100_VGENxLPWR | PFUZE100_VGENxSTBY,
+ PFUZE100_VGENxSTBY);
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_VGEN4VOL,
+ PFUZE100_VGENxLPWR | PFUZE100_VGENxSTBY,
+ PFUZE100_VGENxSTBY);
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_VGEN5VOL,
+ PFUZE100_VGENxLPWR | PFUZE100_VGENxSTBY,
+ PFUZE100_VGENxSTBY);
+ regmap_update_bits(syspm_pfuze_chip->regmap, PFUZE100_VGEN6VOL,
+ PFUZE100_VGENxLPWR | PFUZE100_VGENxSTBY,
+ PFUZE100_VGENxSTBY);
+}
+
+static int pfuze_poweroff_pre_init(struct pfuze_chip *pfuze_chip)
+{
+ char symname[KSYM_NAME_LEN];
+
+ if (pfuze_chip->chip_id != PFUZE100) {
+ dev_warn(pfuze_chip->dev, "Requested prepoweroff handler for not supoorted chip\n");
+ return -ENODEV;
+ }
+
+ if (pm_power_off_prepare) {
+ lookup_symbol_name((ulong)pm_power_off_prepare, symname);
+ pr_warn("%s: pm_power_off already claimed %p %s!\n",
+ __func__, pm_power_off_prepare, symname);
+ return -EBUSY;
+ }
+
+ syspm_pfuze_chip = pfuze_chip;
+
+ pm_power_off_prepare = pfuze_poweroff_pre;
+ return 0;
+}
+
static int pfuze_identify(struct pfuze_chip *pfuze_chip)
{
unsigned int value;
@@ -635,6 +711,10 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
}
}
+ if (of_property_read_bool(client->dev.of_node,
+ "fsl,pmic_stby_poweroff"))
+ return pfuze_poweroff_pre_init(pfuze_chip);
+
return 0;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v1 5/5] ARM: dts: imx6: RIoTboard provide Standby to PowerOff option
2017-05-29 17:09 [PATCH v1 1/5] ARM: imx6q: provide documentation for new fsl, pmic_stby_poweroff property Oleksij Rempel
` (2 preceding siblings ...)
2017-05-29 17:09 ` [PATCH v1 4/5] regulator: pfuze100-regulator: provide pm_power_off_prepare handler Oleksij Rempel
@ 2017-05-29 17:09 ` Oleksij Rempel
2017-06-05 1:50 ` Shawn Guo
3 siblings, 1 reply; 8+ messages in thread
From: Oleksij Rempel @ 2017-05-29 17:09 UTC (permalink / raw)
To: linux-arm-kernel
This board, as well as some other boards with i.MX6 and a PMIC, uses a
"MPIC_STBY_REQ" line to notify the PMIC about a state change.
The PMIC is programmed for a specific state change before triggering the
line.
In this case, PMIC_STBY_REQ can be used for Stand by, Sleep
and Power off modes.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: kernel at pengutronix.de
Cc: linux-arm-kernel at lists.infradead.org
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: devicetree at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/boot/dts/imx6dl-riotboard.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts
index 2cb72824e800..b5f25fe7b809 100644
--- a/arch/arm/boot/dts/imx6dl-riotboard.dts
+++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
@@ -90,6 +90,10 @@
status = "okay";
};
+&clks {
+ fsl,pmic_stby_poweroff;
+};
+
&fec {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
@@ -125,6 +129,7 @@
reg = <0x08>;
interrupt-parent = <&gpio5>;
interrupts = <16 8>;
+ fsl,pmic_stby_poweroff;
regulators {
reg_vddcore: sw1ab { /* VDDARM_IN */
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread