diff options
| author | Nitin Garg <nitin.garg@freescale.com> | 2012-02-16 17:56:56 -0600 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2012-02-16 17:56:56 -0600 |
| commit | edb9f84ac38d7b923f2c031d5e4a7a0a52c8b360 (patch) | |
| tree | effa5e11f4ea05e17da5b52168be6645f723f83d | |
| parent | 86cd96971ce92006f5aec511528aa1511f9940eb (diff) | |
ENGR00174723-1: Integrate the mag3110 and mxc_mma8451
Intergrate the mag3110 and mxc_mma8451 drivers
released by sensor team.
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx5/board-mx53_smd.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c index 31488f4176c0..08681389a825 100644 --- a/arch/arm/mach-mx5/board-mx53_smd.c +++ b/arch/arm/mach-mx5/board-mx53_smd.c @@ -529,10 +529,13 @@ static struct fsl_mxc_lightsensor_platform_data ls_data = { .rext = 700, /* calibration: 499K->700K */ }; +static int mma8451_position = 3; + static struct i2c_board_info mxc_i2c0_board_info[] __initdata = { { .type = "mma8451", .addr = 0x1C, + .platform_data = (void *)&mma8451_position, }, { .type = "ov5642", @@ -552,6 +555,8 @@ static struct mpr121_platform_data mpr121_keyboard_platdata = { .matrix = smd_touchkey_martix, }; +static int mag3110_position; + static struct i2c_board_info mxc_i2c1_board_info[] __initdata = { { .type = "sgtl5000", @@ -567,6 +572,7 @@ static struct i2c_board_info mxc_i2c1_board_info[] __initdata = { .type = "mag3110", .addr = 0x0e, .irq = gpio_to_irq(MX53_SMD_eCOMPASS_INT), + .platform_data = (void *)&mag3110_position, }, }; @@ -1207,13 +1213,14 @@ static void __init mx53_smd_board_init(void) if (fs_in_sdcard == 1) { imx53_add_sdhci_esdhc_imx(0, &mx53_smd_sd1_data); + imx53_add_sdhci_esdhc_imx(1, &mx53_smd_sd2_data); imx53_add_sdhci_esdhc_imx(2, &mx53_smd_sd3_data); } else { imx53_add_sdhci_esdhc_imx(2, &mx53_smd_sd3_data); + imx53_add_sdhci_esdhc_imx(1, &mx53_smd_sd2_data); imx53_add_sdhci_esdhc_imx(0, &mx53_smd_sd1_data); } - imx53_add_sdhci_esdhc_imx(1, &mx53_smd_sd2_data); imx53_add_ahci(0, &mx53_smd_sata_data); mxc_register_device(&imx_ahci_device_hwmon, NULL); mx53_smd_init_usb(); |