diff options
author | Sergio Aguirre <saaguirre@ti.com> | 2009-04-23 23:11:07 -0400 |
---|---|---|
committer | paul <paul@twilight.(none)> | 2009-04-23 23:11:07 -0400 |
commit | 9e53dd7180a1fd59a785dbfb9c633f01c96c388f (patch) | |
tree | df6a08f42a6554ce1e4996d91781169f8b096df9 | |
parent | 15ca78f7925899fee7bc265651a69ab51f449eea (diff) |
OMAP3: clock: Camera module doesn't have IDLEST bit
This patch avoids waiting for the camera module to become ready,
since it doesn't have IDLEST bit.
Based on a earlier hack done by Paul Walmsley on Sep 9 2008 on
linux-omap tree.
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
-rw-r--r-- | arch/arm/mach-omap2/clock34xx.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index 70ec10deb654..f0090175d597 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h | |||
@@ -2052,7 +2052,7 @@ static struct clk dss_ick = { | |||
2052 | 2052 | ||
2053 | static struct clk cam_mclk = { | 2053 | static struct clk cam_mclk = { |
2054 | .name = "cam_mclk", | 2054 | .name = "cam_mclk", |
2055 | .ops = &clkops_omap2_dflt_wait, | 2055 | .ops = &clkops_omap2_dflt, |
2056 | .parent = &dpll4_m5x2_ck, | 2056 | .parent = &dpll4_m5x2_ck, |
2057 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_FCLKEN), | 2057 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_FCLKEN), |
2058 | .enable_bit = OMAP3430_EN_CAM_SHIFT, | 2058 | .enable_bit = OMAP3430_EN_CAM_SHIFT, |
@@ -2063,7 +2063,7 @@ static struct clk cam_mclk = { | |||
2063 | static struct clk cam_ick = { | 2063 | static struct clk cam_ick = { |
2064 | /* Handles both L3 and L4 clocks */ | 2064 | /* Handles both L3 and L4 clocks */ |
2065 | .name = "cam_ick", | 2065 | .name = "cam_ick", |
2066 | .ops = &clkops_omap2_dflt_wait, | 2066 | .ops = &clkops_omap2_dflt, |
2067 | .parent = &l4_ick, | 2067 | .parent = &l4_ick, |
2068 | .init = &omap2_init_clk_clkdm, | 2068 | .init = &omap2_init_clk_clkdm, |
2069 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_ICLKEN), | 2069 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_ICLKEN), |
@@ -2074,7 +2074,7 @@ static struct clk cam_ick = { | |||
2074 | 2074 | ||
2075 | static struct clk csi2_96m_fck = { | 2075 | static struct clk csi2_96m_fck = { |
2076 | .name = "csi2_96m_fck", | 2076 | .name = "csi2_96m_fck", |
2077 | .ops = &clkops_omap2_dflt_wait, | 2077 | .ops = &clkops_omap2_dflt, |
2078 | .parent = &core_96m_fck, | 2078 | .parent = &core_96m_fck, |
2079 | .init = &omap2_init_clk_clkdm, | 2079 | .init = &omap2_init_clk_clkdm, |
2080 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_FCLKEN), | 2080 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_FCLKEN), |