leds: tps68470: LED driver for TPS68470
Subsystems (4)
v2 cover leds: tps68470: LED driver for TPS68470
The v2 patch of TPS68470 LED driver includes:
1. The code improvements were based on reviewers' comments.
2. strcmp() was removed.
3. V2 also included Hans' LED look-up table for the privacy LED.
Hans de Goede (1):
platform: x86: int3472: Register a LED lookup table entry for the
privacy LED
Kate Hsuan (3):
platform: x86: int3472: Add MFD cell for tps68470 LED
include: mfd: tps68470: Add masks for LEDA and LEDB
leds: tps68470: Add LED control for tps68470
drivers/leds/Kconfig | 12 ++ drivers/leds/Makefile | 1 + drivers/leds/leds-tps68470.c | 182 ++++++++++++++++++ drivers/platform/x86/intel/int3472/tps68470.c | 35 +++- include/linux/mfd/tps68470.h | 5 + 5 files changed, 231 insertions(+), 4 deletions(-) create mode 100644 drivers/leds/leds-tps68470.c
Signature · 1 line
2.37.3
PATCH v2 1/4 platform: x86: int3472: Add MFD cell for tps68470 LED
Add MFD cell for tps68470-led.
--- drivers/platform/x86/intel/int3472/tps68470.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/platform/x86/intel/int3472/tps68470.c +3 -2
@@ -17,7 +17,7 @@#define DESIGNED_FOR_CHROMEOS 1#define DESIGNED_FOR_WINDOWS 2 -#define TPS68470_WIN_MFD_CELL_COUNT 3 +#define TPS68470_WIN_MFD_CELL_COUNT 4static const struct mfd_cell tps68470_cros[] = { { .name ="tps68470-gpio" },
@@ -193,7 +193,8 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client) cells[1 ].name ="tps68470-regulator" ; cells[1 ].platform_data = (void *)board_data->tps68470_regulator_pdata; cells[1 ].pdata_size =sizeof (struct tps68470_regulator_platform_data ); - cells[2 ].name ="tps68470-gpio" ; + cells[2 ].name ="tps68470-led" ; + cells[3 ].name ="tps68470-gpio" ;for (i =0 ; i < board_data->n_gpiod_lookups; i++)gpiod_add_lookup_table (board_data->tps68470_gpio_lookup_tables[i]);
Signature · 1 line
2.37.3
Dan Scally
maintainerRe: [PATCH v2 1/4] platform: x86: int3472: Add MFD cell for tps68470 LED
Quoted 4 lines · Kate Hsuan
Add MFD cell for tps68470-led.
Signed-off-by Kate Hsuan <[email protected]>---
Looks fine to me: Reviewed-by: Daniel Scally <[email protected]>
Quoted 26 lines
drivers/platform/x86/intel/int3472/tps68470.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/platform/x86/intel/int3472/tps68470.c +3
-2@@ -17,7 +17,7 @@#define DESIGNED_FOR_CHROMEOS 1#define DESIGNED_FOR_WINDOWS 2 -#define TPS68470_WIN_MFD_CELL_COUNT 3 +#define TPS68470_WIN_MFD_CELL_COUNT 4static const struct mfd_cell tps68470_cros[] = { { .name ="tps68470-gpio" },@@ -193,7 +193,8 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client) cells[1 ].name ="tps68470-regulator" ; cells[1 ].platform_data = (void *)board_data->tps68470_regulator_pdata; cells[1 ].pdata_size =sizeof (struct tps68470_regulator_platform_data ); - cells[2 ].name ="tps68470-gpio" ; + cells[2 ].name ="tps68470-led" ; + cells[3 ].name ="tps68470-gpio" ;for (i =0 ; i < board_data->n_gpiod_lookups; i++)gpiod_add_lookup_table (board_data->tps68470_gpio_lookup_tables[i]);
PATCH v2 2/4 include: mfd: tps68470: Add masks for LEDA and LEDB
In reply to Kate HsuanAdd flags for both LEDA(TPS68470_ILEDCTL_ENA), LEDB (TPS68470_ILEDCTL_ENB), and current control mask for LEDB (TPS68470_ILEDCTL_CTRLB)
--- include/linux/mfd/tps68470.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/mfd/tps68470.h +5 -0
@@ -34,6 +34,7 @@#define TPS68470_REG_SGPO 0x22#define TPS68470_REG_GPDI 0x26#define TPS68470_REG_GPDO 0x27 +#define TPS68470_REG_ILEDCTL 0x28#define TPS68470_REG_VCMVAL 0x3C#define TPS68470_REG_VAUX1VAL 0x3D#define TPS68470_REG_VAUX2VAL 0x3E
@@ -94,4 +95,8 @@#define TPS68470_GPIO_MODE_OUT_CMOS 2#define TPS68470_GPIO_MODE_OUT_ODRAIN 3 +#define TPS68470_ILEDCTL_ENA BIT(2) +#define TPS68470_ILEDCTL_ENB BIT(6) +#define TPS68470_ILEDCTL_CTRLB GENMASK(5, 4) +#endif /* __LINUX_MFD_TPS68470_H */
Signature · 1 line
2.37.3
PATCH v2 3/4 leds: tps68470: Add LED control for tps68470
In reply to Kate HsuanThere are two LED controllers, LEDA indicator LED and LEDB flash LED for tps68470. LEDA can be enabled by setting TPS68470_ILEDCTL_ENA. Moreover, tps68470 provides four levels of power status for LEDB. If the properties called "ti,ledb-current" can be found, the current will be set according to the property values. These two LEDs can be controlled through the LED class of sysfs (tps68470-leda and tps68470-ledb).
--- drivers/leds/Kconfig | 12 +++ drivers/leds/Makefile | 1 + drivers/leds/leds-tps68470.c | 182 +++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 drivers/leds/leds-tps68470.c
drivers/leds/Kconfig +12 -0
@@ -827,6 +827,18 @@ config LEDS_TPS6105X It is a single boost converter primarily for white LEDs and audio amplifiers. +config LEDS_TPS68470 + tristate "LED support for TI TPS68470" + depends on LEDS_CLASS + depends on INTEL_SKL_INT3472 + help + This driver supports TPS68470 PMIC with LED chip. + It provide two LED controllers, including an indicator LED + and a flash LED. + + To compile this driver as a module, choose M and it will be + called leds-tps68470 + config LEDS_IP30 tristate "LED support for SGI Octane machines" depends on LEDS_CLASS
drivers/leds/Makefile +1 -0
@@ -84,6 +84,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds-turris-omnia.o obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o +obj-$(CONFIG_LEDS_TPS68470) += leds-tps68470.o # LED SPI Drivers obj-$(CONFIG_LEDS_CR0014114) += leds-cr0014114.o
drivers/leds/leds-tps68470.c new file +182 -0
182 lines not on this page · raw message
Signature · 1 line
2.37.3
Dan Scally
maintainerRe: [PATCH v2 3/4] leds: tps68470: Add LED control for tps68470
Hi Kate - thanks for the v2
Quoted 21 lines · Kate Hsuan
There are two LED controllers, LEDA indicator LED and LEDB flash LED for tps68470. LEDA can be enabled by setting
TPS68470_ILEDCTL_ENA. Moreover, tps68470 provides four levels of power status for LEDB. If the properties called "ti,ledb-current" can be found, the current will be set according to the property values. These two LEDs can be controlled through the LED class of sysfs (tps68470-leda and tps68470-ledb).Signed-off-by Kate Hsuan <[email protected]>--- drivers/leds/Kconfig | 12 +++ drivers/leds/Makefile | 1 + drivers/leds/leds-tps68470.c | 182 +++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+)create mode 100644
drivers/leds/leds-tps68470.cdrivers/leds/Kconfig +0
-0@@ -827,6 +827,18 @@ config LEDS_TPS6105X It is a single boost converter primarily for white LEDs and
drivers/leds/Kconfig config LEDS_TPS6105X · line 837
Quoted 10 lines
drivers/leds/Kconfig +8
-0audio amplifiers. +config LEDS_TPS68470 + tristate "LED support for TI TPS68470" + depends on LEDS_CLASS + depends on INTEL_SKL_INT3472 + help + This driver supports TPS68470 PMIC with LED chip. + It provide two LED controllers, including an indicator LED + and a flash LED.
s/provide/provides. Also maybe "It provides two LED controllers, with the ability to drive 2 indicator LEDs and 2 flash LEDs". I actually got the WLED part working now finally so I'll send patches on top of this series if that's ok?
Quoted 26 lines
drivers/leds/Kconfig +4
-0+ + To compile this driver as a module, choose M and it will be + called leds-tps68470 + config LEDS_IP30 tristate "LED support for SGI Octane machines" depends on LEDS_CLASSdrivers/leds/Makefile +1
-0@@ -84,6 +84,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds-turris-omnia.o obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o +obj-$(CONFIG_LEDS_TPS68470) += leds-tps68470.o # LED SPI Drivers obj-$(CONFIG_LEDS_CR0014114) += leds-cr0014114.odrivers/leds/leds-tps68470.c new file +1
-0@@ -0,0 +1,182 @@ +// SPDX-License-Identifier: GPL-2.0
drivers/leds/leds-tps68470.c line 11
Quoted 10 lines
drivers/leds/leds-tps68470.c new file +10
-0+/* +* LED driver for TPS68470 PMIC +* +* Copyright (C) 2023 Red Hat +* +* Authors: +* Kate Hsuan <[email protected]> +*/ + +#include <linux/gpio/driver.h>
Not needed I think?
drivers/leds/leds-tps68470.c line 16
Quoted 5 lines
drivers/leds/leds-tps68470.c new file +5
-0+#include <linux/mfd/tps68470.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/leds.h>
Alphabetical order?
Quoted 31 lines
drivers/leds/leds-tps68470.c new file +31
-0+ +#define lcdev_to_led (led_cdev) \ + container_of(led_cdev, struct tps68470_led, lcdev) + +#define led_to_tps68470 (led, index) \ + container_of(led, struct tps68470_device, leds[index]) + +enum tps68470_led_ids { +TPS68470_ILED_A , +TPS68470_ILED_B , +TPS68470_NUM_LEDS +}; + +static const char *tps68470_led_names[] = { + [TPS68470_ILED_A ] ="tps68470-iled_a" , + [TPS68470_ILED_B ] ="tps68470-iled_b" , +}; + +struct tps68470_led { +unsigned int led_id; +struct led_classdev lcdev; +}; + +struct tps68470_device { +struct device *dev; +struct regmap *regmap; +struct tps68470_led leds[TPS68470_NUM_LEDS ]; +}; + +enum ctrlb_current { +CTRLB_2MA =0 ,
drivers/leds/leds-tps68470.c
Quoted 10 lines
drivers/leds/leds-tps68470.c new file +10
-0+CTRLB_4MA =1 , +CTRLB_8MA =2 , + CTRLB_16MA = 3, +}; + +static int tps68470_brightness_set (struct led_classdev *led_cdev,enum led_brightness brightness) +{ +struct tps68470_led *led =lcdev_to_led (led_cdev); +struct tps68470_device *tps68470 =led_to_tps68470 (led, led->led_id); +struct regmap *regmap = tps68470->regmap
This would work fine as is...but I would maybe add something like
if (state > LED_ON) return -EINVAL;
So that brightness values of > 1 aren't just silently accepted...or does the LED core already prevent that? If so it's fine.
Quoted 13 lines
drivers/leds/leds-tps68470.c new file +13
-0+ +switch (led->led_id) { +case TPS68470_ILED_A : +return regmap_update_bits (regmap,TPS68470_REG_ILEDCTL ,TPS68470_ILEDCTL_ENA , + brightness ?TPS68470_ILEDCTL_ENA :0 ); +case TPS68470_ILED_B : +return regmap_update_bits (regmap,TPS68470_REG_ILEDCTL ,TPS68470_ILEDCTL_ENB , + brightness ?TPS68470_ILEDCTL_ENB :0 ); + } +return -EINVAL ; +} + +static enum led_brightness tps68470_brightness_get (struct led_classdev *led_cdev)
drivers/leds/leds-tps68470.c line 80
Quoted 10 lines
drivers/leds/leds-tps68470.c new file +10
-0+{ +struct tps68470_led *led =lcdev_to_led (led_cdev); +struct tps68470_device *tps68470 =led_to_tps68470 (led, led->led_id); +struct regmap *regmap = tps68470->regmap; +int ret =0 ; +int value =0 ; + + ret =regmap_read (regmap,TPS68470_REG_ILEDCTL , &value); +if (ret) + goto error;
Just return dev_err_probe(led_cdev->dev, -EINVAL, "failed on reading register\n") here imo.
Quoted 18 lines
drivers/leds/leds-tps68470.c new file +18
-0+ +switch (led->led_id) { +case TPS68470_ILED_A : + value = value &TPS68470_ILEDCTL_ENA ; +break ; +case TPS68470_ILED_B : + value = value &TPS68470_ILEDCTL_ENB ; +break ; + } + +return value ?LED_ON :LED_OFF ; + +error: +dev_err (led_cdev->dev,"Failed on reading register\n" ); +return -EINVAL ; +} + +static int tps68470_leds_probe (struct platform_device *pdev)
drivers/leds/leds-tps68470.c line 108
Quoted 10 lines
drivers/leds/leds-tps68470.c new file +10
-0+{ +int i =0 ; +int ret =0 ; +unsigned int curr; +struct tps68470_device *tps68470; +struct tps68470_led *led; +struct led_classdev *lcdev; + + tps68470 =devm_kzalloc (&pdev->dev,sizeof (struct tps68470_device ), +GFP_KERNEL );
No -ENOMEM check here?
Quoted 36 lines
drivers/leds/leds-tps68470.c new file +36
-0+ tps68470->dev = &pdev->dev; + tps68470->regmap =dev_get_drvdata (pdev->dev.parent); + +for (i =0 ; i <TPS68470_NUM_LEDS ; i++) { + led = &tps68470->leds[i]; + lcdev = &led->lcdev; + + led->led_id = i; + + lcdev->name =devm_kasprintf (tps68470->dev,GFP_KERNEL ,"%s::%s" , + tps68470_led_names[i],LED_FUNCTION_INDICATOR ); +if (!lcdev->name) +return -ENOMEM ; + + lcdev->max_brightness =1 ; + lcdev->brightness =0 ; + lcdev->brightness_set_blocking = tps68470_brightness_set; + lcdev->brightness_get = tps68470_brightness_get; + lcdev->dev = &pdev->dev; + + ret =devm_led_classdev_register (tps68470->dev, lcdev); +if (ret) { +dev_err_probe (tps68470->dev, ret, +"error registering led\n" ); + goto err_exit; + } + } + +/* configure LEDB current if the properties can be got */ +if (!device_property_read_u32 (&pdev->dev,"ti,ledb-current" , &curr)) { +switch (curr) { +case 2 : + curr =CTRLB_2MA ; +break ; +case 4 : + curr =CTRLB_4MA ;
drivers/leds/leds-tps68470.c line 154
Quoted 10 lines
drivers/leds/leds-tps68470.c new file +10
-0+break ; +case 8 : + curr =CTRLB_8MA ; +break ; +case 16 : + curr =CTRLB_16MA ; +break ; +default : +dev_err (&pdev->dev,"Invalid LEDB curr value: %d\n" , curr); +return -EINVAL ;
There's no jump to err_exit here...I think that this whole section should go above the registration of the LEDS...and probably also into its own function.
Quoted 28 lines
drivers/leds/leds-tps68470.c new file +28
-0+ } + ret =regmap_update_bits (tps68470->regmap,TPS68470_REG_ILEDCTL , +TPS68470_ILEDCTL_CTRLB , curr); + } + +err_exit: +if (ret) { +for (i =0 ; i <TPS68470_NUM_LEDS ; i++) { +if (tps68470->leds[i].lcdev.name) +devm_led_classdev_unregister (&pdev->dev, + &tps68470->leds[i].lcdev); + } + } + +return ret; +} +static struct platform_driver tps68470_led_driver = { + .driver = { + .name ="tps68470-led" , + }, + .probe = tps68470_leds_probe, +}; + +module_platform_driver (tps68470_led_driver); + +MODULE_ALIAS ("platform:tps68470-led" ); +MODULE_DESCRIPTION ("LED driver for TPS68470 PMIC" ); +MODULE_LICENSE ("GPL v2" );
Re: [PATCH v2 3/4] leds: tps68470: Add LED control for tps68470
Hi,
Quoted 27 lines · Dan Scally
Hi Kate - thanks for the v2
Quoted 23 lines · Kate Hsuan
There are two LED controllers, LEDA indicator LED and LEDB flash LED for tps68470. LEDA can be enabled by setting
TPS68470_ILEDCTL_ENA. Moreover, tps68470 provides four levels of power status for LEDB. If the properties called "ti,ledb-current" can be found, the current will be set according to the property values. These two LEDs can be controlled through the LED class of sysfs (tps68470-leda and tps68470-ledb).Signed-off-by Kate Hsuan <[email protected]>--- drivers/leds/Kconfig | 12 +++ drivers/leds/Makefile | 1 + drivers/leds/leds-tps68470.c | 182 +++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+)create mode 100644
drivers/leds/leds-tps68470.cdrivers/leds/Kconfig +0
-0@@ -827,6 +827,18 @@ config LEDS_TPS6105X It is a single boost converter primarily for white LEDs and audio amplifiers.
Quoted 10 lines
drivers/leds/Kconfig config LEDS_TPS6105X · line 837
Quoted 8 lines
drivers/leds/Kconfig +8
-0+config LEDS_TPS68470 + tristate "LED support for TI TPS68470" + depends on LEDS_CLASS + depends on INTEL_SKL_INT3472 + help + This driver supports TPS68470 PMIC with LED chip. + It provide two LED controllers, including an indicator LED + and a flash LED.s/provide/provides. Also maybe "It provides two LED controllers, with the ability to drive 2
I'll revise the description in the v3 patch.
Quoted 2 lines
indicator LEDs and 2 flash LEDs". I actually got the WLED part working now finally so I'll send patches on top of this series if that's ok?
Sounds good! That would be great! Thank you
Quoted 31 lines
Quoted 31 lines
drivers/leds/Kconfig +4
-0+ + To compile this driver as a module, choose M and it will be + called leds-tps68470 + config LEDS_IP30 tristate "LED support for SGI Octane machines" depends on LEDS_CLASSdrivers/leds/Makefile +1
-0@@ -84,6 +84,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds-turris-omnia.o obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o +obj-$(CONFIG_LEDS_TPS68470) += leds-tps68470.o # LED SPI Drivers obj-$(CONFIG_LEDS_CR0014114) += leds-cr0014114.odrivers/leds/leds-tps68470.c new file +5
-0@@ -0,0 +1,182 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* LED driver for TPS68470 PMIC +* +* Copyright (C) 2023 Red Hat
Quoted 8 lines
drivers/leds/leds-tps68470.c line 11
Quoted 6 lines
drivers/leds/leds-tps68470.c new file +6
-0+* +* Authors: +* Kate Hsuan <[email protected]> +*/ + +#include <linux/gpio/driver.h> Not needed I think?
removed
Quoted 8 lines
drivers/leds/leds-tps68470.c line 16
Quoted 6 lines
drivers/leds/leds-tps68470.c new file +5
-0+#include <linux/mfd/tps68470.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/leds.h> Alphabetical order?
Okay.
Quoted 43 lines
Quoted 31 lines
drivers/leds/leds-tps68470.c new file +31
-0+ +#define lcdev_to_led (led_cdev) \ + container_of(led_cdev, struct tps68470_led, lcdev) + +#define led_to_tps68470 (led, index) \ + container_of(led, struct tps68470_device, leds[index]) + +enum tps68470_led_ids { +TPS68470_ILED_A , +TPS68470_ILED_B , +TPS68470_NUM_LEDS +}; + +static const char *tps68470_led_names[] = { + [TPS68470_ILED_A ] ="tps68470-iled_a" , + [TPS68470_ILED_B ] ="tps68470-iled_b" , +}; + +struct tps68470_led { +unsigned int led_id; +struct led_classdev lcdev; +}; + +struct tps68470_device { +struct device *dev; +struct regmap *regmap; +struct tps68470_led leds[TPS68470_NUM_LEDS ]; +}; + +enum ctrlb_current { +CTRLB_2MA =0 ,drivers/leds/leds-tps68470.c
Quoted 10 lines
drivers/leds/leds-tps68470.c new file +10
-0+CTRLB_4MA =1 , +CTRLB_8MA =2 , + CTRLB_16MA = 3, +}; + +static int tps68470_brightness_set (struct led_classdev *led_cdev,enum led_brightness brightness) +{ +struct tps68470_led *led =lcdev_to_led (led_cdev); +struct tps68470_device *tps68470 =led_to_tps68470 (led, led->led_id); +struct regmap *regmap = tps68470->regmapThis would work fine as is...but I would maybe add something like
Quoted 5 lines
if (state >
LED_ON)
return-EINVAL;So that brightness values of > 1 aren't just silently accepted...or does the LED core already prevent that? If so it's fine.
I think it is unnecessary.
The LED framework already handles this. Since we already set "max_brightness" for the device, the framework will check the "brightness" value and make sure the value isn't greater than "max_brightness".
Quoted 18 lines
Quoted 18 lines
drivers/leds/leds-tps68470.c new file +17
-0+ +switch (led->led_id) { +case TPS68470_ILED_A : +return regmap_update_bits (regmap,TPS68470_REG_ILEDCTL ,TPS68470_ILEDCTL_ENA , + brightness ?TPS68470_ILEDCTL_ENA :0 ); +case TPS68470_ILED_B : +return regmap_update_bits (regmap,TPS68470_REG_ILEDCTL ,TPS68470_ILEDCTL_ENB , + brightness ?TPS68470_ILEDCTL_ENB :0 ); + } +return -EINVAL ; +} + +static enum led_brightness tps68470_brightness_get (struct led_classdev *led_cdev) +{ +struct tps68470_led *led =lcdev_to_led (led_cdev); +struct tps68470_device *tps68470 =led_to_tps68470 (led, led->led_id); +struct regmap *regmap = tps68470->regmap;
Quoted 8 lines
drivers/leds/leds-tps68470.c line 80
Quoted 6 lines
drivers/leds/leds-tps68470.c new file +6
-0+int ret =0 ; +int value =0 ; + + ret =regmap_read (regmap,TPS68470_REG_ILEDCTL , &value); +if (ret) + goto error;Just return
dev_err_probe(led_cdev->dev, -EINVAL, "failed on reading register\n")here imo.
Okay.
Quoted 22 lines
Quoted 22 lines
drivers/leds/leds-tps68470.c new file +22
-0+ +switch (led->led_id) { +case TPS68470_ILED_A : + value = value &TPS68470_ILEDCTL_ENA ; +break ; +case TPS68470_ILED_B : + value = value &TPS68470_ILEDCTL_ENB ; +break ; + } + +return value ?LED_ON :LED_OFF ; + +error: +dev_err (led_cdev->dev,"Failed on reading register\n" ); +return -EINVAL ; +} + +static int tps68470_leds_probe (struct platform_device *pdev) +{ +int i =0 ; +int ret =0 ; +unsigned int curr;
Quoted 9 lines
drivers/leds/leds-tps68470.c line 108
Quoted 6 lines
drivers/leds/leds-tps68470.c new file +6
-0+struct tps68470_device *tps68470; +struct tps68470_led *led; +struct led_classdev *lcdev; + + tps68470 =devm_kzalloc (&pdev->dev,sizeof (struct tps68470_device ), +GFP_KERNEL );No
-ENOMEMcheck here?
I'll add a return value check here in the v3 patch.
Quoted 41 lines
Quoted 41 lines
drivers/leds/leds-tps68470.c new file +41
-0+ tps68470->dev = &pdev->dev; + tps68470->regmap =dev_get_drvdata (pdev->dev.parent); + +for (i =0 ; i <TPS68470_NUM_LEDS ; i++) { + led = &tps68470->leds[i]; + lcdev = &led->lcdev; + + led->led_id = i; + + lcdev->name =devm_kasprintf (tps68470->dev,GFP_KERNEL ,"%s::%s" , + tps68470_led_names[i],LED_FUNCTION_INDICATOR ); +if (!lcdev->name) +return -ENOMEM ; + + lcdev->max_brightness =1 ; + lcdev->brightness =0 ; + lcdev->brightness_set_blocking = tps68470_brightness_set; + lcdev->brightness_get = tps68470_brightness_get; + lcdev->dev = &pdev->dev; + + ret =devm_led_classdev_register (tps68470->dev, lcdev); +if (ret) { +dev_err_probe (tps68470->dev, ret, +"error registering led\n" ); + goto err_exit; + } + } + +/* configure LEDB current if the properties can be got */ +if (!device_property_read_u32 (&pdev->dev,"ti,ledb-current" , &curr)) { +switch (curr) { +case 2 : + curr =CTRLB_2MA ; +break ; +case 4 : + curr =CTRLB_4MA ; +break ; +case 8 : + curr =CTRLB_8MA ; +break ; +case 16 :
Quoted 8 lines
drivers/leds/leds-tps68470.c line 154
Quoted 5 lines
drivers/leds/leds-tps68470.c new file +5
-0+ curr =CTRLB_16MA ; +break ; +default : +dev_err (&pdev->dev,"Invalid LEDB curr value: %d\n" , curr); +return -EINVAL ;There's no jump to
err_exithere...I think that this whole section should go above the registration of the LEDS...and probably also into its own function.
Okay.
Quoted 21 lines
Quoted 21 lines
drivers/leds/leds-tps68470.c new file +20
-0+ } + ret =regmap_update_bits (tps68470->regmap,TPS68470_REG_ILEDCTL , +TPS68470_ILEDCTL_CTRLB , curr); + } + +err_exit: +if (ret) { +for (i =0 ; i <TPS68470_NUM_LEDS ; i++) { +if (tps68470->leds[i].lcdev.name) +devm_led_classdev_unregister (&pdev->dev, + &tps68470->leds[i].lcdev); + } + } + +return ret; +} +static struct platform_driver tps68470_led_driver = { + .driver = { + .name ="tps68470-led" , + },
Quoted 9 lines
drivers/leds/leds-tps68470.c line 182
Quoted 8 lines
drivers/leds/leds-tps68470.c new file +8
-0+ .probe = tps68470_leds_probe, +}; + +module_platform_driver (tps68470_led_driver); + +MODULE_ALIAS ("platform:tps68470-led" ); +MODULE_DESCRIPTION ("LED driver for TPS68470 PMIC" ); +MODULE_LICENSE ("GPL v2" );
Thank you
Signature · 2 lines
BR, Kate
Dan Scally
maintainerRe: [PATCH v2 3/4] leds: tps68470: Add LED control for tps68470
In reply to Kate HsuanHi Kate - sorry just noticed one more thing...
Quoted 43 lines · Kate Hsuan
There are two LED controllers, LEDA indicator LED and LEDB flash LED for tps68470. LEDA can be enabled by setting
TPS68470_ILEDCTL_ENA. Moreover, tps68470 provides four levels of power status for LEDB. If the properties called "ti,ledb-current" can be found, the current will be set according to the property values. These two LEDs can be controlled through the LED class of sysfs (tps68470-leda and tps68470-ledb).Signed-off-by Kate Hsuan <[email protected]>--- drivers/leds/Kconfig | 12 +++ drivers/leds/Makefile | 1 + drivers/leds/leds-tps68470.c | 182 +++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+)create mode 100644
drivers/leds/leds-tps68470.cdrivers/leds/Kconfig +12
-0@@ -827,6 +827,18 @@ config LEDS_TPS6105X It is a single boost converter primarily for white LEDs and audio amplifiers. +config LEDS_TPS68470 + tristate "LED support for TI TPS68470" + depends on LEDS_CLASS + depends on INTEL_SKL_INT3472 + help + This driver supports TPS68470 PMIC with LED chip. + It provide two LED controllers, including an indicator LED + and a flash LED. + + To compile this driver as a module, choose M and it will be + called leds-tps68470 + config LEDS_IP30 tristate "LED support for SGI Octane machines" depends on LEDS_CLASSdrivers/leds/Makefile +0
-0
drivers/leds/Makefile obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds-turris-omnia.o · line 87
Quoted 4 lines
drivers/leds/Makefile +1
-0@@ -84,6 +84,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds-turris-omnia.o obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o +obj-$(CONFIG_LEDS_TPS68470) += leds-tps68470.o
Alphabetical order here too please :)
Re: [PATCH v2 3/4] leds: tps68470: Add LED control for tps68470
Quoted 46 lines · Dan Scally
Hi Kate - sorry just noticed one more thing...
Quoted 42 lines · Kate Hsuan
There are two LED controllers, LEDA indicator LED and LEDB flash LED for tps68470. LEDA can be enabled by setting
TPS68470_ILEDCTL_ENA. Moreover, tps68470 provides four levels of power status for LEDB. If the properties called "ti,ledb-current" can be found, the current will be set according to the property values. These two LEDs can be controlled through the LED class of sysfs (tps68470-leda and tps68470-ledb).Signed-off-by Kate Hsuan <[email protected]>--- drivers/leds/Kconfig | 12 +++ drivers/leds/Makefile | 1 + drivers/leds/leds-tps68470.c | 182 +++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+)create mode 100644
drivers/leds/leds-tps68470.cdrivers/leds/Kconfig +12
-0@@ -827,6 +827,18 @@ config LEDS_TPS6105X It is a single boost converter primarily for white LEDs and audio amplifiers. +config LEDS_TPS68470 + tristate "LED support for TI TPS68470" + depends on LEDS_CLASS + depends on INTEL_SKL_INT3472 + help + This driver supports TPS68470 PMIC with LED chip. + It provide two LED controllers, including an indicator LED + and a flash LED. + + To compile this driver as a module, choose M and it will be + called leds-tps68470 + config LEDS_IP30 tristate "LED support for SGI Octane machines" depends on LEDS_CLASSdrivers/leds/Makefile +0
-0
Quoted 9 lines
drivers/leds/Makefile obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds-turris-omnia.o · line 87
Quoted 5 lines
drivers/leds/Makefile +1
-0@@ -84,6 +84,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds-turris-omnia.o obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o +obj-$(CONFIG_LEDS_TPS68470) += leds-tps68470.oAlphabetical order here too please :)
Thank you. I updated this. :)
Signature · 2 lines
BR, Kate
PATCH v2 4/4 platform: x86: int3472: Register a LED lookup table entry for the privacy LED
In reply to Kate HsuanFrom: Hans de Goede <[email protected]>
All currently known models using the tps68470 PMIC have a privacy LED for the back sensor (first ACPI consumer dev of the PMIC) connected to the ileda output of the PMIC.
Add a LED lookup table entry for this, so that the v4l2-core code turns on the LED when streaming from the sensor.
--- drivers/platform/x86/intel/int3472/tps68470.c | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-)
drivers/platform/x86/intel/int3472/tps68470.c +28 -2
@@ -140,11 +140,18 @@ skl_int3472_fill_clk_pdata(struct device *dev, struct tps68470_clk_platform_datareturn n_consumers; } +static void skl_int3472_tps68470_unregister_led_lookup (void *led_lookup) +{ +led_remove_lookup (led_lookup); +} +static int skl_int3472_tps68470_probe (struct i2c_client *client) { -struct acpi_device *adev =ACPI_COMPANION (&client->dev); +struct device *dev = &client->dev; +struct acpi_device *adev =ACPI_COMPANION (dev);const struct int3472_tps68470_board_data *board_data;struct tps68470_clk_platform_data *clk_pdata; +struct led_lookup_data *led_lookup;struct mfd_cell *cells;struct regmap *regmap;int n_consumers;
@@ -177,6 +184,25 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client)if (!board_data)return dev_err_probe (&client->dev, -ENODEV ,"No board-data found for this model\n" ); +/* Add a LED lookup table entry for the privacy LED */ + led_lookup =devm_kzalloc (&client->dev,sizeof (*led_lookup),GFP_KERNEL ); +if (!led_lookup) +return -ENOMEM ; + + ret =skl_int3472_get_sensor_adev_and_name (&client->dev,NULL , &led_lookup->dev_id); +if (ret) +return ret; + + led_lookup->provider ="tps68470-ileda" ; + led_lookup->con_id ="privacy-led" ; +led_add_lookup (led_lookup); + + ret =devm_add_action_or_reset (&client->dev, + skl_int3472_tps68470_unregister_led_lookup, + led_lookup); +if (ret) +return ret; + cells =kcalloc (TPS68470_WIN_MFD_CELL_COUNT ,sizeof (*cells),GFP_KERNEL );if (!cells)return -ENOMEM ;
@@ -259,4 +285,4 @@ module_i2c_driver(int3472_tps68470);MODULE_DESCRIPTION ("Intel SkyLake INT3472 ACPI TPS68470 Device Driver" );MODULE_AUTHOR ("Daniel Scally <[email protected]>" );MODULE_LICENSE ("GPL v2" ); -MODULE_SOFTDEP ("pre: clk-tps68470 tps68470-regulator" ); +MODULE_SOFTDEP ("pre: clk-tps68470 tps68470-regulator leds-tps68470" );
Signature · 1 line
2.37.3
Dan Scally
maintainerRe: [PATCH v2 4/4] platform: x86: int3472: Register a LED lookup table entry for the privacy LED
Hi Kate
Quoted 45 lines · Kate Hsuan
From: Hans de Goede <[email protected]>
All currently known models using the tps68470 PMIC have a privacy LED for the back sensor (first ACPI consumer dev of the PMIC) connected to the ileda output of the PMIC.
Add a LED lookup table entry for this, so that the v4l2-core code turns on the LED when streaming from the sensor.
Signed-off-by Hans de Goede <[email protected]>--- drivers/platform/x86/intel/int3472/tps68470.c | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-)drivers/platform/x86/intel/int3472/tps68470.c +11
-1@@ -140,11 +140,18 @@ skl_int3472_fill_clk_pdata(struct device *dev, struct tps68470_clk_platform_datareturn n_consumers; } +static void skl_int3472_tps68470_unregister_led_lookup (void *led_lookup) +{ +led_remove_lookup (led_lookup); +} +static int skl_int3472_tps68470_probe (struct i2c_client *client) { -struct acpi_device *adev =ACPI_COMPANION (&client->dev); +struct device *dev = &client->dev; +struct acpi_device *adev =ACPI_COMPANION (dev);const struct int3472_tps68470_board_data *board_data;struct tps68470_clk_platform_data *clk_pdata; +struct led_lookup_data *led_lookup;struct mfd_cell *cells;struct regmap *regmap;int n_consumers;@@ -177,6 +184,25 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client)if (!board_data)return dev_err_probe (&client->dev, -ENODEV ,"No board-data found for this model\n" ); +/* Add a LED lookup table entry for the privacy LED */ + led_lookup =devm_kzalloc (&client->dev,sizeof (*led_lookup),GFP_KERNEL ); +if (!led_lookup)
drivers/platform/x86/intel/int3472/tps68470.c static int skl_int3472_tps68470_probe(struct i2c_client *client) · line 199
Quoted 10 lines
drivers/platform/x86/intel/int3472/tps68470.c +10
-0+return -ENOMEM ; + + ret =skl_int3472_get_sensor_adev_and_name (&client->dev,NULL , &led_lookup->dev_id); +if (ret) +return ret; + + led_lookup->provider ="tps68470-ileda" ; + led_lookup->con_id ="privacy-led" ; +led_add_lookup (led_lookup); +
I'm not so sure about this one, because whilst the discrete type INT3472's only have a single dependent, on lots of platforms the TPS68470 type has 2. skl_int3472_get_sensor_adev_and_name() will just get those attributes of the first dependent; that conceivably might not be the ov5693. If it returns the ov7251's attributes this would assign the wrong LED to it, as that one needs the IR LED to function.
I think that this functionality probably needs to be added to the board data returned by int3472_tps68470_get_board_data(), just as the GPIO lookups are.
Quoted 15 lines
drivers/platform/x86/intel/int3472/tps68470.c +7
-1+ ret = devm_add_action_or_reset(&client->dev,. + skl_int3472_tps68470_unregister_led_lookup, + led_lookup); +if (ret) +return ret; + cells =kcalloc (TPS68470_WIN_MFD_CELL_COUNT ,sizeof (*cells),GFP_KERNEL );if (!cells)return -ENOMEM ;@@ -259,4 +285,4 @@ module_i2c_driver(int3472_tps68470);MODULE_DESCRIPTION ("Intel SkyLake INT3472 ACPI TPS68470 Device Driver" );MODULE_AUTHOR ("Daniel Scally <[email protected]>" );MODULE_LICENSE ("GPL v2" ); -MODULE_SOFTDEP ("pre: clk-tps68470 tps68470-regulator" ); +MODULE_SOFTDEP ("pre: clk-tps68470 tps68470-regulator leds-tps68470" );