mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

LED updates for 5.17. Nothing major is happening here. 

I had to rebase at last moment to fix wrong author of one
 commit. Sorry about that.
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRPfPO7r0eAhk010v0w5/Bqldv68gUCYd8hdwAKCRAw5/Bqldv6
 8m3sAKC20ddEFW04Mk45Tw72qSyud6vhwQCaAnQy6dcd+zV6LOxosgLZdtXkvx0=
 =CU+X
 -----END PGP SIGNATURE-----

Merge tag 'leds-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds

Pull LED updates from Pavel Machek:
 "Nothing major is happening here"

* tag 'leds-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds:
  leds: lp55xx: initialise output direction from dts
  ARM: dts: omap3-n900: Fix lp5523 for multi color
  leds: ktd2692: Drop calling dev_of_node() in ktd2692_parse_dt
  leds: lgm-sso: Get rid of duplicate of_node assignment
  leds: tca6507: Get rid of duplicate of_node assignment
  leds: leds-fsg: Drop FSG3 LED driver
  leds: lp50xx: remove unused variable
  dt-bindings: leds: Replace moonlight with indicator in mt6360 example
  leds: led-core: Update fwnode with device_set_node
  leds: tca6507: use swap() to make code cleaner
  leds: Add mt6360 driver
  dt-bindings: leds: Add bindings for MT6360 LED
This commit is contained in:
Linus Torvalds 2022-01-12 16:59:22 -08:00
parent 4eb766f64d 9e87a8da74
commit d9b5941bb5
14 changed files with 1130 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
Documentation/devicetree/bindings/leds/leds-mt6360.yaml Normal file
View File

@ -0,0 +1,159 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/leds/leds-mt6360.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: LED driver for MT6360 PMIC from MediaTek Integrated.
maintainers:
- Gene Chen <gene_chen@richtek.com>
description: |
This module is part of the MT6360 MFD device.
see Documentation/devicetree/bindings/mfd/mt6360.yaml
Add MT6360 LED driver include 2-channel Flash LED with torch/strobe mode,
and 4-channel RGB LED support Register/Flash/Breath Mode
properties:
compatible:
const: mediatek,mt6360-led
"#address-cells":
const: 1
"#size-cells":
const: 0
patternProperties:
"^(multi-)?led@[0-5]$":
type: object
$ref: common.yaml#
description:
Properties for a single LED.
properties:
reg:
description: Index of the LED.
enum:
- 0 # LED output ISINK1
- 1 # LED output ISINK2
- 2 # LED output ISINK3
- 3 # LED output ISINKML
- 4 # LED output FLASH1
- 5 # LED output FLASH2
unevaluatedProperties: false
required:
- compatible
- "#address-cells"
- "#size-cells"
additionalProperties: false
examples:
- |
#include <dt-bindings/leds/common.h>
led-controller {
compatible = "mediatek,mt6360-led";
#address-cells = <1>;
#size-cells = <0>;
multi-led@0 {
reg = <0>;
function = LED_FUNCTION_INDICATOR;
color = <LED_COLOR_ID_RGB>;
led-max-microamp = <24000>;
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_RED>;
};
led@1 {
reg = <1>;
color = <LED_COLOR_ID_GREEN>;
};
led@2 {
reg = <2>;
color = <LED_COLOR_ID_BLUE>;
};
};
led@3 {
reg = <3>;
function = LED_FUNCTION_INDICATOR;
color = <LED_COLOR_ID_WHITE>;
led-max-microamp = <150000>;
};
led@4 {
reg = <4>;
function = LED_FUNCTION_FLASH;
color = <LED_COLOR_ID_WHITE>;
function-enumerator = <1>;
led-max-microamp = <200000>;
flash-max-microamp = <500000>;
flash-max-timeout-us = <1024000>;
};
led@5 {
reg = <5>;
function = LED_FUNCTION_FLASH;
color = <LED_COLOR_ID_WHITE>;
function-enumerator = <2>;
led-max-microamp = <200000>;
flash-max-microamp = <500000>;
flash-max-timeout-us = <1024000>;
};
};
- |
led-controller {
compatible = "mediatek,mt6360-led";
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
function = LED_FUNCTION_INDICATOR;
color = <LED_COLOR_ID_RED>;
led-max-microamp = <24000>;
};
led@1 {
reg = <1>;
function = LED_FUNCTION_INDICATOR;
color = <LED_COLOR_ID_GREEN>;
led-max-microamp = <24000>;
};
led@2 {
reg = <2>;
function = LED_FUNCTION_INDICATOR;
color = <LED_COLOR_ID_BLUE>;
led-max-microamp = <24000>;
};
led@3 {
reg = <3>;
function = LED_FUNCTION_INDICATOR;
color = <LED_COLOR_ID_WHITE>;
led-max-microamp = <150000>;
};
led@4 {
reg = <4>;
function = LED_FUNCTION_FLASH;
color = <LED_COLOR_ID_WHITE>;
function-enumerator = <1>;
led-max-microamp = <200000>;
flash-max-microamp = <500000>;
flash-max-timeout-us = <1024000>;
};
led@5 {
reg = <5>;
function = LED_FUNCTION_FLASH;
color = <LED_COLOR_ID_WHITE>;
function-enumerator = <2>;
led-max-microamp = <200000>;
flash-max-microamp = <500000>;
flash-max-timeout-us = <1024000>;
};
};
...

50
arch/arm/boot/dts/omap3-n900.dts
View File

@ -8,6 +8,7 @@
#include "omap34xx.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
/*
* Default secure signed bootloader (Nokia X-Loader) does not enable L3 firewall
@ -630,63 +631,92 @@
};
lp5523: lp5523@32 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "national,lp5523";
reg = <0x32>;
clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */
enable-gpio = <&gpio2 9 GPIO_ACTIVE_HIGH>; /* 41 */
enable-gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>; /* 41 */
chan0 {
led@0 {
reg = <0>;
chan-name = "lp5523:kb1";
led-cur = /bits/ 8 <50>;
max-cur = /bits/ 8 <100>;
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_KBD_BACKLIGHT;
};
chan1 {
led@1 {
reg = <1>;
chan-name = "lp5523:kb2";
led-cur = /bits/ 8 <50>;
max-cur = /bits/ 8 <100>;
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_KBD_BACKLIGHT;
};
chan2 {
led@2 {
reg = <2>;
chan-name = "lp5523:kb3";
led-cur = /bits/ 8 <50>;
max-cur = /bits/ 8 <100>;
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_KBD_BACKLIGHT;
};
chan3 {
led@3 {
reg = <3>;
chan-name = "lp5523:kb4";
led-cur = /bits/ 8 <50>;
max-cur = /bits/ 8 <100>;
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_KBD_BACKLIGHT;
};
chan4 {
led@4 {
reg = <4>;
chan-name = "lp5523:b";
led-cur = /bits/ 8 <50>;
max-cur = /bits/ 8 <100>;
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_STATUS;
};
chan5 {
led@5 {
reg = <5>;
chan-name = "lp5523:g";
led-cur = /bits/ 8 <50>;
max-cur = /bits/ 8 <100>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_STATUS;
};
chan6 {
led@6 {
reg = <6>;
chan-name = "lp5523:r";
led-cur = /bits/ 8 <50>;
max-cur = /bits/ 8 <100>;
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_STATUS;
};
chan7 {
led@7 {
reg = <7>;
chan-name = "lp5523:kb5";
led-cur = /bits/ 8 <50>;
max-cur = /bits/ 8 <100>;
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_KBD_BACKLIGHT;
};
chan8 {
led@8 {
reg = <8>;
chan-name = "lp5523:kb6";
led-cur = /bits/ 8 <50>;
max-cur = /bits/ 8 <100>;
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_KBD_BACKLIGHT;
};
};

7
drivers/leds/Kconfig
View File

@ -260,13 +260,6 @@ config LEDS_NET48XX
This option enables support for the Soekris net4801 and net4826 error
LED.
config LEDS_FSG
tristate "LED Support for the Freecom FSG-3"
depends on LEDS_CLASS
depends on MACH_FSG
help
This option enables support for the LEDs on the Freecom FSG-3.
config LEDS_WRAP
tristate "LED Support for the WRAP series LEDs"
depends on LEDS_CLASS

1
drivers/leds/Makefile
View File

@ -26,7 +26,6 @@ obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
obj-$(CONFIG_LEDS_CPCAP) += leds-cpcap.o
obj-$(CONFIG_LEDS_DA903X) += leds-da903x.o
obj-$(CONFIG_LEDS_DA9052) += leds-da9052.o
obj-$(CONFIG_LEDS_FSG) += leds-fsg.o
obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
obj-$(CONFIG_LEDS_GPIO_REGISTER) += leds-gpio-register.o
obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o

1
drivers/leds/blink/leds-lgm-sso.c
View File

@ -477,7 +477,6 @@ static int sso_gpio_gc_init(struct device *dev, struct sso_led_priv *priv)
gc->ngpio = priv->gpio.pins;
gc->parent = dev;
gc->owner = THIS_MODULE;
gc->of_node = dev->of_node;
return devm_gpiochip_add_data(dev, gc, priv);
}

13
drivers/leds/flash/Kconfig
View File

@ -48,6 +48,19 @@ config LEDS_MAX77693
multifunction device. It has build in control for two leds in flash
and torch mode.
config LEDS_MT6360
tristate "LED Support for Mediatek MT6360 PMIC"
depends on LEDS_CLASS && OF
depends on LEDS_CLASS_FLASH || !LEDS_CLASS_FLASH
depends on LEDS_CLASS_MULTICOLOR || !LEDS_CLASS_MULTICOLOR
depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS
depends on MFD_MT6360
help
This option enables support for dual Flash LED drivers found on
Mediatek MT6360 PMIC.
Independent current sources supply for each flash LED support torch
and strobe mode.
config LEDS_RT4505
tristate "LED support for RT4505 flashlight controller"
depends on I2C && OF

1
drivers/leds/flash/Makefile
View File

@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_LEDS_MT6360) += leds-mt6360.o
obj-$(CONFIG_LEDS_AAT1290) += leds-aat1290.o
obj-$(CONFIG_LEDS_AS3645A) += leds-as3645a.o
obj-$(CONFIG_LEDS_KTD2692) += leds-ktd2692.o

2
drivers/leds/flash/leds-ktd2692.c
View File

@ -274,7 +274,7 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
struct device_node *child_node;
int ret;
if (!dev_of_node(dev))
if (!np)
return -ENXIO;
led->ctrl_gpio = devm_gpiod_get(dev, "ctrl", GPIOD_ASIS);

910
drivers/leds/flash/leds-mt6360.c Normal file
View File

@ -0,0 +1,910 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/led-class-flash.h>
#include <linux/led-class-multicolor.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/regmap.h>
#include <media/v4l2-flash-led-class.h>
enum {
MT6360_LED_ISNK1 = 0,
MT6360_LED_ISNK2,
MT6360_LED_ISNK3,
MT6360_LED_ISNKML,
MT6360_LED_FLASH1,
MT6360_LED_FLASH2,
MT6360_MAX_LEDS
};
#define MT6360_REG_RGBEN 0x380
#define MT6360_REG_ISNK(_led_no) (0x381 + (_led_no))
#define MT6360_ISNK_ENMASK(_led_no) BIT(7 - (_led_no))
#define MT6360_ISNK_MASK GENMASK(4, 0)
#define MT6360_CHRINDSEL_MASK BIT(3)
/* Virtual definition for multicolor */
#define MT6360_VIRTUAL_MULTICOLOR (MT6360_MAX_LEDS + 1)
#define MULTICOLOR_NUM_CHANNELS 3
#define MT6360_REG_FLEDEN 0x37E
#define MT6360_REG_STRBTO 0x373
#define MT6360_REG_FLEDBASE(_id) (0x372 + 4 * (_id - MT6360_LED_FLASH1))
#define MT6360_REG_FLEDISTRB(_id) (MT6360_REG_FLEDBASE(_id) + 2)
#define MT6360_REG_FLEDITOR(_id) (MT6360_REG_FLEDBASE(_id) + 3)
#define MT6360_REG_CHGSTAT2 0x3E1
#define MT6360_REG_FLEDSTAT1 0x3E9
#define MT6360_ITORCH_MASK GENMASK(4, 0)
#define MT6360_ISTROBE_MASK GENMASK(6, 0)
#define MT6360_STRBTO_MASK GENMASK(6, 0)
#define MT6360_TORCHEN_MASK BIT(3)
#define MT6360_STROBEN_MASK BIT(2)
#define MT6360_FLCSEN_MASK(_id) BIT(MT6360_LED_FLASH2 - _id)
#define MT6360_FLEDCHGVINOVP_MASK BIT(3)
#define MT6360_FLED1STRBTO_MASK BIT(11)
#define MT6360_FLED2STRBTO_MASK BIT(10)
#define MT6360_FLED1STRB_MASK BIT(9)
#define MT6360_FLED2STRB_MASK BIT(8)
#define MT6360_FLED1SHORT_MASK BIT(7)
#define MT6360_FLED2SHORT_MASK BIT(6)
#define MT6360_FLEDLVF_MASK BIT(3)
#define MT6360_ISNKRGB_STEPUA 2000
#define MT6360_ISNKRGB_MAXUA 24000
#define MT6360_ISNKML_STEPUA 5000
#define MT6360_ISNKML_MAXUA 150000
#define MT6360_ITORCH_MINUA 25000
#define MT6360_ITORCH_STEPUA 12500
#define MT6360_ITORCH_MAXUA 400000
#define MT6360_ISTRB_MINUA 50000
#define MT6360_ISTRB_STEPUA 12500
#define MT6360_ISTRB_MAXUA 1500000
#define MT6360_STRBTO_MINUS 64000
#define MT6360_STRBTO_STEPUS 32000
#define MT6360_STRBTO_MAXUS 2432000
#define STATE_OFF 0
#define STATE_KEEP 1
#define STATE_ON 2
struct mt6360_led {
union {
struct led_classdev isnk;
struct led_classdev_mc mc;
struct led_classdev_flash flash;
};
struct v4l2_flash *v4l2_flash;
struct mt6360_priv *priv;
u32 led_no;
u32 default_state;
};
struct mt6360_priv {
struct device *dev;
struct regmap *regmap;
struct mutex lock;
unsigned int fled_strobe_used;
unsigned int fled_torch_used;
unsigned int leds_active;
unsigned int leds_count;
struct mt6360_led leds[];
};
static int mt6360_mc_brightness_set(struct led_classdev *lcdev,
enum led_brightness level)
{
struct led_classdev_mc *mccdev = lcdev_to_mccdev(lcdev);
struct mt6360_led *led = container_of(mccdev, struct mt6360_led, mc);
struct mt6360_priv *priv = led->priv;
u32 real_bright, enable_mask = 0, enable = 0;
int i, ret;
mutex_lock(&priv->lock);
led_mc_calc_color_components(mccdev, level);
for (i = 0; i < mccdev->num_colors; i++) {
struct mc_subled *subled = mccdev->subled_info + i;
real_bright = min(lcdev->max_brightness, subled->brightness);
ret = regmap_update_bits(priv->regmap, MT6360_REG_ISNK(i),
MT6360_ISNK_MASK, real_bright);
if (ret)
goto out;
enable_mask |= MT6360_ISNK_ENMASK(subled->channel);
if (real_bright)
enable |= MT6360_ISNK_ENMASK(subled->channel);
}
ret = regmap_update_bits(priv->regmap, MT6360_REG_RGBEN, enable_mask,
enable);
out:
mutex_unlock(&priv->lock);
return ret;
}
static int mt6360_isnk_brightness_set(struct led_classdev *lcdev,
enum led_brightness level)
{
struct mt6360_led *led = container_of(lcdev, struct mt6360_led, isnk);
struct mt6360_priv *priv = led->priv;
u32 enable_mask = MT6360_ISNK_ENMASK(led->led_no);
u32 val = level ? MT6360_ISNK_ENMASK(led->led_no) : 0;
int ret;
mutex_lock(&priv->lock);
ret = regmap_update_bits(priv->regmap, MT6360_REG_ISNK(led->led_no),
MT6360_ISNK_MASK, level);
if (ret)
goto out;
ret = regmap_update_bits(priv->regmap, MT6360_REG_RGBEN, enable_mask,
val);
out:
mutex_unlock(&priv->lock);
return ret;
}
static int mt6360_torch_brightness_set(struct led_classdev *lcdev,
enum led_brightness level)
{
struct mt6360_led *led =
container_of(lcdev, struct mt6360_led, flash.led_cdev);
struct mt6360_priv *priv = led->priv;
u32 enable_mask = MT6360_TORCHEN_MASK | MT6360_FLCSEN_MASK(led->led_no);
u32 val = level ? MT6360_FLCSEN_MASK(led->led_no) : 0;
u32 prev = priv->fled_torch_used, curr;
int ret;
mutex_lock(&priv->lock);
/*
* Only one set of flash control logic, use the flag to avoid strobe is
* currently used.
*/
if (priv->fled_strobe_used) {
dev_warn(lcdev->dev, "Please disable strobe first [%d]\n",
priv->fled_strobe_used);
ret = -EBUSY;
goto unlock;
}
if (level)
curr = prev | BIT(led->led_no);
else
curr = prev & ~BIT(led->led_no);
if (curr)
val |= MT6360_TORCHEN_MASK;
if (level) {
ret = regmap_update_bits(priv->regmap,
MT6360_REG_FLEDITOR(led->led_no),
MT6360_ITORCH_MASK, level - 1);
if (ret)
goto unlock;
}
ret = regmap_update_bits(priv->regmap, MT6360_REG_FLEDEN, enable_mask,
val);
if (ret)
goto unlock;
priv->fled_torch_used = curr;
unlock:
mutex_unlock(&priv->lock);
return ret;
}
static int mt6360_flash_brightness_set(struct led_classdev_flash *fl_cdev,
u32 brightness)
{
/*
* Due to the current spike when turning on flash, let brightness to be
* kept by framework.
* This empty function is used to prevent led_classdev_flash register
* ops check failure.
*/
return 0;
}
static int _mt6360_flash_brightness_set(struct led_classdev_flash *fl_cdev,
u32 brightness)
{
struct mt6360_led *led =
container_of(fl_cdev, struct mt6360_led, flash);
struct mt6360_priv *priv = led->priv;
struct led_flash_setting *s = &fl_cdev->brightness;
u32 val = (brightness - s->min) / s->step;
return regmap_update_bits(priv->regmap,
MT6360_REG_FLEDISTRB(led->led_no),
MT6360_ISTROBE_MASK, val);
}
static int mt6360_strobe_set(struct led_classdev_flash *fl_cdev, bool state)
{
struct mt6360_led *led =
container_of(fl_cdev, struct mt6360_led, flash);
struct mt6360_priv *priv = led->priv;
struct led_classdev *lcdev = &fl_cdev->led_cdev;
struct led_flash_setting *s = &fl_cdev->brightness;
u32 enable_mask = MT6360_STROBEN_MASK | MT6360_FLCSEN_MASK(led->led_no);
u32 val = state ? MT6360_FLCSEN_MASK(led->led_no) : 0;
u32 prev = priv->fled_strobe_used, curr;
int ret;
mutex_lock(&priv->lock);
/*
* Only one set of flash control logic, use the flag to avoid torch is
* currently used
*/
if (priv->fled_torch_used) {
dev_warn(lcdev->dev, "Please disable torch first [0x%x]\n",
priv->fled_torch_used);
ret = -EBUSY;
goto unlock;
}
if (state)
curr = prev | BIT(led->led_no);
else
curr = prev & ~BIT(led->led_no);
if (curr)
val |= MT6360_STROBEN_MASK;
ret = regmap_update_bits(priv->regmap, MT6360_REG_FLEDEN, enable_mask,
val);
if (ret) {
dev_err(lcdev->dev, "[%d] control current source %d fail\n",
led->led_no, state);
goto unlock;
}
/*
* If the flash need to be on, config the flash current ramping up to
* the setting value.
* Else, always recover back to the minimum one
*/
ret = _mt6360_flash_brightness_set(fl_cdev, state ? s->val : s->min);
if (ret)
goto unlock;
/*
* For the flash turn on/off, HW rampping up/down time is 5ms/500us,
* respectively.
*/
if (!prev && curr)
usleep_range(5000, 6000);
else if (prev && !curr)
udelay(500);
priv->fled_strobe_used = curr;
unlock:
mutex_unlock(&priv->lock);
return ret;
}
static int mt6360_strobe_get(struct led_classdev_flash *fl_cdev, bool *state)
{
struct mt6360_led *led =
container_of(fl_cdev, struct mt6360_led, flash);
struct mt6360_priv *priv = led->priv;
mutex_lock(&priv->lock);
*state = !!(priv->fled_strobe_used & BIT(led->led_no));
mutex_unlock(&priv->lock);
return 0;
}
static int mt6360_timeout_set(struct led_classdev_flash *fl_cdev, u32 timeout)
{
struct mt6360_led *led =
container_of(fl_cdev, struct mt6360_led, flash);
struct mt6360_priv *priv = led->priv;
struct led_flash_setting *s = &fl_cdev->timeout;
u32 val = (timeout - s->min) / s->step;
int ret;
mutex_lock(&priv->lock);
ret = regmap_update_bits(priv->regmap, MT6360_REG_STRBTO,
MT6360_STRBTO_MASK, val);
mutex_unlock(&priv->lock);
return ret;
}
static int mt6360_fault_get(struct led_classdev_flash *fl_cdev, u32 *fault)
{
struct mt6360_led *led =
container_of(fl_cdev, struct mt6360_led, flash);
struct mt6360_priv *priv = led->priv;
u16 fled_stat;
unsigned int chg_stat, strobe_timeout_mask, fled_short_mask;
u32 rfault = 0;
int ret;
mutex_lock(&priv->lock);
ret = regmap_read(priv->regmap, MT6360_REG_CHGSTAT2, &chg_stat);
if (ret)
goto unlock;
ret = regmap_raw_read(priv->regmap, MT6360_REG_FLEDSTAT1, &fled_stat,
sizeof(fled_stat));
if (ret)
goto unlock;
if (led->led_no == MT6360_LED_FLASH1) {
strobe_timeout_mask = MT6360_FLED1STRBTO_MASK;
fled_short_mask = MT6360_FLED1SHORT_MASK;
} else {
strobe_timeout_mask = MT6360_FLED2STRBTO_MASK;
fled_short_mask = MT6360_FLED2SHORT_MASK;
}
if (chg_stat & MT6360_FLEDCHGVINOVP_MASK)
rfault |= LED_FAULT_INPUT_VOLTAGE;
if (fled_stat & strobe_timeout_mask)
rfault |= LED_FAULT_TIMEOUT;
if (fled_stat & fled_short_mask)
rfault |= LED_FAULT_SHORT_CIRCUIT;
if (fled_stat & MT6360_FLEDLVF_MASK)
rfault |= LED_FAULT_UNDER_VOLTAGE;
*fault = rfault;
unlock:
mutex_unlock(&priv->lock);
return ret;
}
static const struct led_flash_ops mt6360_flash_ops = {
.flash_brightness_set = mt6360_flash_brightness_set,
.strobe_set = mt6360_strobe_set,
.strobe_get = mt6360_strobe_get,
.timeout_set = mt6360_timeout_set,
.fault_get = mt6360_fault_get,
};
static int mt6360_isnk_init_default_state(struct mt6360_led *led)
{
struct mt6360_priv *priv = led->priv;
unsigned int regval;
u32 level;
int ret;
ret = regmap_read(priv->regmap, MT6360_REG_ISNK(led->led_no), &regval);
if (ret)
return ret;
level = regval & MT6360_ISNK_MASK;
ret = regmap_read(priv->regmap, MT6360_REG_RGBEN, &regval);
if (ret)
return ret;
if (!(regval & MT6360_ISNK_ENMASK(led->led_no)))
level = LED_OFF;
switch (led->default_state) {
case STATE_ON:
led->isnk.brightness = led->isnk.max_brightness;
break;
case STATE_KEEP:
led->isnk.brightness = min(level, led->isnk.max_brightness);
break;
default:
led->isnk.brightness = LED_OFF;
}
return mt6360_isnk_brightness_set(&led->isnk, led->isnk.brightness);
}
static int mt6360_flash_init_default_state(struct mt6360_led *led)
{
struct led_classdev_flash *flash = &led->flash;
struct mt6360_priv *priv = led->priv;
u32 enable_mask = MT6360_TORCHEN_MASK | MT6360_FLCSEN_MASK(led->led_no);
u32 level;
unsigned int regval;
int ret;
ret = regmap_read(priv->regmap, MT6360_REG_FLEDITOR(led->led_no),
&regval);
if (ret)
return ret;
level = regval & MT6360_ITORCH_MASK;
ret = regmap_read(priv->regmap, MT6360_REG_FLEDEN, &regval);
if (ret)
return ret;
if ((regval & enable_mask) == enable_mask)
level += 1;
else
level = LED_OFF;
switch (led->default_state) {
case STATE_ON:
flash->led_cdev.brightness = flash->led_cdev.max_brightness;
break;
case STATE_KEEP:
flash->led_cdev.brightness =
min(level, flash->led_cdev.max_brightness);
break;
default:
flash->led_cdev.brightness = LED_OFF;
}
return mt6360_torch_brightness_set(&flash->led_cdev,
flash->led_cdev.brightness);
}
#if IS_ENABLED(CONFIG_V4L2_FLASH_LED_CLASS)
static int mt6360_flash_external_strobe_set(struct v4l2_flash *v4l2_flash,
bool enable)
{
struct led_classdev_flash *flash = v4l2_flash->fled_cdev;
struct mt6360_led *led = container_of(flash, struct mt6360_led, flash);
struct mt6360_priv *priv = led->priv;
u32 mask = MT6360_FLCSEN_MASK(led->led_no);
u32 val = enable ? mask : 0;
int ret;
mutex_lock(&priv->lock);
ret = regmap_update_bits(priv->regmap, MT6360_REG_FLEDEN, mask, val);
if (ret)
goto unlock;
if (enable)
priv->fled_strobe_used |= BIT(led->led_no);
else
priv->fled_strobe_used &= ~BIT(led->led_no);
unlock:
mutex_unlock(&priv->lock);
return ret;
}
static const struct v4l2_flash_ops v4l2_flash_ops = {
.external_strobe_set = mt6360_flash_external_strobe_set,
};
static void mt6360_init_v4l2_flash_config(struct mt6360_led *led,
struct v4l2_flash_config *config)
{
struct led_classdev *lcdev;
struct led_flash_setting *s = &config->intensity;
lcdev = &led->flash.led_cdev;
s->min = MT6360_ITORCH_MINUA;
s->step = MT6360_ITORCH_STEPUA;
s->val = s->max = s->min + (lcdev->max_brightness - 1) * s->step;
config->has_external_strobe = 1;
strscpy(config->dev_name, lcdev->dev->kobj.name,
sizeof(config->dev_name));
config->flash_faults = LED_FAULT_SHORT_CIRCUIT | LED_FAULT_TIMEOUT |
LED_FAULT_INPUT_VOLTAGE |
LED_FAULT_UNDER_VOLTAGE;
}
#else
static const struct v4l2_flash_ops v4l2_flash_ops;
static void mt6360_init_v4l2_flash_config(struct mt6360_led *led,
struct v4l2_flash_config *config)
{
}
#endif
static int mt6360_led_register(struct device *parent, struct mt6360_led *led,
struct led_init_data *init_data)
{
struct mt6360_priv *priv = led->priv;
struct v4l2_flash_config v4l2_config = {0};
int ret;
if ((led->led_no == MT6360_LED_ISNK1 ||
led->led_no == MT6360_VIRTUAL_MULTICOLOR) &&
(priv->leds_active & BIT(MT6360_LED_ISNK1))) {
/*
* Change isink1 to SW control mode, disconnect it with
* charger state
*/
ret = regmap_update_bits(priv->regmap, MT6360_REG_RGBEN,
MT6360_CHRINDSEL_MASK,
MT6360_CHRINDSEL_MASK);
if (ret) {
dev_err(parent, "Failed to config ISNK1 to SW mode\n");
return ret;
}
}
switch (led->led_no) {
case MT6360_VIRTUAL_MULTICOLOR:
ret = mt6360_mc_brightness_set(&led->mc.led_cdev, LED_OFF);
if (ret) {
dev_err(parent,
"Failed to init multicolor brightness\n");
return ret;
}
ret = devm_led_classdev_multicolor_register_ext(parent,
&led->mc, init_data);
if (ret) {
dev_err(parent, "Couldn't register multicolor\n");
return ret;
}
break;
case MT6360_LED_ISNK1 ... MT6360_LED_ISNKML:
ret = mt6360_isnk_init_default_state(led);
if (ret) {
dev_err(parent, "Failed to init %d isnk state\n",
led->led_no);
return ret;
}
ret = devm_led_classdev_register_ext(parent, &led->isnk,
init_data);
if (ret) {
dev_err(parent, "Couldn't register isink %d\n",
led->led_no);
return ret;
}
break;
default:
ret = mt6360_flash_init_default_state(led);
if (ret) {
dev_err(parent, "Failed to init %d flash state\n",
led->led_no);
return ret;
}
ret = devm_led_classdev_flash_register_ext(parent, &led->flash,
init_data);
if (ret) {
dev_err(parent, "Couldn't register flash %d\n",
led->led_no);
return ret;
}
mt6360_init_v4l2_flash_config(led, &v4l2_config);
led->v4l2_flash = v4l2_flash_init(parent, init_data->fwnode,
&led->flash,
&v4l2_flash_ops,
&v4l2_config);
if (IS_ERR(led->v4l2_flash)) {
dev_err(parent, "Failed to register %d v4l2 sd\n",
led->led_no);
return PTR_ERR(led->v4l2_flash);
}
}
return 0;
}
static u32 clamp_align(u32 val, u32 min, u32 max, u32 step)
{
u32 retval;
retval = clamp_val(val, min, max);
if (step > 1)
retval = rounddown(retval - min, step) + min;
return retval;
}
static int mt6360_init_isnk_properties(struct mt6360_led *led,
struct led_init_data *init_data)
{
struct led_classdev *lcdev;
struct mt6360_priv *priv = led->priv;
struct fwnode_handle *child;
u32 step_uA = MT6360_ISNKRGB_STEPUA, max_uA = MT6360_ISNKRGB_MAXUA;
u32 val;
int num_color = 0, ret;
if (led->led_no == MT6360_VIRTUAL_MULTICOLOR) {
struct mc_subled *sub_led;
sub_led = devm_kzalloc(priv->dev,
sizeof(*sub_led) * MULTICOLOR_NUM_CHANNELS, GFP_KERNEL);
if (!sub_led)
return -ENOMEM;
fwnode_for_each_child_node(init_data->fwnode, child) {
u32 reg, color;
ret = fwnode_property_read_u32(child, "reg", &reg);
if (ret || reg > MT6360_LED_ISNK3 ||
priv->leds_active & BIT(reg))
return -EINVAL;
ret = fwnode_property_read_u32(child, "color", &color);
if (ret) {
dev_err(priv->dev,
"led %d, no color specified\n",
led->led_no);
return ret;
}
priv->leds_active |= BIT(reg);
sub_led[num_color].color_index = color;
sub_led[num_color].channel = reg;
num_color++;
}
if (num_color < 2) {
dev_err(priv->dev,
"Multicolor must include 2 or more led channel\n");
return -EINVAL;
}
led->mc.num_colors = num_color;
led->mc.subled_info = sub_led;
lcdev = &led->mc.led_cdev;
lcdev->brightness_set_blocking = mt6360_mc_brightness_set;
} else {
if (led->led_no == MT6360_LED_ISNKML) {
step_uA = MT6360_ISNKML_STEPUA;
max_uA = MT6360_ISNKML_MAXUA;
}
lcdev = &led->isnk;
lcdev->brightness_set_blocking = mt6360_isnk_brightness_set;
}
ret = fwnode_property_read_u32(init_data->fwnode, "led-max-microamp",
&val);
if (ret) {
dev_warn(priv->dev,
"Not specified led-max-microamp, config to the minimum\n");
val = step_uA;
} else
val = clamp_align(val, 0, max_uA, step_uA);
lcdev->max_brightness = val / step_uA;
fwnode_property_read_string(init_data->fwnode, "linux,default-trigger",
&lcdev->default_trigger);
return 0;
}
static int mt6360_init_flash_properties(struct mt6360_led *led,
struct led_init_data *init_data)
{
struct led_classdev_flash *flash = &led->flash;
struct led_classdev *lcdev = &flash->led_cdev;
struct mt6360_priv *priv = led->priv;
struct led_flash_setting *s;
u32 val;
int ret;
ret = fwnode_property_read_u32(init_data->fwnode, "led-max-microamp",
&val);
if (ret) {
dev_warn(priv->dev,
"Not specified led-max-microamp, config to the minimum\n");
val = MT6360_ITORCH_MINUA;
} else
val = clamp_align(val, MT6360_ITORCH_MINUA, MT6360_ITORCH_MAXUA,
MT6360_ITORCH_STEPUA);
lcdev->max_brightness =
(val - MT6360_ITORCH_MINUA) / MT6360_ITORCH_STEPUA + 1;
lcdev->brightness_set_blocking = mt6360_torch_brightness_set;
lcdev->flags |= LED_DEV_CAP_FLASH;
ret = fwnode_property_read_u32(init_data->fwnode, "flash-max-microamp",
&val);
if (ret) {
dev_warn(priv->dev,
"Not specified flash-max-microamp, config to the minimum\n");
val = MT6360_ISTRB_MINUA;
} else
val = clamp_align(val, MT6360_ISTRB_MINUA, MT6360_ISTRB_MAXUA,
MT6360_ISTRB_STEPUA);
s = &flash->brightness;
s->min = MT6360_ISTRB_MINUA;
s->step = MT6360_ISTRB_STEPUA;
s->val = s->max = val;
/*
* Always configure as min level when off to prevent flash current
* spike.
*/
ret = _mt6360_flash_brightness_set(flash, s->min);
if (ret)
return ret;
ret = fwnode_property_read_u32(init_data->fwnode,
"flash-max-timeout-us", &val);
if (ret) {
dev_warn(priv->dev,
"Not specified flash-max-timeout-us, config to the minimum\n");
val = MT6360_STRBTO_MINUS;
} else
val = clamp_align(val, MT6360_STRBTO_MINUS, MT6360_STRBTO_MAXUS,
MT6360_STRBTO_STEPUS);
s = &flash->timeout;
s->min = MT6360_STRBTO_MINUS;
s->step = MT6360_STRBTO_STEPUS;
s->val = s->max = val;
flash->ops = &mt6360_flash_ops;
return 0;
}
static int mt6360_init_common_properties(struct mt6360_led *led,
struct led_init_data *init_data)
{
const char *const states[] = { "off", "keep", "on" };
const char *str;
int ret;
if (!fwnode_property_read_string(init_data->fwnode,
"default-state", &str)) {
ret = match_string(states, ARRAY_SIZE(states), str);
if (ret < 0)
ret = STATE_OFF;
led->default_state = ret;
}
return 0;
}
static void mt6360_v4l2_flash_release(struct mt6360_priv *priv)
{
int i;
for (i = 0; i < priv->leds_count; i++) {
struct mt6360_led *led = priv->leds + i;
if (led->v4l2_flash)
v4l2_flash_release(led->v4l2_flash);
}
}
static int mt6360_led_probe(struct platform_device *pdev)
{
struct mt6360_priv *priv;
struct fwnode_handle *child;
size_t count;
int i = 0, ret;
count = device_get_child_node_count(&pdev->dev);
if (!count || count > MT6360_MAX_LEDS) {
dev_err(&pdev->dev,
"No child node or node count over max led number %zu\n",
count);
return -EINVAL;
}
priv = devm_kzalloc(&pdev->dev,
struct_size(priv, leds, count), GFP_KERNEL);
if (!priv)
return -ENOMEM;
priv->leds_count = count;
priv->dev = &pdev->dev;
mutex_init(&priv->lock);
priv->regmap = dev_get_regmap(pdev->dev.parent, NULL);
if (!priv->regmap) {
dev_err(&pdev->dev, "Failed to get parent regmap\n");
return -ENODEV;
}
device_for_each_child_node(&pdev->dev, child) {
struct mt6360_led *led = priv->leds + i;
struct led_init_data init_data = { .fwnode = child, };
u32 reg, led_color;
ret = fwnode_property_read_u32(child, "color", &led_color);
if (ret)
goto out_flash_release;
if (led_color == LED_COLOR_ID_RGB ||
led_color == LED_COLOR_ID_MULTI)
reg = MT6360_VIRTUAL_MULTICOLOR;
else {
ret = fwnode_property_read_u32(child, "reg", &reg);
if (ret)
goto out_flash_release;
if (reg >= MT6360_MAX_LEDS) {
ret = -EINVAL;
goto out_flash_release;
}
}
if (priv->leds_active & BIT(reg)) {
ret = -EINVAL;
goto out_flash_release;
}
priv->leds_active |= BIT(reg);
led->led_no = reg;
led->priv = priv;
ret = mt6360_init_common_properties(led, &init_data);
if (ret)
goto out_flash_release;
if (reg == MT6360_VIRTUAL_MULTICOLOR ||
reg <= MT6360_LED_ISNKML)
ret = mt6360_init_isnk_properties(led, &init_data);
else
ret = mt6360_init_flash_properties(led, &init_data);
if (ret)
goto out_flash_release;
ret = mt6360_led_register(&pdev->dev, led, &init_data);
if (ret)
goto out_flash_release;
i++;
}
platform_set_drvdata(pdev, priv);
return 0;
out_flash_release:
mt6360_v4l2_flash_release(priv);
return ret;
}
static int mt6360_led_remove(struct platform_device *pdev)
{
struct mt6360_priv *priv = platform_get_drvdata(pdev);
mt6360_v4l2_flash_release(priv);
return 0;
}
static const struct of_device_id __maybe_unused mt6360_led_of_id[] = {
{ .compatible = "mediatek,mt6360-led", },
{}
};
MODULE_DEVICE_TABLE(of, mt6360_led_of_id);
static struct platform_driver mt6360_led_driver = {
.driver = {
.name = "mt6360-led",
.of_match_table = mt6360_led_of_id,
},
.probe = mt6360_led_probe,
.remove = mt6360_led_remove,
};
module_platform_driver(mt6360_led_driver);
MODULE_AUTHOR("Gene Chen <gene_chen@richtek.com>");
MODULE_DESCRIPTION("MT6360 LED Driver");
MODULE_LICENSE("GPL v2");

6
drivers/leds/led-class.c
View File

@ -375,10 +375,8 @@ int led_classdev_register_ext(struct device *parent,
mutex_unlock(&led_cdev->led_access);
return PTR_ERR(led_cdev->dev);
}
if (init_data && init_data->fwnode) {
led_cdev->dev->fwnode = init_data->fwnode;
led_cdev->dev->of_node = to_of_node(init_data->fwnode);
}
if (init_data && init_data->fwnode)
device_set_node(led_cdev->dev, init_data->fwnode);
if (ret)
dev_warn(parent, "Led %s renamed to %s due to name collision",

193
drivers/leds/leds-fsg.c
View File

@ -1,193 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* LED Driver for the Freecom FSG-3
*
* Copyright (c) 2008 Rod Whitby <rod@whitby.id.au>
*
* Author: Rod Whitby <rod@whitby.id.au>
*
* Based on leds-spitz.c
* Copyright 2005-2006 Openedhand Ltd.
* Author: Richard Purdie <rpurdie@openedhand.com>
*/
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/module.h>
#include <linux/io.h>
#include <mach/hardware.h>
#define FSG_LED_WLAN_BIT 0
#define FSG_LED_WAN_BIT 1
#define FSG_LED_SATA_BIT 2
#define FSG_LED_USB_BIT 4
#define FSG_LED_RING_BIT 5
#define FSG_LED_SYNC_BIT 7
static short __iomem *latch_address;
static unsigned short latch_value;
static void fsg_led_wlan_set(struct led_classdev *led_cdev,
enum led_brightness value)
{
if (value) {
latch_value &= ~(1 << FSG_LED_WLAN_BIT);
*latch_address = latch_value;
} else {
latch_value |= (1 << FSG_LED_WLAN_BIT);
*latch_address = latch_value;
}
}
static void fsg_led_wan_set(struct led_classdev *led_cdev,
enum led_brightness value)
{
if (value) {
latch_value &= ~(1 << FSG_LED_WAN_BIT);
*latch_address = latch_value;
} else {
latch_value |= (1 << FSG_LED_WAN_BIT);
*latch_address = latch_value;
}
}
static void fsg_led_sata_set(struct led_classdev *led_cdev,
enum led_brightness value)
{
if (value) {
latch_value &= ~(1 << FSG_LED_SATA_BIT);
*latch_address = latch_value;
} else {
latch_value |= (1 << FSG_LED_SATA_BIT);
*latch_address = latch_value;
}
}
static void fsg_led_usb_set(struct led_classdev *led_cdev,
enum led_brightness value)
{
if (value) {
latch_value &= ~(1 << FSG_LED_USB_BIT);
*latch_address = latch_value;
} else {
latch_value |= (1 << FSG_LED_USB_BIT);
*latch_address = latch_value;
}
}
static void fsg_led_sync_set(struct led_classdev *led_cdev,
enum led_brightness value)
{
if (value) {
latch_value &= ~(1 << FSG_LED_SYNC_BIT);
*latch_address = latch_value;
} else {
latch_value |= (1 << FSG_LED_SYNC_BIT);
*latch_address = latch_value;
}
}
static void fsg_led_ring_set(struct led_classdev *led_cdev,
enum led_brightness value)
{
if (value) {
latch_value &= ~(1 << FSG_LED_RING_BIT);
*latch_address = latch_value;
} else {
latch_value |= (1 << FSG_LED_RING_BIT);
*latch_address = latch_value;
}
}
static struct led_classdev fsg_wlan_led = {
.name = "fsg:blue:wlan",
.brightness_set = fsg_led_wlan_set,
.flags = LED_CORE_SUSPENDRESUME,
};
static struct led_classdev fsg_wan_led = {
.name = "fsg:blue:wan",
.brightness_set = fsg_led_wan_set,
.flags = LED_CORE_SUSPENDRESUME,
};
static struct led_classdev fsg_sata_led = {
.name = "fsg:blue:sata",
.brightness_set = fsg_led_sata_set,
.flags = LED_CORE_SUSPENDRESUME,
};
static struct led_classdev fsg_usb_led = {
.name = "fsg:blue:usb",
.brightness_set = fsg_led_usb_set,
.flags = LED_CORE_SUSPENDRESUME,
};
static struct led_classdev fsg_sync_led = {
.name = "fsg:blue:sync",
.brightness_set = fsg_led_sync_set,
.flags = LED_CORE_SUSPENDRESUME,
};
static struct led_classdev fsg_ring_led = {
.name = "fsg:blue:ring",
.brightness_set = fsg_led_ring_set,
.flags = LED_CORE_SUSPENDRESUME,
};
static int fsg_led_probe(struct platform_device *pdev)
{
int ret;
/* Map the LED chip select address space */
latch_address = (unsigned short *) devm_ioremap(&pdev->dev,
IXP4XX_EXP_BUS_BASE(2), 512);
if (!latch_address)
return -ENOMEM;
latch_value = 0xffff;
*latch_address = latch_value;
ret = devm_led_classdev_register(&pdev->dev, &fsg_wlan_led);
if (ret < 0)
return ret;
ret = devm_led_classdev_register(&pdev->dev, &fsg_wan_led);
if (ret < 0)
return ret;
ret = devm_led_classdev_register(&pdev->dev, &fsg_sata_led);
if (ret < 0)
return ret;
ret = devm_led_classdev_register(&pdev->dev, &fsg_usb_led);
if (ret < 0)
return ret;
ret = devm_led_classdev_register(&pdev->dev, &fsg_sync_led);
if (ret < 0)
return ret;
ret = devm_led_classdev_register(&pdev->dev, &fsg_ring_led);
if (ret < 0)
return ret;
return ret;
}
static struct platform_driver fsg_led_driver = {
.probe = fsg_led_probe,
.driver = {
.name = "fsg-led",
},
};
module_platform_driver(fsg_led_driver);
MODULE_AUTHOR("Rod Whitby <rod@whitby.id.au>");
MODULE_DESCRIPTION("Freecom FSG-3 LED driver");
MODULE_LICENSE("GPL");

1
drivers/leds/leds-lp50xx.c
View File

@ -266,7 +266,6 @@ struct lp50xx_led {
struct led_classdev_mc mc_cdev;
struct lp50xx *priv;
unsigned long bank_modules;
int led_intensity[LP50XX_LEDS_PER_MODULE];
u8 ctrl_bank_enabled;
int led_number;
};

4
drivers/leds/leds-lp55xx-common.c
View File

@ -439,6 +439,8 @@ int lp55xx_init_device(struct lp55xx_chip *chip)
return -EINVAL;
if (pdata->enable_gpiod) {
gpiod_direction_output(pdata->enable_gpiod, 0);
gpiod_set_consumer_name(pdata->enable_gpiod, "LP55xx enable");
gpiod_set_value(pdata->enable_gpiod, 0);
usleep_range(1000, 2000); /* Keep enable down at least 1ms */
@ -694,7 +696,7 @@ struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev,
of_property_read_u8(np, "clock-mode", &pdata->clock_mode);
pdata->enable_gpiod = devm_gpiod_get_optional(dev, "enable",
GPIOD_OUT_LOW);
GPIOD_ASIS);
if (IS_ERR(pdata->enable_gpiod))
return ERR_CAST(pdata->enable_gpiod);

7
drivers/leds/leds-tca6507.c
View File

@ -242,9 +242,7 @@ static int choose_times(int msec, int *c1p, int *c2p)
if (diff < 65536) {
int actual;
if (msec & 1) {
c1 = *c2p;
*c2p = *c1p;
*c1p = c1;
swap(*c2p, *c1p);
}
actual = time_codes[*c1p] + time_codes[*c2p];
if (*c1p < *c2p)
@ -643,9 +641,6 @@ static int tca6507_probe_gpios(struct device *dev,
tca->gpio.direction_output = tca6507_gpio_direction_output;
tca->gpio.set = tca6507_gpio_set_value;
tca->gpio.parent = dev;
#ifdef CONFIG_OF_GPIO
tca->gpio.of_node = of_node_get(dev_of_node(dev));
#endif
err = gpiochip_add_data(&tca->gpio, tca);
if (err) {
tca->gpio.ngpio = 0;