Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 894ebc41 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

drm/panel: Changes for v4.11-rc1

This set contains a couple of cleanups as well as support for a few more
simple panels.

* tag 'drm/panel/for-4.11-rc1' of git://anongit.freedesktop.org/tegra/linux:
  drm/panel: simple: Specify bus width and flags for EDT displays
  drm/panel: simple: Add Netron DY E231732
  of: Add vendor prefix for Netron DY
  drm/panel: simple: Add support for Tianma TM070JDHG30
  of: Add vendor prefix for Tianma Micro-electronics
  drm/panel: simple: Add support BOE NV101WXMN51
  dt-bindings: display: Add BOE NV101WXMN51 panel binding
  drm/panel: Constify device node argument to of_drm_find_panel()
parents 84f7174b eaeebffa

Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
BOE OPTOELECTRONICS TECHNOLOGY 10.1" WXGA TFT LCD panel



Required properties:

- compatible: should be "boe,nv101wxmn51"



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

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Netron-DY E231732 7.0" WSVGA TFT LCD panel



Required properties:

- compatible: should be "netron-dy,e231732"



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

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Tianma Micro-electronics TM070JDHG30 7.0" WXGA TFT LCD panel



Required properties:

- compatible: should be "tianma,tm070jdhg30"



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

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ nec NEC LCD Technologies, Ltd. 
neonode		Neonode Inc.

netgear	NETGEAR

netlogic	Broadcom Corporation (formerly NetLogic Microsystems)

netron-dy	Netron DY

netxeon		Shenzhen Netxeon Technology CO., LTD

nexbox	Nexbox

newhaven	Newhaven Display International
@@ -297,6 +298,7 @@ technologic Technologic Systems 
terasic	Terasic Inc.

thine	THine Electronics, Inc.

ti	Texas Instruments

tianma	Tianma Micro-electronics Co., Ltd.

tlm	Trusted Logic Mobility

topeet  Topeet

toradex	Toradex AG

drivers/gpu/drm/drm_panel.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ EXPORT_SYMBOL(drm_panel_detach); 
 * Return: A pointer to the panel registered for the specified device tree

 * node or NULL if no panel matching the device tree node can be found.

 */

struct drm_panel *of_drm_find_panel(struct device_node *np)

struct drm_panel *of_drm_find_panel(const struct device_node *np)

{

	struct drm_panel *panel;