Commit b9e687fc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next 



omapdrm changes for 5.2

- Implement drm_bridge and drm_panel support for omapdrm
- Drop omapdrm's panel-dpi, tfp410 and connector-dvi drivers
- New DRM_BUS_FLAG_*_(DRIVE|SAMPLE)_(POS|NEG)EDGE flags
- Improvements to tfp410 driver
- OSD070T1718-19TS panel support to simple-panel
- panel-tpo-td028ttec1 backlight support

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/670dc1ce-feaf-b88e-780f-b99251b88a82@ti.com
parents 8c2ffd91 5880955f

Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt

+18 −6
Original line number Diff line number Diff line
@@ -6,15 +6,25 @@ Required properties: 


Optional properties:

- powerdown-gpios: power-down gpio

- reg: I2C address. If and only if present the device node

       should be placed into the i2c controller node where the

       tfp410 i2c is connected to.

- reg: I2C address. If and only if present the device node should be placed

  into the I2C controller node where the TFP410 I2C is connected to.

- ti,deskew: data de-skew in 350ps increments, from -4 to +3, as configured

  through th DK[3:1] pins. This property shall be present only if the TFP410

  is not connected through I2C.



Required nodes:

- Video port 0 for DPI input [1].

- Video port 1 for DVI output [1].



[1]: Documentation/devicetree/bindings/media/video-interfaces.txt

This device has two video ports. Their connections are modeled using the OF

graph bindings specified in [1]. Each port node shall have a single endpoint.



- Port 0 is the DPI input port. Its endpoint subnode shall contain a

  pclk-sample property and a remote-endpoint property as specified in [1].



- Port 1 is the DVI output port. Its endpoint subnode shall contain a

  remote-endpoint property is specified in [1].



[1] Documentation/devicetree/bindings/media/video-interfaces.txt





Example

-------
@@ -22,6 +32,7 @@ Example 
tfp410: encoder@0 {

	compatible = "ti,tfp410";

	powerdown-gpios = <&twl_gpio 2 GPIO_ACTIVE_LOW>;

	ti,deskew = <4>;



	ports {

		#address-cells = <1>;
@@ -31,6 +42,7 @@ tfp410: encoder@0 { 
			reg = <0>;



			tfp410_in: endpoint@0 {

				pclk-sample = <1>;

				remote-endpoint = <&dpi_out>;

			};

		};

Documentation/devicetree/bindings/display/panel/osddisplays,osd070t1718-19ts.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
OSD Displays OSD070T1718-19TS 7" WVGA TFT LCD panel



Required properties:

- compatible: shall be "osddisplays,osd070t1718-19ts"

- power-supply: see simple-panel.txt



Optional properties:

- backlight: see simple-panel.txt



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory. No other simple-panel properties than

the ones specified herein are valid.

Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.txt

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 


Optional properties:

- label: a symbolic name for the panel

- backlight: phandle of the backlight device



Required nodes:

- Video port for DPI input
@@ -21,6 +22,7 @@ lcd-panel: td028ttec1@0 { 
	spi-cpha;



	label = "lcd";

	backlight = <&backlight>;

	port {

		lcd_in: endpoint {

			remote-endpoint = <&dpi_out>;

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ oranth Shenzhen Oranth Technology Co., Ltd. 
ORCL	Oracle Corporation

orisetech	Orise Technology

ortustech	Ortus Technology Co., Ltd.

osddisplays	OSD Displays

ovti	OmniVision Technologies

oxsemi	Oxford Semiconductor, Ltd.

panasonic	Panasonic Corporation

drivers/gpu/drm/bridge/dumb-vga-dac.c

+3 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static int dumb_vga_remove(struct platform_device *pdev) 
 */

static const struct drm_bridge_timings default_dac_timings = {

	/* Timing specifications, datasheet page 7 */

	.sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,

	.input_bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,

	.setup_time_ps = 500,

	.hold_time_ps = 1500,

};
@@ -245,7 +245,7 @@ static const struct drm_bridge_timings default_dac_timings = { 
 */

static const struct drm_bridge_timings ti_ths8134_dac_timings = {

	/* From timing diagram, datasheet page 9 */

	.sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,

	.input_bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,

	/* From datasheet, page 12 */

	.setup_time_ps = 3000,

	/* I guess this means latched input */
@@ -258,7 +258,7 @@ static const struct drm_bridge_timings ti_ths8134_dac_timings = { 
 */

static const struct drm_bridge_timings ti_ths8135_dac_timings = {

	/* From timing diagram, datasheet page 14 */

	.sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,

	.input_bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,

	/* From datasheet, page 16 */

	.setup_time_ps = 2000,

	.hold_time_ps = 500,

CRA Git | Maintained and supported by SUSTech CRA and CCSE