[openwrt/openwrt] generic: backport support for KTD2026/7 rgb(w) led controller
LEDE Commits
lede-commits at lists.infradead.org
Thu Nov 28 13:11:16 PST 2024
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/56d97fff55f3d384eeb00b021c43fecb380a5bdd
commit 56d97fff55f3d384eeb00b021c43fecb380a5bdd
Author: George Oldfort <openwrt at 10099.de>
AuthorDate: Tue Nov 26 15:04:45 2024 +0100
generic: backport support for KTD2026/7 rgb(w) led controller
This commit adds the Linux kernel mainline driver "leds-ktd202x" for the
KinetIC KTD2026 and KTD2027 RGB/RBGW controller with I2C interface that was
introduced in kernel version 6.7, last changed in mainline on 2024-05-31.
At least the Acer Connect Vero W6m (a variant of the Acer Predator Connect
W6 without 2.5G eth1 port, usb3 port, and the 6 on-board gpio RGB LEDs) is
equipped with a KTD2026 (and a single RGB LED attached to it used by the
stock firmware as status LED), and maybe other router devices also are.
Signed-off-by: George Oldfort <openwrt at 10099.de>
Link: https://github.com/openwrt/openwrt/pull/16860
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
package/kernel/linux/modules/leds.mk | 18 +
.../860-v6.7-leds-add-ktd202x-driver.patch | 682 +++++++++++++++++++++
...202x-get-device-properties-through-fwnode.patch | 221 +++++++
...td202x-i2c-id-tables-for-ktd2026-and-2027.patch | 49 ++
...rgb-leds-ktd202x-initialize-mutex-earlier.patch | 62 ++
5 files changed, 1032 insertions(+)
diff --git a/package/kernel/linux/modules/leds.mk b/package/kernel/linux/modules/leds.mk
index 8b24cb0ef8..0c42895bb2 100644
--- a/package/kernel/linux/modules/leds.mk
+++ b/package/kernel/linux/modules/leds.mk
@@ -147,6 +147,24 @@ endef
$(eval $(call KernelPackage,leds-apu))
+define KernelPackage/leds-ktd202x
+ SUBMENU:=LED modules
+ TITLE:=LED support for KTD202x Chips
+ DEPENDS:=+kmod-i2c-core +kmod-regmap-i2c
+ KCONFIG:=CONFIG_LEDS_KTD202X
+ FILES:= $(LINUX_DIR)/drivers/leds/rgb/leds-ktd202x.ko
+ AUTOLOAD:=$(call AutoProbe,leds-ktd202x,1)
+endef
+
+define KernelPackage/leds-ktd202x/description
+ This option enables support for the Kinetic KTD2026/KTD2027
+ RGB/White LED driver found in different BQ mobile phones.
+ It is a 3 or 4 channel LED driver programmed via an I2C interface.
+endef
+
+$(eval $(call KernelPackage,leds-ktd202x))
+
+
define KernelPackage/leds-mlxcpld
SUBMENU:=$(LEDS_MENU)
TITLE:=LED support for the Mellanox boards
diff --git a/target/linux/generic/backport-6.6/860-v6.7-leds-add-ktd202x-driver.patch b/target/linux/generic/backport-6.6/860-v6.7-leds-add-ktd202x-driver.patch
new file mode 100644
index 0000000000..fb767c5d99
--- /dev/null
+++ b/target/linux/generic/backport-6.6/860-v6.7-leds-add-ktd202x-driver.patch
@@ -0,0 +1,682 @@
+From 0ebdb7210943eb345992bea9892adbd15a206193 Mon Sep 17 00:00:00 2001
+From: André Apitzsch <git at apitzsch.eu>
+Date: Mon, 2 Oct 2023 18:48:28 +0200
+Subject: leds: Add ktd202x driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This commit adds support for Kinetic KTD2026/7 RGB/White LED driver.
+
+Signed-off-by: André Apitzsch <git at apitzsch.eu>
+Link: https://lore.kernel.org/r/20231002-ktd202x-v6-2-26be8eefeb88@apitzsch.eu
+Signed-off-by: Lee Jones <lee at kernel.org>
+---
+ drivers/leds/rgb/Kconfig | 13 +
+ drivers/leds/rgb/Makefile | 1 +
+ drivers/leds/rgb/leds-ktd202x.c | 625 ++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 639 insertions(+)
+ create mode 100644 drivers/leds/rgb/leds-ktd202x.c
+
+(limited to 'drivers/leds/rgb')
+
+--- a/drivers/leds/rgb/Kconfig
++++ b/drivers/leds/rgb/Kconfig
+@@ -14,6 +14,19 @@ config LEDS_GROUP_MULTICOLOR
+ To compile this driver as a module, choose M here: the module
+ will be called leds-group-multicolor.
+
++config LEDS_KTD202X
++ tristate "LED support for KTD202x Chips"
++ depends on I2C
++ depends on OF
++ select REGMAP_I2C
++ help
++ This option enables support for the Kinetic KTD2026/KTD2027
++ RGB/White LED driver found in different BQ mobile phones.
++ It is a 3 or 4 channel LED driver programmed via an I2C interface.
++
++ To compile this driver as a module, choose M here: the module
++ will be called leds-ktd202x.
++
+ config LEDS_PWM_MULTICOLOR
+ tristate "PWM driven multi-color LED Support"
+ depends on PWM
+--- a/drivers/leds/rgb/Makefile
++++ b/drivers/leds/rgb/Makefile
+@@ -1,6 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+
+ obj-$(CONFIG_LEDS_GROUP_MULTICOLOR) += leds-group-multicolor.o
++obj-$(CONFIG_LEDS_KTD202X) += leds-ktd202x.o
+ obj-$(CONFIG_LEDS_PWM_MULTICOLOR) += leds-pwm-multicolor.o
+ obj-$(CONFIG_LEDS_QCOM_LPG) += leds-qcom-lpg.o
+ obj-$(CONFIG_LEDS_MT6370_RGB) += leds-mt6370-rgb.o
+--- /dev/null
++++ b/drivers/leds/rgb/leds-ktd202x.c
+@@ -0,0 +1,625 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++/*
++ * Kinetic KTD2026/7 RGB/White LED driver with I2C interface
++ *
++ * Copyright 2023 André Apitzsch <git at apitzsch.eu>
++ *
++ * Datasheet: https://www.kinet-ic.com/uploads/KTD2026-7-04h.pdf
++ */
++
++#include <linux/i2c.h>
++#include <linux/led-class-multicolor.h>
++#include <linux/module.h>
++#include <linux/mutex.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/regmap.h>
++#include <linux/regulator/consumer.h>
++
++#define KTD2026_NUM_LEDS 3
++#define KTD2027_NUM_LEDS 4
++#define KTD202X_MAX_LEDS 4
++
++/* Register bank */
++#define KTD202X_REG_RESET_CONTROL 0x00
++#define KTD202X_REG_FLASH_PERIOD 0x01
++#define KTD202X_REG_PWM1_TIMER 0x02
++#define KTD202X_REG_PWM2_TIMER 0x03
++#define KTD202X_REG_CHANNEL_CTRL 0x04
++#define KTD202X_REG_TRISE_FALL 0x05
++#define KTD202X_REG_LED_IOUT(x) (0x06 + (x))
++
++/* Register 0 */
++#define KTD202X_TIMER_SLOT_CONTROL_TSLOT1 0x00
++#define KTD202X_TIMER_SLOT_CONTROL_TSLOT2 0x01
++#define KTD202X_TIMER_SLOT_CONTROL_TSLOT3 0x02
++#define KTD202X_TIMER_SLOT_CONTROL_TSLOT4 0x03
++#define KTD202X_RSTR_RESET 0x07
++
++#define KTD202X_ENABLE_CTRL_WAKE 0x00 /* SCL High & SDA High */
++#define KTD202X_ENABLE_CTRL_SLEEP 0x08 /* SCL High & SDA Toggling */
++
++#define KTD202X_TRISE_FALL_SCALE_NORMAL 0x00
++#define KTD202X_TRISE_FALL_SCALE_SLOW_X2 0x20
++#define KTD202X_TRISE_FALL_SCALE_SLOW_X4 0x40
++#define KTD202X_TRISE_FALL_SCALE_FAST_X8 0x60
++
++/* Register 1 */
++#define KTD202X_FLASH_PERIOD_256_MS_LOG_RAMP 0x00
++
++/* Register 2-3 */
++#define KTD202X_FLASH_ON_TIME_0_4_PERCENT 0x01
++
++/* Register 4 */
++#define KTD202X_CHANNEL_CTRL_MASK(x) (BIT(2 * (x)) | BIT(2 * (x) + 1))
++#define KTD202X_CHANNEL_CTRL_OFF 0x00
++#define KTD202X_CHANNEL_CTRL_ON(x) BIT(2 * (x))
++#define KTD202X_CHANNEL_CTRL_PWM1(x) BIT(2 * (x) + 1)
++#define KTD202X_CHANNEL_CTRL_PWM2(x) (BIT(2 * (x)) | BIT(2 * (x) + 1))
++
++/* Register 5 */
++#define KTD202X_RAMP_TIMES_2_MS 0x00
++
++/* Register 6-9 */
++#define KTD202X_LED_CURRENT_10_mA 0x4f
++
++#define KTD202X_FLASH_PERIOD_MIN_MS 256
++#define KTD202X_FLASH_PERIOD_STEP_MS 128
++#define KTD202X_FLASH_PERIOD_MAX_STEPS 126
++#define KTD202X_FLASH_ON_MAX 256
++
++#define KTD202X_MAX_BRIGHTNESS 192
++
++static const struct reg_default ktd202x_reg_defaults[] = {
++ { KTD202X_REG_RESET_CONTROL, KTD202X_TIMER_SLOT_CONTROL_TSLOT1 |
++ KTD202X_ENABLE_CTRL_WAKE | KTD202X_TRISE_FALL_SCALE_NORMAL },
++ { KTD202X_REG_FLASH_PERIOD, KTD202X_FLASH_PERIOD_256_MS_LOG_RAMP },
++ { KTD202X_REG_PWM1_TIMER, KTD202X_FLASH_ON_TIME_0_4_PERCENT },
++ { KTD202X_REG_PWM2_TIMER, KTD202X_FLASH_ON_TIME_0_4_PERCENT },
++ { KTD202X_REG_CHANNEL_CTRL, KTD202X_CHANNEL_CTRL_OFF },
++ { KTD202X_REG_TRISE_FALL, KTD202X_RAMP_TIMES_2_MS },
++ { KTD202X_REG_LED_IOUT(0), KTD202X_LED_CURRENT_10_mA },
++ { KTD202X_REG_LED_IOUT(1), KTD202X_LED_CURRENT_10_mA },
++ { KTD202X_REG_LED_IOUT(2), KTD202X_LED_CURRENT_10_mA },
++ { KTD202X_REG_LED_IOUT(3), KTD202X_LED_CURRENT_10_mA },
++};
++
++struct ktd202x_led {
++ struct ktd202x *chip;
++ union {
++ struct led_classdev cdev;
++ struct led_classdev_mc mcdev;
++ };
++ u32 index;
++};
++
++struct ktd202x {
++ struct mutex mutex;
++ struct regulator_bulk_data regulators[2];
++ struct device *dev;
++ struct regmap *regmap;
++ bool enabled;
++ int num_leds;
++ struct ktd202x_led leds[] __counted_by(num_leds);
++};
++
++static int ktd202x_chip_disable(struct ktd202x *chip)
++{
++ int ret;
++
++ if (!chip->enabled)
++ return 0;
++
++ regmap_write(chip->regmap, KTD202X_REG_RESET_CONTROL, KTD202X_ENABLE_CTRL_SLEEP);
++
++ ret = regulator_bulk_disable(ARRAY_SIZE(chip->regulators), chip->regulators);
++ if (ret) {
++ dev_err(chip->dev, "Failed to disable regulators: %d\n", ret);
++ return ret;
++ }
++
++ chip->enabled = false;
++ return 0;
++}
++
++static int ktd202x_chip_enable(struct ktd202x *chip)
++{
++ int ret;
++
++ if (chip->enabled)
++ return 0;
++
++ ret = regulator_bulk_enable(ARRAY_SIZE(chip->regulators), chip->regulators);
++ if (ret) {
++ dev_err(chip->dev, "Failed to enable regulators: %d\n", ret);
++ return ret;
++ }
++ chip->enabled = true;
++
++ ret = regmap_write(chip->regmap, KTD202X_REG_RESET_CONTROL, KTD202X_ENABLE_CTRL_WAKE);
++
++ if (ret) {
++ dev_err(chip->dev, "Failed to enable the chip: %d\n", ret);
++ ktd202x_chip_disable(chip);
++ }
++
++ return ret;
++}
++
++static bool ktd202x_chip_in_use(struct ktd202x *chip)
++{
++ int i;
++
++ for (i = 0; i < chip->num_leds; i++) {
++ if (chip->leds[i].cdev.brightness)
++ return true;
++ }
++
++ return false;
++}
++
++static int ktd202x_brightness_set(struct ktd202x_led *led,
++ struct mc_subled *subleds,
++ unsigned int num_channels)
++{
++ bool mode_blink = false;
++ int channel;
++ int state;
++ int ret;
++ int i;
++
++ if (ktd202x_chip_in_use(led->chip)) {
++ ret = ktd202x_chip_enable(led->chip);
++ if (ret)
++ return ret;
++ }
++
++ ret = regmap_read(led->chip->regmap, KTD202X_REG_CHANNEL_CTRL, &state);
++ if (ret)
++ return ret;
++
++ /*
++ * In multicolor case, assume blink mode if PWM is set for at least one
++ * channel because another channel cannot be in state ON at the same time
++ */
++ for (i = 0; i < num_channels; i++) {
++ int channel_state;
++
++ channel = subleds[i].channel;
++ channel_state = (state >> 2 * channel) & KTD202X_CHANNEL_CTRL_MASK(0);
++ if (channel_state == KTD202X_CHANNEL_CTRL_OFF)
++ continue;
++ mode_blink = channel_state == KTD202X_CHANNEL_CTRL_PWM1(0);
++ break;
++ }
++
++ for (i = 0; i < num_channels; i++) {
++ enum led_brightness brightness;
++ int mode;
++
++ brightness = subleds[i].brightness;
++ channel = subleds[i].channel;
++
++ if (brightness) {
++ /* Register expects brightness between 0 and MAX_BRIGHTNESS - 1 */
++ ret = regmap_write(led->chip->regmap, KTD202X_REG_LED_IOUT(channel),
++ brightness - 1);
++ if (ret)
++ return ret;
++
++ if (mode_blink)
++ mode = KTD202X_CHANNEL_CTRL_PWM1(channel);
++ else
++ mode = KTD202X_CHANNEL_CTRL_ON(channel);
++ } else {
++ mode = KTD202X_CHANNEL_CTRL_OFF;
++ }
++ ret = regmap_update_bits(led->chip->regmap, KTD202X_REG_CHANNEL_CTRL,
++ KTD202X_CHANNEL_CTRL_MASK(channel), mode);
++ if (ret)
++ return ret;
++ }
++
++ if (!ktd202x_chip_in_use(led->chip))
++ return ktd202x_chip_disable(led->chip);
++
++ return 0;
++}
++
++static int ktd202x_brightness_single_set(struct led_classdev *cdev,
++ enum led_brightness value)
++{
++ struct ktd202x_led *led = container_of(cdev, struct ktd202x_led, cdev);
++ struct mc_subled info;
++ int ret;
++
++ cdev->brightness = value;
++
++ mutex_lock(&led->chip->mutex);
++
++ info.brightness = value;
++ info.channel = led->index;
++ ret = ktd202x_brightness_set(led, &info, 1);
++
++ mutex_unlock(&led->chip->mutex);
++
++ return ret;
++}
++
++static int ktd202x_brightness_mc_set(struct led_classdev *cdev,
++ enum led_brightness value)
++{
++ struct led_classdev_mc *mc = lcdev_to_mccdev(cdev);
++ struct ktd202x_led *led = container_of(mc, struct ktd202x_led, mcdev);
++ int ret;
++
++ cdev->brightness = value;
++
++ mutex_lock(&led->chip->mutex);
++
++ led_mc_calc_color_components(mc, value);
++ ret = ktd202x_brightness_set(led, mc->subled_info, mc->num_colors);
++
++ mutex_unlock(&led->chip->mutex);
++
++ return ret;
++}
++
++static int ktd202x_blink_set(struct ktd202x_led *led, unsigned long *delay_on,
++ unsigned long *delay_off, struct mc_subled *subleds,
++ unsigned int num_channels)
++{
++ unsigned long delay_total_ms;
++ int ret, num_steps, on;
++ u8 ctrl_mask = 0;
++ u8 ctrl_pwm1 = 0;
++ u8 ctrl_on = 0;
++ int i;
++
++ mutex_lock(&led->chip->mutex);
++
++ for (i = 0; i < num_channels; i++) {
++ int channel = subleds[i].channel;
++
++ ctrl_mask |= KTD202X_CHANNEL_CTRL_MASK(channel);
++ ctrl_on |= KTD202X_CHANNEL_CTRL_ON(channel);
++ ctrl_pwm1 |= KTD202X_CHANNEL_CTRL_PWM1(channel);
++ }
++
++ /* Never off - brightness is already set, disable blinking */
++ if (!*delay_off) {
++ ret = regmap_update_bits(led->chip->regmap, KTD202X_REG_CHANNEL_CTRL,
++ ctrl_mask, ctrl_on);
++ goto out;
++ }
++
++ /* Convert into values the HW will understand. */
++
++ /* Integer representation of time of flash period */
++ num_steps = (*delay_on + *delay_off - KTD202X_FLASH_PERIOD_MIN_MS) /
++ KTD202X_FLASH_PERIOD_STEP_MS;
++ num_steps = clamp(num_steps, 0, KTD202X_FLASH_PERIOD_MAX_STEPS);
++
++ /* Integer representation of percentage of LED ON time */
++ on = (*delay_on * KTD202X_FLASH_ON_MAX) / (*delay_on + *delay_off);
++
++ /* Actually used delay_{on,off} values */
++ delay_total_ms = num_steps * KTD202X_FLASH_PERIOD_STEP_MS + KTD202X_FLASH_PERIOD_MIN_MS;
++ *delay_on = (delay_total_ms * on) / KTD202X_FLASH_ON_MAX;
++ *delay_off = delay_total_ms - *delay_on;
++
++ /* Set timings */
++ ret = regmap_write(led->chip->regmap, KTD202X_REG_FLASH_PERIOD, num_steps);
++ if (ret)
++ goto out;
++
++ ret = regmap_write(led->chip->regmap, KTD202X_REG_PWM1_TIMER, on);
++ if (ret)
++ goto out;
++
++ ret = regmap_update_bits(led->chip->regmap, KTD202X_REG_CHANNEL_CTRL,
++ ctrl_mask, ctrl_pwm1);
++out:
++ mutex_unlock(&led->chip->mutex);
++ return ret;
++}
++
++static int ktd202x_blink_single_set(struct led_classdev *cdev,
++ unsigned long *delay_on,
++ unsigned long *delay_off)
++{
++ struct ktd202x_led *led = container_of(cdev, struct ktd202x_led, cdev);
++ struct mc_subled info;
++ int ret;
++
++ if (!cdev->brightness) {
++ ret = ktd202x_brightness_single_set(cdev, KTD202X_MAX_BRIGHTNESS);
++ if (ret)
++ return ret;
++ }
++
++ /* If no blink specified, default to 1 Hz. */
++ if (!*delay_off && !*delay_on) {
++ *delay_off = 500;
++ *delay_on = 500;
++ }
++
++ /* Never on - just set to off */
++ if (!*delay_on)
++ return ktd202x_brightness_single_set(cdev, LED_OFF);
++
++ info.channel = led->index;
++
++ return ktd202x_blink_set(led, delay_on, delay_off, &info, 1);
++}
++
++static int ktd202x_blink_mc_set(struct led_classdev *cdev,
++ unsigned long *delay_on,
++ unsigned long *delay_off)
++{
++ struct led_classdev_mc *mc = lcdev_to_mccdev(cdev);
++ struct ktd202x_led *led = container_of(mc, struct ktd202x_led, mcdev);
++ int ret;
++
++ if (!cdev->brightness) {
++ ret = ktd202x_brightness_mc_set(cdev, KTD202X_MAX_BRIGHTNESS);
++ if (ret)
++ return ret;
++ }
++
++ /* If no blink specified, default to 1 Hz. */
++ if (!*delay_off && !*delay_on) {
++ *delay_off = 500;
++ *delay_on = 500;
++ }
++
++ /* Never on - just set to off */
++ if (!*delay_on)
++ return ktd202x_brightness_mc_set(cdev, LED_OFF);
++
++ return ktd202x_blink_set(led, delay_on, delay_off, mc->subled_info,
++ mc->num_colors);
++}
++
++static int ktd202x_setup_led_rgb(struct ktd202x *chip, struct device_node *np,
++ struct ktd202x_led *led, struct led_init_data *init_data)
++{
++ struct led_classdev *cdev;
++ struct device_node *child;
++ struct mc_subled *info;
++ int num_channels;
++ int i = 0;
++
++ num_channels = of_get_available_child_count(np);
++ if (!num_channels || num_channels > chip->num_leds)
++ return -EINVAL;
++
++ info = devm_kcalloc(chip->dev, num_channels, sizeof(*info), GFP_KERNEL);
++ if (!info)
++ return -ENOMEM;
++
++ for_each_available_child_of_node(np, child) {
++ u32 mono_color;
++ u32 reg;
++ int ret;
++
++ ret = of_property_read_u32(child, "reg", ®);
++ if (ret != 0 || reg >= chip->num_leds) {
++ dev_err(chip->dev, "invalid 'reg' of %pOFn\n", child);
++ of_node_put(child);
++ return -EINVAL;
++ }
++
++ ret = of_property_read_u32(child, "color", &mono_color);
++ if (ret < 0 && ret != -EINVAL) {
++ dev_err(chip->dev, "failed to parse 'color' of %pOF\n", child);
++ of_node_put(child);
++ return ret;
++ }
++
++ info[i].color_index = mono_color;
++ info[i].channel = reg;
++ info[i].intensity = KTD202X_MAX_BRIGHTNESS;
++ i++;
++ }
++
++ led->mcdev.subled_info = info;
++ led->mcdev.num_colors = num_channels;
++
++ cdev = &led->mcdev.led_cdev;
++ cdev->brightness_set_blocking = ktd202x_brightness_mc_set;
++ cdev->blink_set = ktd202x_blink_mc_set;
++
++ return devm_led_classdev_multicolor_register_ext(chip->dev, &led->mcdev, init_data);
++}
++
++static int ktd202x_setup_led_single(struct ktd202x *chip, struct device_node *np,
++ struct ktd202x_led *led, struct led_init_data *init_data)
++{
++ struct led_classdev *cdev;
++ u32 reg;
++ int ret;
++
++ ret = of_property_read_u32(np, "reg", ®);
++ if (ret != 0 || reg >= chip->num_leds) {
++ dev_err(chip->dev, "invalid 'reg' of %pOFn\n", np);
++ return -EINVAL;
++ }
++ led->index = reg;
++
++ cdev = &led->cdev;
++ cdev->brightness_set_blocking = ktd202x_brightness_single_set;
++ cdev->blink_set = ktd202x_blink_single_set;
++
++ return devm_led_classdev_register_ext(chip->dev, &led->cdev, init_data);
++}
++
++static int ktd202x_add_led(struct ktd202x *chip, struct device_node *np, unsigned int index)
++{
++ struct ktd202x_led *led = &chip->leds[index];
++ struct led_init_data init_data = {};
++ struct led_classdev *cdev;
++ u32 color;
++ int ret;
++
++ /* Color property is optional in single color case */
++ ret = of_property_read_u32(np, "color", &color);
++ if (ret < 0 && ret != -EINVAL) {
++ dev_err(chip->dev, "failed to parse 'color' of %pOF\n", np);
++ return ret;
++ }
++
++ led->chip = chip;
++ init_data.fwnode = of_fwnode_handle(np);
++
++ if (color == LED_COLOR_ID_RGB) {
++ cdev = &led->mcdev.led_cdev;
++ ret = ktd202x_setup_led_rgb(chip, np, led, &init_data);
++ } else {
++ cdev = &led->cdev;
++ ret = ktd202x_setup_led_single(chip, np, led, &init_data);
++ }
++
++ if (ret) {
++ dev_err(chip->dev, "unable to register %s\n", cdev->name);
++ return ret;
++ }
++
++ cdev->max_brightness = KTD202X_MAX_BRIGHTNESS;
++
++ return 0;
++}
++
++static int ktd202x_probe_dt(struct ktd202x *chip)
++{
++ struct device_node *np = dev_of_node(chip->dev), *child;
++ int count;
++ int i = 0;
++
++ chip->num_leds = (int)(unsigned long)of_device_get_match_data(chip->dev);
++
++ count = of_get_available_child_count(np);
++ if (!count || count > chip->num_leds)
++ return -EINVAL;
++
++ regmap_write(chip->regmap, KTD202X_REG_RESET_CONTROL, KTD202X_RSTR_RESET);
++
++ /* Allow the device to execute the complete reset */
++ usleep_range(200, 300);
++
++ for_each_available_child_of_node(np, child) {
++ int ret = ktd202x_add_led(chip, child, i);
++
++ if (ret) {
++ of_node_put(child);
++ return ret;
++ }
++ i++;
++ }
++
++ return 0;
++}
++
++static const struct regmap_config ktd202x_regmap_config = {
++ .reg_bits = 8,
++ .val_bits = 8,
++ .max_register = 0x09,
++ .cache_type = REGCACHE_FLAT,
++ .reg_defaults = ktd202x_reg_defaults,
++ .num_reg_defaults = ARRAY_SIZE(ktd202x_reg_defaults),
++};
++
++static int ktd202x_probe(struct i2c_client *client)
++{
++ struct device *dev = &client->dev;
++ struct ktd202x *chip;
++ int count;
++ int ret;
++
++ count = device_get_child_node_count(dev);
++ if (!count || count > KTD202X_MAX_LEDS)
++ return dev_err_probe(dev, -EINVAL, "Incorrect number of leds (%d)", count);
++
++ chip = devm_kzalloc(dev, struct_size(chip, leds, count), GFP_KERNEL);
++ if (!chip)
++ return -ENOMEM;
++
++ chip->dev = dev;
++ i2c_set_clientdata(client, chip);
++
++ chip->regmap = devm_regmap_init_i2c(client, &ktd202x_regmap_config);
++ if (IS_ERR(chip->regmap)) {
++ ret = dev_err_probe(dev, PTR_ERR(chip->regmap),
++ "Failed to allocate register map.\n");
++ return ret;
++ }
++
++ chip->regulators[0].supply = "vin";
++ chip->regulators[1].supply = "vio";
++ ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(chip->regulators), chip->regulators);
++ if (ret < 0) {
++ dev_err_probe(dev, ret, "Failed to request regulators.\n");
++ return ret;
++ }
++
++ ret = regulator_bulk_enable(ARRAY_SIZE(chip->regulators), chip->regulators);
++ if (ret) {
++ dev_err_probe(dev, ret, "Failed to enable regulators.\n");
++ return ret;
++ }
++
++ ret = ktd202x_probe_dt(chip);
++ if (ret < 0) {
++ regulator_bulk_disable(ARRAY_SIZE(chip->regulators), chip->regulators);
++ return ret;
++ }
++
++ ret = regulator_bulk_disable(ARRAY_SIZE(chip->regulators), chip->regulators);
++ if (ret) {
++ dev_err_probe(dev, ret, "Failed to disable regulators.\n");
++ return ret;
++ }
++
++ mutex_init(&chip->mutex);
++
++ return 0;
++}
++
++static void ktd202x_remove(struct i2c_client *client)
++{
++ struct ktd202x *chip = i2c_get_clientdata(client);
++
++ ktd202x_chip_disable(chip);
++
++ mutex_destroy(&chip->mutex);
++}
++
++static void ktd202x_shutdown(struct i2c_client *client)
++{
++ struct ktd202x *chip = i2c_get_clientdata(client);
++
++ /* Reset registers to make sure all LEDs are off before shutdown */
++ regmap_write(chip->regmap, KTD202X_REG_RESET_CONTROL, KTD202X_RSTR_RESET);
++}
++
++static const struct of_device_id ktd202x_match_table[] = {
++ { .compatible = "kinetic,ktd2026", .data = (void *)KTD2026_NUM_LEDS },
++ { .compatible = "kinetic,ktd2027", .data = (void *)KTD2027_NUM_LEDS },
++ {},
++};
++MODULE_DEVICE_TABLE(of, ktd202x_match_table);
++
++static struct i2c_driver ktd202x_driver = {
++ .driver = {
++ .name = "leds-ktd202x",
++ .of_match_table = ktd202x_match_table,
++ },
++ .probe = ktd202x_probe,
++ .remove = ktd202x_remove,
++ .shutdown = ktd202x_shutdown,
++};
++module_i2c_driver(ktd202x_driver);
++
++MODULE_AUTHOR("André Apitzsch <git at apitzsch.eu>");
++MODULE_DESCRIPTION("Kinetic KTD2026/7 LED driver");
++MODULE_LICENSE("GPL");
diff --git a/target/linux/generic/backport-6.6/861-v6.10-leds-rgb-leds-ktd202x-get-device-properties-through-fwnode.patch b/target/linux/generic/backport-6.6/861-v6.10-leds-rgb-leds-ktd202x-get-device-properties-through-fwnode.patch
new file mode 100644
index 0000000000..92b20c3b9c
--- /dev/null
+++ b/target/linux/generic/backport-6.6/861-v6.10-leds-rgb-leds-ktd202x-get-device-properties-through-fwnode.patch
@@ -0,0 +1,221 @@
+From f14aa5ea415b8add245e976bfab96a12986c6843 Mon Sep 17 00:00:00 2001
+From: Kate Hsuan <hpa at redhat.com>
+Date: Fri, 31 May 2024 13:41:19 +0200
+Subject: leds: rgb: leds-ktd202x: Get device properties through fwnode to
+ support ACPI
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This LED controller is installed on a Xiaomi pad2 and it is an x86
+platform. The original driver is based on the device tree and can't be
+used for this ACPI based system. This patch migrated the driver to use
+fwnode to access the properties. Moreover, the fwnode API supports the
+device tree so this work won't affect the original implementations.
+
+Signed-off-by: Kate Hsuan <hpa at redhat.com>
+Tested-by: André Apitzsch <git at apitzsch.eu> # on BQ Aquaris M5
+Reviewed-by: Hans de Goede <hdegoede at redhat.com>
+Reviewed-by: Andy Shevchenko <andy at kernel.org>
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+Link: https://lore.kernel.org/r/20240531114124.45346-2-hdegoede@redhat.com
+Signed-off-by: Lee Jones <lee at kernel.org>
+---
+ drivers/leds/rgb/Kconfig | 1 -
+ drivers/leds/rgb/leds-ktd202x.c | 64 ++++++++++++++++++++++-------------------
+ 2 files changed, 34 insertions(+), 31 deletions(-)
+
+(limited to 'drivers/leds/rgb')
+
+--- a/drivers/leds/rgb/Kconfig
++++ b/drivers/leds/rgb/Kconfig
+@@ -17,7 +17,6 @@ config LEDS_GROUP_MULTICOLOR
+ config LEDS_KTD202X
+ tristate "LED support for KTD202x Chips"
+ depends on I2C
+- depends on OF
+ select REGMAP_I2C
+ help
+ This option enables support for the Kinetic KTD2026/KTD2027
+--- a/drivers/leds/rgb/leds-ktd202x.c
++++ b/drivers/leds/rgb/leds-ktd202x.c
+@@ -99,7 +99,7 @@ struct ktd202x {
+ struct device *dev;
+ struct regmap *regmap;
+ bool enabled;
+- int num_leds;
++ unsigned long num_leds;
+ struct ktd202x_led leds[] __counted_by(num_leds);
+ };
+
+@@ -381,16 +381,19 @@ static int ktd202x_blink_mc_set(struct l
+ mc->num_colors);
+ }
+
+-static int ktd202x_setup_led_rgb(struct ktd202x *chip, struct device_node *np,
++static int ktd202x_setup_led_rgb(struct ktd202x *chip, struct fwnode_handle *fwnode,
+ struct ktd202x_led *led, struct led_init_data *init_data)
+ {
++ struct fwnode_handle *child;
+ struct led_classdev *cdev;
+- struct device_node *child;
+ struct mc_subled *info;
+ int num_channels;
+ int i = 0;
+
+- num_channels = of_get_available_child_count(np);
++ num_channels = 0;
++ fwnode_for_each_available_child_node(fwnode, child)
++ num_channels++;
++
+ if (!num_channels || num_channels > chip->num_leds)
+ return -EINVAL;
+
+@@ -398,22 +401,22 @@ static int ktd202x_setup_led_rgb(struct
+ if (!info)
+ return -ENOMEM;
+
+- for_each_available_child_of_node(np, child) {
++ fwnode_for_each_available_child_node(fwnode, child) {
+ u32 mono_color;
+ u32 reg;
+ int ret;
+
+- ret = of_property_read_u32(child, "reg", ®);
++ ret = fwnode_property_read_u32(child, "reg", ®);
+ if (ret != 0 || reg >= chip->num_leds) {
+- dev_err(chip->dev, "invalid 'reg' of %pOFn\n", child);
+- of_node_put(child);
+- return -EINVAL;
++ dev_err(chip->dev, "invalid 'reg' of %pfw\n", child);
++ fwnode_handle_put(child);
++ return ret;
+ }
+
+- ret = of_property_read_u32(child, "color", &mono_color);
++ ret = fwnode_property_read_u32(child, "color", &mono_color);
+ if (ret < 0 && ret != -EINVAL) {
+- dev_err(chip->dev, "failed to parse 'color' of %pOF\n", child);
+- of_node_put(child);
++ dev_err(chip->dev, "failed to parse 'color' of %pfw\n", child);
++ fwnode_handle_put(child);
+ return ret;
+ }
+
+@@ -433,16 +436,16 @@ static int ktd202x_setup_led_rgb(struct
+ return devm_led_classdev_multicolor_register_ext(chip->dev, &led->mcdev, init_data);
+ }
+
+-static int ktd202x_setup_led_single(struct ktd202x *chip, struct device_node *np,
++static int ktd202x_setup_led_single(struct ktd202x *chip, struct fwnode_handle *fwnode,
+ struct ktd202x_led *led, struct led_init_data *init_data)
+ {
+ struct led_classdev *cdev;
+ u32 reg;
+ int ret;
+
+- ret = of_property_read_u32(np, "reg", ®);
++ ret = fwnode_property_read_u32(fwnode, "reg", ®);
+ if (ret != 0 || reg >= chip->num_leds) {
+- dev_err(chip->dev, "invalid 'reg' of %pOFn\n", np);
++ dev_err(chip->dev, "invalid 'reg' of %pfw\n", fwnode);
+ return -EINVAL;
+ }
+ led->index = reg;
+@@ -454,7 +457,7 @@ static int ktd202x_setup_led_single(stru
+ return devm_led_classdev_register_ext(chip->dev, &led->cdev, init_data);
+ }
+
+-static int ktd202x_add_led(struct ktd202x *chip, struct device_node *np, unsigned int index)
++static int ktd202x_add_led(struct ktd202x *chip, struct fwnode_handle *fwnode, unsigned int index)
+ {
+ struct ktd202x_led *led = &chip->leds[index];
+ struct led_init_data init_data = {};
+@@ -463,21 +466,21 @@ static int ktd202x_add_led(struct ktd202
+ int ret;
+
+ /* Color property is optional in single color case */
+- ret = of_property_read_u32(np, "color", &color);
++ ret = fwnode_property_read_u32(fwnode, "color", &color);
+ if (ret < 0 && ret != -EINVAL) {
+- dev_err(chip->dev, "failed to parse 'color' of %pOF\n", np);
++ dev_err(chip->dev, "failed to parse 'color' of %pfw\n", fwnode);
+ return ret;
+ }
+
+ led->chip = chip;
+- init_data.fwnode = of_fwnode_handle(np);
++ init_data.fwnode = fwnode;
+
+ if (color == LED_COLOR_ID_RGB) {
+ cdev = &led->mcdev.led_cdev;
+- ret = ktd202x_setup_led_rgb(chip, np, led, &init_data);
++ ret = ktd202x_setup_led_rgb(chip, fwnode, led, &init_data);
+ } else {
+ cdev = &led->cdev;
+- ret = ktd202x_setup_led_single(chip, np, led, &init_data);
++ ret = ktd202x_setup_led_single(chip, fwnode, led, &init_data);
+ }
+
+ if (ret) {
+@@ -490,15 +493,14 @@ static int ktd202x_add_led(struct ktd202
+ return 0;
+ }
+
+-static int ktd202x_probe_dt(struct ktd202x *chip)
++static int ktd202x_probe_fw(struct ktd202x *chip)
+ {
+- struct device_node *np = dev_of_node(chip->dev), *child;
++ struct fwnode_handle *child;
++ struct device *dev = chip->dev;
+ int count;
+ int i = 0;
+
+- chip->num_leds = (int)(unsigned long)of_device_get_match_data(chip->dev);
+-
+- count = of_get_available_child_count(np);
++ count = device_get_child_node_count(dev);
+ if (!count || count > chip->num_leds)
+ return -EINVAL;
+
+@@ -507,11 +509,11 @@ static int ktd202x_probe_dt(struct ktd20
+ /* Allow the device to execute the complete reset */
+ usleep_range(200, 300);
+
+- for_each_available_child_of_node(np, child) {
++ device_for_each_child_node(dev, child) {
+ int ret = ktd202x_add_led(chip, child, i);
+
+ if (ret) {
+- of_node_put(child);
++ fwnode_handle_put(child);
+ return ret;
+ }
+ i++;
+@@ -554,6 +556,8 @@ static int ktd202x_probe(struct i2c_clie
+ return ret;
+ }
+
++ chip->num_leds = (unsigned long)i2c_get_match_data(client);
++
+ chip->regulators[0].supply = "vin";
+ chip->regulators[1].supply = "vio";
+ ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(chip->regulators), chip->regulators);
+@@ -568,7 +572,7 @@ static int ktd202x_probe(struct i2c_clie
+ return ret;
+ }
+
+- ret = ktd202x_probe_dt(chip);
++ ret = ktd202x_probe_fw(chip);
+ if (ret < 0) {
+ regulator_bulk_disable(ARRAY_SIZE(chip->regulators), chip->regulators);
+ return ret;
+@@ -605,7 +609,7 @@ static void ktd202x_shutdown(struct i2c_
+ static const struct of_device_id ktd202x_match_table[] = {
+ { .compatible = "kinetic,ktd2026", .data = (void *)KTD2026_NUM_LEDS },
+ { .compatible = "kinetic,ktd2027", .data = (void *)KTD2027_NUM_LEDS },
+- {},
++ {}
+ };
+ MODULE_DEVICE_TABLE(of, ktd202x_match_table);
+
diff --git a/target/linux/generic/backport-6.6/862-v6.10-leds-rgb-leds-ktd202x-i2c-id-tables-for-ktd2026-and-2027.patch b/target/linux/generic/backport-6.6/862-v6.10-leds-rgb-leds-ktd202x-i2c-id-tables-for-ktd2026-and-2027.patch
new file mode 100644
index 0000000000..223ccd8f50
--- /dev/null
+++ b/target/linux/generic/backport-6.6/862-v6.10-leds-rgb-leds-ktd202x-i2c-id-tables-for-ktd2026-and-2027.patch
@@ -0,0 +1,49 @@
+From 75bd07aef47e1a984229e6ec702e8b9aee0226e4 Mon Sep 17 00:00:00 2001
+From: Kate Hsuan <hpa at redhat.com>
+Date: Fri, 31 May 2024 13:41:20 +0200
+Subject: leds: rgb: leds-ktd202x: I2C ID tables for KTD2026 and 2027
+
+Add an i2c_device_id id_table to match manually instantiated
+(non device-tree / ACPI instantiated) KTD202x controllers as
+found on some x86 boards.
+
+This table shows the maximum support LED channel for KTD2026
+(three LEDs) and KTD-2027 (4 LEDs).
+
+Link: https://www.kinet-ic.com/uploads/KTD2026-7-04h.pdf
+Signed-off-by: Kate Hsuan <hpa at redhat.com>
+Reviewed-by: Hans de Goede <hdegoede at redhat.com>
+Reviewed-by: Andy Shevchenko <andy at kernel.org>
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+Link: https://lore.kernel.org/r/20240531114124.45346-3-hdegoede@redhat.com
+Signed-off-by: Lee Jones <lee at kernel.org>
+---
+ drivers/leds/rgb/leds-ktd202x.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+(limited to 'drivers/leds/rgb')
+
+--- a/drivers/leds/rgb/leds-ktd202x.c
++++ b/drivers/leds/rgb/leds-ktd202x.c
+@@ -606,6 +606,13 @@ static void ktd202x_shutdown(struct i2c_
+ regmap_write(chip->regmap, KTD202X_REG_RESET_CONTROL, KTD202X_RSTR_RESET);
+ }
+
++static const struct i2c_device_id ktd202x_id[] = {
++ {"ktd2026", KTD2026_NUM_LEDS},
++ {"ktd2027", KTD2027_NUM_LEDS},
++ {}
++};
++MODULE_DEVICE_TABLE(i2c, ktd202x_id);
++
+ static const struct of_device_id ktd202x_match_table[] = {
+ { .compatible = "kinetic,ktd2026", .data = (void *)KTD2026_NUM_LEDS },
+ { .compatible = "kinetic,ktd2027", .data = (void *)KTD2027_NUM_LEDS },
+@@ -621,6 +628,7 @@ static struct i2c_driver ktd202x_driver
+ .probe = ktd202x_probe,
+ .remove = ktd202x_remove,
+ .shutdown = ktd202x_shutdown,
++ .id_table = ktd202x_id,
+ };
+ module_i2c_driver(ktd202x_driver);
+
diff --git a/target/linux/generic/backport-6.6/863-v6.10-leds-rgb-leds-ktd202x-initialize-mutex-earlier.patch b/target/linux/generic/backport-6.6/863-v6.10-leds-rgb-leds-ktd202x-initialize-mutex-earlier.patch
new file mode 100644
index 0000000000..533b0f0e17
--- /dev/null
+++ b/target/linux/generic/backport-6.6/863-v6.10-leds-rgb-leds-ktd202x-initialize-mutex-earlier.patch
@@ -0,0 +1,62 @@
+From e1b08c6f5b92d408a9fcc1030a340caeb9852250 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Fri, 31 May 2024 13:41:21 +0200
+Subject: leds: rgb: leds-ktd202x: Initialize mutex earlier
+
+The mutex must be initialized before the LED class device is registered
+otherwise there is a race where it may get used before it is initialized:
+
+ DEBUG_LOCKS_WARN_ON(lock->magic != lock)
+ WARNING: CPU: 2 PID: 2045 at kernel/locking/mutex.c:587 __mutex_lock
+ ...
+ RIP: 0010:__mutex_lock+0x7db/0xc10
+ ...
+ set_brightness_delayed_set_brightness.part.0+0x17/0x60
+ set_brightness_delayed+0xf1/0x100
+ process_one_work+0x222/0x5a0
+
+Move the mutex_init() call earlier to avoid this race condition and
+switch to devm_mutex_init() to avoid the need to add error-exit
+cleanup to probe() if probe() fails later on.
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+Reviewed-by: Andy Shevchenko <andy at kernel.org>
+Link: https://lore.kernel.org/r/20240531114124.45346-4-hdegoede@redhat.com
+Signed-off-by: Lee Jones <lee at kernel.org>
+---
+ drivers/leds/rgb/leds-ktd202x.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+(limited to 'drivers/leds/rgb')
+
+--- a/drivers/leds/rgb/leds-ktd202x.c
++++ b/drivers/leds/rgb/leds-ktd202x.c
+@@ -556,6 +556,10 @@ static int ktd202x_probe(struct i2c_clie
+ return ret;
+ }
+
++ ret = devm_mutex_init(dev, &chip->mutex);
++ if (ret)
++ return ret;
++
+ chip->num_leds = (unsigned long)i2c_get_match_data(client);
+
+ chip->regulators[0].supply = "vin";
+@@ -584,8 +588,6 @@ static int ktd202x_probe(struct i2c_clie
+ return ret;
+ }
+
+- mutex_init(&chip->mutex);
+-
+ return 0;
+ }
+
+@@ -594,8 +596,6 @@ static void ktd202x_remove(struct i2c_cl
+ struct ktd202x *chip = i2c_get_clientdata(client);
+
+ ktd202x_chip_disable(chip);
+-
+- mutex_destroy(&chip->mutex);
+ }
+
+ static void ktd202x_shutdown(struct i2c_client *client)
More information about the lede-commits
mailing list