summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2013-12-21 13:25:51 -0700
committerEric Nelson <eric.nelson@boundarydevices.com>2013-12-21 13:25:51 -0700
commit00f574a710381ac1465c70cb90dbe5389ec92ca7 (patch)
tree7bca09543d52fe23126a1d2f8fdc4f1ba6331837
parentc272be5211d3f34e18fb58f9a7fc068cfb914179 (diff)
mx6_r: Add mma8451 accelerometer support
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
-rw-r--r--arch/arm/configs/mx6_r_defconfig1
-rw-r--r--arch/arm/mach-mx6/board-mx6_r.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/mx6_r_defconfig b/arch/arm/configs/mx6_r_defconfig
index 91b6037651d6..bf5f07850c81 100644
--- a/arch/arm/configs/mx6_r_defconfig
+++ b/arch/arm/configs/mx6_r_defconfig
@@ -131,6 +131,7 @@ CONFIG_I2C_IMX=y
CONFIG_SPI=y
CONFIG_SPI_IMX=y
CONFIG_GPIO_SYSFS=y
+# CONFIG_MXC_MMA8450 is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_IMX2_WDT=y
diff --git a/arch/arm/mach-mx6/board-mx6_r.c b/arch/arm/mach-mx6/board-mx6_r.c
index a6e8fcb51d28..ca0f9f72d39d 100644
--- a/arch/arm/mach-mx6/board-mx6_r.c
+++ b/arch/arm/mach-mx6/board-mx6_r.c
@@ -366,6 +366,9 @@ static struct i2c_board_info mxc_i2c2_board_info[] __initdata = {
I2C_BOARD_INFO("isl1208", 0x6f), /* Real time clock */
.irq = gpio_to_irq(IMX_GPIO_NR(6, 7)), /* NANDF_CLE */
},
+ {
+ I2C_BOARD_INFO("mma8451", 0x1c) /* Accelerometer */
+ },
};
static void usbotg_vbus(bool on)