| Message ID | 20191209140234.6558-1-TheSven73@gmail.com |
|---|---|
| Headers | show |
| Series | tps6105x add devicetree and leds support | expand |
Sven On 12/9/19 8:02 AM, Sven Van Asbroeck wrote: > This driver adds support for the led operational mode of the s/led/LED > tps6105x mfd device. s/mfd/MFD > > Tree: next-20191118 > Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> > Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com> > --- > drivers/leds/Kconfig | 10 +++++ > drivers/leds/Makefile | 1 + > drivers/leds/leds-tps6105x.c | 83 ++++++++++++++++++++++++++++++++++++ > 3 files changed, 94 insertions(+) > create mode 100644 drivers/leds/leds-tps6105x.c > > diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig > index 4b68520ac251..7c7ceaa824a2 100644 > --- a/drivers/leds/Kconfig > +++ b/drivers/leds/Kconfig > @@ -836,6 +836,16 @@ config LEDS_LM36274 > Say Y to enable the LM36274 LED driver for TI LMU devices. > This supports the LED device LM36274. > > +config LEDS_TPS6105X > + tristate "LED support for TI TPS6105X" > + depends on LEDS_CLASS > + depends on TPS6105X > + default y if TPS6105X > + help > + This driver supports TPS61050/TPS61052 led chips. s/led/LED > + It is a single boost converter primarily for white LEDs and > + audio amplifiers. > + > comment "LED Triggers" > source "drivers/leds/trigger/Kconfig" > > diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile > index 2da39e896ce8..d7e1107753fb 100644 > --- a/drivers/leds/Makefile > +++ b/drivers/leds/Makefile > @@ -85,6 +85,7 @@ obj-$(CONFIG_LEDS_LM3601X) += leds-lm3601x.o > obj-$(CONFIG_LEDS_TI_LMU_COMMON) += leds-ti-lmu-common.o > obj-$(CONFIG_LEDS_LM3697) += leds-lm3697.o > obj-$(CONFIG_LEDS_LM36274) += leds-lm36274.o > +obj-$(CONFIG_LEDS_TPS6105X) += leds-tps6105x.o > > # LED SPI Drivers > obj-$(CONFIG_LEDS_CR0014114) += leds-cr0014114.o > diff --git a/drivers/leds/leds-tps6105x.c b/drivers/leds/leds-tps6105x.c > new file mode 100644 > index 000000000000..ea2afaa3e3f0 > --- /dev/null > +++ b/drivers/leds/leds-tps6105x.c > @@ -0,0 +1,83 @@ > +// SPDX-License-Identifier: GPL-2.0-only > + Do you need a copyright? > +#include <linux/leds.h> > +#include <linux/module.h> > +#include <linux/platform_device.h> > +#include <linux/mfd/tps6105x.h> > +#include <linux/regmap.h> > + > +struct tps6105x_priv { > + struct regmap *regmap; > + struct led_classdev cdev; > + struct fwnode_handle *fwnode; > +}; > + > +static void tps6105x_handle_put(void *data) > +{ > + struct tps6105x_priv *priv = data; > + > + fwnode_handle_put(priv->fwnode); > +} > + > +static int tps6105x_brightness_set(struct led_classdev *cdev, > + enum led_brightness brightness) > +{ > + struct tps6105x_priv *priv = container_of(cdev, struct tps6105x_priv, > + cdev); > + > + return regmap_update_bits(priv->regmap, TPS6105X_REG_0, > + TPS6105X_REG0_TORCHC_MASK, > + brightness << TPS6105X_REG0_TORCHC_SHIFT); > +} > + > +static int tps6105x_led_probe(struct platform_device *pdev) > +{ > + struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev); > + struct tps6105x_platform_data *pdata = tps6105x->pdata; > + struct led_init_data init_data = { }; > + struct tps6105x_priv *priv; > + int ret; > + > + /* This instance is not set for torch mode so bail out */ > + if (pdata->mode != TPS6105X_MODE_TORCH) { > + dev_info(&pdev->dev, > + "chip not in torch mode, exit probe"); > + return -EINVAL; > + } > + > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + priv->fwnode = device_get_next_child_node(pdev->dev.parent, NULL); Probably need to check for NULL on the return > + ret = devm_add_action_or_reset(&pdev->dev, tps6105x_handle_put, priv); > + if (ret) > + return ret; > + priv->regmap = tps6105x->regmap; > + priv->cdev.brightness_set_blocking = tps6105x_brightness_set; > + priv->cdev.max_brightness = 7; > + init_data.devicename = "tps6105x"; > + init_data.default_label = ":torch"; > + init_data.fwnode = priv->fwnode; > + > + ret = regmap_update_bits(tps6105x->regmap, TPS6105X_REG_0, > + TPS6105X_REG0_MODE_MASK | TPS6105X_REG0_TORCHC_MASK, > + TPS6105X_REG0_MODE_TORCH << TPS6105X_REG0_MODE_SHIFT); Checkpatch should have warned about alignment here > + if (ret) > + return ret; > + > + return devm_led_classdev_register_ext(&pdev->dev, &priv->cdev, > + &init_data); > +} > + > +static struct platform_driver led_driver = { > + .probe = tps6105x_led_probe, > + .driver = { > + .name = "tps6105x-leds", > + }, > +}; > + > +module_platform_driver(led_driver); > + > +MODULE_DESCRIPTION("TPS6105x led driver"); > +MODULE_AUTHOR("Sven Van Asbroeck <TheSven73@gmail.com>"); > +MODULE_LICENSE("GPL v2");
Thank you for the review, Dan. Some remarks below. On Mon, Dec 9, 2019 at 9:12 AM Dan Murphy <dmurphy@ti.com> wrote: > > > + priv->fwnode = device_get_next_child_node(pdev->dev.parent, NULL); > > Probably need to check for NULL on the return > The driver will work without crashes or oopses even when this returns NULL: - struct led_init_data . fwnode is optional (can be NULL) - fwnode_handle_put() ignores NULL arguments By not checking for NULL here, non-devicetree users can still select led mode through platform data on the parent mfd driver, and things will "just work". Could I persuade you to keep this behaviour? Perhaps I should put a comment in to clarify? > > + ret = regmap_update_bits(tps6105x->regmap, TPS6105X_REG_0, > > + TPS6105X_REG0_MODE_MASK | TPS6105X_REG0_TORCHC_MASK, > > + TPS6105X_REG0_MODE_TORCH << TPS6105X_REG0_MODE_SHIFT); > Checkpatch should have warned about alignment here I used 5.4's checkpatch.pl, but somehow it doesn't warn :( Will fix that up.