]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
arm: tegra: Don't place CSIC/D IOs in DPD mode
authorPreetham Chandru R <pchandru@nvidia.com>
Thu, 12 Jun 2014 09:07:41 +0000 (14:37 +0530)
committerRiham Haidar <rhaidar@nvidia.com>
Fri, 13 Jun 2014 18:54:25 +0000 (11:54 -0700)
According to TRM placing CSIC/D IOs in DPD mode
is no longer available

Bug 200010066

Change-Id: Ic389dba406b06a7c821fa8399ae1854f3ebcac98
Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>
Reviewed-on: http://git-master/r/422677
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Frank Chen <frankc@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
arch/arm/mach-tegra/board-ardbeg-sensors.c

index 1cc385e03608cf8c80aa639b2df126799a1ccb76..95963648b68bbca29ed9cdcd5d79a01a9f791195 100644 (file)
@@ -250,18 +250,6 @@ static struct tegra_io_dpd csib_io = {
        .io_dpd_bit             = 1,
 };
 
-static struct tegra_io_dpd csic_io = {
-       .name                   = "CSIC",
-       .io_dpd_reg_index       = 1,
-       .io_dpd_bit             = 10,
-};
-
-static struct tegra_io_dpd csid_io = {
-       .name                   = "CSID",
-       .io_dpd_reg_index       = 1,
-       .io_dpd_bit             = 11,
-};
-
 static struct tegra_io_dpd csie_io = {
        .name                   = "CSIE",
        .io_dpd_reg_index       = 1,
@@ -927,10 +915,6 @@ static int ardbeg_ov5693_front_power_on(struct ov5693_power_rail *pw)
        if (unlikely(WARN_ON(!pw || !pw->dovdd || !pw->avdd)))
                return -EFAULT;
 
-       /* disable CSIC/D IOs DPD mode to turn on camera for ardbeg */
-       tegra_io_dpd_disable(&csic_io);
-       tegra_io_dpd_disable(&csid_io);
-
        if (ardbeg_get_extra_regulators())
                goto ov5693_front_poweron_fail;
 
@@ -969,9 +953,6 @@ ov5693_front_avdd_fail:
        gpio_set_value(CAM_RSTN, 0);
 
 ov5693_front_poweron_fail:
-       /* put CSIC/D IOs into DPD mode to save additional power for ardbeg */
-       tegra_io_dpd_enable(&csic_io);
-       tegra_io_dpd_enable(&csid_io);
        pr_err("%s FAILED\n", __func__);
        return -ENODEV;
 }
@@ -979,11 +960,6 @@ ov5693_front_poweron_fail:
 static int ardbeg_ov5693_front_power_off(struct ov5693_power_rail *pw)
 {
        if (unlikely(WARN_ON(!pw || !pw->dovdd || !pw->avdd))) {
-               /* put CSIC/D IOs into DPD mode to
-                * save additional power for ardbeg
-                */
-               tegra_io_dpd_enable(&csic_io);
-               tegra_io_dpd_enable(&csid_io);
                return -EFAULT;
        }
 
@@ -996,9 +972,6 @@ static int ardbeg_ov5693_front_power_off(struct ov5693_power_rail *pw)
        regulator_disable(pw->dovdd);
        regulator_disable(pw->avdd);
 
-       /* put CSIC/D IOs into DPD mode to save additional power for ardbeg */
-       tegra_io_dpd_enable(&csic_io);
-       tegra_io_dpd_enable(&csid_io);
        return 0;
 }
 
@@ -1120,8 +1093,6 @@ static int ardbeg_camera_init(void)
         */
        tegra_io_dpd_enable(&csia_io);
        tegra_io_dpd_enable(&csib_io);
-       tegra_io_dpd_enable(&csic_io);
-       tegra_io_dpd_enable(&csid_io);
        tegra_io_dpd_enable(&csie_io);
 
 #if IS_ENABLED(CONFIG_SOC_CAMERA_PLATFORM)