Commit ad15f74a authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'tags/drm-for-v4.12' into drm-intel-next-queued



Backmerge the main drm-next pull to sync up.

Chris also pointed out that

commit ade0b0c9
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Sat Apr 22 09:15:37 2017 +0100

    drm/i915: Confirm the request is still active before adding it to the await

is double-applied in the git merge, so make sure we get this right.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 8a2d6ae1 8b03d1ed
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ Linas Vepstas <linas@austin.ibm.com>
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
Mark Brown <broonie@sirena.org.uk>
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
Matthieu CASTET <castet.matthieu@free.fr>
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
+26 −0
Original line number Diff line number Diff line
Ampire AM-480272H3TMQW-T01H 4.3" WQVGA TFT LCD panel

This binding is compatible with the simple-panel binding, which is specified
in simple-panel.txt in this directory.

Required properties:
- compatible: should be "ampire,am-480272h3tmqw-t01h"

Optional properties:
- power-supply: regulator to provide the supply voltage
- enable-gpios: GPIO pin to enable or disable the panel
- backlight: phandle of the backlight device attached to the panel

Optional nodes:
- Video port for RGB input.

Example:
	panel_rgb: panel-rgb {
		compatible = "ampire,am-480272h3tmqw-t01h";
		enable-gpios = <&gpioa 8 1>;
		port {
			panel_in_rgb: endpoint {
				remote-endpoint = <&controller_out_rgb>;
			};
		};
	};
+28 −0
Original line number Diff line number Diff line
Samsung S6E3HA2 5.7" 1440x2560 AMOLED panel

Required properties:
  - compatible: "samsung,s6e3ha2"
  - reg: the virtual channel number of a DSI peripheral
  - vdd3-supply: I/O voltage supply
  - vci-supply: voltage supply for analog circuits
  - reset-gpios: a GPIO spec for the reset pin (active low)
  - enable-gpios: a GPIO spec for the panel enable pin (active high)

Optional properties:
  - te-gpios: a GPIO spec for the tearing effect synchronization signal
    gpio pin (active high)

Example:
&dsi {
	...

	panel@0 {
		compatible = "samsung,s6e3ha2";
		reg = <0>;
		vdd3-supply = <&ldo27_reg>;
		vci-supply = <&ldo28_reg>;
		reset-gpios = <&gpg0 0 GPIO_ACTIVE_LOW>;
		enable-gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>;
		te-gpios = <&gpf1 3 GPIO_ACTIVE_HIGH>;
	};
};
+37 −0
Original line number Diff line number Diff line
Sitronix ST7789V RGB panel with SPI control bus

Required properties:
  - compatible: "sitronix,st7789v"
  - reg: Chip select of the panel on the SPI bus
  - reset-gpios: a GPIO phandle for the reset pin
  - power-supply: phandle of the regulator that provides the supply voltage

Optional properties:
  - backlight: phandle to the backlight used

The generic bindings for the SPI slaves documented in [1] also applies

The device node can contain one 'port' child node with one child
'endpoint' node, according to the bindings defined in [2]. This
node should describe panel's video bus.

[1]: Documentation/devicetree/bindings/spi/spi-bus.txt
[2]: Documentation/devicetree/bindings/graph.txt

Example:

panel@0 {
	compatible = "sitronix,st7789v";
	reg = <0>;
	reset-gpios = <&pio 6 11 GPIO_ACTIVE_LOW>;
	backlight = <&pwm_bl>;
	spi-max-frequency = <100000>;
	spi-cpol;
	spi-cpha;

	port {
		panel_input: endpoint {
			remote-endpoint = <&tcon0_out_panel>;
		};
	};
};
+48 −0
Original line number Diff line number Diff line
Winstar Display Corporation 3.5" QVGA (320x240) TFT LCD panel

Required properties:
- compatible: should be "winstar,wf35ltiacd"
- power-supply: regulator to provide the VCC supply voltage (3.3 volts)

This binding is compatible with the simple-panel binding, which is specified
in simple-panel.txt in this directory.

Example:
	backlight: backlight {
		compatible = "pwm-backlight";
		pwms = <&hlcdc_pwm 0 50000 PWM_POLARITY_INVERTED>;
		brightness-levels = <0 31 63 95 127 159 191 223 255>;
		default-brightness-level = <191>;
		power-supply = <&bl_reg>;
	};

	bl_reg: backlight_regulator {
		compatible = "regulator-fixed";
		regulator-name = "backlight-power-supply";
		regulator-min-microvolt = <5000000>;
		regulator-max-microvolt = <5000000>;
	};

	panel: panel {
		compatible = "winstar,wf35ltiacd", "simple-panel";
		backlight = <&backlight>;
		power-supply = <&panel_reg>;
		#address-cells = <1>;
		#size-cells = <0>;

		port {
			#address-cells = <1>;
			#size-cells = <0>;

			panel_input: endpoint {
				remote-endpoint = <&hlcdc_panel_output>;
			};
		};
	};

	panel_reg: panel_regulator {
		compatible = "regulator-fixed";
		regulator-name = "panel-power-supply";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
	};
Loading