mfd: s2mps11: Add manual shutdown method for Odroid XU3
Subsystems (3)
PATCH RESEND v2 1/1 mfd: s2mps11: Add manual shutdown method for Odroid XU3
On Odroid XU3 board (with S2MPS11 PMIC) the PWRHOLD bit in CTRL1 register must be manually set to 0 before initiating power off sequence.
One of usual power down methods for Exynos based devices looks like:
1. PWRHOLD pin of PMIC is connected to PSHOLD of Exynos SoC.
2. Exynos holds up this pin during system operation.
3. ACOKB pin of PMIC is pulled up to VBATT and optionally to pin in other device.
4. When PWRHOLD/PSHOLD goes low, the PMIC will turn off the power if ACOKB goes high.
On Odroid XU3 family the difference is in (3) - the ACOKB is grounded. This means that PMIC must manually set PWRHOLD field to low and then wait for signal from Application Processor (the usual change in PWRHOLD/PSHOLD pin will actually cut off the power).
The patch adds respective binding allowing Odroid XU3 device to be powered off.
---
The rest of patchset was applied by Kukjin Kim:
- dt-bindings documentation:
https://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/commit/?h=v4.3-next/dt-samsung-new-3&id=ff1020841cf0ff868d61d44169e7cc32f73599b8
- DTS change:
https://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/commit/?h=v4.3-next/dt-samsung-new-3&id=5bcbe4ba55bb0ad75c8495ee295bab036735483e
Changes since v2:
1. Just rebase on current next.
Changes since v1:
1. Split bindings documentation to separate patch (suggested by Lee).
2. Fix additional empty line (suggested by Lee).
3. Add Anand's tested-by, Javier's reviewed-by and Lee's acked-by.
Patch is losely based on patch in Hardkernel repository and previous work of Anand Moon.
--- drivers/mfd/sec-core.c | 30 ++++++++++++++++++++++++++++++ include/linux/mfd/samsung/core.h | 2 ++ include/linux/mfd/samsung/s2mps11.h | 1 + 3 files changed, 33 insertions(+)
drivers/mfd/sec-core.c +30 -0
@@ -278,6 +278,8 @@ static struct sec_platform_data *sec_pmic_i2c_parse_dt_pdata(* not parsed here. */ + pd->manual_poweroff =of_property_read_bool (dev->of_node, +"samsung,s2mps11-acokb-ground" ); return pd; }#else
@@ -440,6 +442,33 @@ static int sec_pmic_remove(struct i2c_client *i2c)return 0 ; } +static void sec_pmic_shutdown (struct i2c_client *i2c) +{ +struct sec_pmic_dev *sec_pmic =i2c_get_clientdata (i2c); +unsigned int reg, mask; + +if (!sec_pmic->pdata->manual_poweroff) +return ; + +switch (sec_pmic->device_type) { +case S2MPS11X : + reg =S2MPS11_REG_CTRL1 ; + mask =S2MPS11_CTRL1_PWRHOLD_MASK ; +break ; +default : +/* +* Currently only one board with S2MPS11 needs this, so just +* ignore the rest. +*/ +dev_warn (sec_pmic->dev, +"Unsupported device %lu for manual power off\n" , + sec_pmic->device_type); +return ; + } + +regmap_update_bits (sec_pmic->regmap_pmic, reg, mask,0 ); +} +#ifdef CONFIG_PM_SLEEP static int sec_pmic_suspend (struct device *dev) {
@@ -491,6 +520,7 @@ static struct i2c_driver sec_pmic_driver = { }, .probe = sec_pmic_probe, .remove = sec_pmic_remove, + .shutdown = sec_pmic_shutdown, .id_table = sec_pmic_id, };
include/linux/mfd/samsung/core.h +2 -0
@@ -132,6 +132,8 @@ struct sec_platform_data {int buck2_init;int buck3_init;int buck4_init; +/* Whether or not manually set PWRHOLD to low during shutdown. */ +bool manual_poweroff; };/**
include/linux/mfd/samsung/s2mps11.h +1 -0
@@ -179,6 +179,7 @@ enum s2mps11_regulators {#define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1)#define S2MPS11_RAMP_DELAY 25000/* uV/us */ +#define S2MPS11_CTRL1_PWRHOLD_MASK BIT(4)#define S2MPS11_BUCK2_RAMP_SHIFT 6#define S2MPS11_BUCK34_RAMP_SHIFT 4
Signature · 1 line
2.1.4
Lee Jones
AppliedQuoted 41 lines · Krzysztof Kozlowski
On Odroid XU3 board (with S2MPS11 PMIC) the PWRHOLD bit in CTRL1 register must be manually set to 0 before initiating power off sequence.
One of usual power down methods for Exynos based devices looks like:
1. PWRHOLD pin of PMIC is connected to PSHOLD of Exynos SoC.
2. Exynos holds up this pin during system operation.
3. ACOKB pin of PMIC is pulled up to VBATT and optionally to pin in other device.
4. When PWRHOLD/PSHOLD goes low, the PMIC will turn off the power if ACOKB goes high.On Odroid XU3 family the difference is in (3) - the ACOKB is grounded. This means that PMIC must manually set PWRHOLD field to low and then wait for signal from Application Processor (the usual change in PWRHOLD/PSHOLD pin will actually cut off the power).
The patch adds respective binding allowing Odroid XU3 device to be powered off.
Signed-off-by Krzysztof Kozlowski <[email protected]>Reported-by Anand Moon <[email protected]>Tested-by Anand Moon <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>Acked-by Lee Jones <[email protected]>---
The rest of patchset was applied by Kukjin Kim:
- dt-bindings documentation:https://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/commit/?h=v4.3-next/dt-samsung-new-3&id=ff1020841cf0ff868d61d44169e7cc32f73599b8 - DTS change: https://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/commit/?h=v4.3-next/dt-samsung-new-3&id=5bcbe4ba55bb0ad75c8495ee295bab036735483eChanges since v2:
1. Just rebase on current next.Changes since v1:
1. Split bindings documentation to separate patch (suggested by Lee).
2. Fix additional empty line (suggested by Lee).
3. Add Anand's tested-by, Javier's reviewed-by and Lee's acked-by.
Quoted 7 lines
Patch is losely based on patch in Hardkernel repository and previous work of Anand Moon.
--- drivers/mfd/sec-core.c | 30 ++++++++++++++++++++++++++++++ include/linux/mfd/samsung/core.h | 2 ++ include/linux/mfd/samsung/s2mps11.h | 1 + 3 files changed, 33 insertions(+)
Applied, thanks.
Quoted 80 lines
drivers/mfd/sec-core.c +30
-0@@ -278,6 +278,8 @@ static struct sec_platform_data *sec_pmic_i2c_parse_dt_pdata(* not parsed here. */ + pd->manual_poweroff =of_property_read_bool (dev->of_node, +"samsung,s2mps11-acokb-ground" ); return pd; }#else @@ -440,6 +442,33 @@ static int sec_pmic_remove(struct i2c_client *i2c)return 0 ; } +static void sec_pmic_shutdown (struct i2c_client *i2c) +{ +struct sec_pmic_dev *sec_pmic =i2c_get_clientdata (i2c); +unsigned int reg, mask; + +if (!sec_pmic->pdata->manual_poweroff) +return ; + +switch (sec_pmic->device_type) { +case S2MPS11X : + reg =S2MPS11_REG_CTRL1 ; + mask =S2MPS11_CTRL1_PWRHOLD_MASK ; +break ; +default : +/* +* Currently only one board with S2MPS11 needs this, so just +* ignore the rest. +*/ +dev_warn (sec_pmic->dev, +"Unsupported device %lu for manual power off\n" , + sec_pmic->device_type); +return ; + } + +regmap_update_bits (sec_pmic->regmap_pmic, reg, mask,0 ); +} +#ifdef CONFIG_PM_SLEEP static int sec_pmic_suspend (struct device *dev) {@@ -491,6 +520,7 @@ static struct i2c_driver sec_pmic_driver = { }, .probe = sec_pmic_probe, .remove = sec_pmic_remove, + .shutdown = sec_pmic_shutdown, .id_table = sec_pmic_id, };include/linux/mfd/samsung/core.h +2
-0@@ -132,6 +132,8 @@ struct sec_platform_data {int buck2_init;int buck3_init;int buck4_init; +/* Whether or not manually set PWRHOLD to low during shutdown. */ +bool manual_poweroff; };/** include/linux/mfd/samsung/s2mps11.h +1
-0@@ -179,6 +179,7 @@ enum s2mps11_regulators {#define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1)#define S2MPS11_RAMP_DELAY 25000/* uV/us */ +#define S2MPS11_CTRL1_PWRHOLD_MASK BIT(4)#define S2MPS11_BUCK2_RAMP_SHIFT 6#define S2MPS11_BUCK34_RAMP_SHIFT 4
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog