diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-07-25 08:55:46 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-07-25 08:55:46 +0000 |
| commit | d9053b487965042b9c849ce40c7f1fb7a0b84b39 (patch) | |
| tree | 1fbb2559dd8fd400cf1dff5711cc5e408ea79ef6 /drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c | |
| parent | 4c5b1fb8a1348542afb153aef72f6067989f578e (diff) | |
| parent | 974a65825e0b5fbda49605f0416a2c975d66e9e6 (diff) | |
| download | talos-obmc-linux-d9053b487965042b9c849ce40c7f1fb7a0b84b39.tar.gz talos-obmc-linux-d9053b487965042b9c849ce40c7f1fb7a0b84b39.zip | |
Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next
Conflicts:
drivers/video/omap2/dss/core.c
drivers/video/omap2/dss/dispc.c
Diffstat (limited to 'drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c')
| -rw-r--r-- | drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c index ba38b3ad17d6..bd86ba9ccf76 100644 --- a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c +++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c @@ -44,6 +44,12 @@ static struct omap_video_timings sharp_ls_timings = { .vsw = 1, .vfp = 1, .vbp = 1, + + .vsync_level = OMAPDSS_SIG_ACTIVE_LOW, + .hsync_level = OMAPDSS_SIG_ACTIVE_LOW, + .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE, + .de_level = OMAPDSS_SIG_ACTIVE_HIGH, + .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, }; static int sharp_ls_bl_update_status(struct backlight_device *bl) @@ -86,9 +92,6 @@ static int sharp_ls_panel_probe(struct omap_dss_device *dssdev) struct sharp_data *sd; int r; - dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS | - OMAP_DSS_LCD_IHS; - dssdev->panel.acb = 0x28; dssdev->panel.timings = sharp_ls_timings; sd = kzalloc(sizeof(*sd), GFP_KERNEL); |
