regulator: arizona-ldo1: Fix handling of GPIO 0
PATCH 1/1 regulator: arizona-ldo1: Fix handling of GPIO 0
The LDO1 driver is using the arizona_of_get_named_gpio helper function which will return 0 if an error was encountered whilst parsing the GPIO, as under the pdata scheme 0 was not being treated as a valid GPIO. However, since the regulator framework was expanded to allow the use of GPIO 0 this causes us to attempt to register GPIO 0 when we encountered an error parsing the device tree.
This patch uses of_get_named_gpio directly and sets the ena_gpio_initialized flag based on the return value.
--- drivers/regulator/arizona-ldo1.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-)
drivers/regulator/arizona-ldo1.c +13 -5
@@ -17,6 +17,7 @@#include <linux/bitops.h> #include <linux/err.h> #include <linux/of.h> +#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h>
@@ -189,13 +190,22 @@ static int arizona_ldo1_of_get_pdata(struct arizona *arizona, {struct arizona_pdata *pdata = &arizona->pdata;struct arizona_ldo1 *ldo1 = config->driver_data; +struct device_node *np = arizona->dev->of_node;struct device_node *init_node, *dcvdd_node;struct regulator_init_data *init_data; - pdata->ldoena =arizona_of_get_named_gpio (arizona,"wlf,ldoena" , true); + pdata->ldoena =of_get_named_gpio (np,"wlf,ldoena" ,0 ); +if (pdata->ldoena <0 ) { +dev_warn (arizona->dev, +"LDOENA GPIO property missing/malformed: %d\n" , + pdata->ldoena); + pdata->ldoena =0 ; + }else { + config->ena_gpio_initialized = true; + } - init_node =of_get_child_by_name (arizona->dev->of_node,"ldo1" ); - dcvdd_node =of_parse_phandle (arizona->dev->of_node,"DCVDD-supply" ,0 ); + init_node =of_get_child_by_name (np,"ldo1" ); + dcvdd_node =of_parse_phandle (np,"DCVDD-supply" ,0 );if (init_node) { config->of_node = init_node;
@@ -274,8 +284,6 @@ static int arizona_ldo1_probe(struct platform_device *pdev) ret =arizona_ldo1_of_get_pdata (arizona, &config, desc);if (ret <0 )return ret; - - config.ena_gpio_initialized = true; } }
Signature · 1 line
1.7.2.5
Mark Brown
maintainerApplied "regulator: arizona-ldo1: Fix handling of GPIO 0" to the regulator tree
The patch
regulator: arizona-ldo1: Fix handling of GPIO 0
has been applied to the regulator tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
ce938001c08c6580a8da38dc226fa605512afab6Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Thu, 15 Oct 2015 10:37:12 +0100
Subject: [PATCH] regulator: arizona-ldo1: Fix handling of GPIO 0
The LDO1 driver is using the arizona_of_get_named_gpio helper function which will return 0 if an error was encountered whilst parsing the GPIO, as under the pdata scheme 0 was not being treated as a valid GPIO. However, since the regulator framework was expanded to allow the use of GPIO 0 this causes us to attempt to register GPIO 0 when we encountered an error parsing the device tree.
This patch uses of_get_named_gpio directly and sets the ena_gpio_initialized flag based on the return value.
--- drivers/regulator/arizona-ldo1.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/regulator/arizona-ldo1.c +13 -5
@@ -17,6 +17,7 @@#include <linux/bitops.h> #include <linux/err.h> #include <linux/of.h> +#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h>
@@ -189,13 +190,22 @@ static int arizona_ldo1_of_get_pdata(struct arizona *arizona, {struct arizona_pdata *pdata = &arizona->pdata;struct arizona_ldo1 *ldo1 = config->driver_data; +struct device_node *np = arizona->dev->of_node;struct device_node *init_node, *dcvdd_node;struct regulator_init_data *init_data; - pdata->ldoena =arizona_of_get_named_gpio (arizona,"wlf,ldoena" , true); + pdata->ldoena =of_get_named_gpio (np,"wlf,ldoena" ,0 ); +if (pdata->ldoena <0 ) { +dev_warn (arizona->dev, +"LDOENA GPIO property missing/malformed: %d\n" , + pdata->ldoena); + pdata->ldoena =0 ; + }else { + config->ena_gpio_initialized = true; + } - init_node =of_get_child_by_name (arizona->dev->of_node,"ldo1" ); - dcvdd_node =of_parse_phandle (arizona->dev->of_node,"DCVDD-supply" ,0 ); + init_node =of_get_child_by_name (np,"ldo1" ); + dcvdd_node =of_parse_phandle (np,"DCVDD-supply" ,0 );if (init_node) { config->of_node = init_node;
@@ -274,8 +284,6 @@ static int arizona_ldo1_probe(struct platform_device *pdev) ret =arizona_ldo1_of_get_pdata (arizona, &config, desc);if (ret <0 )return ret; - - config.ena_gpio_initialized = true; } }
Signature · 1 line
2.6.1