Message ID | 1472636131-82477-2-git-send-email-preid@electromag.com.au (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
Hi Phil, On Wed, Aug 31, 2016 at 05:35:31PM +0800, Phil Reid wrote: > Switch to using new gpio_desc interface and devm gpio get calls to > automatically manage gpio resource. Use gpiod_get_value which handles > active high / low calls. > > If gpio_detect is set then force loading of the driver as it is > reasonable to assume that the battery may not be present. > > Update the is_present flag immediately in the IRQ. > > pdata is always allocated in probe, which removes need to do check for > not null in driver. > > Signed-off-by: Phil Reid <preid@electromag.com.au> > --- > drivers/power/supply/sbs-battery.c | 129 ++++++++++++++----------------------- > include/linux/power/sbs-battery.h | 6 +- > 2 files changed, 51 insertions(+), 84 deletions(-) > > diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c > index e1dfb3e..28670e4 100644 > --- a/drivers/power/supply/sbs-battery.c > +++ b/drivers/power/supply/sbs-battery.c > @@ -26,7 +26,7 @@ > #include <linux/i2c.h> > #include <linux/slab.h> > #include <linux/interrupt.h> > -#include <linux/gpio.h> > +#include <linux/gpio/consumer.h> > #include <linux/of.h> > #include <linux/stat.h> > > @@ -165,7 +165,6 @@ struct sbs_info { > struct power_supply *power_supply; > struct sbs_platform_data *pdata; > bool is_present; > - bool gpio_detect; > bool enable_detection; > int last_state; > int poll_time; > @@ -183,8 +182,7 @@ static int sbs_read_word_data(struct i2c_client *client, u8 address) > s32 ret = 0; > int retries = 1; > > - if (chip->pdata) > - retries = max(chip->pdata->i2c_retry_count + 1, 1); > + retries = max(chip->pdata->i2c_retry_count + 1, 1); > > while (retries > 0) { > ret = i2c_smbus_read_word_data(client, address); > @@ -211,10 +209,8 @@ static int sbs_read_string_data(struct i2c_client *client, u8 address, > int retries_length = 1, retries_block = 1; > u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1]; > > - if (chip->pdata) { > - retries_length = max(chip->pdata->i2c_retry_count + 1, 1); > - retries_block = max(chip->pdata->i2c_retry_count + 1, 1); > - } > + retries_length = max(chip->pdata->i2c_retry_count + 1, 1); > + retries_block = max(chip->pdata->i2c_retry_count + 1, 1); > > /* Adapter needs to support these two functions */ > if (!i2c_check_functionality(client->adapter, > @@ -278,8 +274,7 @@ static int sbs_write_word_data(struct i2c_client *client, u8 address, > s32 ret = 0; > int retries = 1; > > - if (chip->pdata) > - retries = max(chip->pdata->i2c_retry_count + 1, 1); > + retries = max(chip->pdata->i2c_retry_count + 1, 1); > > while (retries > 0) { > ret = i2c_smbus_write_word_data(client, address, > @@ -306,13 +301,11 @@ static int sbs_get_battery_presence_and_health( > s32 ret; > struct sbs_info *chip = i2c_get_clientdata(client); > > - if (psp == POWER_SUPPLY_PROP_PRESENT && > - chip->gpio_detect) { > - ret = gpio_get_value(chip->pdata->battery_detect); > - if (ret == chip->pdata->battery_detect_present) > - val->intval = 1; > - else > - val->intval = 0; > + if (psp == POWER_SUPPLY_PROP_PRESENT && chip->pdata->gpio_detect) { > + ret = gpiod_get_value_cansleep(chip->pdata->gpio_detect); > + if (ret < 0) > + return ret; > + val->intval = ret; > chip->is_present = val->intval; > return ret; > } > @@ -654,7 +647,7 @@ static int sbs_get_property(struct power_supply *psy, > if (!chip->enable_detection) > goto done; > > - if (!chip->gpio_detect && > + if (!chip->pdata->gpio_detect && > chip->is_present != (ret >= 0)) { > chip->is_present = (ret >= 0); > power_supply_changed(chip->power_supply); > @@ -683,7 +676,12 @@ static irqreturn_t sbs_irq(int irq, void *devid) > { > struct sbs_info *chip = devid; > struct power_supply *battery = chip->power_supply; > + int ret; > > + ret = gpiod_get_value_cansleep(chip->pdata->gpio_detect); > + if (ret < 0) > + return ret; > + chip->is_present = ret; > power_supply_changed(battery); > > return IRQ_HANDLED; > @@ -750,21 +748,20 @@ static const struct of_device_id sbs_dt_ids[] = { > }; > MODULE_DEVICE_TABLE(of, sbs_dt_ids); > > -static struct sbs_platform_data *sbs_of_populate_pdata( > - struct i2c_client *client) > +static struct sbs_platform_data *sbs_of_populate_pdata(struct sbs_info *chip) > { > + struct i2c_client *client = chip->client; > struct device_node *of_node = client->dev.of_node; > - struct sbs_platform_data *pdata = client->dev.platform_data; > - enum of_gpio_flags gpio_flags; > + struct sbs_platform_data *pdata; > int rc; > u32 prop; > > - /* verify this driver matches this device */ > - if (!of_node) > - return NULL; > + pdata = devm_kzalloc(&client->dev, sizeof(struct sbs_platform_data), > + GFP_KERNEL); > + if (!pdata) > + return ERR_PTR(-ENOMEM); > > - /* if platform data is set, honor it */ > - if (pdata) > + if (!of_node) > return pdata; I think we should just return ERR_PTR(-ENODATA) for missing of_node. > /* first make sure at least one property is set, otherwise > @@ -775,11 +772,6 @@ static struct sbs_platform_data *sbs_of_populate_pdata( > !of_get_property(of_node, "sbs,battery-detect-gpios", NULL)) > goto of_out; > > - pdata = devm_kzalloc(&client->dev, sizeof(struct sbs_platform_data), > - GFP_KERNEL); > - if (!pdata) > - goto of_out; > - > rc = of_property_read_u32(of_node, "sbs,i2c-retry-count", &prop); > if (!rc) > pdata->i2c_retry_count = prop; > @@ -788,27 +780,29 @@ static struct sbs_platform_data *sbs_of_populate_pdata( > if (!rc) > pdata->poll_retry_count = prop; > > - if (!of_get_property(of_node, "sbs,battery-detect-gpios", NULL)) { > - pdata->battery_detect = -1; > - goto of_out; > - } > - > - pdata->battery_detect = of_get_named_gpio_flags(of_node, > - "sbs,battery-detect-gpios", 0, &gpio_flags); > - > - if (gpio_flags & OF_GPIO_ACTIVE_LOW) > - pdata->battery_detect_present = 0; > - else > - pdata->battery_detect_present = 1; > + pdata->gpio_detect = devm_gpiod_get_optional(&client->dev, > + "sbs,battery-detect", GPIOD_IN); > > + if (IS_ERR(pdata->gpio_detect)) { > + dev_err(&client->dev, "Failed to get gpio: %ld\n", > + PTR_ERR(pdata->gpio_detect)); > + return ERR_PTR(PTR_ERR(pdata->gpio_detect)); > + } > of_out: > return pdata; > } > #else > static struct sbs_platform_data *sbs_of_populate_pdata( > - struct i2c_client *client) > + struct sbs_info *client) > { > - return client->dev.platform_data; > + struct sbs_platform_data *pdata; > + > + pdata = devm_kzalloc(&client->dev, sizeof(struct sbs_platform_data), > + GFP_KERNEL); > + if (!pdata) > + return ERR_PTR(-ENOMEM); > + > + return pdata; just return ERR_PTR(-ENOSYS); > } > #endif > > @@ -846,7 +840,6 @@ static int sbs_probe(struct i2c_client *client, > > chip->client = client; > chip->enable_detection = false; > - chip->gpio_detect = false; > psy_cfg.of_node = client->dev.of_node; > psy_cfg.drv_data = chip; > /* ignore first notification of external change, it is generated > @@ -855,38 +848,22 @@ static int sbs_probe(struct i2c_client *client, > chip->ignore_changes = 1; > chip->last_state = POWER_SUPPLY_STATUS_UNKNOWN; > > - pdata = sbs_of_populate_pdata(client); > - > - if (pdata) { > - chip->gpio_detect = gpio_is_valid(pdata->battery_detect); > - chip->pdata = pdata; > - } > + if (!pdata) > + pdata = sbs_of_populate_pdata(chip); > > - i2c_set_clientdata(client, chip); > + if (IS_ERR(pdata)) > + return PTR_ERR(pdata); > > - if (!chip->gpio_detect) > - goto skip_gpio; > + chip->pdata = pdata; > > - rc = gpio_request(pdata->battery_detect, dev_name(&client->dev)); > - if (rc) { > - dev_warn(&client->dev, "Failed to request gpio: %d\n", rc); > - chip->gpio_detect = false; > - goto skip_gpio; > - } > + i2c_set_clientdata(client, chip); > > - rc = gpio_direction_input(pdata->battery_detect); > - if (rc) { > - dev_warn(&client->dev, "Failed to get gpio as input: %d\n", rc); > - gpio_free(pdata->battery_detect); > - chip->gpio_detect = false; > + if (!pdata->gpio_detect) > goto skip_gpio; > - } > > - irq = gpio_to_irq(pdata->battery_detect); > + irq = gpiod_to_irq(pdata->gpio_detect); > if (irq <= 0) { > dev_warn(&client->dev, "Failed to get gpio as irq: %d\n", irq); > - gpio_free(pdata->battery_detect); > - chip->gpio_detect = false; > goto skip_gpio; > } > > @@ -895,8 +872,6 @@ static int sbs_probe(struct i2c_client *client, > dev_name(&client->dev), chip); > if (rc) { > dev_warn(&client->dev, "Failed to request irq: %d\n", rc); > - gpio_free(pdata->battery_detect); > - chip->gpio_detect = false; > goto skip_gpio; > } > > @@ -905,7 +880,7 @@ skip_gpio: > * Before we register, we might need to make sure we can actually talk > * to the battery. > */ > - if (!force_load) { > + if (!(force_load || pdata->gpio_detect)) { > rc = sbs_read_word_data(client, sbs_data[REG_STATUS].addr); > > if (rc < 0) { > @@ -934,9 +909,6 @@ skip_gpio: > return 0; > > exit_psupply: > - if (chip->gpio_detect) > - gpio_free(pdata->battery_detect); > - > return rc; > } > > @@ -944,9 +916,6 @@ static int sbs_remove(struct i2c_client *client) > { > struct sbs_info *chip = i2c_get_clientdata(client); > > - if (chip->gpio_detect) > - gpio_free(chip->pdata->battery_detect); > - > cancel_delayed_work_sync(&chip->work); > > return 0; > diff --git a/include/linux/power/sbs-battery.h b/include/linux/power/sbs-battery.h > index 2b0a9d9..711ced2 100644 > --- a/include/linux/power/sbs-battery.h > +++ b/include/linux/power/sbs-battery.h > @@ -26,15 +26,13 @@ > > /** > * struct sbs_platform_data - platform data for sbs devices > - * @battery_detect: GPIO which is used to detect battery presence > - * @battery_detect_present: gpio state when battery is present (0 / 1) > + * @gpio_detect: GPIO which is used to detect battery presence > * @i2c_retry_count: # of times to retry on i2c IO failure > * @poll_retry_count: # of times to retry looking for new status after > * external change notification > */ > struct sbs_platform_data { > - int battery_detect; > - int battery_detect_present; > + struct gpio_desc *gpio_detect; > int i2c_retry_count; > int poll_retry_count; > }; GPIOs are not supposed to be set in the platform data for the gpiod interface. Move it from "struct sbs_platform_data" into "struct sbs_info". Then move the gpiod_get from the DT specific part into the common probe code. boardcode can assign the gpio using the interface described in Documentation/gpio/board.txt (section "Platform Data") -- Sebastian
diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index e1dfb3e..28670e4 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -26,7 +26,7 @@ #include <linux/i2c.h> #include <linux/slab.h> #include <linux/interrupt.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/of.h> #include <linux/stat.h> @@ -165,7 +165,6 @@ struct sbs_info { struct power_supply *power_supply; struct sbs_platform_data *pdata; bool is_present; - bool gpio_detect; bool enable_detection; int last_state; int poll_time; @@ -183,8 +182,7 @@ static int sbs_read_word_data(struct i2c_client *client, u8 address) s32 ret = 0; int retries = 1; - if (chip->pdata) - retries = max(chip->pdata->i2c_retry_count + 1, 1); + retries = max(chip->pdata->i2c_retry_count + 1, 1); while (retries > 0) { ret = i2c_smbus_read_word_data(client, address); @@ -211,10 +209,8 @@ static int sbs_read_string_data(struct i2c_client *client, u8 address, int retries_length = 1, retries_block = 1; u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1]; - if (chip->pdata) { - retries_length = max(chip->pdata->i2c_retry_count + 1, 1); - retries_block = max(chip->pdata->i2c_retry_count + 1, 1); - } + retries_length = max(chip->pdata->i2c_retry_count + 1, 1); + retries_block = max(chip->pdata->i2c_retry_count + 1, 1); /* Adapter needs to support these two functions */ if (!i2c_check_functionality(client->adapter, @@ -278,8 +274,7 @@ static int sbs_write_word_data(struct i2c_client *client, u8 address, s32 ret = 0; int retries = 1; - if (chip->pdata) - retries = max(chip->pdata->i2c_retry_count + 1, 1); + retries = max(chip->pdata->i2c_retry_count + 1, 1); while (retries > 0) { ret = i2c_smbus_write_word_data(client, address, @@ -306,13 +301,11 @@ static int sbs_get_battery_presence_and_health( s32 ret; struct sbs_info *chip = i2c_get_clientdata(client); - if (psp == POWER_SUPPLY_PROP_PRESENT && - chip->gpio_detect) { - ret = gpio_get_value(chip->pdata->battery_detect); - if (ret == chip->pdata->battery_detect_present) - val->intval = 1; - else - val->intval = 0; + if (psp == POWER_SUPPLY_PROP_PRESENT && chip->pdata->gpio_detect) { + ret = gpiod_get_value_cansleep(chip->pdata->gpio_detect); + if (ret < 0) + return ret; + val->intval = ret; chip->is_present = val->intval; return ret; } @@ -654,7 +647,7 @@ static int sbs_get_property(struct power_supply *psy, if (!chip->enable_detection) goto done; - if (!chip->gpio_detect && + if (!chip->pdata->gpio_detect && chip->is_present != (ret >= 0)) { chip->is_present = (ret >= 0); power_supply_changed(chip->power_supply); @@ -683,7 +676,12 @@ static irqreturn_t sbs_irq(int irq, void *devid) { struct sbs_info *chip = devid; struct power_supply *battery = chip->power_supply; + int ret; + ret = gpiod_get_value_cansleep(chip->pdata->gpio_detect); + if (ret < 0) + return ret; + chip->is_present = ret; power_supply_changed(battery); return IRQ_HANDLED; @@ -750,21 +748,20 @@ static const struct of_device_id sbs_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, sbs_dt_ids); -static struct sbs_platform_data *sbs_of_populate_pdata( - struct i2c_client *client) +static struct sbs_platform_data *sbs_of_populate_pdata(struct sbs_info *chip) { + struct i2c_client *client = chip->client; struct device_node *of_node = client->dev.of_node; - struct sbs_platform_data *pdata = client->dev.platform_data; - enum of_gpio_flags gpio_flags; + struct sbs_platform_data *pdata; int rc; u32 prop; - /* verify this driver matches this device */ - if (!of_node) - return NULL; + pdata = devm_kzalloc(&client->dev, sizeof(struct sbs_platform_data), + GFP_KERNEL); + if (!pdata) + return ERR_PTR(-ENOMEM); - /* if platform data is set, honor it */ - if (pdata) + if (!of_node) return pdata; /* first make sure at least one property is set, otherwise @@ -775,11 +772,6 @@ static struct sbs_platform_data *sbs_of_populate_pdata( !of_get_property(of_node, "sbs,battery-detect-gpios", NULL)) goto of_out; - pdata = devm_kzalloc(&client->dev, sizeof(struct sbs_platform_data), - GFP_KERNEL); - if (!pdata) - goto of_out; - rc = of_property_read_u32(of_node, "sbs,i2c-retry-count", &prop); if (!rc) pdata->i2c_retry_count = prop; @@ -788,27 +780,29 @@ static struct sbs_platform_data *sbs_of_populate_pdata( if (!rc) pdata->poll_retry_count = prop; - if (!of_get_property(of_node, "sbs,battery-detect-gpios", NULL)) { - pdata->battery_detect = -1; - goto of_out; - } - - pdata->battery_detect = of_get_named_gpio_flags(of_node, - "sbs,battery-detect-gpios", 0, &gpio_flags); - - if (gpio_flags & OF_GPIO_ACTIVE_LOW) - pdata->battery_detect_present = 0; - else - pdata->battery_detect_present = 1; + pdata->gpio_detect = devm_gpiod_get_optional(&client->dev, + "sbs,battery-detect", GPIOD_IN); + if (IS_ERR(pdata->gpio_detect)) { + dev_err(&client->dev, "Failed to get gpio: %ld\n", + PTR_ERR(pdata->gpio_detect)); + return ERR_PTR(PTR_ERR(pdata->gpio_detect)); + } of_out: return pdata; } #else static struct sbs_platform_data *sbs_of_populate_pdata( - struct i2c_client *client) + struct sbs_info *client) { - return client->dev.platform_data; + struct sbs_platform_data *pdata; + + pdata = devm_kzalloc(&client->dev, sizeof(struct sbs_platform_data), + GFP_KERNEL); + if (!pdata) + return ERR_PTR(-ENOMEM); + + return pdata; } #endif @@ -846,7 +840,6 @@ static int sbs_probe(struct i2c_client *client, chip->client = client; chip->enable_detection = false; - chip->gpio_detect = false; psy_cfg.of_node = client->dev.of_node; psy_cfg.drv_data = chip; /* ignore first notification of external change, it is generated @@ -855,38 +848,22 @@ static int sbs_probe(struct i2c_client *client, chip->ignore_changes = 1; chip->last_state = POWER_SUPPLY_STATUS_UNKNOWN; - pdata = sbs_of_populate_pdata(client); - - if (pdata) { - chip->gpio_detect = gpio_is_valid(pdata->battery_detect); - chip->pdata = pdata; - } + if (!pdata) + pdata = sbs_of_populate_pdata(chip); - i2c_set_clientdata(client, chip); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); - if (!chip->gpio_detect) - goto skip_gpio; + chip->pdata = pdata; - rc = gpio_request(pdata->battery_detect, dev_name(&client->dev)); - if (rc) { - dev_warn(&client->dev, "Failed to request gpio: %d\n", rc); - chip->gpio_detect = false; - goto skip_gpio; - } + i2c_set_clientdata(client, chip); - rc = gpio_direction_input(pdata->battery_detect); - if (rc) { - dev_warn(&client->dev, "Failed to get gpio as input: %d\n", rc); - gpio_free(pdata->battery_detect); - chip->gpio_detect = false; + if (!pdata->gpio_detect) goto skip_gpio; - } - irq = gpio_to_irq(pdata->battery_detect); + irq = gpiod_to_irq(pdata->gpio_detect); if (irq <= 0) { dev_warn(&client->dev, "Failed to get gpio as irq: %d\n", irq); - gpio_free(pdata->battery_detect); - chip->gpio_detect = false; goto skip_gpio; } @@ -895,8 +872,6 @@ static int sbs_probe(struct i2c_client *client, dev_name(&client->dev), chip); if (rc) { dev_warn(&client->dev, "Failed to request irq: %d\n", rc); - gpio_free(pdata->battery_detect); - chip->gpio_detect = false; goto skip_gpio; } @@ -905,7 +880,7 @@ skip_gpio: * Before we register, we might need to make sure we can actually talk * to the battery. */ - if (!force_load) { + if (!(force_load || pdata->gpio_detect)) { rc = sbs_read_word_data(client, sbs_data[REG_STATUS].addr); if (rc < 0) { @@ -934,9 +909,6 @@ skip_gpio: return 0; exit_psupply: - if (chip->gpio_detect) - gpio_free(pdata->battery_detect); - return rc; } @@ -944,9 +916,6 @@ static int sbs_remove(struct i2c_client *client) { struct sbs_info *chip = i2c_get_clientdata(client); - if (chip->gpio_detect) - gpio_free(chip->pdata->battery_detect); - cancel_delayed_work_sync(&chip->work); return 0; diff --git a/include/linux/power/sbs-battery.h b/include/linux/power/sbs-battery.h index 2b0a9d9..711ced2 100644 --- a/include/linux/power/sbs-battery.h +++ b/include/linux/power/sbs-battery.h @@ -26,15 +26,13 @@ /** * struct sbs_platform_data - platform data for sbs devices - * @battery_detect: GPIO which is used to detect battery presence - * @battery_detect_present: gpio state when battery is present (0 / 1) + * @gpio_detect: GPIO which is used to detect battery presence * @i2c_retry_count: # of times to retry on i2c IO failure * @poll_retry_count: # of times to retry looking for new status after * external change notification */ struct sbs_platform_data { - int battery_detect; - int battery_detect_present; + struct gpio_desc *gpio_detect; int i2c_retry_count; int poll_retry_count; };
Switch to using new gpio_desc interface and devm gpio get calls to automatically manage gpio resource. Use gpiod_get_value which handles active high / low calls. If gpio_detect is set then force loading of the driver as it is reasonable to assume that the battery may not be present. Update the is_present flag immediately in the IRQ. pdata is always allocated in probe, which removes need to do check for not null in driver. Signed-off-by: Phil Reid <preid@electromag.com.au> --- drivers/power/supply/sbs-battery.c | 129 ++++++++++++++----------------------- include/linux/power/sbs-battery.h | 6 +- 2 files changed, 51 insertions(+), 84 deletions(-)