summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-tegra/include/nvodm_query_gpio.h2
-rw-r--r--arch/arm/mach-tegra/odm_kit/platform/keyboard/nvodm_keyboard.c5
-rw-r--r--arch/arm/mach-tegra/odm_kit/query/harmony/nvodm_query_gpio.c2
3 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/include/nvodm_query_gpio.h b/arch/arm/mach-tegra/include/nvodm_query_gpio.h
index fe69335e99e1..143f609283a1 100644
--- a/arch/arm/mach-tegra/include/nvodm_query_gpio.h
+++ b/arch/arm/mach-tegra/include/nvodm_query_gpio.h
@@ -145,7 +145,7 @@ typedef enum
NvOdmGpioPinGroup_Power,
/// Specifies a group for keys used to resume from EC keyboard.
- NvOdmGpioPinGroup_WakeFromECKeyboard,
+ NvOdmGpioPinGroup_EmbeddedController,
/// Specifies a group for Battery
NvOdmGpioPinGroup_Battery,
diff --git a/arch/arm/mach-tegra/odm_kit/platform/keyboard/nvodm_keyboard.c b/arch/arm/mach-tegra/odm_kit/platform/keyboard/nvodm_keyboard.c
index 81051933f4e0..d70893b35f18 100644
--- a/arch/arm/mach-tegra/odm_kit/platform/keyboard/nvodm_keyboard.c
+++ b/arch/arm/mach-tegra/odm_kit/platform/keyboard/nvodm_keyboard.c
@@ -138,9 +138,8 @@ NvBool NvOdmKeyboardInit(void)
}
/* Check the supported GPIOs */
- hOdm->GpioPinInfo = NvOdmQueryGpioPinMap(NvOdmGpioPinGroup_WakeFromECKeyboard,
- 0,
- &hOdm->PinCount);
+ hOdm->GpioPinInfo = NvOdmQueryGpioPinMap(NvOdmGpioPinGroup_EmbeddedController,
+ 0, &hOdm->PinCount);
NvRmGpioAcquirePinHandle(s_hGpioGlobal,
hOdm->GpioPinInfo->Port,
diff --git a/arch/arm/mach-tegra/odm_kit/query/harmony/nvodm_query_gpio.c b/arch/arm/mach-tegra/odm_kit/query/harmony/nvodm_query_gpio.c
index a18d2644239a..5b9ad3375959 100644
--- a/arch/arm/mach-tegra/odm_kit/query/harmony/nvodm_query_gpio.c
+++ b/arch/arm/mach-tegra/odm_kit/query/harmony/nvodm_query_gpio.c
@@ -252,7 +252,7 @@ const NvOdmGpioPinInfo *NvOdmQueryGpioPinMap(NvOdmGpioPinGroup Group,
*pCount = NVODM_ARRAY_SIZE(s_Power);
return s_Power;
- case NvOdmGpioPinGroup_WakeFromECKeyboard:
+ case NvOdmGpioPinGroup_EmbeddedController:
*pCount = NVODM_ARRAY_SIZE(s_WakeFromKeyBoard);
return s_WakeFromKeyBoard;