diff options
| author | Gary King <gking@nvidia.com> | 2010-06-23 16:23:17 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-06-23 20:51:03 -0700 |
| commit | ddc91484aaead10c4dfef1bdda5bd40b33d3da89 (patch) | |
| tree | e0c2fed6048cba6b2978303f7841925307199439 /arch | |
| parent | 30dcabc4078d53ed1d3b9d584b3aa688520d5820 (diff) | |
[ARM/tegra] odm kit: rename GPIO group WakeFromECKeyboard
rename WakeFromECKeyboard to EmbeddedController, to remain compatible
with the header file used for bootloader and user-space builds
Change-Id: I6051b8ee6853f25df3a5e0d09d2bf67f6c5434b2
Reviewed-on: http://git-master/r/3108
Reviewed-by: Gary King <gking@nvidia.com>
Tested-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch')
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; |