Re: [PATCH V3 2/2] omap4: platform changes for CMA3000

2010-09-23 Thread Tony Lindgren
* Hemanth V heman...@ti.com [100907 23:11]:
 From 8082870cc704d901d98cf0d6af90e45860927ceb Mon Sep 17 00:00:00 2001
 From: Hemanth V heman...@ti.com
 Date: Thu, 26 Aug 2010 17:49:12 +0530
 Subject: [PATCH] Platform changes for CMA3000 Accelerometer driver
 
 Update 4430 SDP board file with platform data for accelerometer driver
 and select the driver in kconfig
 
 Signed-off-by: Hemanth V heman...@ti.com
 ---
  arch/arm/mach-omap2/Kconfig |2 ++
  arch/arm/mach-omap2/board-4430sdp.c |   30 ++
  2 files changed, 32 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
 index a928fd6..e87c049 100644
 --- a/arch/arm/mach-omap2/Kconfig
 +++ b/arch/arm/mach-omap2/Kconfig
 @@ -255,6 +255,8 @@ config MACH_OMAP_4430SDP
   depends on ARCH_OMAP4
   select INPUT_TOUCHSCREEN
   select TOUCHSCREEN_SYNTM12XX
 + select INPUT_MISC
 + select INPUT_CMA3000_I2C
 
  config MACH_OMAP4_PANDA
   bool OMAP4 Panda Board

This does not apply, can you please refresh against the current
devel-boards branch in the linux-omap tree. I'm getting:

patching file arch/arm/mach-omap2/Kconfig
Hunk #1 FAILED at 255.
1 out of 1 hunk FAILED -- rejects in file arch/arm/mach-omap2/Kconfig
patching file arch/arm/mach-omap2/board-4430sdp.c
Hunk #2 FAILED at 46.
Hunk #3 succeeded at 441 (offset -46 lines).
Hunk #4 succeeded at 479 with fuzz 2 (offset -62 lines).
Hunk #5 succeeded at 518 (offset -80 lines).
1 out of 5 hunks FAILED -- rejects in file arch/arm/mach-omap2/board-4430sdp.c
Patch apply does not apply (enforce with -f)

Regards,

Tony
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH V3 2/2] omap4: platform changes for CMA3000

2010-09-08 Thread Hemanth V
From 8082870cc704d901d98cf0d6af90e45860927ceb Mon Sep 17 00:00:00 2001
From: Hemanth V heman...@ti.com
Date: Thu, 26 Aug 2010 17:49:12 +0530
Subject: [PATCH] Platform changes for CMA3000 Accelerometer driver

Update 4430 SDP board file with platform data for accelerometer driver
and select the driver in kconfig

Signed-off-by: Hemanth V heman...@ti.com
---
 arch/arm/mach-omap2/Kconfig |2 ++
 arch/arm/mach-omap2/board-4430sdp.c |   30 ++
 2 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index a928fd6..e87c049 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -255,6 +255,8 @@ config MACH_OMAP_4430SDP
depends on ARCH_OMAP4
select INPUT_TOUCHSCREEN
select TOUCHSCREEN_SYNTM12XX
+   select INPUT_MISC
+   select INPUT_CMA3000_I2C

 config MACH_OMAP4_PANDA
bool OMAP4 Panda Board
diff --git a/arch/arm/mach-omap2/board-4430sdp.c 
b/arch/arm/mach-omap2/board-4430sdp.c
index ed78cdb..8b94f1f 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -23,6 +23,8 @@
 #include linux/gpio_keys.h
 #include linux/regulator/machine.h
 #include linux/leds.h
+#include linux/i2c/cma3000.h
+#include linux/interrupt.h

 #include mach/hardware.h
 #include mach/omap4-common.h
@@ -44,6 +46,7 @@
 #define ETH_KS8851_QUART   138
 #define OMAP4SDP_MDM_PWR_EN_GPIO   157
 #define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO   184
+#define OMAP4_CMA3000ACCL_GPIO 186
 #define OMAP4_SFH7741_ENABLE_GPIO  188

 static struct gpio_led sdp4430_gpio_leds[] = {
@@ -485,6 +488,27 @@ static struct twl4030_platform_data sdp4430_twldata = {
.vaux3  = sdp4430_vaux3,
 };

+static struct cma3000_platform_data cma3000_platform_data = {
+   .fuzz_x = 25,
+   .fuzz_y = 25,
+   .fuzz_z = 25,
+   .g_range = CMARANGE_8G,
+   .mode = CMAMODE_MOTDET,
+   .mdthr = 0x8,
+   .mdfftmr = 0x33,
+   .ffthr = 0x8,
+   .irqflags = IRQF_TRIGGER_HIGH,
+};
+
+static void omap_cma3000accl_init(void)
+{
+   if (gpio_request(OMAP4_CMA3000ACCL_GPIO, Accelerometer)  0) {
+   pr_err(Accelerometer GPIO request failed\n);
+   return;
+   }
+   gpio_direction_input(OMAP4_CMA3000ACCL_GPIO);
+}
+
 static struct i2c_board_info __initdata sdp4430_i2c_boardinfo[] = {
{
I2C_BOARD_INFO(twl6030, 0x48),
@@ -518,6 +542,11 @@ static struct i2c_board_info __initdata 
sdp4430_i2c_4_boardinfo[] = {
{
I2C_BOARD_INFO(hmc5843, 0x1e),
},
+   {
+   I2C_BOARD_INFO(cma3000_accl, 0x1c),
+   .platform_data = cma3000_platform_data,
+   .irq = OMAP_GPIO_IRQ(OMAP4_CMA3000ACCL_GPIO),
+   },
 };

 static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
@@ -570,6 +599,7 @@ static void __init omap_sfh7741prox_init(void)
 __func__, OMAP4_SFH7741_ENABLE_GPIO, error);
gpio_free(OMAP4_SFH7741_ENABLE_GPIO);
}
+   omap_cma3000accl_init();
 }

 static void __init omap_4430sdp_init(void)
-- 
1.5.4.3



--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html