aboutsummaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-05-10 12:55:44 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-05-10 13:24:14 -0400
commit9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262 (patch)
treed034047d7cd562700c59a0b1b3ba707367939fe7 /include/video
parent1dfafbc655b3723e37120d4b30e82d1c87767dd1 (diff)
parente4a9e94cc58ed6e4efb02b80be3a9bf57f448d07 (diff)
Merge branch 'for-l-o-3.5'
Conflicts: drivers/video/omap2/displays/panel-taal.c Merge OMAP DSS related board file changes. The branch will also be merged through linux-omap tree to solve conflicts.
Diffstat (limited to 'include/video')
-rw-r--r--include/video/omap-panel-nokia-dsi.h3
-rw-r--r--include/video/omap-panel-tfp410.h (renamed from include/video/omap-panel-dvi.h)18
-rw-r--r--include/video/omapdss.h28
3 files changed, 28 insertions, 21 deletions
diff --git a/include/video/omap-panel-nokia-dsi.h b/include/video/omap-panel-nokia-dsi.h
index 7dc71f9c13e6..04219a295539 100644
--- a/include/video/omap-panel-nokia-dsi.h
+++ b/include/video/omap-panel-nokia-dsi.h
@@ -11,6 +11,7 @@ struct omap_dss_device;
11 * @esd_interval: interval of ESD checks, 0 = disabled (ms) 11 * @esd_interval: interval of ESD checks, 0 = disabled (ms)
12 * @ulps_timeout: time to wait before entering ULPS, 0 = disabled (ms) 12 * @ulps_timeout: time to wait before entering ULPS, 0 = disabled (ms)
13 * @use_dsi_backlight: true if panel uses DSI command to control backlight 13 * @use_dsi_backlight: true if panel uses DSI command to control backlight
14 * @pin_config: DSI pin configuration
14 */ 15 */
15struct nokia_dsi_panel_data { 16struct nokia_dsi_panel_data {
16 const char *name; 17 const char *name;
@@ -24,6 +25,8 @@ struct nokia_dsi_panel_data {
24 unsigned ulps_timeout; 25 unsigned ulps_timeout;
25 26
26 bool use_dsi_backlight; 27 bool use_dsi_backlight;
28
29 struct omap_dsi_pin_config pin_config;
27}; 30};
28 31
29#endif /* __OMAP_NOKIA_DSI_PANEL_H */ 32#endif /* __OMAP_NOKIA_DSI_PANEL_H */
diff --git a/include/video/omap-panel-dvi.h b/include/video/omap-panel-tfp410.h
index 87ad567b4229..68c31d79c571 100644
--- a/include/video/omap-panel-dvi.h
+++ b/include/video/omap-panel-tfp410.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Header for DVI output driver 2 * Header for TFP410 chip driver
3 * 3 *
4 * Copyright (C) 2011 Texas Instruments Inc 4 * Copyright (C) 2011 Texas Instruments Inc
5 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com> 5 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
@@ -17,21 +17,19 @@
17 * this program. If not, see <http://www.gnu.org/licenses/>. 17 * this program. If not, see <http://www.gnu.org/licenses/>.
18 */ 18 */
19 19
20#ifndef __OMAP_PANEL_DVI_H 20#ifndef __OMAP_PANEL_TFP410_H
21#define __OMAP_PANEL_DVI_H 21#define __OMAP_PANEL_TFP410_H
22 22
23struct omap_dss_device; 23struct omap_dss_device;
24 24
25/** 25/**
26 * struct panel_dvi_platform_data - panel driver configuration data 26 * struct tfp410_platform_data - panel driver configuration data
27 * @platform_enable: platform specific panel enable function
28 * @platform_disable: platform specific panel disable function
29 * @i2c_bus_num: i2c bus id for the panel 27 * @i2c_bus_num: i2c bus id for the panel
28 * @power_down_gpio: gpio number for PD pin (or -1 if not available)
30 */ 29 */
31struct panel_dvi_platform_data { 30struct tfp410_platform_data {
32 int (*platform_enable)(struct omap_dss_device *dssdev);
33 void (*platform_disable)(struct omap_dss_device *dssdev);
34 u16 i2c_bus_num; 31 u16 i2c_bus_num;
32 int power_down_gpio;
35}; 33};
36 34
37#endif /* __OMAP_PANEL_DVI_H */ 35#endif /* __OMAP_PANEL_TFP410_H */
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 5f36ddd0e295..1cbb2dd5fbba 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -469,6 +469,21 @@ struct omap_overlay_manager {
469 int (*wait_for_vsync)(struct omap_overlay_manager *mgr); 469 int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
470}; 470};
471 471
472/* 22 pins means 1 clk lane and 10 data lanes */
473#define OMAP_DSS_MAX_DSI_PINS 22
474
475struct omap_dsi_pin_config {
476 int num_pins;
477 /*
478 * pin numbers in the following order:
479 * clk+, clk-
480 * data1+, data1-
481 * data2+, data2-
482 * ...
483 */
484 int pins[OMAP_DSS_MAX_DSI_PINS];
485};
486
472struct omap_dss_device { 487struct omap_dss_device {
473 struct device dev; 488 struct device dev;
474 489
@@ -491,17 +506,6 @@ struct omap_dss_device {
491 } sdi; 506 } sdi;
492 507
493 struct { 508 struct {
494 u8 clk_lane;
495 u8 clk_pol;
496 u8 data1_lane;
497 u8 data1_pol;
498 u8 data2_lane;
499 u8 data2_pol;
500 u8 data3_lane;
501 u8 data3_pol;
502 u8 data4_lane;
503 u8 data4_pol;
504
505 int module; 509 int module;
506 510
507 bool ext_te; 511 bool ext_te;
@@ -690,6 +694,8 @@ int omap_dsi_update(struct omap_dss_device *dssdev, int channel,
690int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel); 694int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel);
691int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id); 695int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id);
692void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel); 696void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel);
697int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev,
698 const struct omap_dsi_pin_config *pin_cfg);
693 699
694int omapdss_dsi_display_enable(struct omap_dss_device *dssdev); 700int omapdss_dsi_display_enable(struct omap_dss_device *dssdev);
695void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, 701void omapdss_dsi_display_disable(struct omap_dss_device *dssdev,