linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/2] Input: Add device_enable handler to DaVinci Keyscan platform data
@ 2009-11-13 19:43 miguel.aguilar
  2009-11-19  2:59 ` Dmitry Torokhov
  2009-12-08  0:24 ` Kevin Hilman
  0 siblings, 2 replies; 16+ messages in thread
From: miguel.aguilar @ 2009-11-13 19:43 UTC (permalink / raw)
  To: davinci-linux-open-source, nsnehaprabha, linux-input
  Cc: todd.fischer, diego.dompe, clark.becker, santiago.nunez, Miguel Aguilar

From: Miguel Aguilar <miguel.aguilar@ridgerun.com>

Add a function pointer in the platform data of the DaVinci Keyscan driver
called device_enabled, in order to perform board specific actions when
the device is initialized, like setup the PINMUX configuration.

Signed-off-by: Miguel Aguilar <miguel.aguilar@ridgerun.com>
---
 arch/arm/mach-davinci/include/mach/keyscan.h |    1 +
 drivers/input/keyboard/davinci_keyscan.c     |    8 ++++++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-davinci/include/mach/keyscan.h b/arch/arm/mach-davinci/include/mach/keyscan.h
index b4e21a2..7a560e0 100644
--- a/arch/arm/mach-davinci/include/mach/keyscan.h
+++ b/arch/arm/mach-davinci/include/mach/keyscan.h
@@ -29,6 +29,7 @@ enum davinci_matrix_types {
 };
 
 struct davinci_ks_platform_data {
+	int		(*device_enable)(struct device *dev);
 	unsigned short	*keymap;
 	u32		keymapsize;
 	u8		rep:1;
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
index 6e52d85..d410d7a 100644
--- a/drivers/input/keyboard/davinci_keyscan.c
+++ b/drivers/input/keyboard/davinci_keyscan.c
@@ -174,6 +174,14 @@ static int __init davinci_ks_probe(struct platform_device *pdev)
 	struct davinci_ks_platform_data *pdata = pdev->dev.platform_data;
 	int error, i;
 
+	if (pdata->device_enable) {
+		error = pdata->device_enable(dev);
+		if (error < 0) {
+			dev_dbg(dev, "device enable function failed\n");
+			return error;
+		}
+	}
+
 	if (!pdata->keymap) {
 		dev_dbg(dev, "no keymap from pdata\n");
 		return -EINVAL;
-- 
1.6.0.4


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2010-01-06 17:04 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-13 19:43 [PATCH v2 1/2] Input: Add device_enable handler to DaVinci Keyscan platform data miguel.aguilar
2009-11-19  2:59 ` Dmitry Torokhov
2009-11-19 16:32   ` Miguel Aguilar
2009-11-19 16:55     ` Dmitry Torokhov
2009-11-19 17:54       ` Miguel Aguilar
2009-11-19 20:33         ` Dmitry Torokhov
2009-11-19 20:59           ` Miguel Aguilar
2009-11-19 21:33             ` Narnakaje, Snehaprabha
2009-11-24 16:49               ` Miguel Aguilar
2009-12-01 17:08               ` Steve Chen
2009-12-08  0:24 ` Kevin Hilman
2009-12-08  0:48   ` Dmitry Torokhov
2009-12-08  1:05     ` Kevin Hilman
     [not found]       ` <877hsy46o0.fsf-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org>
2010-01-06  0:21         ` Kevin Hilman
2010-01-06  8:26           ` Dmitry Torokhov
2010-01-06 17:04             ` Kevin Hilman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).