Commit 6213640f authored by Dave Airlie's avatar Dave Airlie
Browse files

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

drm-misc-next for 4.16:

Cross-subsystem Changes:

- some dt-binding changes for Ilitek and sun4i devices

Core Changes:

- panel_orientation_quirks: fix tainted kernel

Driver Changes:

- panel changes
- A83T and LVDS support to sun4i

* tag 'drm-misc-next-2018-01-08' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/panel: lvds: Add support for the power-supply property
  dt-bindings: panel: lvds: Document power-supply property
  drm/sun4i: Add A83T support
  drm/sun4i: Add LVDS support
  drm/sun4i: Create minimal multipliers and dividers
  drm/sun4i: Force the mixer rate at 150MHz
  dt-bindings: display: sun4i-drm: Add A83T pipeline
  dt-bindings: display: sun4i-drm: Add LVDS properties
  drm/tinydrm: add driver for ST7735R panels
  dt-bindings: Add binding for Sitronix ST7735R display panels
  dt-bindings: add jianda vendor prefix
  drm/tinydrm: Update ILI9225 compatible string
  dt-bindings: update compatible string for ILI9225
  dt-bindings: Add "vot" vendor prefix
  drm: fix tainted kernel caused by drm_panel_orientation_quirks.c
  drm/panel: Add Ilitek ILI9322 driver
  drm/panel: Add DT bindings for Ilitek ILI9322
parents bd3c0094 a1c55bcc

Documentation/devicetree/bindings/display/ilitek,ili9225.txt

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ This binding is for display panels using an Ilitek ILI9225 controller in SPI 
mode.



Required properties:

- compatible:	"ilitek,ili9225-2.2in-176x220"

- compatible:	"vot,v220hf01a-t", "ilitek,ili9225"

- rs-gpios:	Register select signal

- reset-gpios:	Reset pin
@@ -16,7 +16,7 @@ Optional properties: 


Example:

	display@0{

		compatible = "ilitek,ili9225-2.2in-176x220";

		compatible = "vot,v220hf01a-t", "ilitek,ili9225";

		reg = <0>;

		spi-max-frequency = <12000000>;

		rs-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;

Documentation/devicetree/bindings/display/panel/ilitek,ili9322.txt

0 → 100644
+49 −0
Original line number Diff line number Diff line 
Ilitek ILI9322 TFT panel driver with SPI control bus



This is a driver for 320x240 TFT panels, accepting a variety of input

streams that get adapted and scaled to the panel. The panel output has

960 TFT source driver pins and 240 TFT gate driver pins, VCOM, VCOML and

VCOMH outputs.



Required properties:

  - compatible: "dlink,dir-685-panel", "ilitek,ili9322"

    (full system-specific compatible is always required to look up configuration)

  - reg: address of the panel on the SPI bus



Optional properties:

  - vcc-supply: core voltage supply, see regulator/regulator.txt

  - iovcc-supply: voltage supply for the interface input/output signals,

    see regulator/regulator.txt

  - vci-supply: voltage supply for analog parts, see regulator/regulator.txt

  - reset-gpios: a GPIO spec for the reset pin, see gpio/gpio.txt



  The following optional properties only apply to RGB and YUV input modes and

  can be omitted for BT.656 input modes:



  - pixelclk-active: see display/panel/display-timing.txt

  - de-active: see display/panel/display-timing.txt

  - hsync-active: see display/panel/display-timing.txt

  - vsync-active: see display/panel/display-timing.txt



The panel must obey the rules for a SPI slave device as specified in

spi/spi-bus.txt



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

'endpoint' node, according to the bindings defined in

media/video-interfaces.txt. This node should describe panel's video bus.



Example:



panel: display@0 {

	compatible = "dlink,dir-685-panel", "ilitek,ili9322";

	reg = <0>;

	vcc-supply = <&vdisp>;

	iovcc-supply = <&vdisp>;

	vci-supply = <&vdisp>;



	port {

		panel_in: endpoint {

			remote-endpoint = <&display_out>;

		};

	};

};

Documentation/devicetree/bindings/display/panel/panel-common.txt

+10 −0
Original line number Diff line number Diff line
@@ -78,6 +78,16 @@ used for panels that implement compatible control signals. 
  while active. Active high reset signals can be supported by inverting the

  GPIO specifier polarity flag.



Power

-----



- power-supply: display panels require power to be supplied. While several

  panels need more than one power supply with panel-specific constraints

  governing the order and timings of the power supplies, in many cases a single

  power supply is sufficient, either because the panel has a single power rail,

  or because all its power rails can be driven by the same supply. In that case

  the power-supply property specifies the supply powering the panel as a phandle

  to a regulator.



Backlight

---------

Documentation/devicetree/bindings/display/panel/panel-lvds.txt

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Optional properties: 
- label: See panel-common.txt.

- gpios: See panel-common.txt.

- backlight: See panel-common.txt.

- power-supply: See panel-common.txt.

- data-mirror: If set, reverse the bit order described in the data mappings

  below on all data lanes, transmitting bits for slots 6 to 0 instead of

  0 to 6.

Documentation/devicetree/bindings/display/panel/simple-panel.txt

+1 −1
Original line number Diff line number Diff line 
Simple display panel



Required properties:

- power-supply: regulator to provide the supply voltage

- power-supply: See panel-common.txt



Optional properties:

- ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing

CRA Git | Maintained and supported by SUSTech CRA and CCSE