Commit 7b83741b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm/panel/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next 

drm/panel: Changes for v3.20-rc1

This contains the long-awaited drm_bridge series that makes Chromebooks
work for people. I had thought this would've been perfect by now, but
then I go and build test it and the first thing it does is yell about a
recursive dependency. I fixed that up because I was feeling bad for not
getting around to look at this earlier.

Biseds that there is new support for two more panels, a couple of fixup
patches to the Sharp LQ101R1SX01 dual-channel DSI panel driver and a
potential NULL pointer dereference fix.

* tag 'drm/panel/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux: (23 commits)
  drm/bridge: dw-hdmi: Adapt to bridge API change
  drm/sti: fixup for bridge interface
  drm/bridge: dw-hdmi: Fix return error path
  drm: Check the right variable when setting formats
  Documentation: bridge: Add documentation for ps8622 DT properties
  Documentation: devicetree: Add vendor prefix for parade
  Documentation: drm: bridge: move to video/bridge
  drm/bridge: ptn3460: use gpiod interface
  drm/bridge: ptn3460: probe connector at the end of bridge attach
  drm/bridge: ptn3460: support drm_panel
  drm/exynos: dp: support drm_bridge
  drm/bridge: ptn3460: Convert to I2C driver model
  drm/bridge: make bridge registration independent of drm flow
  drm/bridge: do not pass drm_bridge_funcs to drm_bridge_init
  drm/bridge: ptn3460: Few trivial cleanups
  drm/panel: simple: Add AVIC TM070DDH03 panel support
  of: Add vendor prefix for Shanghai AVIC Optoelectronics Co., Ltd.
  drm/panel: sharp: lq101r1sx01: Remove unneeded include
  drm/panel: sharp: lq101r1sx01: Respect power timings
  drm/panel: sharp: lq101r1sx01: Add delay after display on
  ...
parents 21773f16 b5217bf4

Documentation/devicetree/bindings/panel/avic,tm070ddh03.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Shanghai AVIC Optoelectronics 7" 1024x600 color TFT-LCD panel



Required properties:

- compatible: should be "avic,tm070ddh03"



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

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/panel/giantplus,gpg482739qs5.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
GiantPlus GPG48273QS5 4.3" (480x272) WQVGA TFT LCD panel



Required properties:

- compatible: should be "giantplus,gpg48273qs5"



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

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/vendor-prefixes.txt

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ armadeus ARMadeus Systems SARL 
atmel	Atmel Corporation

auo	AU Optronics Corporation

avago	Avago Technologies

avic	Shanghai AVIC Optoelectronics Co., Ltd.

bosch	Bosch Sensortec GmbH

brcm	Broadcom Corporation

buffalo	Buffalo, Inc.
@@ -62,6 +63,7 @@ fsl Freescale Semiconductor 
GEFanuc	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

geniatech	Geniatech, Inc.

giantplus	Giantplus Technology Co., Ltd.

globalscale	Globalscale Technologies, Inc.

gmt	Global Mixed-mode Technology, Inc.

google	Google, Inc.
@@ -119,6 +121,7 @@ nxp NXP Semiconductors 
onnn	ON Semiconductor Corp.

opencores	OpenCores.org

panasonic	Panasonic Corporation

parade	Parade Technologies Inc.

pericom	Pericom Technology Inc.

phytec	PHYTEC Messtechnik GmbH

picochip	Picochip Ltd

Documentation/devicetree/bindings/video/bridge/ps8622.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
ps8622-bridge bindings



Required properties:

	- compatible: "parade,ps8622" or "parade,ps8625"

	- reg: first i2c address of the bridge

	- sleep-gpios: OF device-tree gpio specification for PD_ pin.

	- reset-gpios: OF device-tree gpio specification for RST_ pin.



Optional properties:

	- lane-count: number of DP lanes to use

	- use-external-pwm: backlight will be controlled by an external PWM

	- video interfaces: Device node can contain video interface port

			    nodes for panel according to [1].



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



Example:

	lvds-bridge@48 {

		compatible = "parade,ps8622";

		reg = <0x48>;

		sleep-gpios = <&gpc3 6 1 0 0>;

		reset-gpios = <&gpc3 1 1 0 0>;

		lane-count = <1>;

		ports {

			port@0 {

				bridge_out: endpoint {

					remote-endpoint = <&panel_in>;

				};

			};

		};

	};

Documentation/devicetree/bindings/drm/bridge/ptn3460.txt→Documentation/devicetree/bindings/video/bridge/ptn3460.txt

+14 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ ptn3460 bridge bindings 
Required properties:

	- compatible: "nxp,ptn3460"

	- reg: i2c address of the bridge

	- powerdown-gpio: OF device-tree gpio specification

	- reset-gpio: OF device-tree gpio specification

	- powerdown-gpio: OF device-tree gpio specification  for PD_N pin.

	- reset-gpio: OF device-tree gpio specification for RST_N pin.

	- edid-emulation: The EDID emulation entry to use

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

		| Value | Resolution | Description      |
@@ -17,6 +17,11 @@ Required properties: 
		|   6   |  1600x900  | ChiMei M215HGE   |

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



	- video interfaces: Device node can contain video interface port

			    nodes for panel according to [1].



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



Example:

	lvds-bridge@20 {

		compatible = "nxp,ptn3460";
@@ -24,4 +29,11 @@ Example: 
		powerdown-gpio = <&gpy2 5 1 0 0>;

		reset-gpio = <&gpx1 5 1 0 0>;

		edid-emulation = <5>;

		ports {

			port@0 {

				bridge_out: endpoint {

					remote-endpoint = <&panel_in>;

				};

			};

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE