diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2011-11-09 18:59:02 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-11-15 11:52:17 -0800 |
| commit | ec1c562461090170ce9515147954185c9a5bda44 (patch) | |
| tree | 36d12d5e0b3ae968ee8eed073e6cf29c76dd9dd1 /arch | |
| parent | 92cd5c809536e4c7c8a30b08d033346bb4f147a3 (diff) | |
arm: tegra: Configuring kbc pins as per gpio nr
Configuring the kbc pins such that the row/column is configured
in their respective GPIO number.
bug 804531
Reviewed-on: http://git-master/r/59942
(cherry picked from commit 8685f95f771c5568e0dba4e444179a2f7412e639)
Change-Id: I07c46281f25bdfadb2d35704a507e2ace640a684
Reviewed-on: http://git-master/r/64033
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-kbc.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise-kbc.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana-kbc.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler-kbc.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-kbc.c b/arch/arm/mach-tegra/board-cardhu-kbc.c index 93a936ac01a4..bd10c1e582e7 100644 --- a/arch/arm/mach-tegra/board-cardhu-kbc.c +++ b/arch/arm/mach-tegra/board-cardhu-kbc.c @@ -132,8 +132,8 @@ int __init cardhu_kbc_init(void) data->pin_cfg[i].pin_type = kbc_pin_row; } for (i = 0; i < col_count; i++) { - data->pin_cfg[i + row_count].num = i; - data->pin_cfg[i + row_count].pin_type = kbc_pin_col; + data->pin_cfg[i + KBC_PIN_GPIO_16].num = i; + data->pin_cfg[i + KBC_PIN_GPIO_16].pin_type = kbc_pin_col; } platform_device_register(&cardhu_kbc_device); diff --git a/arch/arm/mach-tegra/board-enterprise-kbc.c b/arch/arm/mach-tegra/board-enterprise-kbc.c index d8082662f3ab..15332fd723f5 100644 --- a/arch/arm/mach-tegra/board-enterprise-kbc.c +++ b/arch/arm/mach-tegra/board-enterprise-kbc.c @@ -86,8 +86,8 @@ int __init enterprise_kbc_init(void) } for (i = 0; i < ENTERPRISE_COL_COUNT; i++) { - data->pin_cfg[i + ENTERPRISE_ROW_COUNT].num = i; - data->pin_cfg[i + ENTERPRISE_ROW_COUNT].pin_type = kbc_pin_col; + data->pin_cfg[i + KBC_PIN_GPIO_16].num = i; + data->pin_cfg[i + KBC_PIN_GPIO_16].pin_type = kbc_pin_col; } platform_device_register(&tegra_kbc_device); pr_info("Registering successful tegra-kbc\n"); diff --git a/arch/arm/mach-tegra/board-ventana-kbc.c b/arch/arm/mach-tegra/board-ventana-kbc.c index d157d065b8e1..456f18c5e4ac 100644 --- a/arch/arm/mach-tegra/board-ventana-kbc.c +++ b/arch/arm/mach-tegra/board-ventana-kbc.c @@ -134,8 +134,8 @@ int __init ventana_kbc_init(void) } for (i = 0; i < VENTANA_COL_COUNT; i++) { - data->pin_cfg[i + VENTANA_ROW_COUNT].num = i; - data->pin_cfg[i + VENTANA_ROW_COUNT].pin_type = kbc_pin_col; + data->pin_cfg[i + KBC_PIN_GPIO_16].num = i; + data->pin_cfg[i + KBC_PIN_GPIO_16].pin_type = kbc_pin_col; } platform_device_register(&ventana_kbc_device); return 0; diff --git a/arch/arm/mach-tegra/board-whistler-kbc.c b/arch/arm/mach-tegra/board-whistler-kbc.c index 95bfa774ecaa..2d43131f8024 100644 --- a/arch/arm/mach-tegra/board-whistler-kbc.c +++ b/arch/arm/mach-tegra/board-whistler-kbc.c @@ -121,8 +121,8 @@ int __init whistler_kbc_init(void) data->pin_cfg[i].pin_type = kbc_pin_row; } for (i = 0; i < WHISTLER_COL_COUNT; i++) { - data->pin_cfg[i + WHISTLER_ROW_COUNT].num = i; - data->pin_cfg[i + WHISTLER_ROW_COUNT].pin_type = kbc_pin_col; + data->pin_cfg[i + KBC_PIN_GPIO_16].num = i; + data->pin_cfg[i + KBC_PIN_GPIO_16].pin_type = kbc_pin_col; } platform_device_register(&whistler_kbc_device); |