* [RFC][PATCH 1/4] regulator: Add helper function to get "poweroff-source" property
@ 2014-09-30 17:29 Romain Perier
2014-09-30 17:29 ` [RFC][PATCH 2/4] regulator: act8865: Add support to turn off all outputs Romain Perier
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Romain Perier @ 2014-09-30 17:29 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: broonie-DgEjT+Ai2ygdnm+yROfE0A, lgirdwood-Re5JQEeQqe8AvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, heiko-4mtYJXux2i+zQB+pC5nmwQ
Several drivers create their own devicetree property when they register
poweroff capabilites. This is for example the case for mfd, regulator
or power drivers which define "vendor,system-power-controller" property.
This patch adds support for a standard property "poweroff-source"
which marks the device as able to shutdown the system.
Signed-off-by: Romain Perier <romain.perier-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/regulator/of_regulator.c | 12 ++++++++++++
include/linux/regulator/of_regulator.h | 6 ++++++
2 files changed, 18 insertions(+)
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 7a51814..94e0ec4 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -240,3 +240,15 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
return init_data;
}
+
+/**
+ * of_get_regulator_poweroff_source - Get poweroff-source for given device_node
+ * @np: Pointer to the given device_node
+ *
+ * return true if present false otherwise
+ */
+bool of_get_regulator_poweroff_source(const struct device_node *np)
+{
+ return of_property_read_bool(np, "poweroff-source");
+}
+EXPORT_SYMBOL_GPL(of_get_regulator_poweroff_source);
diff --git a/include/linux/regulator/of_regulator.h b/include/linux/regulator/of_regulator.h
index f921796..2e7aa89 100644
--- a/include/linux/regulator/of_regulator.h
+++ b/include/linux/regulator/of_regulator.h
@@ -20,6 +20,7 @@ extern struct regulator_init_data
extern int of_regulator_match(struct device *dev, struct device_node *node,
struct of_regulator_match *matches,
unsigned int num_matches);
+extern bool of_get_regulator_poweroff_source(const struct device_node *np);
#else
static inline struct regulator_init_data
*of_get_regulator_init_data(struct device *dev,
@@ -35,6 +36,11 @@ static inline int of_regulator_match(struct device *dev,
{
return 0;
}
+
+static inline bool of_get_regulator_poweroff_source(const struct device_node *np)
+{
+ return false;
+}
#endif /* CONFIG_OF */
#endif /* __LINUX_OF_REG_H */
--
1.9.1
--
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 related [flat|nested] 6+ messages in thread
* [RFC][PATCH 2/4] regulator: act8865: Add support to turn off all outputs
2014-09-30 17:29 [RFC][PATCH 1/4] regulator: Add helper function to get "poweroff-source" property Romain Perier
@ 2014-09-30 17:29 ` Romain Perier
[not found] ` <1412098186-5042-1-git-send-email-romain.perier-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-10-01 18:07 ` [RFC][PATCH 1/4] regulator: Add helper function to get "poweroff-source" property Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Romain Perier @ 2014-09-30 17:29 UTC (permalink / raw)
To: devicetree; +Cc: broonie, lgirdwood, linux-kernel, heiko
When the property "poweroff-source" is found in the
devicetree, the function pm_power_off is defined. This function sends the
rights bit fields to the global off control register. shutdown/poweroff
commands are now supported for hardware components which use these PMU.
Signed-off-by: Romain Perier <romain.perier@gmail.com>
---
drivers/regulator/act8865-regulator.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
index afd06f9..c574123 100644
--- a/drivers/regulator/act8865-regulator.c
+++ b/drivers/regulator/act8865-regulator.c
@@ -61,6 +61,8 @@
#define ACT8846_REG12_VSET 0xa0
#define ACT8846_REG12_CTRL 0xa1
#define ACT8846_REG13_CTRL 0xb1
+#define ACT8846_GLB_OFF_CTRL 0xc3
+#define ACT8846_OFF_SYSMASK 0x18
/*
* ACT8865 Global Register Map.
@@ -84,6 +86,7 @@
#define ACT8865_LDO3_CTRL 0x61
#define ACT8865_LDO4_VSET 0x64
#define ACT8865_LDO4_CTRL 0x65
+#define ACT8865_MSTROFF 0x20
/*
* Field Definitions.
@@ -98,6 +101,8 @@
struct act8865 {
struct regmap *regmap;
+ int off_reg;
+ int off_mask;
};
static const struct regmap_config act8865_regmap_config = {
@@ -275,6 +280,16 @@ static struct regulator_init_data
return NULL;
}
+static struct i2c_client *act8865_i2c_client;
+static void act8865_power_off(void)
+{
+ struct act8865 *act8865;
+
+ act8865 = i2c_get_clientdata(act8865_i2c_client);
+ regmap_write(act8865->regmap, act8865->off_reg, act8865->off_mask);
+ while (1);
+}
+
static int act8865_pmic_probe(struct i2c_client *client,
const struct i2c_device_id *i2c_id)
{
@@ -285,6 +300,7 @@ static int act8865_pmic_probe(struct i2c_client *client,
int i, ret, num_regulators;
struct act8865 *act8865;
unsigned long type;
+ int off_reg, off_mask;
pdata = dev_get_platdata(dev);
@@ -304,10 +320,14 @@ static int act8865_pmic_probe(struct i2c_client *client,
case ACT8846:
regulators = act8846_regulators;
num_regulators = ARRAY_SIZE(act8846_regulators);
+ off_reg = ACT8846_GLB_OFF_CTRL;
+ off_mask = ACT8846_OFF_SYSMASK;
break;
case ACT8865:
regulators = act8865_regulators;
num_regulators = ARRAY_SIZE(act8865_regulators);
+ off_reg = ACT8865_SYS_CTRL;
+ off_mask = ACT8865_MSTROFF;
break;
default:
dev_err(dev, "invalid device id %lu\n", type);
@@ -345,6 +365,14 @@ static int act8865_pmic_probe(struct i2c_client *client,
return ret;
}
+ if (dev->of_node && of_get_regulator_poweroff_source(dev->of_node) &&
+ !pm_power_off) {
+ act8865_i2c_client = client;
+ act8865->off_reg = off_reg;
+ act8865->off_mask = off_mask;
+ pm_power_off = act8865_power_off;
+ }
+
/* Finally register devices */
for (i = 0; i < num_regulators; i++) {
const struct regulator_desc *desc = ®ulators[i];
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [RFC][PATCH 3/4] ARM: dts: rockchip: Enable power off in pmic for Radxa Rock
[not found] ` <1412098186-5042-1-git-send-email-romain.perier-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2014-09-30 17:29 ` Romain Perier
2014-09-30 17:29 ` [RFC][PATCH 4/4] dt-bindings: Document the property poweroff-source for act8865 regulator Romain Perier
1 sibling, 0 replies; 6+ messages in thread
From: Romain Perier @ 2014-09-30 17:29 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: broonie-DgEjT+Ai2ygdnm+yROfE0A, lgirdwood-Re5JQEeQqe8AvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, heiko-4mtYJXux2i+zQB+pC5nmwQ
Add "poweroff-source" property to act8846 node.
shutdown/poweroff commands are now handled for this board.
Signed-off-by: Romain Perier <romain.perier-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
arch/arm/boot/dts/rk3188-radxarock.dts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index e04bf8f..1217481 100644
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -115,6 +115,8 @@
pinctrl-names = "default";
pinctrl-0 = <&act8846_dvs0_ctl>;
+ poweroff-source;
+
regulators {
vcc_ddr: REG1 {
regulator-name = "VCC_DDR";
--
1.9.1
--
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 related [flat|nested] 6+ messages in thread
* [RFC][PATCH 4/4] dt-bindings: Document the property poweroff-source for act8865 regulator
[not found] ` <1412098186-5042-1-git-send-email-romain.perier-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-09-30 17:29 ` [RFC][PATCH 3/4] ARM: dts: rockchip: Enable power off in pmic for Radxa Rock Romain Perier
@ 2014-09-30 17:29 ` Romain Perier
1 sibling, 0 replies; 6+ messages in thread
From: Romain Perier @ 2014-09-30 17:29 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: broonie-DgEjT+Ai2ygdnm+yROfE0A, lgirdwood-Re5JQEeQqe8AvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, heiko-4mtYJXux2i+zQB+pC5nmwQ
Signed-off-by: Romain Perier <romain.perier-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
Documentation/devicetree/bindings/regulator/act8865-regulator.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
index 865614b..4d7f33e 100644
--- a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
@@ -5,6 +5,10 @@ Required properties:
- compatible: "active-semi,act8846" or "active-semi,act8865"
- reg: I2C slave address
+Optional properties:
+- poweroff-source: Telling whether or not this pmic is controlling
+ the system power
+
Any standard regulator properties can be used to configure the single regulator.
The valid names for regulators are:
--
1.9.1
--
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 related [flat|nested] 6+ messages in thread
* Re: [RFC][PATCH 1/4] regulator: Add helper function to get "poweroff-source" property
2014-09-30 17:29 [RFC][PATCH 1/4] regulator: Add helper function to get "poweroff-source" property Romain Perier
2014-09-30 17:29 ` [RFC][PATCH 2/4] regulator: act8865: Add support to turn off all outputs Romain Perier
[not found] ` <1412098186-5042-1-git-send-email-romain.perier-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2014-10-01 18:07 ` Mark Brown
[not found] ` <20141001180759.GH4273-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2014-10-01 18:07 UTC (permalink / raw)
To: Romain Perier; +Cc: devicetree, lgirdwood, linux-kernel, heiko
[-- Attachment #1: Type: text/plain, Size: 912 bytes --]
On Tue, Sep 30, 2014 at 05:29:43PM +0000, Romain Perier wrote:
> +/**
> + * of_get_regulator_poweroff_source - Get poweroff-source for given device_node
> + * @np: Pointer to the given device_node
> + *
> + * return true if present false otherwise
> + */
> +bool of_get_regulator_poweroff_source(const struct device_node *np)
> +{
> + return of_property_read_bool(np, "poweroff-source");
> +}
> +EXPORT_SYMBOL_GPL(of_get_regulator_poweroff_source);
This isn't really a regulator specific thing - it's common for the
actual implementation to be to simply cut power but it could be
something that doesn't look like a regulator doing it like a system
monitor. I'd rename this to something like is_system_poweroff_source().
You probably also want to CC the DT maintainers on this and add some
documentation of this as a standard property, not entirely sure where
exactly but I'm sure the DT people could advise.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC][PATCH 1/4] regulator: Add helper function to get "poweroff-source" property
[not found] ` <20141001180759.GH4273-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
@ 2014-10-02 17:43 ` Romain Perier
0 siblings, 0 replies; 6+ messages in thread
From: Romain Perier @ 2014-10-02 17:43 UTC (permalink / raw)
To: Mark Brown
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA,
lgirdwood-Re5JQEeQqe8AvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
"heiko@sntech.de >> Heiko Stübner",
sameo-VuQAYsv1563Yd54FQh9/CA, lee.jones-QSEj5FYQhm4dnm+yROfE0A,
grant.likely-QSEj5FYQhm4dnm+yROfE0A,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A, sre-DgEjT+Ai2ygdnm+yROfE0A,
dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w, dwmw2-wEGCiKHe2LqWVfeAwA7xHQ,
anton-9xeibp6oKSgdnm+yROfE0A, ldewangan-DDmLM1+adcrQT0dZR+AlfA,
linux-omap-u79uwXL29TY76Z2rM5mHXA,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
Adding the corresponding drivers and DT maintainers to the loop (parts
of the kernel which use this property)
Le 01/10/2014 20:07, Mark Brown a écrit :
> On Tue, Sep 30, 2014 at 05:29:43PM +0000, Romain Perier wrote:
>
>> +/**
>> + * of_get_regulator_poweroff_source - Get poweroff-source for given device_node
>> + * @np: Pointer to the given device_node
>> + *
>> + * return true if present false otherwise
>> + */
>> +bool of_get_regulator_poweroff_source(const struct device_node *np)
>> +{
>> + return of_property_read_bool(np, "poweroff-source");
>> +}
>> +EXPORT_SYMBOL_GPL(of_get_regulator_poweroff_source);
> This isn't really a regulator specific thing - it's common for the
> actual implementation to be to simply cut power but it could be
> something that doesn't look like a regulator doing it like a system
> monitor. I'd rename this to something like is_system_poweroff_source().
>
> You probably also want to CC the DT maintainers on this and add some
> documentation of this as a standard property, not entirely sure where
> exactly but I'm sure the DT people could advise.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-10-02 17:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-30 17:29 [RFC][PATCH 1/4] regulator: Add helper function to get "poweroff-source" property Romain Perier
2014-09-30 17:29 ` [RFC][PATCH 2/4] regulator: act8865: Add support to turn off all outputs Romain Perier
[not found] ` <1412098186-5042-1-git-send-email-romain.perier-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-09-30 17:29 ` [RFC][PATCH 3/4] ARM: dts: rockchip: Enable power off in pmic for Radxa Rock Romain Perier
2014-09-30 17:29 ` [RFC][PATCH 4/4] dt-bindings: Document the property poweroff-source for act8865 regulator Romain Perier
2014-10-01 18:07 ` [RFC][PATCH 1/4] regulator: Add helper function to get "poweroff-source" property Mark Brown
[not found] ` <20141001180759.GH4273-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-10-02 17:43 ` Romain Perier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).