Revert "Revert "leds: class: Store the color index in struct led_clas…

…sdev"" This reverts commit 7893eca.
pop-os · May 1, 2024 · b57f055 · b57f055
1 parent 1a1c483
commit b57f055
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
@@ -491,6 +491,10 @@ int led_classdev_register_ext(struct device *parent,
  fwnode_property_read_u32(init_data->fwnode,
  "max-brightness",
  &led_cdev->max_brightness);
+
+ if (fwnode_property_present(init_data->fwnode, "color"))
+ fwnode_property_read_u32(init_data->fwnode, "color",
+ &led_cdev->color);
  }
  } else {
  proposed_name = led_cdev->name;
@@ -500,6 +504,9 @@ int led_classdev_register_ext(struct device *parent,
  if (ret < 0)
  return ret;
 
+ if (led_cdev->color >= LED_COLOR_ID_MAX)
+ dev_warn(parent, "LED %s color identifier out of range\n", final_name);
+
  mutex_init(&led_cdev->led_access);
  mutex_lock(&led_cdev->led_access);
  led_cdev->dev = device_create_with_groups(&leds_class, parent, 0,

diff --git a/include/linux/leds.h b/include/linux/leds.h
@@ -100,6 +100,7 @@ struct led_classdev {
  const char *name;
  unsigned int brightness;
  unsigned int max_brightness;
+ unsigned int color;
  int flags;
 
  /* Lower 16 bits reflect status */