| Message ID | 20211030182813.116672-11-hdegoede@redhat.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | power-suppy/i2c/extcon: Add support for cht-wc PMIC without USB-PD support | expand |
On Sat, Oct 30, 2021 at 9:28 PM Hans de Goede <hdegoede@redhat.com> wrote: > > The bq25890_charger code supports enabling/disabling the boost converter > based on usb-phy notifications. But the usb-phy framework is not used on > all boards/platforms. At support for registering the Vbus boost converter > as a standard regulator when there is no usb-phy on the board. > > Also add support for providing regulator_init_data through platform_data > for use on boards where device-tree is not used and the platform code must > thus provide the regulator_init_data. ... > @@ -1018,6 +1059,21 @@ static int bq25890_probe(struct i2c_client *client, > INIT_WORK(&bq->usb_work, bq25890_usb_work); > bq->usb_nb.notifier_call = bq25890_usb_notifier; > usb_register_notifier(bq->usb_phy, &bq->usb_nb); > +#ifdef CONFIG_REGULATOR > + } else { > + struct bq25890_platform_data *pdata = dev_get_platdata(dev); > + struct regulator_config cfg = { }; > + struct regulator_dev *reg; > + > + cfg.dev = dev; > + cfg.driver_data = bq; > + if (pdata) > + cfg.init_data = pdata->regulator_init_data; > + > + reg = devm_regulator_register(dev, &bq25890_vbus_desc, &cfg); > + if (IS_ERR(reg)) > + return dev_err_probe(dev, PTR_ERR(reg), "registering regulator"); > +#endif > } } #ifdef else { ... } #endif is a bit better to maintain (less error prone in case of new code). ... > +#ifndef _BQ25890_CHARGER_H_ > +#define _BQ25890_CHARGER_H_ > +#include <linux/regulator/machine.h> struct regulator_init_data; should be sufficient, no header is needed. > +struct bq25890_platform_data { > + const struct regulator_init_data *regulator_init_data; > +}; > + > +#endif
Hi, On 10/31/21 00:13, Andy Shevchenko wrote: > On Sat, Oct 30, 2021 at 9:28 PM Hans de Goede <hdegoede@redhat.com> wrote: >> >> The bq25890_charger code supports enabling/disabling the boost converter >> based on usb-phy notifications. But the usb-phy framework is not used on >> all boards/platforms. At support for registering the Vbus boost converter >> as a standard regulator when there is no usb-phy on the board. >> >> Also add support for providing regulator_init_data through platform_data >> for use on boards where device-tree is not used and the platform code must >> thus provide the regulator_init_data. > > ... > >> @@ -1018,6 +1059,21 @@ static int bq25890_probe(struct i2c_client *client, >> INIT_WORK(&bq->usb_work, bq25890_usb_work); >> bq->usb_nb.notifier_call = bq25890_usb_notifier; >> usb_register_notifier(bq->usb_phy, &bq->usb_nb); >> +#ifdef CONFIG_REGULATOR >> + } else { >> + struct bq25890_platform_data *pdata = dev_get_platdata(dev); >> + struct regulator_config cfg = { }; >> + struct regulator_dev *reg; >> + >> + cfg.dev = dev; >> + cfg.driver_data = bq; >> + if (pdata) >> + cfg.init_data = pdata->regulator_init_data; >> + >> + reg = devm_regulator_register(dev, &bq25890_vbus_desc, &cfg); >> + if (IS_ERR(reg)) >> + return dev_err_probe(dev, PTR_ERR(reg), "registering regulator"); >> +#endif >> } > > } > #ifdef > else { > ... > } > #endif > > is a bit better to maintain (less error prone in case of new code). > > ... > >> +#ifndef _BQ25890_CHARGER_H_ >> +#define _BQ25890_CHARGER_H_ > >> +#include <linux/regulator/machine.h> > > struct regulator_init_data; > > should be sufficient, no header is needed. Thanks, I've fixed both for v2 of the patch-set. Regards, Hans > >> +struct bq25890_platform_data { >> + const struct regulator_init_data *regulator_init_data; >> +}; >> + >> +#endif >
diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c index 7504e30f1e4d..eaadb7a82c67 100644 --- a/drivers/power/supply/bq25890_charger.c +++ b/drivers/power/supply/bq25890_charger.c @@ -8,7 +8,9 @@ #include <linux/module.h> #include <linux/i2c.h> #include <linux/power_supply.h> +#include <linux/power/bq25890_charger.h> #include <linux/regmap.h> +#include <linux/regulator/driver.h> #include <linux/types.h> #include <linux/gpio/consumer.h> #include <linux/interrupt.h> @@ -817,6 +819,45 @@ static int bq25890_usb_notifier(struct notifier_block *nb, unsigned long val, return NOTIFY_OK; } +#ifdef CONFIG_REGULATOR +static int bq25890_vbus_enable(struct regulator_dev *rdev) +{ + struct bq25890_device *bq = rdev_get_drvdata(rdev); + + return bq25890_set_otg_cfg(bq, 1); +} + +static int bq25890_vbus_disable(struct regulator_dev *rdev) +{ + struct bq25890_device *bq = rdev_get_drvdata(rdev); + + return bq25890_set_otg_cfg(bq, 0); +} + +static int bq25890_vbus_is_enabled(struct regulator_dev *rdev) +{ + struct bq25890_device *bq = rdev_get_drvdata(rdev); + + return bq25890_field_read(bq, F_OTG_CFG); +} + +static const struct regulator_ops bq25890_vbus_ops = { + .enable = bq25890_vbus_enable, + .disable = bq25890_vbus_disable, + .is_enabled = bq25890_vbus_is_enabled, +}; + +static const struct regulator_desc bq25890_vbus_desc = { + .name = "usb_otg_vbus", + .of_match = "usb-otg-vbus", + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE, + .ops = &bq25890_vbus_ops, + .fixed_uV = 5000000, + .n_voltages = 1, +}; +#endif + static int bq25890_get_chip_version(struct bq25890_device *bq) { int id, rev; @@ -1018,6 +1059,21 @@ static int bq25890_probe(struct i2c_client *client, INIT_WORK(&bq->usb_work, bq25890_usb_work); bq->usb_nb.notifier_call = bq25890_usb_notifier; usb_register_notifier(bq->usb_phy, &bq->usb_nb); +#ifdef CONFIG_REGULATOR + } else { + struct bq25890_platform_data *pdata = dev_get_platdata(dev); + struct regulator_config cfg = { }; + struct regulator_dev *reg; + + cfg.dev = dev; + cfg.driver_data = bq; + if (pdata) + cfg.init_data = pdata->regulator_init_data; + + reg = devm_regulator_register(dev, &bq25890_vbus_desc, &cfg); + if (IS_ERR(reg)) + return dev_err_probe(dev, PTR_ERR(reg), "registering regulator"); +#endif } ret = bq25890_power_supply_init(bq); diff --git a/include/linux/power/bq25890_charger.h b/include/linux/power/bq25890_charger.h new file mode 100644 index 000000000000..8a36c0d787c7 --- /dev/null +++ b/include/linux/power/bq25890_charger.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Platform data for the TI bq25890 battery charger driver. + */ + +#ifndef _BQ25890_CHARGER_H_ +#define _BQ25890_CHARGER_H_ + +#include <linux/regulator/machine.h> + +struct bq25890_platform_data { + const struct regulator_init_data *regulator_init_data; +}; + +#endif
The bq25890_charger code supports enabling/disabling the boost converter based on usb-phy notifications. But the usb-phy framework is not used on all boards/platforms. At support for registering the Vbus boost converter as a standard regulator when there is no usb-phy on the board. Also add support for providing regulator_init_data through platform_data for use on boards where device-tree is not used and the platform code must thus provide the regulator_init_data. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/power/supply/bq25890_charger.c | 56 ++++++++++++++++++++++++++ include/linux/power/bq25890_charger.h | 15 +++++++ 2 files changed, 71 insertions(+) create mode 100644 include/linux/power/bq25890_charger.h