diff options
| author | Louis Li <louli@nvidia.com> | 2014-03-18 13:33:44 +0800 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2014-03-19 21:03:34 -0700 |
| commit | b60ddf14234e49edea5191cdb4899e1c44d3c582 (patch) | |
| tree | 1ce5bd262bd0a48a82a3bdc960ff7a87b7109d51 /arch/arm/mach-tegra/board-loki-kbc.c | |
| parent | d0216edfe8e5493faad48bc31be306d2c204f3e0 (diff) | |
arm: tegra: loki: disable PS6 GPIO button for A00
On A00 GPIO_PS6 (KB_ROW14) is SNN (floating). It shouldn't be used as a
wake source on P2530-A00.
Bug 1480429
Change-Id: I0fd936a51b43224051aa063e1e711c7002e4eb53
Signed-off-by: Louis Li <louli@nvidia.com>
Reviewed-on: http://git-master/r/382964
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Yunfan Zhang <yunfanz@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Jun Yan <juyan@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-loki-kbc.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-loki-kbc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-loki-kbc.c b/arch/arm/mach-tegra/board-loki-kbc.c index a27a20e01b53..c3839bc4a175 100644 --- a/arch/arm/mach-tegra/board-loki-kbc.c +++ b/arch/arm/mach-tegra/board-loki-kbc.c @@ -2,7 +2,7 @@ * arch/arm/mach-tegra/board-loki-kbc.c * Keys configuration for Nvidia tegra4 loki platform. * - * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2012-2014, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -61,6 +61,7 @@ #define PMC_WAKE_STATUS 0x14 #define TEGRA_WAKE_PWR_INT (1UL << 18) #define PMC_WAKE2_STATUS 0x168 +#define LOKI_FFD_A00 0x0a static int loki_wakeup_key(void); @@ -131,6 +132,10 @@ int __init loki_kbc_init(void) pr_info("Boardid:SKU = 0x%04x:0x%04x\n", board_info.board_id, board_info.sku); + /* GPIO PS6 is not used for Loki FFD A00 board */ + if (board_info.fab == LOKI_FFD_A00) + loki_int_keys_pdata.nbuttons -= 1; + ret = platform_device_register(&loki_int_keys_device); return ret; } |