Commit 54c88a02 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2018-07-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 4.19:

Cross-subsystem Changes:
- many dt-bindings Doc changes

Core Changes:
- Encoder clean ups (Ville Syrjälä)
- Connector Writeback improvements(Boris Brezillon)
- Fake vblank support (Boris Brezillon)
- API for in-kernel clients (Noralf Trønnes)
- improvements to the path of finding panels(Boris Brezillon)

Driver Changes:
- initial support for the virtual display driver - vkms(Haneen Mohammed and Rodrigo Siqueira)
- panel: add Rocktech RK070ER9427 LCD support (Jagan Teki)
- panel: add support for the EDT ETM0700G0EDH6 and EDT ETM0700G0BDH6(Jan Tuerk)
- panel: add DLC DLC0700YZG-1 (Philipp Zabel)
- panel: add support for BOE HV070WSA-100 (Andrzej Hajda)
- panel: add newhaven, nhd-4.3-480272ef-atxl LCD (Tomi Valkeinen)
- panel: add support for Innolux G070Y2-L01 (Christoph Fritz)
- panel: add support for DataImage SCF0700C48GGU18 (Michal Vokáč)
- panel: add support for Sharp LQ035Q7DB03 (Vladimir Zapolskiy)
- panel: p079zca: Refactor panel driver to support multiple panels (Lin Huang)
- sun4i: Add R40 display engine compatible(Jernej Skrabec)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180712011137.GA26620@juma
parents b861686b ae61f61f

Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ Required properties for DSI: 
		The 3 clocks output from the DSI analog PHY: dsi[01]_byte,

		dsi[01]_ddr2, and dsi[01]_ddr



Required properties for the TXP (writeback) block:

- compatible:	Should be "brcm,bcm2835-txp"

- reg:		Physical base address and length of the TXP block's registers

- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt



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



Example:

Documentation/devicetree/bindings/display/panel/boe,hv070wsa-100.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
BOE HV070WSA-100 7.01" WSVGA TFT LCD panel



Required properties:

- compatible: should be "boe,hv070wsa-100"

- power-supply: regulator to provide the VCC supply voltage (3.3 volts)

- enable-gpios: GPIO pin to enable and disable panel (active high)



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

in simple-panel.txt in this directory.



The device node can contain one 'port' child node with one child

'endpoint' node, according to the bindings defined in [1]. This

node should describe panel's video bus.



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



Example:



	panel: panel {

		compatible = "boe,hv070wsa-100";

		power-supply = <&vcc_3v3_reg>;

		enable-gpios = <&gpd1 3 GPIO_ACTIVE_HIGH>;

		port {

			panel_ep: endpoint {

				remote-endpoint = <&bridge_out_ep>;

			};

		};

	};

Documentation/devicetree/bindings/display/panel/edt,et070080dh6.txt→Documentation/devicetree/bindings/display/panel/dataimage,scf0700c48ggu18.txt

+8 −0
Original line number Diff line number Diff line 
Emerging Display Technology Corp. ET070080DH6 7.0" WVGA TFT LCD panel

DataImage, Inc. 7" WVGA (800x480) TFT LCD panel with 24-bit parallel interface.



Required properties:

- compatible: should be "edt,et070080dh6"



This panel is the same as ETM0700G0DH6 except for the touchscreen.

ET070080DH6 is the model with resistive touch.

- compatible: should be "dataimage,scf0700c48ggu18"

- power-supply: as specified in the base binding



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

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
DLC Display Co. DLC0700YZG-1 7.0" WSVGA TFT LCD panel



Required properties:

- compatible: should be "dlc,dlc0700yzg-1"

- power-supply: See simple-panel.txt



Optional properties:

- reset-gpios: See panel-common.txt

- enable-gpios: See simple-panel.txt

- backlight: See simple-panel.txt



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

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/edt,et-series.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Emerging Display Technology Corp. Displays

==========================================





Display bindings for EDT Display Technology Corp. Displays which are

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

simple-panel.txt





5,7" WVGA TFT Panels

--------------------



+-----------------+---------------------+-------------------------------------+

| Identifier      | compatbile          | description                         |

+=================+=====================+=====================================+

| ET057090DHU     | edt,et057090dhu     | 5.7" VGA TFT LCD panel              |

+-----------------+---------------------+-------------------------------------+





7,0" WVGA TFT Panels

--------------------



+-----------------+---------------------+-------------------------------------+

| Identifier      | compatbile          | description                         |

+=================+=====================+=====================================+

| ETM0700G0DH6    | edt,etm070080dh6    | WVGA TFT Display with capacitive    |

|                 |                     | Touchscreen                         |

+-----------------+---------------------+-------------------------------------+

| ETM0700G0BDH6   | edt,etm070080bdh6   | Same as ETM0700G0DH6 but with       |

|                 |                     | inverted pixel clock.               |

+-----------------+---------------------+-------------------------------------+

| ETM0700G0EDH6   | edt,etm070080edh6   | Same display as the ETM0700G0BDH6,  |

|                 |                     | but with changed Hardware for the   |

|                 |                     | backlight and the touch interface   |

+-----------------+---------------------+-------------------------------------+

| ET070080DH6     | edt,etm070080dh6    | Same timings as the ETM0700G0DH6,   |

|                 |                     | but with resistive touch.           |

+-----------------+---------------------+-------------------------------------+

CRA Git | Maintained and supported by SUSTech CRA and CCSE