diff options
author | Pritesh Raithatha <praithatha@nvidia.com> | 2011-05-11 22:31:14 +0530 |
---|---|---|
committer | Varun Colbert <vcolbert@nvidia.com> | 2011-05-17 12:04:20 -0700 |
commit | aa75aa10d1eb24686b86f923e434746ce04f68da (patch) | |
tree | 778a4cef1f53c95b048389775b889df4a1a43649 | |
parent | 45c8916ab8e12fdc3e122a64e564467d5cbe20ec (diff) |
ARM: tegra: cardhu: remove avdd_dsi_csi regulator code
remove avdd_dsi_csi regulator code as it is already handled by
tegra_camera.c
Bug 826043
Change-Id: I0e97268c4381a27d9d2b499d7f332cc21314a045
Reviewed-on: http://git-master/r/31191
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-sensors.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-sensors.c b/arch/arm/mach-tegra/board-cardhu-sensors.c index 3a2d7d6e2560..cedba22a94d6 100644 --- a/arch/arm/mach-tegra/board-cardhu-sensors.c +++ b/arch/arm/mach-tegra/board-cardhu-sensors.c @@ -42,7 +42,6 @@ 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; @@ -147,17 +146,6 @@ static int cardhu_left_ov5650_power_on(void) } 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); if ((board_info.board_id == BOARD_E1198) || (board_info.board_id == BOARD_E1291)) { @@ -174,10 +162,6 @@ reg_alloc_fail: 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; @@ -199,8 +183,6 @@ static int cardhu_left_ov5650_power_off(void) } 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); @@ -246,17 +228,6 @@ static int cardhu_right_ov5650_power_on(void) } 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; - } - } - regulator_enable(cardhu_avdd_dsi_csi); - mdelay(5); return 0; @@ -265,10 +236,6 @@ reg_alloc_fail: 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; @@ -290,8 +257,6 @@ static int cardhu_right_ov5650_power_off(void) 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); @@ -340,17 +305,6 @@ static int cardhu_ov2710_power_on(void) } } 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; @@ -360,10 +314,6 @@ reg_alloc_fail: 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; @@ -387,8 +337,6 @@ static int cardhu_ov2710_power_off(void) 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); |