media: video: tegra: tegra_camera: remove reset
Jihoon Bang [Mon, 8 Oct 2012 18:30:01 +0000 (11:30 -0700)]
Resetting VI, ISP and CSI is taken care of by
tegra_powergate_partition and tegra_unpowergate_partition api.
tegra_camera doesn't have to reset them again.

Bug 1059495

Reviewed-on: http://git-master/r/142451
(cherry picked from commit 3c08187fe1d5c8f44de6e40c96de1ce6e71f34eb)

Change-Id: Ia98e1ccfc5ea9c5080b99c3c74b929c771232e31
Signed-off-by: Jihoon Bang <jbang@nvidia.com>
Reviewed-on: http://git-master/r/145665
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Frank Chen <frankc@nvidia.com>
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>

drivers/media/video/tegra/tegra_camera.c

index 91b09fd..881d17f 100644 (file)
@@ -72,20 +72,8 @@ static int tegra_camera_enable_clk(struct tegra_camera_dev *dev)
        clk_enable(dev->vi_clk);
        clk_enable(dev->vi_sensor_clk);
        clk_enable(dev->csus_clk);
-
-       tegra_periph_reset_assert(dev->vi_clk);
-       udelay(2);
-       tegra_periph_reset_deassert(dev->vi_clk);
-
        clk_enable(dev->isp_clk);
-       tegra_periph_reset_assert(dev->isp_clk);
-       udelay(2);
-       tegra_periph_reset_deassert(dev->isp_clk);
-
        clk_enable(dev->csi_clk);
-       tegra_periph_reset_assert(dev->csi_clk);
-       udelay(2);
-       tegra_periph_reset_deassert(dev->csi_clk);
 
 #ifdef CONFIG_ARCH_TEGRA_11x_SOC
        clk_enable(dev->cilab_clk);
@@ -98,13 +86,11 @@ static int tegra_camera_enable_clk(struct tegra_camera_dev *dev)
 static int tegra_camera_disable_clk(struct tegra_camera_dev *dev)
 {
        clk_disable(dev->csi_clk);
-       tegra_periph_reset_assert(dev->csi_clk);
        clk_disable(dev->isp_clk);
-       tegra_periph_reset_assert(dev->isp_clk);
        clk_disable(dev->csus_clk);
        clk_disable(dev->vi_sensor_clk);
        clk_disable(dev->vi_clk);
-       tegra_periph_reset_assert(dev->vi_clk);
+
 #ifdef CONFIG_ARCH_TEGRA_11x_SOC
        clk_disable(dev->cilab_clk);
        clk_disable(dev->cilcd_clk);