diff options
| author | Naveen Kumar S <nkumars@nvidia.com> | 2013-05-30 14:44:02 +0530 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-05-31 17:59:51 -0700 |
| commit | 21694e460574c1228c01c4cae3a7071026020096 (patch) | |
| tree | 2f3bd47b61a0d5610e9a4240869b68a76b9e31f2 /drivers/video | |
| parent | 41180c60574d0018ad084eb2715cb23172e2f8ec (diff) | |
video: tegra: camera: do not powergate DISA on T30
Added conditional check to determine that the SoC is not T20 or T30
while powergating DISA partition as this partition is not present
in these SoCs.
Bug 1289935
Change-Id: I13b9eb84edf4c2a9fed27905f245f0be5d7da365
Signed-off-by: Naveen Kumar S <nkumars@nvidia.com>
Reviewed-on: http://git-master/r/234054
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/tegra/camera/camera_power.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/tegra/camera/camera_power.c b/drivers/video/tegra/camera/camera_power.c index 554d2ecc043e..b5a3e0c7d467 100644 --- a/drivers/video/tegra/camera/camera_power.c +++ b/drivers/video/tegra/camera/camera_power.c @@ -1,7 +1,7 @@ /* * drivers/video/tegra/camera/camera_power.c * - * Copyright (C) 2013 Nvidia Corp + * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -35,12 +35,13 @@ int tegra_camera_power_on(struct tegra_camera *camera) /* Powergating DIS must powergate VE partition. Camera * module needs to increase the ref-count of disa to * avoid itself powergated by DIS inadvertently. */ +#ifndef CONFIG_ARCH_TEGRA_3x_SOC ret = tegra_unpowergate_partition(TEGRA_POWERGATE_DISA); if (ret) dev_err(camera->dev, "%s: DIS unpowergate failed.\n", __func__); - +#endif /* Unpowergate VE */ ret = tegra_unpowergate_partition(TEGRA_POWERGATE_VENC); if (ret) @@ -66,12 +67,14 @@ int tegra_camera_power_off(struct tegra_camera *camera) "%s: VENC powergate failed.\n", __func__); +#ifndef CONFIG_ARCH_TEGRA_3x_SOC ret = tegra_powergate_partition(TEGRA_POWERGATE_DISA); if (ret) dev_err(camera->dev, "%s: DIS powergate failed.\n", __func__); #endif +#endif /* Disable external power */ if (camera->reg) { ret = regulator_disable(camera->reg); |