Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b75b54c authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Merge omapdss topic branch for fbdev 4.1

parents 7374ccc0 aa977f62

Documentation/devicetree/bindings/video/ti,omap-dss.txt

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ Video Ports 
-----------



The DSS Core and the encoders have video port outputs. The structure of the

video ports is described in Documentation/devicetree/bindings/video/video-

ports.txt, and the properties for the ports and endpoints for each encoder are

video ports is described in Documentation/devicetree/bindings/graph.txt,

and the properties for the ports and endpoints for each encoder are

described in the SoC's DSS binding documentation.



The video ports are used to describe the connections to external hardware, like

drivers/gpu/drm/omapdrm/omap_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void copy_timings_drm_to_omap(struct omap_video_timings *timings, 


	timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;

	timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH;

	timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES;

	timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;

}



static enum drm_connector_status omap_connector_detect(

drivers/video/fbdev/omap2/displays-new/connector-dvi.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static const struct omap_video_timings dvic_default_timings = { 
	.hsync_level	= OMAPDSS_SIG_ACTIVE_HIGH,

	.data_pclk_edge	= OMAPDSS_DRIVE_SIG_RISING_EDGE,

	.de_level	= OMAPDSS_SIG_ACTIVE_HIGH,

	.sync_pclk_edge	= OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,

	.sync_pclk_edge	= OMAPDSS_DRIVE_SIG_FALLING_EDGE,

};



struct panel_drv_data {

drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c

+11 −0
Original line number Diff line number Diff line
@@ -114,12 +114,21 @@ static void tfp410_disable(struct omap_dss_device *dssdev) 
	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static void tfp410_fix_timings(struct omap_video_timings *timings)

{

	timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;

	timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;

	timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH;

}



static void tfp410_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;



	tfp410_fix_timings(timings);



	ddata->timings = *timings;

	dssdev->panel.timings = *timings;
@@ -140,6 +149,8 @@ static int tfp410_check_timings(struct omap_dss_device *dssdev, 
	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;



	tfp410_fix_timings(timings);



	return in->ops.dpi->check_timings(in, timings);

}

drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static struct omap_video_timings lb035q02_timings = { 
	.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,

	.sync_pclk_edge	= OMAPDSS_DRIVE_SIG_FALLING_EDGE,

};



struct panel_drv_data {