342604a4bb
* [Mellanox] Don't populate arm64 Kconfig when integrating hw-mgmt
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
* Intgerate HW-MGMT 7.0030.2008 Changes
## Patch List
* 0285-UBUNTU-SAUCE-mlxbf-gige-Fix-intermittent-no-ip-issue.patch :
* 0286-pinctrl-Introduce-struct-pinfunction-and-PINCTRL_PIN.patch :
* 0287-pinctrl-mlxbf3-Add-pinctrl-driver-support.patch :
* 0288-UBUNTU-SAUCE-gpio-mmio-handle-ngpios-properly-in-bgp.patch :
* 0289-UBUNTU-SAUCE-gpio-mlxbf3-Add-gpio-driver-support.patch :
* 0291-mlxsw-core_hwmon-Align-modules-label-name-assignment.patch :
* 0292-mlxsw-i2c-Limit-single-transaction-buffer-size.patch :
* 0293-mlxsw-reg-Limit-MTBR-register-records-buffer-by-one-.patch :
* 0296-UBUNTU-SAUCE-mmc-sdhci-of-dwcmshc-Add-runtime-PM-ope.patch :
* 0298-UBUNTU-SAUCE-mlxbf-ptm-use-0444-instead-of-S_IRUGO.patch :
* 0299-UBUNTU-SAUCE-mlxbf-ptm-add-atx-debugfs-nodes.patch :
* 0300-UBUNTU-SAUCE-mlxbf-ptm-update-module-version.patch :
* 0301-UBUNTU-SAUCE-mlxbf-gige-Fix-kernel-panic-at-shutdown.patch :
* 0302-UBUNTU-SAUCE-mlxbf-bootctl-support-SMC-call-for-sett.patch :
* 0303-UBUNTU-SAUCE-Add-BF3-related-ACPI-config-and-Ring-de.patch :
* 0306-dt-bindings-trivial-devices-Add-infineon-xdpe1a2g7.patch :
* 0307-leds-mlxreg-Add-support-for-new-flavour-of-capabilit.patch :
* 0308-leds-mlxreg-Remove-code-for-amber-LED-colour.patch :
* 0308-platform_data-mlxreg-Add-capability-bit-and-mask-fie.patch :
* 0309-hwmon-mlxreg-fan-Add-support-for-new-flavour-of-capa.patch :
* 0310-hwmon-mlxreg-fan-Extend-number-of-supporetd-fans.patch :
* 0317-platform-mellanox-Introduce-support-for-switches-equ.patch :
* 0318-mellanox-Relocate-mlx-platform-driver.patch :
* 0319-UBUNTU-SAUCE-mlxbf-tmfifo-fix-potential-race.patch :
* 0320-UBUNTU-SAUCE-mlxbf-tmfifo-Drop-the-Rx-packet-if-no-m.patch :
* 0321-UBUNTU-SAUCE-mlxbf-tmfifo-Drop-jumbo-frames.patch :
* 0322-UBUNTU-SAUCE-mlxbf-tmfifo.c-Amend-previous-tmfifo-pa.patch :
* 0323-mlxbf_gige-add-set_link_ksettings-ethtool-callback.patch :
* 0324-mlxbf_gige-fix-white-space-in-mlxbf_gige_eth_ioctl.patch :
* 0325-UBUNTU-SAUCE-mlxbf-bootctl-Fix-kernel-panic-due-to-b.patch :
* 0326-platform-mellanox-mlxreg-hotplug-Add-support-for-new.patch :
* 0327-platform-mellanox-mlx-platform-Change-register-name.patch :
* 0328-platform-mellanox-mlx-platform-Add-support-for-new-X.patch :
* [Mellanox] Remove thermal zone related code and replace with new one
* Revert "Revert "[Mellanox] Align PSU temperature sysfs node name with hw-management change (#16820)" (#16956)"
This reverts commit c2edc6f9d5.
---------
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Co-authored-by: Junchao-Mellanox <junchao@nvidia.com>
Co-authored-by: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From 76dc17f264b5d1530f110187220923dc8f7db0a4 Mon Sep 17 00:00:00 2001
|
|
From: Vadim Pasternak <vadimp@nvidia.com>
|
|
Date: Sun, 23 Jul 2023 10:07:15 +0000
|
|
Subject: [PATCH backport 5.10.179 2/2] leds: mlxreg: Remove code for amber LED
|
|
colour
|
|
|
|
Remove unused code for amber LED colour.
|
|
|
|
In case system LED color is "green", "orange" or "amber" same code is
|
|
to be used for colour setting.
|
|
|
|
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
|
|
---
|
|
drivers/leds/leds-mlxreg.c | 10 ++--------
|
|
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/leds/leds-mlxreg.c b/drivers/leds/leds-mlxreg.c
|
|
index e6b205d31..26039e187 100644
|
|
--- a/drivers/leds/leds-mlxreg.c
|
|
+++ b/drivers/leds/leds-mlxreg.c
|
|
@@ -22,7 +22,6 @@
|
|
#define MLXREG_LED_RED_SOLID 0x05 /* Solid red or orange */
|
|
#define MLXREG_LED_GREEN_SOLID_HW 0x09 /* Solid green by hardware */
|
|
#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 */
|
|
@@ -262,16 +261,11 @@ 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")) {
|
|
- brightness = LED_OFF;
|
|
- led_data->base_color = MLXREG_LED_RED_SOLID;
|
|
- } else if (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;
|
|
led_data->base_color_hw = MLXREG_LED_RED_SOLID_HW;
|
|
- } 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;
|
|
--
|
|
2.20.1
|
|
|