summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorkdivvela <kdivvela@nvidia.com>2011-09-06 16:50:05 +0530
committerVarun Colbert <vcolbert@nvidia.com>2011-09-09 14:28:21 -0700
commit4eaca0ed7652aacf1bf56d1f7ad1ff1bd39c73a9 (patch)
tree79c0ce21c89afa42cf3c5aeb0b945934dfd16394 /drivers
parent792cf8a95646bf3bbd61653cd46b6218254a6ac2 (diff)
media: tegra_camera: Enable Null sensor
Enable pd2vi_clk in case of Null sensor Bug 870406 Change-Id: I29ab4e4d3d24a54b2eace84eeb8266582e53dd1f Reviewed-on: http://git-master/r/50822 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Krupal Divvela <kdivvela@nvidia.com> Reviewed-by: Prayas Mohanty <pmohanty@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/tegra/tegra_camera.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/video/tegra/tegra_camera.c b/drivers/media/video/tegra/tegra_camera.c
index 2d4baa54c911..95d477ee8cca 100644
--- a/drivers/media/video/tegra/tegra_camera.c
+++ b/drivers/media/video/tegra/tegra_camera.c
@@ -140,11 +140,15 @@ static int tegra_camera_clk_set_rate(struct tegra_camera_clk_info *info)
clk_set_rate(clk, info->rate);
if (info->clk_id == TEGRA_CAMERA_VI_CLK) {
- u32 val;
+ u32 val = 0x2;
void __iomem *car = IO_ADDRESS(TEGRA_CLK_RESET_BASE);
void __iomem *apb_misc = IO_ADDRESS(TEGRA_APB_MISC_BASE);
- writel(0x2, car + offset);
+ if (info->flag == TEGRA_CAMERA_ENABLE_PD2VI_CLK) {
+ val |= TEGRA_CAMERA_PD2VI_CLK_SEL_VI_SENSOR_CLK;
+ }
+
+ writel(val, car + offset);
val = readl(apb_misc + 0x42c);
writel(val | 0x1, apb_misc + 0x42c);