diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-08-07 06:38:34 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-11-12 06:40:21 -0500 |
commit | 6a3d03e93e54a1780131c714de383d1782131a4d (patch) | |
tree | d9f28640b8ad2544303ef15c02db2f508623dae2 | |
parent | 3640d9fa7afa02940873d7d4c6c22915320d2a77 (diff) |
OMAPDSS: DSI: remove pll_locked field
We have pll_locked field in struct dsi_data, but it doesn't have any
meaningful use anymore, and can be removed.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r-- | drivers/video/fbdev/omap2/dss/dsi.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dsi.c b/drivers/video/fbdev/omap2/dss/dsi.c index deab4135ddc0..37517e407f37 100644 --- a/drivers/video/fbdev/omap2/dss/dsi.c +++ b/drivers/video/fbdev/omap2/dss/dsi.c | |||
@@ -329,8 +329,6 @@ struct dsi_data { | |||
329 | struct mutex lock; | 329 | struct mutex lock; |
330 | struct semaphore bus_lock; | 330 | struct semaphore bus_lock; |
331 | 331 | ||
332 | unsigned pll_locked; | ||
333 | |||
334 | spinlock_t irq_lock; | 332 | spinlock_t irq_lock; |
335 | struct dsi_isr_tables isr_tables; | 333 | struct dsi_isr_tables isr_tables; |
336 | /* space for a copy used by the interrupt handler */ | 334 | /* space for a copy used by the interrupt handler */ |
@@ -1206,11 +1204,6 @@ static inline void dsi_enable_pll_clock(struct platform_device *dsidev, | |||
1206 | clk_prepare_enable(dsi->sys_clk); | 1204 | clk_prepare_enable(dsi->sys_clk); |
1207 | else | 1205 | else |
1208 | clk_disable_unprepare(dsi->sys_clk); | 1206 | clk_disable_unprepare(dsi->sys_clk); |
1209 | |||
1210 | if (enable && dsi->pll_locked) { | ||
1211 | if (wait_for_bit_change(dsidev, DSI_PLL_STATUS, 1, 1) != 1) | ||
1212 | DSSERR("cannot lock PLL when enabling clocks\n"); | ||
1213 | } | ||
1214 | } | 1207 | } |
1215 | 1208 | ||
1216 | static void _dsi_print_reset_status(struct platform_device *dsidev) | 1209 | static void _dsi_print_reset_status(struct platform_device *dsidev) |
@@ -1647,8 +1640,6 @@ int dsi_pll_set_clock_div(struct platform_device *dsidev, | |||
1647 | goto err; | 1640 | goto err; |
1648 | } | 1641 | } |
1649 | 1642 | ||
1650 | dsi->pll_locked = 1; | ||
1651 | |||
1652 | l = dsi_read_reg(dsidev, DSI_PLL_CONFIGURATION2); | 1643 | l = dsi_read_reg(dsidev, DSI_PLL_CONFIGURATION2); |
1653 | l = FLD_MOD(l, 0, 0, 0); /* DSI_PLL_IDLE */ | 1644 | l = FLD_MOD(l, 0, 0, 0); /* DSI_PLL_IDLE */ |
1654 | l = FLD_MOD(l, 0, 5, 5); /* DSI_PLL_PLLLPMODE */ | 1645 | l = FLD_MOD(l, 0, 5, 5); /* DSI_PLL_PLLLPMODE */ |
@@ -1739,7 +1730,6 @@ void dsi_pll_uninit(struct platform_device *dsidev, bool disconnect_lanes) | |||
1739 | { | 1730 | { |
1740 | struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev); | 1731 | struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev); |
1741 | 1732 | ||
1742 | dsi->pll_locked = 0; | ||
1743 | dsi_pll_power(dsidev, DSI_PLL_POWER_OFF); | 1733 | dsi_pll_power(dsidev, DSI_PLL_POWER_OFF); |
1744 | if (disconnect_lanes) { | 1734 | if (disconnect_lanes) { |
1745 | WARN_ON(!dsi->vdds_dsi_enabled); | 1735 | WARN_ON(!dsi->vdds_dsi_enabled); |