mfd: arizona: Remove arizona_of_get_named_gpio helper function
Subsystems (2)
PATCH 1/2 mfd: arizona: Remove arizona_of_get_named_gpio helper function
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.
--- drivers/mfd/arizona-core.c | 27 +++++++-------------------- include/linux/mfd/arizona/core.h | 3 --- 2 files changed, 7 insertions(+), 23 deletions(-)
drivers/mfd/arizona-core.c +7 -20
@@ -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",
include/linux/mfd/arizona/core.h +0 -3
@@ -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
Signature · 1 line
2.1.4
PATCH 2/2 mfd: arizona: Handle probe deferral for reset GPIO
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.
--- drivers/mfd/arizona-core.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/mfd/arizona-core.c +9 -4
@@ -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++) {
Signature · 1 line
2.1.4
Lee Jones
AppliedRe: [PATCH 2/2] mfd: arizona: Handle probe deferral for reset GPIO
Quoted 11 lines · Charles Keepax
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 <[email protected]>Signed-off-by Charles Keepax <[email protected]>--- drivers/mfd/arizona-core.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
Applied, thanks.
Quoted 33 lines
drivers/mfd/arizona-core.c +9
-4@@ -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++) {
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Lee Jones
AppliedQuoted 41 lines · Charles Keepax
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 <[email protected]>--- drivers/mfd/arizona-core.c | 27 +++++++-------------------- include/linux/mfd/arizona/core.h | 3 --- 2 files changed, 7 insertions(+), 23 deletions(-)drivers/mfd/arizona-core.c +0
-19@@ -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;
drivers/mfd/arizona-core.c static int arizona_of_get_core_pdata(struct arizona *arizona) · line 817
Quoted 7 lines
drivers/mfd/arizona-core.c +3
-1@@ -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.
Quoted 19 lines
drivers/mfd/arizona-core.c +4
-0+ pdata->reset); + + pdata->reset =0 ; + } ret = of_property_read_u32_array(arizona->dev->of_node, "wlf,gpio-defaults",include/linux/mfd/arizona/core.h +0
-3@@ -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
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog