From patchwork Mon May  3 05:51:45 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Shubhrajyoti Datta <shubhrajyoti@ti.com>
X-Patchwork-Id: 96416
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o435pqKd004341
	for <patchwork-linux-input@patchwork.kernel.org>;
	Mon, 3 May 2010 05:51:52 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752458Ab0ECFvv (ORCPT
	<rfc822;patchwork-linux-input@patchwork.kernel.org>);
	Mon, 3 May 2010 01:51:51 -0400
Received: from arroyo.ext.ti.com ([192.94.94.40]:37824 "EHLO
	arroyo.ext.ti.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752211Ab0ECFvu convert rfc822-to-8bit (ORCPT
	<rfc822; linux-input@vger.kernel.org>); Mon, 3 May 2010 01:51:50 -0400
Received: from dbdp20.itg.ti.com ([172.24.170.38])
	by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o435pltP006732
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 3 May 2010 00:51:49 -0500
Received: from dbde70.ent.ti.com (localhost [127.0.0.1])
	by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id o435pleB017490;
	Mon, 3 May 2010 11:21:47 +0530 (IST)
Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com
	([172.24.170.148]) with mapi; Mon, 3 May 2010 11:21:47 +0530
From: "Datta, Shubhrajyoti" <shubhrajyoti@ti.com>
To: "linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
	"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
CC: "Datta, Shubhrajyoti" <shubhrajyoti@ti.com>
Date: Mon, 3 May 2010 11:21:45 +0530
Subject: FW: [PATCH2/2] SFH7741 : Adding board support for proximity sensor
	SFH7741
Thread-Topic: [PATCH2/2] SFH7741 : Adding board support for proximity sensor
	SFH7741
Thread-Index: AcrqhG7CCRD7EK9qR06GsxncsuT45wAAAtrw
Message-ID: <0680EC522D0CC943BC586913CF3768C003B3164B35@dbde02.ent.ti.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
acceptlanguage: en-US
MIME-Version: 1.0
Sender: linux-input-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-input.vger.kernel.org>
X-Mailing-List: linux-input@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Mon, 03 May 2010 05:51:52 +0000 (UTC)


diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index c261558..72e7b14 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -21,6 +21,7 @@
 #include <linux/usb/otg.h>
 #include <linux/input.h>
 #include <linux/input/matrix_keypad.h>
+#include <linux/input/sfh7741.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -134,6 +135,17 @@ static struct platform_device sdp4430_keypad_device = {
 	},
 };
 
+static struct sfh7741_platform_data omap_sfh7741_data = {
+		.gpio_intr = 184,
+		.gpio_en = 188,
+};
+static struct platform_device sdp4430_proximity_device = {
+	.name		= "sfh7741",
+	.id		= 1,
+	.dev		= {
+		.platform_data = &omap_sfh7741_data,
+	},
+};
 /* Begin Synaptic Touchscreen TM-01217 */
 
 static char *tm12xx_idev_names[] = {
@@ -199,6 +211,7 @@ static struct platform_device sdp4430_lcd_device = {
 static struct platform_device *sdp4430_devices[] __initdata = {
 	&sdp4430_lcd_device,
 	&sdp4430_keypad_device,
+	&sdp4430_proximity_device,
 };
 
 static __attribute__ ((unused)) struct