summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Cai <R63905@freescale.com>2012-08-22 21:47:59 +0800
committerEric Nelson <eric.nelson@boundarydevices.com>2012-08-28 09:51:35 -0700
commit234935a40be16acfee47e4cc367416c4b4a24743 (patch)
tree619b73d5e209a86272761f706b55c364b00bf96c
parent3e8b342d1f9702fe42020efaf9889afa5d226ede (diff)
ENGR00221131: imx6sl arm2/evk: add mma8450q accelerometer support
mma8450q on E-INK DC3 boards, with i2c address 0x1c on I2C1. Signed-off-by: Robby Cai <R63905@freescale.com>
-rw-r--r--arch/arm/configs/imx6s_defconfig4
-rwxr-xr-xarch/arm/mach-mx6/board-mx6sl_arm2.c2
-rw-r--r--arch/arm/mach-mx6/board-mx6sl_evk.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/configs/imx6s_defconfig b/arch/arm/configs/imx6s_defconfig
index 390770f974cb..f03e456d7386 100644
--- a/arch/arm/configs/imx6s_defconfig
+++ b/arch/arm/configs/imx6s_defconfig
@@ -1382,8 +1382,8 @@ CONFIG_SENSORS_MAX17135=y
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
CONFIG_SENSORS_MAG3110=y
-# CONFIG_MXC_MMA8450 is not set
-CONFIG_MXC_MMA8451=y
+CONFIG_MXC_MMA8450=y
+# CONFIG_MXC_MMA8451 is not set
CONFIG_THERMAL=y
# CONFIG_THERMAL_HWMON is not set
CONFIG_WATCHDOG=y
diff --git a/arch/arm/mach-mx6/board-mx6sl_arm2.c b/arch/arm/mach-mx6/board-mx6sl_arm2.c
index 5e3d91519c94..d1cf110f6c3b 100755
--- a/arch/arm/mach-mx6/board-mx6sl_arm2.c
+++ b/arch/arm/mach-mx6/board-mx6sl_arm2.c
@@ -562,6 +562,8 @@ static struct i2c_board_info mxc_i2c0_board_info[] __initdata = {
}, {
I2C_BOARD_INFO("elan-touch", 0x10),
.irq = gpio_to_irq(MX6SL_BRD_ELAN_INT),
+ }, {
+ I2C_BOARD_INFO("mma8450", 0x1c),
},
};
diff --git a/arch/arm/mach-mx6/board-mx6sl_evk.c b/arch/arm/mach-mx6/board-mx6sl_evk.c
index 7ef077f91cfc..11623ccc68e7 100644
--- a/arch/arm/mach-mx6/board-mx6sl_evk.c
+++ b/arch/arm/mach-mx6/board-mx6sl_evk.c
@@ -575,6 +575,8 @@ static struct i2c_board_info mxc_i2c0_board_info[] __initdata = {
}, {
I2C_BOARD_INFO("elan-touch", 0x10),
.irq = gpio_to_irq(MX6SL_BRD_ELAN_INT),
+ }, {
+ I2C_BOARD_INFO("mma8450", 0x1c),
},
};