aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
-rw-r--r--arch/arm/mach-omap2/display.c238
1 files changed, 222 insertions, 16 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index a5b7a236aa5b..bc6cf863a563 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -15,17 +15,48 @@
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 */ 16 */
17 17
18#include <linux/string.h>
18#include <linux/kernel.h> 19#include <linux/kernel.h>
19#include <linux/init.h> 20#include <linux/init.h>
20#include <linux/platform_device.h> 21#include <linux/platform_device.h>
21#include <linux/io.h> 22#include <linux/io.h>
22#include <linux/clk.h> 23#include <linux/clk.h>
23#include <linux/err.h> 24#include <linux/err.h>
25#include <linux/delay.h>
24 26
25#include <video/omapdss.h> 27#include <video/omapdss.h>
26#include <plat/omap_hwmod.h> 28#include <plat/omap_hwmod.h>
27#include <plat/omap_device.h> 29#include <plat/omap_device.h>
28#include <plat/omap-pm.h> 30#include <plat/omap-pm.h>
31#include "common.h"
32
33#include "control.h"
34#include "display.h"
35
36#define DISPC_CONTROL 0x0040
37#define DISPC_CONTROL2 0x0238
38#define DISPC_IRQSTATUS 0x0018
39
40#define DSS_SYSCONFIG 0x10
41#define DSS_SYSSTATUS 0x14
42#define DSS_CONTROL 0x40
43#define DSS_SDI_CONTROL 0x44
44#define DSS_PLL_CONTROL 0x48
45
46#define LCD_EN_MASK (0x1 << 0)
47#define DIGIT_EN_MASK (0x1 << 1)
48
49#define FRAMEDONE_IRQ_SHIFT 0
50#define EVSYNC_EVEN_IRQ_SHIFT 2
51#define EVSYNC_ODD_IRQ_SHIFT 3
52#define FRAMEDONE2_IRQ_SHIFT 22
53#define FRAMEDONETV_IRQ_SHIFT 24
54
55/*
56 * FRAMEDONE_IRQ_TIMEOUT: how long (in milliseconds) to wait during DISPC
57 * reset before deciding that something has gone wrong
58 */
59#define FRAMEDONE_IRQ_TIMEOUT 100
29 60
30static struct platform_device omap_display_device = { 61static struct platform_device omap_display_device = {
31 .name = "omapdss", 62 .name = "omapdss",
@@ -35,14 +66,6 @@ static struct platform_device omap_display_device = {
35 }, 66 },
36}; 67};
37 68
38static struct omap_device_pm_latency omap_dss_latency[] = {
39 [0] = {
40 .deactivate_func = omap_device_idle_hwmods,
41 .activate_func = omap_device_enable_hwmods,
42 .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
43 },
44};
45
46struct omap_dss_hwmod_data { 69struct omap_dss_hwmod_data {
47 const char *oh_name; 70 const char *oh_name;
48 const char *dev_name; 71 const char *dev_name;
@@ -61,7 +84,7 @@ static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initdata = {
61 { "dss_dispc", "omapdss_dispc", -1 }, 84 { "dss_dispc", "omapdss_dispc", -1 },
62 { "dss_rfbi", "omapdss_rfbi", -1 }, 85 { "dss_rfbi", "omapdss_rfbi", -1 },
63 { "dss_venc", "omapdss_venc", -1 }, 86 { "dss_venc", "omapdss_venc", -1 },
64 { "dss_dsi1", "omapdss_dsi1", -1 }, 87 { "dss_dsi1", "omapdss_dsi", 0 },
65}; 88};
66 89
67static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = { 90static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
@@ -69,16 +92,63 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
69 { "dss_dispc", "omapdss_dispc", -1 }, 92 { "dss_dispc", "omapdss_dispc", -1 },
70 { "dss_rfbi", "omapdss_rfbi", -1 }, 93 { "dss_rfbi", "omapdss_rfbi", -1 },
71 { "dss_venc", "omapdss_venc", -1 }, 94 { "dss_venc", "omapdss_venc", -1 },
72 { "dss_dsi1", "omapdss_dsi1", -1 }, 95 { "dss_dsi1", "omapdss_dsi", 0 },
73 { "dss_dsi2", "omapdss_dsi2", -1 }, 96 { "dss_dsi2", "omapdss_dsi", 1 },
74 { "dss_hdmi", "omapdss_hdmi", -1 }, 97 { "dss_hdmi", "omapdss_hdmi", -1 },
75}; 98};
76 99
100static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
101{
102 u32 enable_mask, enable_shift;
103 u32 pipd_mask, pipd_shift;
104 u32 reg;
105
106 if (dsi_id == 0) {
107 enable_mask = OMAP4_DSI1_LANEENABLE_MASK;
108 enable_shift = OMAP4_DSI1_LANEENABLE_SHIFT;
109 pipd_mask = OMAP4_DSI1_PIPD_MASK;
110 pipd_shift = OMAP4_DSI1_PIPD_SHIFT;
111 } else if (dsi_id == 1) {
112 enable_mask = OMAP4_DSI2_LANEENABLE_MASK;
113 enable_shift = OMAP4_DSI2_LANEENABLE_SHIFT;
114 pipd_mask = OMAP4_DSI2_PIPD_MASK;
115 pipd_shift = OMAP4_DSI2_PIPD_SHIFT;
116 } else {
117 return -ENODEV;
118 }
119
120 reg = omap4_ctrl_pad_readl(OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY);
121
122 reg &= ~enable_mask;
123 reg &= ~pipd_mask;
124
125 reg |= (lanes << enable_shift) & enable_mask;
126 reg |= (lanes << pipd_shift) & pipd_mask;
127
128 omap4_ctrl_pad_writel(reg, OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY);
129
130 return 0;
131}
132
133static int omap_dsi_enable_pads(int dsi_id, unsigned lane_mask)
134{
135 if (cpu_is_omap44xx())
136 return omap4_dsi_mux_pads(dsi_id, lane_mask);
137
138 return 0;
139}
140
141static void omap_dsi_disable_pads(int dsi_id, unsigned lane_mask)
142{
143 if (cpu_is_omap44xx())
144 omap4_dsi_mux_pads(dsi_id, 0);
145}
146
77int __init omap_display_init(struct omap_dss_board_info *board_data) 147int __init omap_display_init(struct omap_dss_board_info *board_data)
78{ 148{
79 int r = 0; 149 int r = 0;
80 struct omap_hwmod *oh; 150 struct omap_hwmod *oh;
81 struct omap_device *od; 151 struct platform_device *pdev;
82 int i, oh_count; 152 int i, oh_count;
83 struct omap_display_platform_data pdata; 153 struct omap_display_platform_data pdata;
84 const struct omap_dss_hwmod_data *curr_dss_hwmod; 154 const struct omap_dss_hwmod_data *curr_dss_hwmod;
@@ -96,6 +166,11 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
96 oh_count = ARRAY_SIZE(omap4_dss_hwmod_data); 166 oh_count = ARRAY_SIZE(omap4_dss_hwmod_data);
97 } 167 }
98 168
169 if (board_data->dsi_enable_pads == NULL)
170 board_data->dsi_enable_pads = omap_dsi_enable_pads;
171 if (board_data->dsi_disable_pads == NULL)
172 board_data->dsi_disable_pads = omap_dsi_disable_pads;
173
99 pdata.board_data = board_data; 174 pdata.board_data = board_data;
100 pdata.board_data->get_context_loss_count = 175 pdata.board_data->get_context_loss_count =
101 omap_pm_get_dev_context_loss_count; 176 omap_pm_get_dev_context_loss_count;
@@ -108,13 +183,12 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
108 return -ENODEV; 183 return -ENODEV;
109 } 184 }
110 185
111 od = omap_device_build(curr_dss_hwmod[i].dev_name, 186 pdev = omap_device_build(curr_dss_hwmod[i].dev_name,
112 curr_dss_hwmod[i].id, oh, &pdata, 187 curr_dss_hwmod[i].id, oh, &pdata,
113 sizeof(struct omap_display_platform_data), 188 sizeof(struct omap_display_platform_data),
114 omap_dss_latency, 189 NULL, 0, 0);
115 ARRAY_SIZE(omap_dss_latency), 0);
116 190
117 if (WARN((IS_ERR(od)), "Could not build omap_device for %s\n", 191 if (WARN((IS_ERR(pdev)), "Could not build omap_device for %s\n",
118 curr_dss_hwmod[i].oh_name)) 192 curr_dss_hwmod[i].oh_name))
119 return -ENODEV; 193 return -ENODEV;
120 } 194 }
@@ -126,3 +200,135 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
126 200
127 return r; 201 return r;
128} 202}
203
204static void dispc_disable_outputs(void)
205{
206 u32 v, irq_mask = 0;
207 bool lcd_en, digit_en, lcd2_en = false;
208 int i;
209 struct omap_dss_dispc_dev_attr *da;
210 struct omap_hwmod *oh;
211
212 oh = omap_hwmod_lookup("dss_dispc");
213 if (!oh) {
214 WARN(1, "display: could not disable outputs during reset - could not find dss_dispc hwmod\n");
215 return;
216 }
217
218 if (!oh->dev_attr) {
219 pr_err("display: could not disable outputs during reset due to missing dev_attr\n");
220 return;
221 }
222
223 da = (struct omap_dss_dispc_dev_attr *)oh->dev_attr;
224
225 /* store value of LCDENABLE and DIGITENABLE bits */
226 v = omap_hwmod_read(oh, DISPC_CONTROL);
227 lcd_en = v & LCD_EN_MASK;
228 digit_en = v & DIGIT_EN_MASK;
229
230 /* store value of LCDENABLE for LCD2 */
231 if (da->manager_count > 2) {
232 v = omap_hwmod_read(oh, DISPC_CONTROL2);
233 lcd2_en = v & LCD_EN_MASK;
234 }
235
236 if (!(lcd_en | digit_en | lcd2_en))
237 return; /* no managers currently enabled */
238
239 /*
240 * If any manager was enabled, we need to disable it before
241 * DSS clocks are disabled or DISPC module is reset
242 */
243 if (lcd_en)
244 irq_mask |= 1 << FRAMEDONE_IRQ_SHIFT;
245
246 if (digit_en) {
247 if (da->has_framedonetv_irq) {
248 irq_mask |= 1 << FRAMEDONETV_IRQ_SHIFT;
249 } else {
250 irq_mask |= 1 << EVSYNC_EVEN_IRQ_SHIFT |
251 1 << EVSYNC_ODD_IRQ_SHIFT;
252 }
253 }
254
255 if (lcd2_en)
256 irq_mask |= 1 << FRAMEDONE2_IRQ_SHIFT;
257
258 /*
259 * clear any previous FRAMEDONE, FRAMEDONETV,
260 * EVSYNC_EVEN/ODD or FRAMEDONE2 interrupts
261 */
262 omap_hwmod_write(irq_mask, oh, DISPC_IRQSTATUS);
263
264 /* disable LCD and TV managers */
265 v = omap_hwmod_read(oh, DISPC_CONTROL);
266 v &= ~(LCD_EN_MASK | DIGIT_EN_MASK);
267 omap_hwmod_write(v, oh, DISPC_CONTROL);
268
269 /* disable LCD2 manager */
270 if (da->manager_count > 2) {
271 v = omap_hwmod_read(oh, DISPC_CONTROL2);
272 v &= ~LCD_EN_MASK;
273 omap_hwmod_write(v, oh, DISPC_CONTROL2);
274 }
275
276 i = 0;
277 while ((omap_hwmod_read(oh, DISPC_IRQSTATUS) & irq_mask) !=
278 irq_mask) {
279 i++;
280 if (i > FRAMEDONE_IRQ_TIMEOUT) {
281 pr_err("didn't get FRAMEDONE1/2 or TV interrupt\n");
282 break;
283 }
284 mdelay(1);
285 }
286}
287
288#define MAX_MODULE_SOFTRESET_WAIT 10000
289int omap_dss_reset(struct omap_hwmod *oh)
290{
291 struct omap_hwmod_opt_clk *oc;
292 int c = 0;
293 int i, r;
294
295 if (!(oh->class->sysc->sysc_flags & SYSS_HAS_RESET_STATUS)) {
296 pr_err("dss_core: hwmod data doesn't contain reset data\n");
297 return -EINVAL;
298 }
299
300 for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++)
301 if (oc->_clk)
302 clk_enable(oc->_clk);
303
304 dispc_disable_outputs();
305
306 /* clear SDI registers */
307 if (cpu_is_omap3430()) {
308 omap_hwmod_write(0x0, oh, DSS_SDI_CONTROL);
309 omap_hwmod_write(0x0, oh, DSS_PLL_CONTROL);
310 }
311
312 /*
313 * clear DSS_CONTROL register to switch DSS clock sources to
314 * PRCM clock, if any
315 */
316 omap_hwmod_write(0x0, oh, DSS_CONTROL);
317
318 omap_test_timeout((omap_hwmod_read(oh, oh->class->sysc->syss_offs)
319 & SYSS_RESETDONE_MASK),
320 MAX_MODULE_SOFTRESET_WAIT, c);
321
322 if (c == MAX_MODULE_SOFTRESET_WAIT)
323 pr_warning("dss_core: waiting for reset to finish failed\n");
324 else
325 pr_debug("dss_core: softreset done\n");
326
327 for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++)
328 if (oc->_clk)
329 clk_disable(oc->_clk);
330
331 r = (c == MAX_MODULE_SOFTRESET_WAIT) ? -ETIMEDOUT : 0;
332
333 return r;
334}