Skip to contentSkip to conversation

leds: mlxreg: Change behavior during init and remove unused definition

PATCH New Vadim Pasternak 1 participant 3 messages Aug 22, 2023

Subsystems (2)
lore
Share & tools
lore

Vadim Pasternak

author maintainer
#0 lore raw

cover leds: mlxreg: Change behavior during init and remove unused definition

The patch set contains:
Patch #1 - remove unused color definition.
Patch #2 - remove LED color setting during initialization, leaving this
decision to application level.

Vadim Pasternak (2):
leds: mlxreg: Remove code for amber LED colour
leds: mlxreg: Skip setting LED color during initialization

 drivers/leds/leds-mlxreg.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
Signature · 1 line
2.20.1
author maintainer
#1 lore raw

PATCH 1/2 leds: mlxreg: Remove code for amber LED colour

Remove unused code for amber LED colour.

In case system LED color is "red", "orange" or "amber" same code is to be used for colour setting.

---
 drivers/leds/leds-mlxreg.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/leds/leds-mlxreg.c +2 -6
index b7855c93bd72..916544e95e26 100644
@@ -19,7 +19,6 @@
 #define MLXREG_LED_IS_OFF		0x00 /* Off */
 #define MLXREG_LED_RED_SOLID		0x05 /* Solid red */
 #define MLXREG_LED_GREEN_SOLID		0x0D /* Solid green */
-#define MLXREG_LED_AMBER_SOLID		0x09 /* Solid amber */
 #define MLXREG_LED_BLINK_3HZ		167 /* ~167 msec off/on - HW support */
 #define MLXREG_LED_BLINK_6HZ		83 /* ~83 msec off/on - HW support */
 #define MLXREG_LED_CAPABILITY_CLEAR	GENMASK(31, 8) /* Clear mask */
@@ -218,13 +217,10 @@ static int mlxreg_led_config(struct mlxreg_led_priv_data *priv)
 
 		led_cdev = &led_data->led_cdev;
 		led_data->data_parent = priv;
-		if (strstr(data->label, "red") ||
-		    strstr(data->label, "orange")) {
+		if (strstr(data->label, "red") || strstr(data->label, "orange") ||
+		    strstr(data->label, "amber")) {
 			brightness = LED_OFF;
 			led_data->base_color = MLXREG_LED_RED_SOLID;
-		} else if (strstr(data->label, "amber")) {
-			brightness = LED_OFF;
-			led_data->base_color = MLXREG_LED_AMBER_SOLID;
 		} else {
 			brightness = LED_OFF;
 			led_data->base_color = MLXREG_LED_GREEN_SOLID;
Signature · 1 line
2.20.1
author maintainer
#2 lore raw

PATCH 2/2 leds: mlxreg: Skip setting LED color during initialization

In reply to Vadim Pasternak

Hardware controls LED through CPLD device and LED control ownership passes to the software after it performs the first write operation for any LED on a system.
For example, hardware sets "system" LED "green blink" during boot and might change it to "red", in case something is went wrong from hardware point of view.
The motivation for not setting LED during kernel initialization is for keeping hardware settings visible for user, until user will not decide to set LEDs according to user OS specific requirements.

---
 drivers/leds/leds-mlxreg.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/leds/leds-mlxreg.c +0 -3
index 916544e95e26..d4e08d243804 100644
@@ -240,9 +240,6 @@ static int mlxreg_led_config(struct mlxreg_led_priv_data *priv)
 		if (err)
 			return err;
 
-		if (led_cdev->brightness)
-			mlxreg_led_brightness_set(led_cdev,
-						  led_cdev->brightness);
 		dev_info(led_cdev->dev, "label: %s, mask: 0x%02x, offset:0x%02x\n",
 			 data->label, data->mask, data->reg);
 	}
Signature · 1 line
2.20.1