summaryrefslogtreecommitdiff
path: root/drivers/media/platform/soc_camera
diff options
context:
space:
mode:
authorChao Xu <cxu@nvidia.com>2013-07-18 11:37:09 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 13:32:51 -0700
commit87259acf39034f0ca3105aa7af6a4df5c9c1f9a1 (patch)
tree51747bb97e1ad610c793cf3dea9a24d1eefe99c7 /drivers/media/platform/soc_camera
parent4f628c0db3cf0f8b489de09e0d5cb535c05cc619 (diff)
media: tegra: Remove VE from DISP powergate partition
VE is not part of DISP power partition anymore. Change-Id: I35824aac86bb12bb1ca9ab0b2d0e01a9d8d5d5ee Signed-off-by: Chao Xu <cxu@nvidia.com> Reviewed-on: http://git-master/r/251429 Reviewed-by: Bryan Wu <pengw@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/media/platform/soc_camera')
-rw-r--r--drivers/media/platform/soc_camera/tegra_v4l2_camera.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/soc_camera/tegra_v4l2_camera.c b/drivers/media/platform/soc_camera/tegra_v4l2_camera.c
index fccd9771dfdb..bf2fbb50e946 100644
--- a/drivers/media/platform/soc_camera/tegra_v4l2_camera.c
+++ b/drivers/media/platform/soc_camera/tegra_v4l2_camera.c
@@ -989,7 +989,9 @@ static void tegra_camera_activate(struct tegra_camera_dev *pcdev)
* module needs to increase the ref-count of disa to
* avoid itself powergated by DIS inadvertently.
*/
+#if defined(CONFIG_ARCH_TEGRA_11x_SOC) || defined(CONFIG_ARCH_TEGRA_14x_SOC)
tegra_unpowergate_partition(TEGRA_POWERGATE_DISA);
+#endif
/* Unpowergate VE */
tegra_unpowergate_partition(TEGRA_POWERGATE_VENC);
@@ -1023,7 +1025,9 @@ static void tegra_camera_deactivate(struct tegra_camera_dev *pcdev)
/* Powergate VE */
tegra_powergate_partition(TEGRA_POWERGATE_VENC);
+#if defined(CONFIG_ARCH_TEGRA_11x_SOC) || defined(CONFIG_ARCH_TEGRA_14x_SOC)
tegra_powergate_partition(TEGRA_POWERGATE_DISA);
+#endif
/* Disable external power */
regulator_disable(pcdev->reg);