arm: tegra: cardhu: Adding cam-AF power rails
[linux-2.6.git] / arch / arm / mach-tegra / board-cardhu-sensors.c
index d26a6b6..90231f7 100644 (file)
 #include <mach/fb.h>
 #include <mach/gpio.h>
 #include <media/ov5650.h>
+#include <media/ov2710.h>
 #include <generated/mach-types.h>
 #include "gpio-names.h"
 #include "board.h"
+#include <linux/mpu.h>
+
+#include <mach/gpio.h>
+
+#include "gpio-names.h"
 #include "board-cardhu.h"
 
 static struct regulator *cardhu_1v8_cam1 = NULL;
+static struct regulator *cardhu_1v8_cam2 = NULL;
+static struct regulator *cardhu_1v8_cam3 = NULL;
 static struct regulator *cardhu_avdd_dsi_csi = NULL;
+static struct regulator *cardhu_vdd_2v8_cam1 = NULL;
+static struct regulator *cardhu_vdd_2v8_cam2 = NULL;
+static struct regulator *cardhu_vdd_cam3 = NULL;
+
+static struct board_info board_info;
 
-#ifdef CONFIG_I2C_MUX_PCA954x
 static struct pca954x_platform_mode cardhu_pca954x_modes[] = {
-       { .adap_id = PCA954x_I2C_BUS0, },
-       { .adap_id = PCA954x_I2C_BUS1, },
-       { .adap_id = PCA954x_I2C_BUS2, },
-       { .adap_id = PCA954x_I2C_BUS3, },
+       { .adap_id = PCA954x_I2C_BUS0, .deselect_on_exit = true, },
+       { .adap_id = PCA954x_I2C_BUS1, .deselect_on_exit = true, },
+       { .adap_id = PCA954x_I2C_BUS2, .deselect_on_exit = true, },
+       { .adap_id = PCA954x_I2C_BUS3, .deselect_on_exit = true, },
 };
 
 static struct pca954x_platform_data cardhu_pca954x_data = {
        .modes    = cardhu_pca954x_modes,
        .num_modes      = ARRAY_SIZE(cardhu_pca954x_modes),
 };
-#endif
 
 static int cardhu_camera_init(void)
 {
        int ret;
-       struct board_info board_info;
 
-       tegra_get_board_info(&board_info);
        /* Boards E1198 and E1291 are of Cardhu personality
         * and donot have TCA6416 exp for camera */
        if ((board_info.board_id == BOARD_E1198) ||
                (board_info.board_id == BOARD_E1291)) {
-               tegra_gpio_enable(CAMERA_CSI_CAM_SEL_GPIO);
-               ret = gpio_request(CAMERA_CSI_CAM_SEL_GPIO, "camera_cam_mclk");
+               tegra_gpio_enable(CAM1_POWER_DWN_GPIO);
+               ret = gpio_request(CAM1_POWER_DWN_GPIO, "camera_power_en");
+               if (ret < 0)
+                       pr_err("%s: gpio_request failed for gpio %s\n",
+                               __func__, "CAM1_POWER_DWN_GPIO");
+                               tegra_gpio_enable(CAM3_POWER_DWN_GPIO);
+               ret = gpio_request(CAM3_POWER_DWN_GPIO, "cam3_power_en");
                if (ret < 0)
                        pr_err("%s: gpio_request failed for gpio %s\n",
-                               __func__, "CAMERA_CSI_CAM_SEL_GPIO");
-               gpio_direction_output(CAMERA_CSI_CAM_SEL_GPIO, 1);
-               gpio_export(CAMERA_CSI_CAM_SEL_GPIO, false);
+                               __func__, "CAM3_POWER_DWN_GPIO");
+
+               tegra_gpio_enable(CAM2_POWER_DWN_GPIO);
+               ret = gpio_request(CAM2_POWER_DWN_GPIO, "camera2_power_en");
+               if (ret < 0)
+                       pr_err("%s: gpio_request failed for gpio %s\n",
+                               __func__, "CAM2_POWER_DWN_GPIO");
+
+               tegra_gpio_enable(OV5650_RESETN_GPIO);
+               ret = gpio_request(OV5650_RESETN_GPIO, "camera_reset");
+               if (ret < 0)
+                       pr_err("%s: gpio_request failed for gpio %s\n",
+                               __func__, "OV5650_RESETN_GPIO");
+
+               gpio_direction_output(CAM3_POWER_DWN_GPIO, 1);
+               gpio_direction_output(CAM1_POWER_DWN_GPIO, 1);
+               gpio_direction_output(CAM2_POWER_DWN_GPIO, 1);
+               mdelay(10);
+
+               gpio_direction_output(OV5650_RESETN_GPIO, 1);
+               mdelay(5);
+               gpio_direction_output(OV5650_RESETN_GPIO, 0);
+               mdelay(5);
+               gpio_direction_output(OV5650_RESETN_GPIO, 1);
+               mdelay(5);
        }
 
        /* To select the CSIB MUX either for cam2 or cam3 */
@@ -80,125 +116,311 @@ static int cardhu_camera_init(void)
        return 0;
 }
 
-static int cardhu_ov5650_power_on(void)
+static int cardhu_left_ov5650_power_on(void)
 {
-       int ret;
-       struct board_info board_info;
-       tegra_get_board_info(&board_info);
        /* Boards E1198 and E1291 are of Cardhu personality
         * and donot have TCA6416 exp for camera */
        if ((board_info.board_id == BOARD_E1198) ||
                (board_info.board_id == BOARD_E1291)) {
-               tegra_gpio_enable(CAM1_POWER_DWN_GPIO);
-               ret = gpio_request(CAM1_POWER_DWN_GPIO, "camera_power_en");
-               if (ret < 0)
-                       pr_err("%s: gpio_request failed for gpio %s\n",
-                               __func__, "CAM1_POWER_DWN_GPIO");
-               gpio_direction_output(CAM1_POWER_DWN_GPIO, 0);
-               gpio_export(CAM1_POWER_DWN_GPIO, false);
 
+               gpio_direction_output(CAM1_POWER_DWN_GPIO, 0);
                mdelay(10);
-               tegra_gpio_enable(CAM1_LDO_EN_GPIO);
-               ret = gpio_request(CAM1_LDO_EN_GPIO, "camera_ldo");
-               if (ret < 0)
-                       pr_err("%s: gpio_request failed for gpio %s\n",
-                               __func__, "CAM1_LDO_EN_GPIO");
-               gpio_direction_output(CAM1_LDO_EN_GPIO, 1);
-               gpio_export(CAM1_LDO_EN_GPIO, false);
 
-               tegra_gpio_enable(OV5650_RESETN_GPIO);
-               ret = gpio_request(OV5650_RESETN_GPIO, "camera_reset");
-               if (ret < 0)
-                       pr_err("%s: gpio_request failed for gpio %s\n",
-                               __func__, "OV5650_RESETN_GPIO");
-               gpio_direction_output(OV5650_RESETN_GPIO, 1);
-               mdelay(5);
-               gpio_direction_output(OV5650_RESETN_GPIO, 0);
-               mdelay(5);
-               gpio_direction_output(OV5650_RESETN_GPIO, 1);
-               mdelay(5);
-       }
-       else {
-               if (cardhu_1v8_cam1 == NULL) {
-                       cardhu_1v8_cam1 = regulator_get(NULL, "vdd_1v8_cam1");
-                       if (WARN_ON(IS_ERR(cardhu_1v8_cam1))) {
-                               pr_err("%s: couldn't get regulator vdd_1v8_cam1: %ld\n",
-                                       __func__, PTR_ERR(cardhu_1v8_cam1));
+               if (cardhu_vdd_2v8_cam1 == NULL) {
+                       cardhu_vdd_2v8_cam1 = regulator_get(NULL, "vdd_2v8_cam1");
+                       if (WARN_ON(IS_ERR(cardhu_vdd_2v8_cam1))) {
+                               pr_err("%s: couldn't get regulator vdd_2v8_cam1: %ld\n",
+                                       __func__, PTR_ERR(cardhu_vdd_2v8_cam1));
                                goto reg_alloc_fail;
                        }
                }
+               regulator_enable(cardhu_vdd_2v8_cam1);
+               mdelay(5);
+       }
+
+       /* Enable VDD_1V8_Cam1 */
+       if (cardhu_1v8_cam1 == NULL) {
+               cardhu_1v8_cam1 = regulator_get(NULL, "vdd_1v8_cam1");
+               if (WARN_ON(IS_ERR(cardhu_1v8_cam1))) {
+                       pr_err("%s: couldn't get regulator vdd_1v8_cam1: %ld\n",
+                               __func__, PTR_ERR(cardhu_1v8_cam1));
+                       goto reg_alloc_fail;
+               }
+       }
+       regulator_enable(cardhu_1v8_cam1);
+
+       /* Enable AVDD_CSI_DSI */
+       if (cardhu_avdd_dsi_csi == NULL) {
+               cardhu_avdd_dsi_csi = regulator_get(NULL, "avdd_dsi_csi");
+               if (WARN_ON(IS_ERR(cardhu_avdd_dsi_csi))) {
+                       pr_err("%s: couldn't get regulator avdd_dsi_csi: %ld\n",
+                               __func__, PTR_ERR(cardhu_avdd_dsi_csi));
+                       goto reg_alloc_fail;
+               }
+       }
+       regulator_enable(cardhu_avdd_dsi_csi);
+
+       mdelay(5);
+       return 0;
+
+reg_alloc_fail:
+       if (cardhu_1v8_cam1) {
+               regulator_put(cardhu_1v8_cam1);
+               cardhu_1v8_cam1 = NULL;
+       }
+       if (cardhu_avdd_dsi_csi) {
+               regulator_put(cardhu_avdd_dsi_csi);
+               cardhu_avdd_dsi_csi = NULL;
+       }
+       if (cardhu_vdd_2v8_cam1) {
+               regulator_put(cardhu_vdd_2v8_cam1);
+               cardhu_vdd_2v8_cam1 = NULL;
+       }
+
+       return -ENODEV;
+
+}
+
+static int cardhu_left_ov5650_power_off(void)
+{
+       /* Boards E1198 and E1291 are of Cardhu personality
+        * and donot have TCA6416 exp for camera */
+       if ((board_info.board_id == BOARD_E1198) ||
+               (board_info.board_id == BOARD_E1291)) {
+               gpio_direction_output(CAM1_POWER_DWN_GPIO, 1);
+               gpio_direction_output(CAM2_POWER_DWN_GPIO, 1);
+               gpio_direction_output(CAM3_POWER_DWN_GPIO, 1);
+       }
+       if (cardhu_1v8_cam1)
+               regulator_disable(cardhu_1v8_cam1);
+       if (cardhu_avdd_dsi_csi)
+               regulator_disable(cardhu_avdd_dsi_csi);
+       if (cardhu_vdd_2v8_cam1)
+               regulator_disable(cardhu_vdd_2v8_cam1);
+
+       return 0;
+}
 
-               /* Enable AVDD_CSI_DSI */
-               if (cardhu_avdd_dsi_csi == NULL) {
-                       cardhu_avdd_dsi_csi = regulator_get(NULL, "avdd_dsi_csi");
-                       if (WARN_ON(IS_ERR(cardhu_avdd_dsi_csi))) {
-                               pr_err("%s: couldn't get regulator avdd_dsi_csi: %ld\n",
-                                       __func__, PTR_ERR(cardhu_avdd_dsi_csi));
+struct ov5650_platform_data cardhu_left_ov5650_data = {
+       .power_on = cardhu_left_ov5650_power_on,
+       .power_off = cardhu_left_ov5650_power_off,
+};
+
+static int cardhu_right_ov5650_power_on(void)
+{
+       /* Boards E1198 and E1291 are of Cardhu personality
+        * and donot have TCA6416 exp for camera */
+       if ((board_info.board_id == BOARD_E1198) ||
+               (board_info.board_id == BOARD_E1291)) {
+
+               gpio_direction_output(CAM1_POWER_DWN_GPIO, 0);
+               gpio_direction_output(CAM2_POWER_DWN_GPIO, 0);
+               mdelay(10);
+
+               if (cardhu_vdd_2v8_cam2 == NULL) {
+                       cardhu_vdd_2v8_cam2 = regulator_get(NULL, "vdd_2v8_cam2");
+                       if (WARN_ON(IS_ERR(cardhu_vdd_2v8_cam2))) {
+                               pr_err("%s: couldn't get regulator vdd_2v8_cam2: %ld\n",
+                                       __func__, PTR_ERR(cardhu_vdd_2v8_cam2));
                                goto reg_alloc_fail;
                        }
                }
-
-               regulator_enable(cardhu_1v8_cam1);
-               regulator_enable(cardhu_avdd_dsi_csi);
+               regulator_enable(cardhu_vdd_2v8_cam2);
                mdelay(5);
-               return 0;
+       }
 
-reg_alloc_fail:
-               if (cardhu_1v8_cam1) {
-                       regulator_put(cardhu_1v8_cam1);
-                       cardhu_1v8_cam1 = NULL;
+       /* Enable VDD_1V8_Cam2 */
+       if (cardhu_1v8_cam2 == NULL) {
+               cardhu_1v8_cam2 = regulator_get(NULL, "vdd_1v8_cam2");
+               if (WARN_ON(IS_ERR(cardhu_1v8_cam2))) {
+                       pr_err("%s: couldn't get regulator vdd_1v8_cam2: %ld\n",
+                               __func__, PTR_ERR(cardhu_1v8_cam2));
+                       goto reg_alloc_fail;
                }
-               if (cardhu_avdd_dsi_csi) {
-                       regulator_put(cardhu_avdd_dsi_csi);
-                       cardhu_avdd_dsi_csi = NULL;
+       }
+       regulator_enable(cardhu_1v8_cam2);
+
+       /* Enable AVDD_CSI_DSI */
+       if (cardhu_avdd_dsi_csi == NULL) {
+               cardhu_avdd_dsi_csi = regulator_get(NULL, "avdd_dsi_csi");
+               if (WARN_ON(IS_ERR(cardhu_avdd_dsi_csi))) {
+                       pr_err("%s: couldn't get regulator avdd_dsi_csi: %ld\n",
+                               __func__, PTR_ERR(cardhu_avdd_dsi_csi));
+                       goto reg_alloc_fail;
                }
-               return -ENODEV;
        }
+       regulator_enable(cardhu_avdd_dsi_csi);
 
+       mdelay(5);
        return 0;
+
+reg_alloc_fail:
+       if (cardhu_1v8_cam2) {
+               regulator_put(cardhu_1v8_cam2);
+               cardhu_1v8_cam2 = NULL;
+       }
+       if (cardhu_avdd_dsi_csi) {
+               regulator_put(cardhu_avdd_dsi_csi);
+               cardhu_avdd_dsi_csi = NULL;
+       }
+       if (cardhu_vdd_2v8_cam2) {
+               regulator_put(cardhu_vdd_2v8_cam2);
+               cardhu_vdd_2v8_cam2 = NULL;
+       }
+
+       return -ENODEV;
+
 }
 
-static int cardhu_ov5650_power_off(void)
+static int cardhu_right_ov5650_power_off(void)
 {
-       struct board_info board_info;
-       tegra_get_board_info(&board_info);
        /* Boards E1198 and E1291 are of Cardhu personality
         * and donot have TCA6416 exp for camera */
        if ((board_info.board_id == BOARD_E1198) ||
                (board_info.board_id == BOARD_E1291)) {
                gpio_direction_output(CAM1_POWER_DWN_GPIO, 1);
-               gpio_direction_output(OV5650_RESETN_GPIO, 0);
-               gpio_direction_output(CAM1_LDO_EN_GPIO, 0);
+               gpio_direction_output(CAM2_POWER_DWN_GPIO, 1);
+       }
+
+       if (cardhu_1v8_cam2)
+               regulator_disable(cardhu_1v8_cam2);
+       if (cardhu_avdd_dsi_csi)
+               regulator_disable(cardhu_avdd_dsi_csi);
+       if (cardhu_vdd_2v8_cam2)
+               regulator_disable(cardhu_vdd_2v8_cam2);
+
+       return 0;
+}
+
+
+struct ov5650_platform_data cardhu_right_ov5650_data = {
+       .power_on = cardhu_right_ov5650_power_on,
+       .power_off = cardhu_right_ov5650_power_off,
+};
+
+static int cardhu_ov2710_power_on(void)
+{
+       /* CSI-B and front sensor are muxed on verbier */
+       gpio_direction_output(CAMERA_CSI_MUX_SEL_GPIO, 1);
+
+       /* Boards E1198 and E1291 are of Cardhu personality
+        * and donot have TCA6416 exp for camera */
+       if ((board_info.board_id == BOARD_E1198) ||
+               (board_info.board_id == BOARD_E1291)) {
+
+               gpio_direction_output(CAM1_POWER_DWN_GPIO, 0);
+               gpio_direction_output(CAM2_POWER_DWN_GPIO, 0);
+               gpio_direction_output(CAM3_POWER_DWN_GPIO, 0);
+               mdelay(10);
+
+               if (cardhu_vdd_cam3 == NULL) {
+                       cardhu_vdd_cam3 = regulator_get(NULL, "vdd_cam3");
+                       if (WARN_ON(IS_ERR(cardhu_vdd_cam3))) {
+                               pr_err("%s: couldn't get regulator vdd_cam3: %ld\n",
+                                       __func__, PTR_ERR(cardhu_vdd_cam3));
+                               goto reg_alloc_fail;
+                       }
+               }
+               regulator_enable(cardhu_vdd_cam3);
        }
-       else {
-               if (cardhu_1v8_cam1)
-                       regulator_disable(cardhu_1v8_cam1);
 
-               if (cardhu_avdd_dsi_csi)
-                       regulator_disable(cardhu_avdd_dsi_csi);
+       /* Enable VDD_1V8_Cam3 */
+       if (cardhu_1v8_cam3 == NULL) {
+               cardhu_1v8_cam3 = regulator_get(NULL, "vdd_1v8_cam3");
+               if (WARN_ON(IS_ERR(cardhu_1v8_cam3))) {
+                       pr_err("%s: couldn't get regulator vdd_1v8_cam3: %ld\n",
+                               __func__, PTR_ERR(cardhu_1v8_cam3));
+                       goto reg_alloc_fail;
+               }
+       }
+       regulator_enable(cardhu_1v8_cam3);
+
+       /* Enable AVDD_CSI_DSI */
+       if (cardhu_avdd_dsi_csi == NULL) {
+               cardhu_avdd_dsi_csi = regulator_get(NULL, "avdd_dsi_csi");
+               if (WARN_ON(IS_ERR(cardhu_avdd_dsi_csi))) {
+                       pr_err("%s: couldn't get regulator avdd_dsi_csi: %ld\n",
+                               __func__, PTR_ERR(cardhu_avdd_dsi_csi));
+                       goto reg_alloc_fail;
+               }
        }
+       regulator_enable(cardhu_avdd_dsi_csi);
+       mdelay(5);
 
        return 0;
+
+reg_alloc_fail:
+       if (cardhu_1v8_cam3) {
+               regulator_put(cardhu_1v8_cam3);
+               cardhu_1v8_cam3 = NULL;
+       }
+       if (cardhu_avdd_dsi_csi) {
+               regulator_put(cardhu_avdd_dsi_csi);
+               cardhu_avdd_dsi_csi = NULL;
+       }
+       if (cardhu_vdd_cam3) {
+               regulator_put(cardhu_vdd_cam3);
+               cardhu_vdd_cam3 = NULL;
+       }
+
+       return -ENODEV;
 }
 
+static int cardhu_ov2710_power_off(void)
+{
+       gpio_direction_output(CAMERA_CSI_MUX_SEL_GPIO, 1);
+
+       /* Boards E1198 and E1291 are of Cardhu personality
+        * and donot have TCA6416 exp for camera */
+       if ((board_info.board_id == BOARD_E1198) ||
+               (board_info.board_id == BOARD_E1291)) {
+               gpio_direction_output(CAM1_POWER_DWN_GPIO, 1);
+               gpio_direction_output(CAM2_POWER_DWN_GPIO, 1);
+               gpio_direction_output(CAM3_POWER_DWN_GPIO, 1);
+       }
+
+       if (cardhu_1v8_cam3)
+               regulator_disable(cardhu_1v8_cam3);
+       if (cardhu_avdd_dsi_csi)
+               regulator_disable(cardhu_avdd_dsi_csi);
+       if (cardhu_vdd_cam3)
+               regulator_disable(cardhu_vdd_cam3);
+
+       return 0;
+}
 
-struct ov5650_platform_data cardhu_ov5650_data = {
-       .power_on = cardhu_ov5650_power_on,
-       .power_off = cardhu_ov5650_power_off,
+struct ov2710_platform_data cardhu_ov2710_data = {
+       .power_on = cardhu_ov2710_power_on,
+       .power_off = cardhu_ov2710_power_off,
 };
 
 static const struct i2c_board_info cardhu_i2c3_board_info[] = {
-#ifdef CONFIG_I2C_MUX_PCA954x
        {
                I2C_BOARD_INFO("pca9546", 0x70),
                .platform_data = &cardhu_pca954x_data,
        },
-#endif
 };
 static struct i2c_board_info cardhu_i2c6_board_info[] = {
        {
-               I2C_BOARD_INFO("ov5650", 0x36),
-               .platform_data = &cardhu_ov5650_data,
+               I2C_BOARD_INFO("ov5650L", 0x36),
+               .platform_data = &cardhu_left_ov5650_data,
+       },
+       {
+               I2C_BOARD_INFO("sh532u", 0x72),
+       },
+};
+
+static struct i2c_board_info cardhu_i2c7_board_info[] = {
+       {
+               I2C_BOARD_INFO("ov5650R", 0x36),
+               .platform_data = &cardhu_right_ov5650_data,
+       },
+};
+
+static struct i2c_board_info cardhu_i2c8_board_info[] = {
+       {
+               I2C_BOARD_INFO("ov2710", 0x36),
+               .platform_data = &cardhu_ov2710_data,
        },
 };
 
@@ -214,6 +436,13 @@ static struct nct1008_platform_data cardhu_nct1008_pdata = {
        .alarm_fn = NULL,
 };
 
+static struct i2c_board_info cardhu_i2c4_bq27510_board_info[] = {
+       {
+               I2C_BOARD_INFO("bq27510", 0x55),
+               .irq = AC_PRESENT_GPIO,
+       },
+};
+
 static struct i2c_board_info cardhu_i2c4_board_info[] = {
        {
                I2C_BOARD_INFO("nct1008", 0x4C),
@@ -225,15 +454,13 @@ static struct i2c_board_info cardhu_i2c4_board_info[] = {
 static int cardhu_nct1008_init(void)
 {
        int nct1008_port = -1;
-       struct board_info BoardInfo;
        int ret;
 
-       tegra_get_board_info(&BoardInfo);
-       if ((BoardInfo.board_id == BOARD_E1198) ||
-               (BoardInfo.board_id == BOARD_E1291)) {
+       if ((board_info.board_id == BOARD_E1198) ||
+               (board_info.board_id == BOARD_E1291)) {
                nct1008_port = TEGRA_GPIO_PCC2;
-       } else if ((BoardInfo.board_id == BOARD_E1186) ||
-               (BoardInfo.board_id == BOARD_E1187)) {
+       } else if ((board_info.board_id == BOARD_E1186) ||
+               (board_info.board_id == BOARD_E1187)) {
                /* FIXME: seems to be conflicting with usb3 vbus on E1186 */
                /* nct1008_port = TEGRA_GPIO_PH7; */
        }
@@ -282,11 +509,9 @@ static const struct i2c_board_info cardhu_i2c2_board_info_tca6416[] = {
 
 static int __init pmu_tca6416_init(void)
 {
-       struct board_info board_info;
-       tegra_get_board_info(&board_info);
        if ((board_info.board_id == BOARD_E1198) ||
-                       (board_info.board_id == BOARD_E1291))
-               return 0;
+               (board_info.board_id == BOARD_E1291))
+                       return 0;
 
        pr_info("Registering pmu pca6416\n");
        i2c_register_board_info(4, cardhu_i2c4_board_info_tca6416,
@@ -296,8 +521,6 @@ static int __init pmu_tca6416_init(void)
 
 static int __init cam_tca6416_init(void)
 {
-       struct board_info board_info;
-       tegra_get_board_info(&board_info);
        /* Boards E1198 and E1291 are of Cardhu personality
         * and donot have TCA6416 exp for camera */
        if ((board_info.board_id == BOARD_E1198) ||
@@ -321,30 +544,103 @@ static int __init cam_tca6416_init(void)
 }
 #endif
 
+#ifdef CONFIG_SENSORS_MPU3050
+#define SENSOR_MPU_NAME "mpu3050"
+static struct mpu3050_platform_data mpu3050_data = {
+       .int_config  = 0x10,
+       .orientation = { 0, -1, 0, -1, 0, 0, 0, 0, -1 },  /* Orientation matrix for MPU on cardhu */
+       .level_shifter = 0,
+
+       .accel = {
+       .get_slave_descr = get_accel_slave_descr,
+       .adapt_num   = 2,
+       .bus         = EXT_SLAVE_BUS_SECONDARY,
+       .address     = 0x0F,
+       .orientation = { 0, -1, 0, -1, 0, 0, 0, 0, -1 },  /* Orientation matrix for Kionix on cardhu */
+       },
+
+       .compass = {
+       .get_slave_descr = get_compass_slave_descr,
+       .adapt_num   = 2,
+       .bus         = EXT_SLAVE_BUS_PRIMARY,
+       .address     = 0x0C,
+       .orientation = { 1, 0, 0, 0, -1, 0, 0, 0, -1 },  /* Orientation matrix for AKM on cardhu */
+       },
+};
+
+static struct i2c_board_info __initdata mpu3050_i2c0_boardinfo[] = {
+       {
+               I2C_BOARD_INFO(SENSOR_MPU_NAME, 0x68),
+               .irq = TEGRA_GPIO_TO_IRQ(TEGRA_GPIO_PX1),
+               .platform_data = &mpu3050_data,
+       },
+};
+
+static void cardhu_mpuirq_init(void)
+{
+       pr_info("*** MPU START *** cardhu_mpuirq_init...\n");
+       tegra_gpio_enable(TEGRA_GPIO_PX1);
+       gpio_request(TEGRA_GPIO_PX1, SENSOR_MPU_NAME);
+       gpio_direction_input(TEGRA_GPIO_PX1);
+       pr_info("*** MPU END *** cardhu_mpuirq_init...\n");
+}
+#endif
+
+
+static struct i2c_board_info cardhu_i2c2_isl_board_info[] = {
+       {
+               I2C_BOARD_INFO("isl29028", 0x44),
+       }
+};
+
 int __init cardhu_sensors_init(void)
 {
        int err;
 
+       tegra_get_board_info(&board_info);
+
        cardhu_camera_init();
        cam_tca6416_init();
 
        i2c_register_board_info(2, cardhu_i2c3_board_info,
                ARRAY_SIZE(cardhu_i2c3_board_info));
 
-       /* CAM-A is on BUS0 to set CAM-B need to change
-        * PCA954x_I2C_BUS0 to PCA954x_I2C_BUS1 */
+       /* Left  camera is on PCA954x's I2C BUS0, Right camera is on BUS1 &
+        * Front camera is on BUS2 */
        i2c_register_board_info(PCA954x_I2C_BUS0, cardhu_i2c6_board_info,
                ARRAY_SIZE(cardhu_i2c6_board_info));
 
+       i2c_register_board_info(PCA954x_I2C_BUS1, cardhu_i2c7_board_info,
+               ARRAY_SIZE(cardhu_i2c7_board_info));
+
+       i2c_register_board_info(PCA954x_I2C_BUS2, cardhu_i2c8_board_info,
+               ARRAY_SIZE(cardhu_i2c8_board_info));
+
        pmu_tca6416_init();
 
        i2c_register_board_info(4, cardhu_i2c4_board_info,
                ARRAY_SIZE(cardhu_i2c4_board_info));
 
+       if (board_info.board_id == BOARD_E1291)
+               i2c_register_board_info(4, cardhu_i2c4_bq27510_board_info,
+                       ARRAY_SIZE(cardhu_i2c4_bq27510_board_info));
+
+       i2c_register_board_info(2, cardhu_i2c2_isl_board_info,
+               ARRAY_SIZE(cardhu_i2c2_isl_board_info));
+
        err = cardhu_nct1008_init();
        if (err)
                return err;
 
+#ifdef CONFIG_SENSORS_MPU3050
+       cardhu_mpuirq_init();
+#endif
+
+#ifdef CONFIG_SENSORS_MPU3050
+       i2c_register_board_info(2, mpu3050_i2c0_boardinfo,
+               ARRAY_SIZE(mpu3050_i2c0_boardinfo));
+#endif
+
        return 0;
 }
 
@@ -385,6 +681,7 @@ int __init cardhu_ov5650_late_init(void)
        int ret;
        int i;
 
+       printk("%s: \n", __func__);
        for (i = 0; i < ARRAY_SIZE(ov5650_gpio_keys); i++) {
                ret = gpio_request(ov5650_gpio_keys[i].gpio,
                        ov5650_gpio_keys[i].name);
@@ -393,6 +690,7 @@ int __init cardhu_ov5650_late_init(void)
                                __func__, i);
                        goto fail;
                }
+               printk("%s: enable - %d\n", __func__, i);
                gpio_direction_output(ov5650_gpio_keys[i].gpio,
                        ov5650_gpio_keys[i].enabled);
                gpio_export(ov5650_gpio_keys[i].gpio, false);