* [PATCH 0/2] mfd/EXYNOS: Properly shutdown Odroid XU3
@ 2015-08-03 12:37 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2015-08-03 12:37 UTC (permalink / raw)
To: Sangbeom Kim, Krzysztof Kozlowski, Lee Jones, linux-kernel,
linux-samsung-soc, devicetree, Kukjin Kim, linux-arm-kernel
Cc: Anand Moon, Krzysztof Kozlowski
Hi,
This fixes shutdown of Odroid XU3 family. More details in patch 1.
Patches are independent, please pick up freely.
Best regards,
Krzysztof
Krzysztof Kozlowski (2):
mfd: s2mps11: Add manual shutdown method for Odroid XU3
ARM: dts: Fix power off method on exynos5422-odroidxu3
Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 +
drivers/mfd/sec-core.c | 31 ++++++++++++++++++++++
include/linux/mfd/samsung/core.h | 2 ++
include/linux/mfd/samsung/s2mps11.h | 1 +
5 files changed, 39 insertions(+)
--
2.1.4
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 0/2] mfd/EXYNOS: Properly shutdown Odroid XU3
@ 2015-08-03 12:37 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2015-08-03 12:37 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
This fixes shutdown of Odroid XU3 family. More details in patch 1.
Patches are independent, please pick up freely.
Best regards,
Krzysztof
Krzysztof Kozlowski (2):
mfd: s2mps11: Add manual shutdown method for Odroid XU3
ARM: dts: Fix power off method on exynos5422-odroidxu3
Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 +
drivers/mfd/sec-core.c | 31 ++++++++++++++++++++++
include/linux/mfd/samsung/core.h | 2 ++
include/linux/mfd/samsung/s2mps11.h | 1 +
5 files changed, 39 insertions(+)
--
2.1.4
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
2015-08-03 12:37 ` Krzysztof Kozlowski
@ 2015-08-03 12:37 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2015-08-03 12:37 UTC (permalink / raw)
To: Sangbeom Kim, Krzysztof Kozlowski, Lee Jones, linux-kernel,
linux-samsung-soc, devicetree, Kukjin Kim, linux-arm-kernel
Cc: Anand Moon, 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.
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 <k.kozlowski.k@gmail.com>
Reported-by: Anand Moon <linux.amoon@gmail.com>
---
Patch is losely based on patch in Hardkernel repository [0] and previous
work of Anand Moon [1].
[0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
[1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
---
Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
include/linux/mfd/samsung/core.h | 2 ++
include/linux/mfd/samsung/s2mps11.h | 1 +
4 files changed, 38 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
index 57a045016fca..90eaef393325 100644
--- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
+++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
@@ -15,6 +15,10 @@ Optional properties:
- interrupt-parent: Specifies the phandle of the interrupt controller to which
the interrupts from s2mps11 are delivered to.
- interrupts: Interrupt specifiers for interrupt sources.
+- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
+ connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
+ register to turn off the power. Usually the ACOKB is pulled up to VBATT so
+ when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
Optional nodes:
- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index d206a3e8fe87..a56ab2102a32 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -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,34 @@ 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 +521,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,
};
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index 75115384f3fc..aa78957e092f 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -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;
};
/**
diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
index 7981a9d77d3f..b288965e8101 100644
--- a/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
@ 2015-08-03 12:37 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2015-08-03 12:37 UTC (permalink / raw)
To: linux-arm-kernel
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.
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 <k.kozlowski.k@gmail.com>
Reported-by: Anand Moon <linux.amoon@gmail.com>
---
Patch is losely based on patch in Hardkernel repository [0] and previous
work of Anand Moon [1].
[0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
[1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
---
Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
include/linux/mfd/samsung/core.h | 2 ++
include/linux/mfd/samsung/s2mps11.h | 1 +
4 files changed, 38 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
index 57a045016fca..90eaef393325 100644
--- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
+++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
@@ -15,6 +15,10 @@ Optional properties:
- interrupt-parent: Specifies the phandle of the interrupt controller to which
the interrupts from s2mps11 are delivered to.
- interrupts: Interrupt specifiers for interrupt sources.
+- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
+ connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
+ register to turn off the power. Usually the ACOKB is pulled up to VBATT so
+ when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
Optional nodes:
- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index d206a3e8fe87..a56ab2102a32 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -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,34 @@ 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 +521,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,
};
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index 75115384f3fc..aa78957e092f 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -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;
};
/**
diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
index 7981a9d77d3f..b288965e8101 100644
--- a/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/2] ARM: dts: Fix power off method on exynos5422-odroidxu3
2015-08-03 12:37 ` Krzysztof Kozlowski
@ 2015-08-03 12:37 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2015-08-03 12:37 UTC (permalink / raw)
To: Sangbeom Kim, Krzysztof Kozlowski, Lee Jones, linux-kernel,
linux-samsung-soc, devicetree, Kukjin Kim, linux-arm-kernel
Cc: Anand Moon, Krzysztof Kozlowski
The Odroid XU3 family boards have ACOKB pin of PMIC grounded, instead of
pulled up as usual. This means that PMIC must manually set PWRHOLD field
in its CTRL1 register to low before initiating power down.
This fixes Odroid XU3 powering off:
[ 25.966053] reboot: Power down
[ 25.967679] Power down.
[ 26.070174] Power down failed, please power off system manually.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Reported-by: Anand Moon <linux.amoon@gmail.com>
---
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 1565667e6f69..48cecc8cf26e 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -159,6 +159,7 @@
s2mps11,buck2-ramp-enable = <1>;
s2mps11,buck3-ramp-enable = <1>;
s2mps11,buck4-ramp-enable = <1>;
+ samsung,s2mps11-acokb-ground;
interrupt-parent = <&gpx0>;
interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/2] ARM: dts: Fix power off method on exynos5422-odroidxu3
@ 2015-08-03 12:37 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2015-08-03 12:37 UTC (permalink / raw)
To: linux-arm-kernel
The Odroid XU3 family boards have ACOKB pin of PMIC grounded, instead of
pulled up as usual. This means that PMIC must manually set PWRHOLD field
in its CTRL1 register to low before initiating power down.
This fixes Odroid XU3 powering off:
[ 25.966053] reboot: Power down
[ 25.967679] Power down.
[ 26.070174] Power down failed, please power off system manually.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Reported-by: Anand Moon <linux.amoon@gmail.com>
---
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 1565667e6f69..48cecc8cf26e 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -159,6 +159,7 @@
s2mps11,buck2-ramp-enable = <1>;
s2mps11,buck3-ramp-enable = <1>;
s2mps11,buck4-ramp-enable = <1>;
+ samsung,s2mps11-acokb-ground;
interrupt-parent = <&gpx0>;
interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
@ 2015-08-03 18:52 ` Anand Moon
0 siblings, 0 replies; 17+ messages in thread
From: Anand Moon @ 2015-08-03 18:52 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Sangbeom Kim, Krzysztof Kozlowski, Lee Jones, Linux Kernel,
linux-samsung-soc, devicetree, Kukjin Kim, linux-arm-kernel
Hi Krzysztof,
On 3 August 2015 at 18:07, Krzysztof Kozlowski <k.kozlowski.k@gmail.com> wrote:
> 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.
> 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 <k.kozlowski.k@gmail.com>
> Reported-by: Anand Moon <linux.amoon@gmail.com>
>
> ---
>
> Patch is losely based on patch in Hardkernel repository [0] and previous
> work of Anand Moon [1].
>
> [0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
> [1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
> ---
> Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
> drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
> include/linux/mfd/samsung/core.h | 2 ++
> include/linux/mfd/samsung/s2mps11.h | 1 +
> 4 files changed, 38 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> index 57a045016fca..90eaef393325 100644
> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> @@ -15,6 +15,10 @@ Optional properties:
> - interrupt-parent: Specifies the phandle of the interrupt controller to which
> the interrupts from s2mps11 are delivered to.
> - interrupts: Interrupt specifiers for interrupt sources.
> +- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
> + connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
> + register to turn off the power. Usually the ACOKB is pulled up to VBATT so
> + when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
>
> Optional nodes:
> - clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
> index d206a3e8fe87..a56ab2102a32 100644
> --- a/drivers/mfd/sec-core.c
> +++ b/drivers/mfd/sec-core.c
> @@ -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,34 @@ 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 +521,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,
> };
>
> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
> index 75115384f3fc..aa78957e092f 100644
> --- a/include/linux/mfd/samsung/core.h
> +++ b/include/linux/mfd/samsung/core.h
> @@ -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;
> };
>
> /**
> diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
> index 7981a9d77d3f..b288965e8101 100644
> --- a/include/linux/mfd/samsung/s2mps11.h
> +++ b/include/linux/mfd/samsung/s2mps11.h
> @@ -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
> --
> 2.1.4
>
Thanks. Tested on Odroid-XU3 board.
Tested-by: Anand Moon <linux.amoon@gmail.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
@ 2015-08-03 18:52 ` Anand Moon
0 siblings, 0 replies; 17+ messages in thread
From: Anand Moon @ 2015-08-03 18:52 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Sangbeom Kim, Krzysztof Kozlowski, Lee Jones, Linux Kernel,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA, Kukjin Kim,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Hi Krzysztof,
On 3 August 2015 at 18:07, Krzysztof Kozlowski <k.kozlowski.k-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> 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.
> 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 <k.kozlowski.k-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Reported-by: Anand Moon <linux.amoon-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>
> ---
>
> Patch is losely based on patch in Hardkernel repository [0] and previous
> work of Anand Moon [1].
>
> [0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
> [1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
> ---
> Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
> drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
> include/linux/mfd/samsung/core.h | 2 ++
> include/linux/mfd/samsung/s2mps11.h | 1 +
> 4 files changed, 38 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> index 57a045016fca..90eaef393325 100644
> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> @@ -15,6 +15,10 @@ Optional properties:
> - interrupt-parent: Specifies the phandle of the interrupt controller to which
> the interrupts from s2mps11 are delivered to.
> - interrupts: Interrupt specifiers for interrupt sources.
> +- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
> + connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
> + register to turn off the power. Usually the ACOKB is pulled up to VBATT so
> + when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
>
> Optional nodes:
> - clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
> index d206a3e8fe87..a56ab2102a32 100644
> --- a/drivers/mfd/sec-core.c
> +++ b/drivers/mfd/sec-core.c
> @@ -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,34 @@ 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 +521,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,
> };
>
> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
> index 75115384f3fc..aa78957e092f 100644
> --- a/include/linux/mfd/samsung/core.h
> +++ b/include/linux/mfd/samsung/core.h
> @@ -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;
> };
>
> /**
> diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
> index 7981a9d77d3f..b288965e8101 100644
> --- a/include/linux/mfd/samsung/s2mps11.h
> +++ b/include/linux/mfd/samsung/s2mps11.h
> @@ -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
> --
> 2.1.4
>
Thanks. Tested on Odroid-XU3 board.
Tested-by: Anand Moon <linux.amoon-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
@ 2015-08-03 18:52 ` Anand Moon
0 siblings, 0 replies; 17+ messages in thread
From: Anand Moon @ 2015-08-03 18:52 UTC (permalink / raw)
To: linux-arm-kernel
Hi Krzysztof,
On 3 August 2015 at 18:07, Krzysztof Kozlowski <k.kozlowski.k@gmail.com> wrote:
> 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.
> 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 <k.kozlowski.k@gmail.com>
> Reported-by: Anand Moon <linux.amoon@gmail.com>
>
> ---
>
> Patch is losely based on patch in Hardkernel repository [0] and previous
> work of Anand Moon [1].
>
> [0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
> [1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
> ---
> Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
> drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
> include/linux/mfd/samsung/core.h | 2 ++
> include/linux/mfd/samsung/s2mps11.h | 1 +
> 4 files changed, 38 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> index 57a045016fca..90eaef393325 100644
> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> @@ -15,6 +15,10 @@ Optional properties:
> - interrupt-parent: Specifies the phandle of the interrupt controller to which
> the interrupts from s2mps11 are delivered to.
> - interrupts: Interrupt specifiers for interrupt sources.
> +- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
> + connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
> + register to turn off the power. Usually the ACOKB is pulled up to VBATT so
> + when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
>
> Optional nodes:
> - clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
> index d206a3e8fe87..a56ab2102a32 100644
> --- a/drivers/mfd/sec-core.c
> +++ b/drivers/mfd/sec-core.c
> @@ -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,34 @@ 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 +521,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,
> };
>
> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
> index 75115384f3fc..aa78957e092f 100644
> --- a/include/linux/mfd/samsung/core.h
> +++ b/include/linux/mfd/samsung/core.h
> @@ -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;
> };
>
> /**
> diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
> index 7981a9d77d3f..b288965e8101 100644
> --- a/include/linux/mfd/samsung/s2mps11.h
> +++ b/include/linux/mfd/samsung/s2mps11.h
> @@ -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
> --
> 2.1.4
>
Thanks. Tested on Odroid-XU3 board.
Tested-by: Anand Moon <linux.amoon@gmail.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
2015-08-03 12:37 ` Krzysztof Kozlowski
@ 2015-08-05 10:53 ` Javier Martinez Canillas
-1 siblings, 0 replies; 17+ messages in thread
From: Javier Martinez Canillas @ 2015-08-05 10:53 UTC (permalink / raw)
To: Krzysztof Kozlowski, Sangbeom Kim, Krzysztof Kozlowski,
Lee Jones, linux-kernel, linux-samsung-soc, devicetree,
Kukjin Kim, linux-arm-kernel
Cc: Anand Moon
Hello Krzysztof,
On 08/03/2015 02:37 PM, Krzysztof Kozlowski wrote:
> 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.
> 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).
>
Is nice to finally have an explanation about why this is needed.
> The patch adds respective binding allowing Odroid XU3 device to be
> powered off.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
> Reported-by: Anand Moon <linux.amoon@gmail.com>
>
> ---
>
> Patch is losely based on patch in Hardkernel repository [0] and previous
> work of Anand Moon [1].
>
> [0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
> [1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
> ---
> Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
> drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
> include/linux/mfd/samsung/core.h | 2 ++
> include/linux/mfd/samsung/s2mps11.h | 1 +
> 4 files changed, 38 insertions(+)
>
The patch looks good to me.
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
@ 2015-08-05 10:53 ` Javier Martinez Canillas
0 siblings, 0 replies; 17+ messages in thread
From: Javier Martinez Canillas @ 2015-08-05 10:53 UTC (permalink / raw)
To: linux-arm-kernel
Hello Krzysztof,
On 08/03/2015 02:37 PM, Krzysztof Kozlowski wrote:
> 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.
> 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).
>
Is nice to finally have an explanation about why this is needed.
> The patch adds respective binding allowing Odroid XU3 device to be
> powered off.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
> Reported-by: Anand Moon <linux.amoon@gmail.com>
>
> ---
>
> Patch is losely based on patch in Hardkernel repository [0] and previous
> work of Anand Moon [1].
>
> [0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
> [1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
> ---
> Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
> drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
> include/linux/mfd/samsung/core.h | 2 ++
> include/linux/mfd/samsung/s2mps11.h | 1 +
> 4 files changed, 38 insertions(+)
>
The patch looks good to me.
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] ARM: dts: Fix power off method on exynos5422-odroidxu3
2015-08-03 12:37 ` Krzysztof Kozlowski
@ 2015-08-05 10:54 ` Javier Martinez Canillas
-1 siblings, 0 replies; 17+ messages in thread
From: Javier Martinez Canillas @ 2015-08-05 10:54 UTC (permalink / raw)
To: Krzysztof Kozlowski, Sangbeom Kim, Krzysztof Kozlowski,
Lee Jones, linux-kernel, linux-samsung-soc, devicetree,
Kukjin Kim, linux-arm-kernel
Cc: Anand Moon
Hello Krzysztof,
On 08/03/2015 02:37 PM, Krzysztof Kozlowski wrote:
> The Odroid XU3 family boards have ACOKB pin of PMIC grounded, instead of
> pulled up as usual. This means that PMIC must manually set PWRHOLD field
> in its CTRL1 register to low before initiating power down.
>
> This fixes Odroid XU3 powering off:
> [ 25.966053] reboot: Power down
> [ 25.967679] Power down.
> [ 26.070174] Power down failed, please power off system manually.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
> Reported-by: Anand Moon <linux.amoon@gmail.com>
> ---
> arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
> index 1565667e6f69..48cecc8cf26e 100644
> --- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
> +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
> @@ -159,6 +159,7 @@
> s2mps11,buck2-ramp-enable = <1>;
> s2mps11,buck3-ramp-enable = <1>;
> s2mps11,buck4-ramp-enable = <1>;
> + samsung,s2mps11-acokb-ground;
>
> interrupt-parent = <&gpx0>;
> interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/2] ARM: dts: Fix power off method on exynos5422-odroidxu3
@ 2015-08-05 10:54 ` Javier Martinez Canillas
0 siblings, 0 replies; 17+ messages in thread
From: Javier Martinez Canillas @ 2015-08-05 10:54 UTC (permalink / raw)
To: linux-arm-kernel
Hello Krzysztof,
On 08/03/2015 02:37 PM, Krzysztof Kozlowski wrote:
> The Odroid XU3 family boards have ACOKB pin of PMIC grounded, instead of
> pulled up as usual. This means that PMIC must manually set PWRHOLD field
> in its CTRL1 register to low before initiating power down.
>
> This fixes Odroid XU3 powering off:
> [ 25.966053] reboot: Power down
> [ 25.967679] Power down.
> [ 26.070174] Power down failed, please power off system manually.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
> Reported-by: Anand Moon <linux.amoon@gmail.com>
> ---
> arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
> index 1565667e6f69..48cecc8cf26e 100644
> --- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
> +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
> @@ -159,6 +159,7 @@
> s2mps11,buck2-ramp-enable = <1>;
> s2mps11,buck3-ramp-enable = <1>;
> s2mps11,buck4-ramp-enable = <1>;
> + samsung,s2mps11-acokb-ground;
>
> interrupt-parent = <&gpx0>;
> interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
2015-08-03 12:37 ` Krzysztof Kozlowski
@ 2015-08-10 15:49 ` Lee Jones
-1 siblings, 0 replies; 17+ messages in thread
From: Lee Jones @ 2015-08-10 15:49 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Sangbeom Kim, Krzysztof Kozlowski, linux-kernel,
linux-samsung-soc, devicetree, Kukjin Kim, linux-arm-kernel,
Anand Moon
On Mon, 03 Aug 2015, Krzysztof Kozlowski wrote:
> 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.
> 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 <k.kozlowski.k@gmail.com>
> Reported-by: Anand Moon <linux.amoon@gmail.com>
>
> ---
>
> Patch is losely based on patch in Hardkernel repository [0] and previous
> work of Anand Moon [1].
>
> [0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
> [1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
> ---
> Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
> drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
> include/linux/mfd/samsung/core.h | 2 ++
> include/linux/mfd/samsung/s2mps11.h | 1 +
> 4 files changed, 38 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> index 57a045016fca..90eaef393325 100644
> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> @@ -15,6 +15,10 @@ Optional properties:
> - interrupt-parent: Specifies the phandle of the interrupt controller to which
> the interrupts from s2mps11 are delivered to.
> - interrupts: Interrupt specifiers for interrupt sources.
> +- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
> + connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
> + register to turn off the power. Usually the ACOKB is pulled up to VBATT so
> + when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
Binding looks fine. Please seperate it into a different patch and
apply my Ack:
Acked-by: Lee Jones <lee.jones@linaro.org>
> Optional nodes:
> - clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
> index d206a3e8fe87..a56ab2102a32 100644
> --- a/drivers/mfd/sec-core.c
> +++ b/drivers/mfd/sec-core.c
> @@ -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,34 @@ 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);
> +}
> +
> +
Remove the extra '\n'.
When you resubmit, apply my Ack:
Acked-by: Lee Jones <lee.jones@linaro.org>
> #ifdef CONFIG_PM_SLEEP
> static int sec_pmic_suspend(struct device *dev)
> {
> @@ -491,6 +521,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,
> };
>
> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
> index 75115384f3fc..aa78957e092f 100644
> --- a/include/linux/mfd/samsung/core.h
> +++ b/include/linux/mfd/samsung/core.h
> @@ -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;
> };
>
> /**
> diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
> index 7981a9d77d3f..b288965e8101 100644
> --- a/include/linux/mfd/samsung/s2mps11.h
> +++ b/include/linux/mfd/samsung/s2mps11.h
> @@ -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
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
@ 2015-08-10 15:49 ` Lee Jones
0 siblings, 0 replies; 17+ messages in thread
From: Lee Jones @ 2015-08-10 15:49 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 03 Aug 2015, Krzysztof Kozlowski wrote:
> 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.
> 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 <k.kozlowski.k@gmail.com>
> Reported-by: Anand Moon <linux.amoon@gmail.com>
>
> ---
>
> Patch is losely based on patch in Hardkernel repository [0] and previous
> work of Anand Moon [1].
>
> [0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
> [1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
> ---
> Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
> drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
> include/linux/mfd/samsung/core.h | 2 ++
> include/linux/mfd/samsung/s2mps11.h | 1 +
> 4 files changed, 38 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> index 57a045016fca..90eaef393325 100644
> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> @@ -15,6 +15,10 @@ Optional properties:
> - interrupt-parent: Specifies the phandle of the interrupt controller to which
> the interrupts from s2mps11 are delivered to.
> - interrupts: Interrupt specifiers for interrupt sources.
> +- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
> + connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
> + register to turn off the power. Usually the ACOKB is pulled up to VBATT so
> + when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
Binding looks fine. Please seperate it into a different patch and
apply my Ack:
Acked-by: Lee Jones <lee.jones@linaro.org>
> Optional nodes:
> - clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
> index d206a3e8fe87..a56ab2102a32 100644
> --- a/drivers/mfd/sec-core.c
> +++ b/drivers/mfd/sec-core.c
> @@ -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,34 @@ 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);
> +}
> +
> +
Remove the extra '\n'.
When you resubmit, apply my Ack:
Acked-by: Lee Jones <lee.jones@linaro.org>
> #ifdef CONFIG_PM_SLEEP
> static int sec_pmic_suspend(struct device *dev)
> {
> @@ -491,6 +521,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,
> };
>
> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
> index 75115384f3fc..aa78957e092f 100644
> --- a/include/linux/mfd/samsung/core.h
> +++ b/include/linux/mfd/samsung/core.h
> @@ -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;
> };
>
> /**
> diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
> index 7981a9d77d3f..b288965e8101 100644
> --- a/include/linux/mfd/samsung/s2mps11.h
> +++ b/include/linux/mfd/samsung/s2mps11.h
> @@ -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
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
2015-08-10 15:49 ` Lee Jones
@ 2015-08-10 23:45 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2015-08-10 23:45 UTC (permalink / raw)
To: Lee Jones, Krzysztof Kozlowski
Cc: Sangbeom Kim, linux-kernel, linux-samsung-soc, devicetree,
Kukjin Kim, linux-arm-kernel, Anand Moon
On 11.08.2015 00:49, Lee Jones wrote:
> On Mon, 03 Aug 2015, Krzysztof Kozlowski wrote:
>
>> 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.
>> 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 <k.kozlowski.k@gmail.com>
>> Reported-by: Anand Moon <linux.amoon@gmail.com>
>>
>> ---
>>
>> Patch is losely based on patch in Hardkernel repository [0] and previous
>> work of Anand Moon [1].
>>
>> [0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
>> [1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
>> ---
>> Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
>> drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
>> include/linux/mfd/samsung/core.h | 2 ++
>> include/linux/mfd/samsung/s2mps11.h | 1 +
>> 4 files changed, 38 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> index 57a045016fca..90eaef393325 100644
>> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> @@ -15,6 +15,10 @@ Optional properties:
>> - interrupt-parent: Specifies the phandle of the interrupt controller to which
>> the interrupts from s2mps11 are delivered to.
>> - interrupts: Interrupt specifiers for interrupt sources.
>
>> +- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
>> + connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
>> + register to turn off the power. Usually the ACOKB is pulled up to VBATT so
>> + when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
>
> Binding looks fine. Please seperate it into a different patch and
> apply my Ack:
>
> Acked-by: Lee Jones <lee.jones@linaro.org>
OK
>
>> Optional nodes:
>> - clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
>> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
>> index d206a3e8fe87..a56ab2102a32 100644
>> --- a/drivers/mfd/sec-core.c
>> +++ b/drivers/mfd/sec-core.c
>> @@ -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,34 @@ 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);
>> +}
>> +
>> +
>
> Remove the extra '\n'.
>
> When you resubmit, apply my Ack:
>
> Acked-by: Lee Jones <lee.jones@linaro.org>
Sure, I'll resend. The patch may go through your tree because there are
no external dependencies.
Best regards,
Krzysztof
>
>> #ifdef CONFIG_PM_SLEEP
>> static int sec_pmic_suspend(struct device *dev)
>> {
>> @@ -491,6 +521,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,
>> };
>>
>> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
>> index 75115384f3fc..aa78957e092f 100644
>> --- a/include/linux/mfd/samsung/core.h
>> +++ b/include/linux/mfd/samsung/core.h
>> @@ -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;
>> };
>>
>> /**
>> diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
>> index 7981a9d77d3f..b288965e8101 100644
>> --- a/include/linux/mfd/samsung/s2mps11.h
>> +++ b/include/linux/mfd/samsung/s2mps11.h
>> @@ -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
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for Odroid XU3
@ 2015-08-10 23:45 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2015-08-10 23:45 UTC (permalink / raw)
To: linux-arm-kernel
On 11.08.2015 00:49, Lee Jones wrote:
> On Mon, 03 Aug 2015, Krzysztof Kozlowski wrote:
>
>> 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.
>> 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 <k.kozlowski.k@gmail.com>
>> Reported-by: Anand Moon <linux.amoon@gmail.com>
>>
>> ---
>>
>> Patch is losely based on patch in Hardkernel repository [0] and previous
>> work of Anand Moon [1].
>>
>> [0] https://github.com/hardkernel/linux/commit/6897e62ba328bd1c8c095d918101863250cd73e7
>> [1] http://www.spinics.net/lists/linux-samsung-soc/msg45959.html
>> ---
>> Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +++
>> drivers/mfd/sec-core.c | 31 +++++++++++++++++++++++
>> include/linux/mfd/samsung/core.h | 2 ++
>> include/linux/mfd/samsung/s2mps11.h | 1 +
>> 4 files changed, 38 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> index 57a045016fca..90eaef393325 100644
>> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> @@ -15,6 +15,10 @@ Optional properties:
>> - interrupt-parent: Specifies the phandle of the interrupt controller to which
>> the interrupts from s2mps11 are delivered to.
>> - interrupts: Interrupt specifiers for interrupt sources.
>
>> +- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
>> + connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
>> + register to turn off the power. Usually the ACOKB is pulled up to VBATT so
>> + when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
>
> Binding looks fine. Please seperate it into a different patch and
> apply my Ack:
>
> Acked-by: Lee Jones <lee.jones@linaro.org>
OK
>
>> Optional nodes:
>> - clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
>> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
>> index d206a3e8fe87..a56ab2102a32 100644
>> --- a/drivers/mfd/sec-core.c
>> +++ b/drivers/mfd/sec-core.c
>> @@ -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,34 @@ 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);
>> +}
>> +
>> +
>
> Remove the extra '\n'.
>
> When you resubmit, apply my Ack:
>
> Acked-by: Lee Jones <lee.jones@linaro.org>
Sure, I'll resend. The patch may go through your tree because there are
no external dependencies.
Best regards,
Krzysztof
>
>> #ifdef CONFIG_PM_SLEEP
>> static int sec_pmic_suspend(struct device *dev)
>> {
>> @@ -491,6 +521,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,
>> };
>>
>> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
>> index 75115384f3fc..aa78957e092f 100644
>> --- a/include/linux/mfd/samsung/core.h
>> +++ b/include/linux/mfd/samsung/core.h
>> @@ -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;
>> };
>>
>> /**
>> diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
>> index 7981a9d77d3f..b288965e8101 100644
>> --- a/include/linux/mfd/samsung/s2mps11.h
>> +++ b/include/linux/mfd/samsung/s2mps11.h
>> @@ -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
>
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2015-08-10 23:45 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-03 12:37 [PATCH 0/2] mfd/EXYNOS: Properly shutdown Odroid XU3 Krzysztof Kozlowski
2015-08-03 12:37 ` Krzysztof Kozlowski
2015-08-03 12:37 ` [PATCH 1/2] mfd: s2mps11: Add manual shutdown method for " Krzysztof Kozlowski
2015-08-03 12:37 ` Krzysztof Kozlowski
2015-08-03 18:52 ` Anand Moon
2015-08-03 18:52 ` Anand Moon
2015-08-03 18:52 ` Anand Moon
2015-08-05 10:53 ` Javier Martinez Canillas
2015-08-05 10:53 ` Javier Martinez Canillas
2015-08-10 15:49 ` Lee Jones
2015-08-10 15:49 ` Lee Jones
2015-08-10 23:45 ` Krzysztof Kozlowski
2015-08-10 23:45 ` Krzysztof Kozlowski
2015-08-03 12:37 ` [PATCH 2/2] ARM: dts: Fix power off method on exynos5422-odroidxu3 Krzysztof Kozlowski
2015-08-03 12:37 ` Krzysztof Kozlowski
2015-08-05 10:54 ` Javier Martinez Canillas
2015-08-05 10:54 ` Javier Martinez Canillas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.