From 1346a8bad2e58bb27600562bde4621e3d18f58bb Mon Sep 17 00:00:00 2001 From: Jostar Yang Date: Tue, 4 Dec 2018 15:27:51 +0800 Subject: [PATCH] Fix as7726 system led-loc issue --- .../modules/builds/x86-64-accton-as7726-32x-leds.c | 7 +++---- .../builds/src/x86_64_accton_as7726_32x/module/src/ledi.c | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/modules/builds/x86-64-accton-as7726-32x-leds.c b/packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/modules/builds/x86-64-accton-as7726-32x-leds.c index 801cd9e3..b6e34ac4 100755 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/modules/builds/x86-64-accton-as7726-32x-leds.c +++ b/packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/modules/builds/x86-64-accton-as7726-32x-leds.c @@ -53,7 +53,6 @@ static struct accton_as7726_32x_led_data *ledctl = NULL; #define LED_TYPE_DIAG_REG_MASK (0x3) #define LED_MODE_DIAG_GREEN_VALUE (0x02) #define LED_MODE_DIAG_RED_VALUE (0x01) -#define LED_MODE_DIAG_AMBER_VALUE (0x00) /*It's yellow actually. Green+Red=Yellow*/ #define LED_MODE_DIAG_OFF_VALUE (0x03) @@ -102,11 +101,11 @@ struct led_type_mode { static struct led_type_mode led_type_mode_data[] = { {LED_TYPE_LOC, LED_MODE_OFF, LED_TYPE_LOC_REG_MASK, LED_MODE_LOC_OFF_VALUE}, - {LED_TYPE_LOC, LED_MODE_AMBER, LED_TYPE_LOC_REG_MASK, LED_MODE_LOC_ON_VALUE}, + {LED_TYPE_LOC, LED_MODE_BLUE, LED_TYPE_LOC_REG_MASK, LED_MODE_LOC_ON_VALUE}, {LED_TYPE_DIAG, LED_MODE_OFF, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_OFF_VALUE}, {LED_TYPE_DIAG, LED_MODE_GREEN, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_GREEN_VALUE}, + {LED_TYPE_DIAG, LED_MODE_OFF, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_OFF_VALUE}, {LED_TYPE_DIAG, LED_MODE_RED, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_RED_VALUE}, - {LED_TYPE_DIAG, LED_MODE_AMBER, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_AMBER_VALUE}, }; @@ -428,6 +427,6 @@ static void __exit accton_as7726_32x_led_exit(void) module_init(accton_as7726_32x_led_init); module_exit(accton_as7726_32x_led_exit); -MODULE_AUTHOR("Brandon Chuang "); +MODULE_AUTHOR("Jostar Yang "); MODULE_DESCRIPTION("accton_as7726_32x_led driver"); MODULE_LICENSE("GPL"); diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/onlp/builds/src/x86_64_accton_as7726_32x/module/src/ledi.c b/packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/onlp/builds/src/x86_64_accton_as7726_32x/module/src/ledi.c index 94926527..ad7437ed 100755 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/onlp/builds/src/x86_64_accton_as7726_32x/module/src/ledi.c +++ b/packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/onlp/builds/src/x86_64_accton_as7726_32x/module/src/ledi.c @@ -77,7 +77,6 @@ typedef struct led_light_mode_map { led_light_mode_map_t led_map[] = { {LED_DIAG, LED_MODE_OFF, ONLP_LED_MODE_OFF}, {LED_DIAG, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, -{LED_DIAG, LED_MODE_AMBER, ONLP_LED_MODE_ORANGE}, {LED_DIAG, LED_MODE_RED, ONLP_LED_MODE_RED}, {LED_LOC, LED_MODE_OFF, ONLP_LED_MODE_OFF}, {LED_LOC, LED_MODE_BLUE, ONLP_LED_MODE_BLUE}, @@ -105,7 +104,7 @@ static onlp_led_info_t linfo[] = { { ONLP_LED_ID_CREATE(LED_DIAG), "LED 1 (DIAG LED)", 0 }, ONLP_LED_STATUS_PRESENT, - ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_ORANGE, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_RED, }, { { ONLP_LED_ID_CREATE(LED_LOC), "LED 2 (LOC LED)", 0 },