[ARM] tegra:kbc:Misc fixes and cleanups

Following are changes:
- Fixes stylistic, indenting and coding style issue.
- Added option for scan timeout.
- Fixes code to have only required number of key codes from board.
- Remove the keycodes from driver and only based on board table.
- Fixes the kbc platform data to provide better option for configuration.
- Modified board files to build properly.

Original-Change-Id: I5e6b9f26ecf8db0769aabac9574cfb6d48c1f061
Reviewed-on: http://git-master/r/16254
Tested-by: Pradeep Goudagunta <pgoudagunta@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

Rebase-Id: R3a40ac7b679fa22c22718b9268ea4de7c5bd7592

1 files changed, 33 insertions, 79 deletions

diff --git a/arch/arm/mach-tegra/board-ventana-kbc.c b/arch/arm/mach-tegra/board-ventana-kbc.c
index 869af114fa90..3ea765ee5035 100644
--- a/arch/arm/mach-tegra/board-ventana-kbc.c
+++ b/arch/arm/mach-tegra/board-ventana-kbc.c
@@ -22,7 +22,6 @@
 * driver instead
 */
 
-
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
@@ -39,80 +38,42 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+#define VENTANA_ROW_COUNT	15
+#define VENTANA_COL_COUNT	7
 
 static int plain_kbd_keycode[] = {
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
+			KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
 	KEY_RESERVED, KEY_HOME, KEY_BACK, KEY_MENU,
-		KEY_VOLUMEDOWN, KEY_VOLUMEUP, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED
+			KEY_VOLUMEDOWN, KEY_VOLUMEUP, KEY_RESERVED,
 };
 
-static int fn_kbd_keycode[] = {
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_HOME, KEY_BACK, KEY_MENU,
-		KEY_VOLUMEDOWN, KEY_VOLUMEUP, KEY_RESERVED, KEY_RESERVED,
-	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
-		KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED
-};
-
-
-
-
 static struct tegra_kbc_wake_key ventana_wake_cfg[] = {
 	[0] = {
 		.row = 14,
@@ -120,16 +81,18 @@ static struct tegra_kbc_wake_key ventana_wake_cfg[] = {
 	},
 };
 
-
 static struct tegra_kbc_platform_data ventana_kbc_platform_data = {
 	.debounce_cnt = 20,
 	.repeat_cnt = 50 * 32,
-	.wake_cnt = 1,
+	.scan_timeout_cnt = 3000 * 32,
+	.plain_keycode = plain_kbd_keycode,
+	.fn_keycode = NULL,
+	.is_filter_keys = false,
+	.is_wake_on_any_key = false,
+	.wake_key_cnt = 1,
 	.wake_cfg = &ventana_wake_cfg[0],
-	.filter_keys  = true,
 };
 
-
 static struct resource ventana_kbc_resources[] = {
 	[0] = {
 		.start = TEGRA_KBC_BASE,
@@ -143,7 +106,6 @@ static struct resource ventana_kbc_resources[] = {
 	},
 };
 
-
 struct platform_device ventana_kbc_device = {
 	.name = "tegra-kbc",
 	.id = -1,
@@ -161,28 +123,20 @@ int __init ventana_kbc_init(void)
 
 	pr_info("KBC: ventana_kbc_init\n");
 
-	/*
-	 * Setup the pin configuration information.
-	 */
-	for (i = 0; i < KBC_MAX_ROW; i++) {
+	/* Setup the pin configuration information. */
+	for (i = 0; i < KBC_MAX_GPIO; i++) {
+		data->pin_cfg[i].num = 0;
+		data->pin_cfg[i].pin_type = kbc_pin_unused;
+	}
+	for (i = 0; i < VENTANA_ROW_COUNT; i++) {
 		data->pin_cfg[i].num = i;
-		data->pin_cfg[i].is_row = true;
-		data->pin_cfg[i].is_col = false;
+		data->pin_cfg[i].pin_type = kbc_pin_row;
 	}
 
-	for (j = 0; j < 7/*KBC_MAX_COL*/; j++) {
-		data->pin_cfg[i + j].num = j;
-		data->pin_cfg[i + j].is_row = false;
-		data->pin_cfg[i + j].is_col = true;
+	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;
 	}
-
-	/* tegra-kbc will use default keycodes. */
-	data->plain_keycode = plain_kbd_keycode;
-	data->fn_keycode = fn_kbd_keycode;
-	data->filter_keys = true;
 	platform_device_register(&ventana_kbc_device);
 	return 0;
 }
-
-
-