From patchwork Mon Nov 29 10:57:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemanth V X-Patchwork-Id: 363622 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oATAvnYc028892 for ; Mon, 29 Nov 2010 10:57:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752914Ab0K2K5s (ORCPT ); Mon, 29 Nov 2010 05:57:48 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:34919 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752720Ab0K2K5r (ORCPT ); Mon, 29 Nov 2010 05:57:47 -0500 Received: from dlep34.itg.ti.com ([157.170.170.115]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id oATAvlCX021032 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 29 Nov 2010 04:57:47 -0600 Received: from dbdmail.itg.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id oATAviXI025017; Mon, 29 Nov 2010 04:57:45 -0600 (CST) Received: from 10.24.255.17 (SquirrelMail authenticated user x0099946); by dbdmail.itg.ti.com with HTTP; Mon, 29 Nov 2010 16:27:46 +0530 (IST) Message-ID: <37166.10.24.255.17.1291028266.squirrel@dbdmail.itg.ti.com> Date: Mon, 29 Nov 2010 16:27:46 +0530 (IST) Subject: [PATCH V4 2/2] omap4: platform changes for CMA3000 From: "Hemanth V" To: linux-omap@vger.kernel.org Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org User-Agent: SquirrelMail/1.4.3a X-Mailer: SquirrelMail/1.4.3a MIME-Version: 1.0 X-Priority: 3 (Normal) Importance: Normal Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 29 Nov 2010 10:57:49 +0000 (UTC) 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 + 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 #include #include +#include +#include #include #include @@ -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_d01", 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)