Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 03:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/powernv: Fix mis-merge of OPAL support for LEDS driver

Browse Source 
When I merged the OPAL support for the powernv LEDS driver I missed a
hunk.

This is slightly modified from the original patch, as the original added
code to opal-api.h which is not in the skiboot version, which is
discouraged.

Instead those values are moved into the driver, which is the only place
they are used.

Fixes: 8a8d91817a ("powerpc/powernv: Add OPAL interfaces for accessing and modifying system LED states")
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2015-08-22 09:33:55 +10:00
parent e72bb8a5a8
commit 5d53be7d8c
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/include/asm/opal-api.h
View File

@ -343,6 +343,18 @@ enum OpalPciResetState {
OPAL_ASSERT_RESET = 1
};
enum OpalSlotLedType {
OPAL_SLOT_LED_TYPE_ID = 0, /* IDENTIFY LED */
OPAL_SLOT_LED_TYPE_FAULT = 1, /* FAULT LED */
OPAL_SLOT_LED_TYPE_ATTN = 2, /* System Attention LED */
OPAL_SLOT_LED_TYPE_MAX = 3
};
enum OpalSlotLedState {
OPAL_SLOT_LED_STATE_OFF = 0, /* LED is OFF */
OPAL_SLOT_LED_STATE_ON = 1 /* LED is ON */
};
/*
* Address cycle types for LPC accesses. These also correspond
* to the content of the first cell of the "reg" property for

6
drivers/leds/leds-powernv.c
View File

@ -27,9 +27,9 @@ struct led_type_map {
const char *desc;
};
static const struct led_type_map led_type_map[] = {
{OPAL_SLOT_LED_TYPE_ID, POWERNV_LED_TYPE_IDENTIFY},
{OPAL_SLOT_LED_TYPE_FAULT, POWERNV_LED_TYPE_FAULT},
{OPAL_SLOT_LED_TYPE_ATTN, POWERNV_LED_TYPE_ATTENTION},
{OPAL_SLOT_LED_TYPE_ID, "identify"},
{OPAL_SLOT_LED_TYPE_FAULT, "fault"},
{OPAL_SLOT_LED_TYPE_ATTN, "attention"},
{-1, NULL},
};