* [PATCH 1/6] mfd: arizona: Factor out read of device tree GPIOs
2014-03-31 11:59 [PATCH 0/6] Arizona Regulator Updates v4 Charles Keepax
@ 2014-03-31 11:59 ` Charles Keepax
2014-03-31 11:59 ` [PATCH 2/6] regulator: arizona-ldo1: Move setup processing from arizona-core Charles Keepax
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Charles Keepax @ 2014-03-31 11:59 UTC (permalink / raw)
To: broonie
Cc: lee.jones, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, rob, sameo, lgirdwood, ckeepax, devicetree, linux-kernel
This patch factors out the reading of GPIOs for the Arizona devices
into a helper function.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/arizona-core.c | 33 ++++++++++++++++++++++++---------
include/linux/mfd/arizona/core.h | 3 +++
2 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index a45aab9..8ad4373 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -512,19 +512,34 @@ int arizona_of_get_type(struct device *dev)
}
EXPORT_SYMBOL_GPL(arizona_of_get_type);
+int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop,
+ bool mandatory, int *gpio)
+{
+ int ret;
+
+ ret = of_get_named_gpio(arizona->dev->of_node, prop, 0);
+ *gpio = ret;
+ if (ret >= 0)
+ return ret;
+
+ *gpio = 0;
+
+ if (mandatory)
+ dev_err(arizona->dev,
+ "Mandatory DT gpio %s missing/malformed: %d\n",
+ prop, ret);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(arizona_of_get_named_gpio);
+
static int arizona_of_get_core_pdata(struct arizona *arizona)
{
+ struct arizona_pdata *pdata = &arizona->pdata;
int ret, i;
- arizona->pdata.reset = of_get_named_gpio(arizona->dev->of_node,
- "wlf,reset", 0);
- if (arizona->pdata.reset < 0)
- arizona->pdata.reset = 0;
-
- arizona->pdata.ldoena = of_get_named_gpio(arizona->dev->of_node,
- "wlf,ldoena", 0);
- if (arizona->pdata.ldoena < 0)
- arizona->pdata.ldoena = 0;
+ arizona_of_get_named_gpio(arizona, "wlf,reset", true, &pdata->reset);
+ arizona_of_get_named_gpio(arizona, "wlf,ldoena", true, &pdata->ldoena);
ret = of_property_read_u32_array(arizona->dev->of_node,
"wlf,gpio-defaults",
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h
index 5cf8b91..16150cc 100644
--- a/include/linux/mfd/arizona/core.h
+++ b/include/linux/mfd/arizona/core.h
@@ -124,4 +124,7 @@ int wm5102_patch(struct arizona *arizona);
int wm5110_patch(struct arizona *arizona);
int wm8997_patch(struct arizona *arizona);
+extern int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop,
+ bool mandatory, int *gpio);
+
#endif
--
1.7.2.5
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 2/6] regulator: arizona-ldo1: Move setup processing from arizona-core
2014-03-31 11:59 [PATCH 0/6] Arizona Regulator Updates v4 Charles Keepax
2014-03-31 11:59 ` [PATCH 1/6] mfd: arizona: Factor out read of device tree GPIOs Charles Keepax
@ 2014-03-31 11:59 ` Charles Keepax
2014-03-31 11:59 ` [PATCH 3/6] regulator: arizona-ldo1: Add processing of init_data from device tree Charles Keepax
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Charles Keepax @ 2014-03-31 11:59 UTC (permalink / raw)
To: broonie
Cc: lee.jones, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, rob, sameo, lgirdwood, ckeepax, devicetree, linux-kernel
It is more idiomatic to process things relating to the regulator in its
driver. This patch moves both processing of device tree relating to the
regulator and checking if the regulator is external from arizona-core
into the regulator driver.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/arizona-core.c | 12 +++---------
drivers/regulator/arizona-ldo1.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 8ad4373..0096261 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -539,7 +539,6 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
int ret, i;
arizona_of_get_named_gpio(arizona, "wlf,reset", true, &pdata->reset);
- arizona_of_get_named_gpio(arizona, "wlf,ldoena", true, &pdata->ldoena);
ret = of_property_read_u32_array(arizona->dev->of_node,
"wlf,gpio-defaults",
@@ -671,6 +670,9 @@ int arizona_dev_init(struct arizona *arizona)
return -EINVAL;
}
+ /* Mark DCVDD as external, LDO1 driver will clear if internal */
+ arizona->external_dcvdd = true;
+
ret = mfd_add_devices(arizona->dev, -1, early_devs,
ARRAY_SIZE(early_devs), NULL, 0, NULL);
if (ret != 0) {
@@ -870,14 +872,6 @@ int arizona_dev_init(struct arizona *arizona)
arizona->pdata.gpio_defaults[i]);
}
- /*
- * LDO1 can only be used to supply DCVDD so if it has no
- * consumers then DCVDD is supplied externally.
- */
- if (arizona->pdata.ldo1 &&
- arizona->pdata.ldo1->num_consumer_supplies == 0)
- arizona->external_dcvdd = true;
-
pm_runtime_set_autosuspend_delay(arizona->dev, 100);
pm_runtime_use_autosuspend(arizona->dev);
pm_runtime_enable(arizona->dev);
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index b1033d3..211af83 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -178,6 +178,22 @@ static const struct regulator_init_data arizona_ldo1_default = {
.num_consumer_supplies = 1,
};
+#ifdef CONFIG_OF
+static int arizona_ldo1_of_get_pdata(struct arizona *arizona)
+{
+ struct arizona_pdata *pdata = &arizona->pdata;
+
+ arizona_of_get_named_gpio(arizona, "wlf,ldoena", true, &pdata->ldoena);
+
+ return 0;
+}
+#else
+static inline int arizona_ldo1_of_get_pdata(struct arizona *arizona)
+{
+ return 0;
+}
+#endif
+
static int arizona_ldo1_probe(struct platform_device *pdev)
{
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
@@ -186,6 +202,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
struct arizona_ldo1 *ldo1;
int ret;
+ arizona->external_dcvdd = false;
+
ldo1 = devm_kzalloc(&pdev->dev, sizeof(*ldo1), GFP_KERNEL);
if (!ldo1)
return -ENOMEM;
@@ -216,6 +234,13 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
config.dev = arizona->dev;
config.driver_data = ldo1;
config.regmap = arizona->regmap;
+
+ if (!dev_get_platdata(arizona->dev)) {
+ ret = arizona_ldo1_of_get_pdata(arizona);
+ if (ret < 0)
+ return ret;
+ }
+
config.ena_gpio = arizona->pdata.ldoena;
if (arizona->pdata.ldo1)
@@ -223,6 +248,13 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
else
config.init_data = &ldo1->init_data;
+ /*
+ * LDO1 can only be used to supply DCVDD so if it has no
+ * consumers then DCVDD is supplied externally.
+ */
+ if (config.init_data->num_consumer_supplies == 0)
+ arizona->external_dcvdd = true;
+
ldo1->regulator = devm_regulator_register(&pdev->dev, desc, &config);
if (IS_ERR(ldo1->regulator)) {
ret = PTR_ERR(ldo1->regulator);
--
1.7.2.5
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 3/6] regulator: arizona-ldo1: Add processing of init_data from device tree
2014-03-31 11:59 [PATCH 0/6] Arizona Regulator Updates v4 Charles Keepax
2014-03-31 11:59 ` [PATCH 1/6] mfd: arizona: Factor out read of device tree GPIOs Charles Keepax
2014-03-31 11:59 ` [PATCH 2/6] regulator: arizona-ldo1: Move setup processing from arizona-core Charles Keepax
@ 2014-03-31 11:59 ` Charles Keepax
2014-03-31 11:59 ` [PATCH 4/6] mfd: arizona: Update DT binding to support LDO1 init_data Charles Keepax
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Charles Keepax @ 2014-03-31 11:59 UTC (permalink / raw)
To: broonie
Cc: lee.jones, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, rob, sameo, lgirdwood, ckeepax, devicetree, linux-kernel
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/regulator/arizona-ldo1.c | 47 +++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index 211af83..e23a95f 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -19,6 +19,7 @@
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
#include <linux/gpio.h>
#include <linux/slab.h>
@@ -179,19 +180,56 @@ static const struct regulator_init_data arizona_ldo1_default = {
};
#ifdef CONFIG_OF
-static int arizona_ldo1_of_get_pdata(struct arizona *arizona)
+static int arizona_ldo1_of_get_pdata(struct arizona *arizona,
+ struct regulator_config *config)
{
struct arizona_pdata *pdata = &arizona->pdata;
+ struct arizona_ldo1 *ldo1 = config->driver_data;
+ struct device_node *init_node, *dcvdd_node;
+ struct regulator_init_data *init_data;
arizona_of_get_named_gpio(arizona, "wlf,ldoena", true, &pdata->ldoena);
+ init_node = of_get_child_by_name(arizona->dev->of_node, "ldo1");
+ dcvdd_node = of_parse_phandle(arizona->dev->of_node, "DCVDD-supply", 0);
+
+ if (init_node) {
+ config->of_node = init_node;
+
+ init_data = of_get_regulator_init_data(arizona->dev, init_node);
+
+ if (init_data) {
+ init_data->consumer_supplies = &ldo1->supply;
+ init_data->num_consumer_supplies = 1;
+
+ if (dcvdd_node && dcvdd_node != init_node)
+ arizona->external_dcvdd = true;
+
+ pdata->ldo1 = init_data;
+ }
+ } else if (dcvdd_node) {
+ arizona->external_dcvdd = true;
+ }
+
+ of_node_put(dcvdd_node);
+
return 0;
}
+
+static void arizona_ldo1_of_put_pdata(struct regulator_config *config)
+{
+ of_node_put(config->of_node);
+}
#else
-static inline int arizona_ldo1_of_get_pdata(struct arizona *arizona)
+static inline int arizona_ldo1_of_get_pdata(struct arizona *arizona,
+ struct regulator_config *config)
{
return 0;
}
+
+static inline void arizona_ldo1_of_put_pdata(struct regulator_config *config)
+{
+}
#endif
static int arizona_ldo1_probe(struct platform_device *pdev)
@@ -236,7 +274,7 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
config.regmap = arizona->regmap;
if (!dev_get_platdata(arizona->dev)) {
- ret = arizona_ldo1_of_get_pdata(arizona);
+ ret = arizona_ldo1_of_get_pdata(arizona, &config);
if (ret < 0)
return ret;
}
@@ -263,6 +301,9 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
return ret;
}
+ if (!dev_get_platdata(arizona->dev))
+ arizona_ldo1_of_put_pdata(&config);
+
platform_set_drvdata(pdev, ldo1);
return 0;
--
1.7.2.5
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 4/6] mfd: arizona: Update DT binding to support LDO1 init_data
2014-03-31 11:59 [PATCH 0/6] Arizona Regulator Updates v4 Charles Keepax
` (2 preceding siblings ...)
2014-03-31 11:59 ` [PATCH 3/6] regulator: arizona-ldo1: Add processing of init_data from device tree Charles Keepax
@ 2014-03-31 11:59 ` Charles Keepax
2014-03-31 15:30 ` Mark Rutland
2014-03-31 11:59 ` [PATCH 5/6] regulator: arizona-micsupp: Add processing of init_data from device tree Charles Keepax
2014-03-31 11:59 ` [PATCH 6/6] mfd: arizona: Update DT binding to support MICVDD init_data Charles Keepax
5 siblings, 1 reply; 10+ messages in thread
From: Charles Keepax @ 2014-03-31 11:59 UTC (permalink / raw)
To: broonie
Cc: lee.jones, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, rob, sameo, lgirdwood, ckeepax, devicetree, linux-kernel
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
Documentation/devicetree/bindings/mfd/arizona.txt | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
index 0e295c9..c019e73 100644
--- a/Documentation/devicetree/bindings/mfd/arizona.txt
+++ b/Documentation/devicetree/bindings/mfd/arizona.txt
@@ -40,6 +40,13 @@ Optional properties:
the chip default will be used. If present exactly five values must
be specified.
+ - ldo1 : Initial data for the LDO1 regulator, as covered in
+ Documentation/devicetree/bindings/regulator/regulator.txt
+
+ - DCVDD-supply : Power supply, only needs to be specified if DCVDD is being
+ externally supplied. As covered in
+ Documentation/devicetree/bindings/regulator/regulator.txt
+
Example:
codec: wm5102@1a {
--
1.7.2.5
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 4/6] mfd: arizona: Update DT binding to support LDO1 init_data
2014-03-31 11:59 ` [PATCH 4/6] mfd: arizona: Update DT binding to support LDO1 init_data Charles Keepax
@ 2014-03-31 15:30 ` Mark Rutland
0 siblings, 0 replies; 10+ messages in thread
From: Mark Rutland @ 2014-03-31 15:30 UTC (permalink / raw)
To: Charles Keepax
Cc: broonie, lee.jones, robh+dt, Pawel Moll, ijc+devicetree, galak,
rob, sameo, lgirdwood, devicetree, linux-kernel
On Mon, Mar 31, 2014 at 12:59:45PM +0100, Charles Keepax wrote:
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> Documentation/devicetree/bindings/mfd/arizona.txt | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
> index 0e295c9..c019e73 100644
> --- a/Documentation/devicetree/bindings/mfd/arizona.txt
> +++ b/Documentation/devicetree/bindings/mfd/arizona.txt
> @@ -40,6 +40,13 @@ Optional properties:
> the chip default will be used. If present exactly five values must
> be specified.
>
> + - ldo1 : Initial data for the LDO1 regulator, as covered in
> + Documentation/devicetree/bindings/regulator/regulator.txt
This seems to be a node rather than a property, judging from the code.
Please describe properties separately from sub-nodes and their
properties. That also covers the micvdd addition in patch 6.
Thanks,
Mark.
> +
> + - DCVDD-supply : Power supply, only needs to be specified if DCVDD is being
> + externally supplied. As covered in
> + Documentation/devicetree/bindings/regulator/regulator.txt
> +
> Example:
>
> codec: wm5102@1a {
> --
> 1.7.2.5
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 5/6] regulator: arizona-micsupp: Add processing of init_data from device tree
2014-03-31 11:59 [PATCH 0/6] Arizona Regulator Updates v4 Charles Keepax
` (3 preceding siblings ...)
2014-03-31 11:59 ` [PATCH 4/6] mfd: arizona: Update DT binding to support LDO1 init_data Charles Keepax
@ 2014-03-31 11:59 ` Charles Keepax
2014-03-31 11:59 ` [PATCH 6/6] mfd: arizona: Update DT binding to support MICVDD init_data Charles Keepax
5 siblings, 0 replies; 10+ messages in thread
From: Charles Keepax @ 2014-03-31 11:59 UTC (permalink / raw)
To: broonie
Cc: lee.jones, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, rob, sameo, lgirdwood, ckeepax, devicetree, linux-kernel
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/regulator/arizona-micsupp.c | 53 +++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index 6fdd9bf..5225470 100644
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@ -19,6 +19,7 @@
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
#include <linux/gpio.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
@@ -195,6 +196,49 @@ static const struct regulator_init_data arizona_micsupp_ext_default = {
.num_consumer_supplies = 1,
};
+#ifdef CONFIG_OF
+static int arizona_micsupp_of_get_pdata(struct arizona *arizona,
+ struct regulator_config *config)
+{
+ struct arizona_pdata *pdata = &arizona->pdata;
+ struct arizona_micsupp *micsupp = config->driver_data;
+ struct device_node *np;
+ struct regulator_init_data *init_data;
+
+ np = of_get_child_by_name(arizona->dev->of_node, "micvdd");
+
+ if (np) {
+ config->of_node = np;
+
+ init_data = of_get_regulator_init_data(arizona->dev, np);
+
+ if (init_data) {
+ init_data->consumer_supplies = &micsupp->supply;
+ init_data->num_consumer_supplies = 1;
+
+ pdata->micvdd = init_data;
+ }
+ }
+
+ return 0;
+}
+
+static void arizona_micsupp_of_put_pdata(struct regulator_config *config)
+{
+ of_node_put(config->of_node);
+}
+#else
+static inline int arizona_micsupp_of_get_pdata(struct arizona *arizona,
+ struct regulator_config *config)
+{
+ return 0;
+}
+
+static inline void arizona_micsupp_of_put_pdata(struct regulator_config *config)
+{
+}
+#endif
+
static int arizona_micsupp_probe(struct platform_device *pdev)
{
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
@@ -234,6 +278,12 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
config.driver_data = micsupp;
config.regmap = arizona->regmap;
+ if (!dev_get_platdata(arizona->dev)) {
+ ret = arizona_micsupp_of_get_pdata(arizona, &config);
+ if (ret < 0)
+ return ret;
+ }
+
if (arizona->pdata.micvdd)
config.init_data = arizona->pdata.micvdd;
else
@@ -253,6 +303,9 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
return ret;
}
+ if (!dev_get_platdata(arizona->dev))
+ arizona_micsupp_of_put_pdata(&config);
+
platform_set_drvdata(pdev, micsupp);
return 0;
--
1.7.2.5
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 6/6] mfd: arizona: Update DT binding to support MICVDD init_data
2014-03-31 11:59 [PATCH 0/6] Arizona Regulator Updates v4 Charles Keepax
` (4 preceding siblings ...)
2014-03-31 11:59 ` [PATCH 5/6] regulator: arizona-micsupp: Add processing of init_data from device tree Charles Keepax
@ 2014-03-31 11:59 ` Charles Keepax
5 siblings, 0 replies; 10+ messages in thread
From: Charles Keepax @ 2014-03-31 11:59 UTC (permalink / raw)
To: broonie
Cc: lee.jones, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, rob, sameo, lgirdwood, ckeepax, devicetree, linux-kernel
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
index c019e73..0bf69a9 100644
--- a/Documentation/devicetree/bindings/mfd/arizona.txt
+++ b/Documentation/devicetree/bindings/mfd/arizona.txt
@@ -42,9 +42,11 @@ Optional properties:
- ldo1 : Initial data for the LDO1 regulator, as covered in
Documentation/devicetree/bindings/regulator/regulator.txt
+ - micvdd : Initial data for the MICVDD regulator, as covered in
+ Documentation/devicetree/bindings/regulator/regulator.txt
- - DCVDD-supply : Power supply, only needs to be specified if DCVDD is being
- externally supplied. As covered in
+ - DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if
+ they are being externally supplied. As covered in
Documentation/devicetree/bindings/regulator/regulator.txt
Example:
--
1.7.2.5
^ permalink raw reply [flat|nested] 10+ messages in thread