diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-10 20:55:44 +0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-10 21:24:14 +0400 |
| commit | 9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262 (patch) | |
| tree | d034047d7cd562700c59a0b1b3ba707367939fe7 /include/video/omapdss.h | |
| parent | 1dfafbc655b3723e37120d4b30e82d1c87767dd1 (diff) | |
| parent | e4a9e94cc58ed6e4efb02b80be3a9bf57f448d07 (diff) | |
| download | linux-9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262.tar.xz | |
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/omapdss.h')
| -rw-r--r-- | include/video/omapdss.h | 28 |
1 files changed, 17 insertions, 11 deletions
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 { int (*wait_for_vsync)(struct omap_overlay_manager *mgr); }; +/* 22 pins means 1 clk lane and 10 data lanes */ +#define OMAP_DSS_MAX_DSI_PINS 22 + +struct omap_dsi_pin_config { + int num_pins; + /* + * pin numbers in the following order: + * clk+, clk- + * data1+, data1- + * data2+, data2- + * ... + */ + int pins[OMAP_DSS_MAX_DSI_PINS]; +}; + struct omap_dss_device { struct device dev; @@ -491,17 +506,6 @@ struct omap_dss_device { } sdi; struct { - u8 clk_lane; - u8 clk_pol; - u8 data1_lane; - u8 data1_pol; - u8 data2_lane; - u8 data2_pol; - u8 data3_lane; - u8 data3_pol; - u8 data4_lane; - u8 data4_pol; - int module; bool ext_te; @@ -690,6 +694,8 @@ int omap_dsi_update(struct omap_dss_device *dssdev, int channel, int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel); int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id); void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel); +int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev, + const struct omap_dsi_pin_config *pin_cfg); int omapdss_dsi_display_enable(struct omap_dss_device *dssdev); void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, |