twl4030_keypad cleanup

Rename this so it no longer presumes needless OMAP dependency.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 27c4f1dc4b20c3285b93ed11f57b0e9d4834c79f..9f68f208895a9ae935b53772b5904a1631fa1a2d 100644 (file)
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_KEYBOARD_OMAP)           += omap-keypad.o
 obj-$(CONFIG_OMAP_PS2)                 += innovator_ps2.o
 obj-$(CONFIG_KEYBOARD_TSC2301)         += tsc2301_kp.o
 obj-$(CONFIG_KEYBOARD_LM8323)          += lm8323.o
-obj-$(CONFIG_KEYBOARD_TWL4030)         += omap-twl4030keypad.o
+obj-$(CONFIG_KEYBOARD_TWL4030)         += twl4030_keypad.o
 obj-$(CONFIG_KEYBOARD_PXA27x)          += pxa27x_keypad.o
 obj-$(CONFIG_KEYBOARD_PXA930_ROTARY)   += pxa930_rotary.o
 obj-$(CONFIG_KEYBOARD_AAED2000)                += aaed2000_kbd.o

diff --git a/drivers/input/keyboard/omap-twl4030keypad.c b/drivers/input/keyboard/twl4030_keypad.c
similarity index 97%
rename from drivers/input/keyboard/omap-twl4030keypad.c
rename to drivers/input/keyboard/twl4030_keypad.c
index 61b63026aa350d394bfd2f38c9b7549078573e04..8bfd65015ac6cc971aa6848bc2431b2f57729d94 100644 (file)
--- a/drivers/input/keyboard/omap-twl4030keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -1,5 +1,5 @@
 /*
- * drivers/input/keyboard/omap-twl4030keypad.c
+ * twl4030_keypad.c - driver for 8x8 keypad controller in twl4030 chips
  *
  * Copyright (C) 2007 Texas Instruments, Inc.
  * Copyright (C) 2008 Nokia Corporation
@@ -33,6 +33,7 @@
 #include <linux/platform_device.h>
 #include <linux/i2c/twl4030.h>
 
+
 /*
  * The TWL4030 family chips include a keypad controller that supports
  * up to an 8x8 switch matrix.  The controller can issue system wakeup
@@ -458,6 +459,12 @@ static int __devexit twl4030_kp_remove(struct platform_device *pdev)
        return 0;
 }
 
+/*
+ * NOTE: twl4030 are multi-function devices connected via I2C.
+ * So this device is a child of an I2C parent, thus it needs to
+ * support unplug/replug (which most platform devices don't).
+ */
+
 MODULE_ALIAS("platform:twl4030_keypad");
 
 static struct platform_driver twl4030_kp_driver = {
@@ -469,9 +476,6 @@ static struct platform_driver twl4030_kp_driver = {
        },
 };
 
-/*
- * OMAP TWL4030 Keypad init
- */
 static int __init twl4030_kp_init(void)
 {
        return platform_driver_register(&twl4030_kp_driver);