* [PATCH 1/2] mfd: arizona: Remove arizona_of_get_named_gpio helper function
@ 2016-09-20 15:30 Charles Keepax
2016-09-20 15:30 ` [PATCH 2/2] mfd: arizona: Handle probe deferral for reset GPIO Charles Keepax
2016-09-27 23:59 ` [PATCH 1/2] mfd: arizona: Remove arizona_of_get_named_gpio helper function Lee Jones
0 siblings, 2 replies; 4+ messages in thread
From: Charles Keepax @ 2016-09-20 15:30 UTC (permalink / raw)
To: lee.jones; +Cc: rf, linux-kernel, patches
This function is only used in a single place and no new users will be
added as all the devices other required GPIOs are already handled. As
such just merge the code back into the calling function.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/arizona-core.c | 27 +++++++--------------------
include/linux/mfd/arizona/core.h | 3 ---
2 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 4c18c8e..f466f29 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -803,25 +803,6 @@ unsigned long 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;
-
- gpio = of_get_named_gpio(arizona->dev->of_node, prop, 0);
- if (gpio < 0) {
- if (mandatory)
- dev_err(arizona->dev,
- "Mandatory DT gpio %s missing/malformed: %d\n",
- prop, gpio);
-
- gpio = 0;
- }
-
- return gpio;
-}
-EXPORT_SYMBOL_GPL(arizona_of_get_named_gpio);
-
static int arizona_of_get_core_pdata(struct arizona *arizona)
{
struct arizona_pdata *pdata = &arizona->pdata;
@@ -831,7 +812,13 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
int ret, i;
int count = 0;
- pdata->reset = arizona_of_get_named_gpio(arizona, "wlf,reset", true);
+ pdata->reset = of_get_named_gpio(arizona->dev->of_node, "wlf,reset", 0);
+ if (pdata->reset < 0) {
+ dev_err(arizona->dev, "Reset gpio missing/malformed: %d\n",
+ pdata->reset);
+
+ pdata->reset = 0;
+ }
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 b9909bb..b31b3be 100644
--- a/include/linux/mfd/arizona/core.h
+++ b/include/linux/mfd/arizona/core.h
@@ -191,7 +191,4 @@ int cs47l24_patch(struct arizona *arizona);
int wm8997_patch(struct arizona *arizona);
int wm8998_patch(struct arizona *arizona);
-extern int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop,
- bool mandatory);
-
#endif
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] mfd: arizona: Handle probe deferral for reset GPIO
2016-09-20 15:30 [PATCH 1/2] mfd: arizona: Remove arizona_of_get_named_gpio helper function Charles Keepax
@ 2016-09-20 15:30 ` Charles Keepax
2016-09-27 23:59 ` Lee Jones
2016-09-27 23:59 ` [PATCH 1/2] mfd: arizona: Remove arizona_of_get_named_gpio helper function Lee Jones
1 sibling, 1 reply; 4+ messages in thread
From: Charles Keepax @ 2016-09-20 15:30 UTC (permalink / raw)
To: lee.jones; +Cc: rf, linux-kernel, patches
The Arizona CODECs will generally function correctly without a reset line
although it is strongly advised to have one, as such we do allow the system
to boot if the reset gpio is missing or incorrectly specified. However
we should fail probe if we get a probe deferral request, this patch adds
handling for this case.
Reported-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/arizona-core.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index f466f29..d18f3b1 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -813,7 +813,9 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
int count = 0;
pdata->reset = of_get_named_gpio(arizona->dev->of_node, "wlf,reset", 0);
- if (pdata->reset < 0) {
+ if (pdata->reset == -EPROBE_DEFER) {
+ return pdata->reset;
+ } else if (pdata->reset < 0) {
dev_err(arizona->dev, "Reset gpio missing/malformed: %d\n",
pdata->reset);
@@ -1011,11 +1013,14 @@ int arizona_dev_init(struct arizona *arizona)
dev_set_drvdata(arizona->dev, arizona);
mutex_init(&arizona->clk_lock);
- if (dev_get_platdata(arizona->dev))
+ if (dev_get_platdata(arizona->dev)) {
memcpy(&arizona->pdata, dev_get_platdata(arizona->dev),
sizeof(arizona->pdata));
- else
- arizona_of_get_core_pdata(arizona);
+ } else {
+ ret = arizona_of_get_core_pdata(arizona);
+ if (ret < 0)
+ return ret;
+ }
BUILD_BUG_ON(ARRAY_SIZE(arizona->mclk) != ARRAY_SIZE(mclk_name));
for (i = 0; i < ARRAY_SIZE(arizona->mclk); i++) {
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] mfd: arizona: Handle probe deferral for reset GPIO
2016-09-20 15:30 ` [PATCH 2/2] mfd: arizona: Handle probe deferral for reset GPIO Charles Keepax
@ 2016-09-27 23:59 ` Lee Jones
0 siblings, 0 replies; 4+ messages in thread
From: Lee Jones @ 2016-09-27 23:59 UTC (permalink / raw)
To: Charles Keepax; +Cc: rf, linux-kernel, patches
On Tue, 20 Sep 2016, Charles Keepax wrote:
> The Arizona CODECs will generally function correctly without a reset line
> although it is strongly advised to have one, as such we do allow the system
> to boot if the reset gpio is missing or incorrectly specified. However
> we should fail probe if we get a probe deferral request, this patch adds
> handling for this case.
>
> Reported-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/arizona-core.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index f466f29..d18f3b1 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -813,7 +813,9 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
> int count = 0;
>
> pdata->reset = of_get_named_gpio(arizona->dev->of_node, "wlf,reset", 0);
> - if (pdata->reset < 0) {
> + if (pdata->reset == -EPROBE_DEFER) {
> + return pdata->reset;
> + } else if (pdata->reset < 0) {
> dev_err(arizona->dev, "Reset gpio missing/malformed: %d\n",
> pdata->reset);
>
> @@ -1011,11 +1013,14 @@ int arizona_dev_init(struct arizona *arizona)
> dev_set_drvdata(arizona->dev, arizona);
> mutex_init(&arizona->clk_lock);
>
> - if (dev_get_platdata(arizona->dev))
> + if (dev_get_platdata(arizona->dev)) {
> memcpy(&arizona->pdata, dev_get_platdata(arizona->dev),
> sizeof(arizona->pdata));
> - else
> - arizona_of_get_core_pdata(arizona);
> + } else {
> + ret = arizona_of_get_core_pdata(arizona);
> + if (ret < 0)
> + return ret;
> + }
>
> BUILD_BUG_ON(ARRAY_SIZE(arizona->mclk) != ARRAY_SIZE(mclk_name));
> for (i = 0; i < ARRAY_SIZE(arizona->mclk); i++) {
--
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] 4+ messages in thread
* Re: [PATCH 1/2] mfd: arizona: Remove arizona_of_get_named_gpio helper function
2016-09-20 15:30 [PATCH 1/2] mfd: arizona: Remove arizona_of_get_named_gpio helper function Charles Keepax
2016-09-20 15:30 ` [PATCH 2/2] mfd: arizona: Handle probe deferral for reset GPIO Charles Keepax
@ 2016-09-27 23:59 ` Lee Jones
1 sibling, 0 replies; 4+ messages in thread
From: Lee Jones @ 2016-09-27 23:59 UTC (permalink / raw)
To: Charles Keepax; +Cc: rf, linux-kernel, patches
On Tue, 20 Sep 2016, Charles Keepax wrote:
> This function is only used in a single place and no new users will be
> added as all the devices other required GPIOs are already handled. As
> such just merge the code back into the calling function.
>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/arizona-core.c | 27 +++++++--------------------
> include/linux/mfd/arizona/core.h | 3 ---
> 2 files changed, 7 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index 4c18c8e..f466f29 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -803,25 +803,6 @@ unsigned long 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;
> -
> - gpio = of_get_named_gpio(arizona->dev->of_node, prop, 0);
> - if (gpio < 0) {
> - if (mandatory)
> - dev_err(arizona->dev,
> - "Mandatory DT gpio %s missing/malformed: %d\n",
> - prop, gpio);
> -
> - gpio = 0;
> - }
> -
> - return gpio;
> -}
> -EXPORT_SYMBOL_GPL(arizona_of_get_named_gpio);
> -
> static int arizona_of_get_core_pdata(struct arizona *arizona)
> {
> struct arizona_pdata *pdata = &arizona->pdata;
> @@ -831,7 +812,13 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
> int ret, i;
> int count = 0;
>
> - pdata->reset = arizona_of_get_named_gpio(arizona, "wlf,reset", true);
> + pdata->reset = of_get_named_gpio(arizona->dev->of_node, "wlf,reset", 0);
> + if (pdata->reset < 0) {
> + dev_err(arizona->dev, "Reset gpio missing/malformed: %d\n",
gpio should be GPIO.
I'll probably just fix this up myself though.
Applied, thanks.
> + pdata->reset);
> +
> + pdata->reset = 0;
> + }
>
> 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 b9909bb..b31b3be 100644
> --- a/include/linux/mfd/arizona/core.h
> +++ b/include/linux/mfd/arizona/core.h
> @@ -191,7 +191,4 @@ int cs47l24_patch(struct arizona *arizona);
> int wm8997_patch(struct arizona *arizona);
> int wm8998_patch(struct arizona *arizona);
>
> -extern int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop,
> - bool mandatory);
> -
> #endif
--
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] 4+ messages in thread
end of thread, other threads:[~2016-09-27 23:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-20 15:30 [PATCH 1/2] mfd: arizona: Remove arizona_of_get_named_gpio helper function Charles Keepax
2016-09-20 15:30 ` [PATCH 2/2] mfd: arizona: Handle probe deferral for reset GPIO Charles Keepax
2016-09-27 23:59 ` Lee Jones
2016-09-27 23:59 ` [PATCH 1/2] mfd: arizona: Remove arizona_of_get_named_gpio helper function Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox