From 2200829acd4bd9560179f06052ffcf9a3746784f Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Wed, 9 Nov 2011 18:59:02 +0530 Subject: 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/64033 (cherry picked from commit ec1c562461090170ce9515147954185c9a5bda44) Change-Id: I5242bee91e767151022071022f195f0f1ca7bea2 Signed-off-by: Laxman Dewangan Change-Id: I3cb02c81b88db4284337177355caaea77ef48e12 Reviewed-on: http://git-master/r/65134 Reviewed-by: Varun Colbert Tested-by: Varun Colbert Rebase-Id: R2867df551e1c8d81fe4a7cd0034aeed9439f1e09 --- arch/arm/mach-tegra/board-cardhu-kbc.c | 4 ++-- arch/arm/mach-tegra/board-enterprise-kbc.c | 4 ++-- arch/arm/mach-tegra/board-whistler-kbc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-tegra/board-cardhu-kbc.c b/arch/arm/mach-tegra/board-cardhu-kbc.c index 46353b671224..a816e2b7e334 100644 --- a/arch/arm/mach-tegra/board-cardhu-kbc.c +++ b/arch/arm/mach-tegra/board-cardhu-kbc.c @@ -134,8 +134,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 21f863a2db84..0c4a5587b605 100644 --- a/arch/arm/mach-tegra/board-enterprise-kbc.c +++ b/arch/arm/mach-tegra/board-enterprise-kbc.c @@ -93,8 +93,8 @@ int __init enterprise_kbc_init(void) data->pin_cfg[i].en = true; } for (i = 0; i < ENTERPRISE_COL_COUNT; i++) { - data->pin_cfg[i + KBC_MAX_ROW].num = i; - data->pin_cfg[i + KBC_MAX_ROW].en = true; + data->pin_cfg[i + KBC_PIN_GPIO_16].num = i; + data->pin_cfg[i + KBC_PIN_GPIO_16].en = true; } platform_device_register(&tegra_kbc_device); diff --git a/arch/arm/mach-tegra/board-whistler-kbc.c b/arch/arm/mach-tegra/board-whistler-kbc.c index cfa673bc7ce9..d46ae22bba05 100644 --- a/arch/arm/mach-tegra/board-whistler-kbc.c +++ b/arch/arm/mach-tegra/board-whistler-kbc.c @@ -126,8 +126,8 @@ int __init whistler_kbc_init(void) data->pin_cfg[i].en = true; } for (i = 0; i < WHISTLER_COL_COUNT; i++) { - data->pin_cfg[i + KBC_MAX_ROW].num = i; - data->pin_cfg[i + KBC_MAX_ROW].en = true; + data->pin_cfg[i + KBC_PIN_GPIO_16].num = i; + data->pin_cfg[i + KBC_PIN_GPIO_16].en = true; } platform_device_register(&whistler_kbc_device); -- cgit v1.2.3