diff options
| author | Pritesh Raithatha <praithatha@nvidia.com> | 2011-05-12 19:38:42 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-05-13 18:42:41 -0700 |
| commit | c7296a1a366faf78e4097bf0537588d89f76c783 (patch) | |
| tree | d4828aa7c92b445eea01ef74bafd1ac2123d44e0 | |
| parent | 1b8580f71a09d5004f2e1ca2eca17fd373b5ba4e (diff) | |
media: tegra_camera: add support for regulator avdd_dsi_csi
Bug 826043
Change-Id: I3d78f7941d54038f12f587400c899aa145c63122
Reviewed-on: http://git-master/r/31369
Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
Tested-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
| -rw-r--r-- | drivers/media/video/tegra/tegra_camera.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/tegra/tegra_camera.c b/drivers/media/video/tegra/tegra_camera.c index f310d0f5619f..2d4baa54c911 100644 --- a/drivers/media/video/tegra/tegra_camera.c +++ b/drivers/media/video/tegra/tegra_camera.c @@ -290,9 +290,13 @@ static int tegra_camera_probe(struct platform_device *pdev) int err; pr_info("%s: probe\n", TEGRA_CAMERA_NAME); +#ifdef CONFIG_ARCH_TEGRA_2x_SOC tegra_camera_regulator_csi = regulator_get(&pdev->dev, "vcsi"); +#else + tegra_camera_regulator_csi = regulator_get(&pdev->dev, "avdd_dsi_csi"); +#endif if (IS_ERR_OR_NULL(tegra_camera_regulator_csi)) { - pr_err("%s: Couldn't get regulator vcsi\n", TEGRA_CAMERA_NAME); + pr_err("%s: Couldn't get regulator\n", TEGRA_CAMERA_NAME); return PTR_ERR(tegra_camera_regulator_csi); } |