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

Commit aaba6448 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-fsl-dcu' of https://github.com/Jianwei-Wang/linux-drm-fsl-dcu into drm-next 

Merge Freescale DCU FRM driver.

* 'drm-next-fsl-dcu' of https://github.com/Jianwei-Wang/linux-drm-fsl-dcu:
  MAINTAINERS: Add Freescale DCU DRM driver maintainer
  devicetree: Add NEC to the vendor-prefix list
  drm/layerscape: Add Freescale DCU DRM driver
parents d072f465 b55a1b9c

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ mundoreader Mundo Reader S.L. 
murata	Murata Manufacturing Co., Ltd.

mxicy	Macronix International Co., Ltd.

national	National Semiconductor

nec	NEC LCD Technologies, Ltd.

neonode		Neonode Inc.

netgear	NETGEAR

netlogic	Broadcom Corporation (formerly NetLogic Microsystems)

Documentation/devicetree/bindings/video/fsl,dcu.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Device Tree bindings for Freescale DCU DRM Driver



Required properties:

- compatible:		Should be one of

	* "fsl,ls1021a-dcu".

	* "fsl,vf610-dcu".



- reg:			Address and length of the register set for dcu.

- clocks:		From common clock binding: handle to dcu clock.

- clock-names:		From common clock binding: Shall be "dcu".

- big-endian		Boolean property, LS1021A DCU registers are big-endian.

- fsl,panel:		The phandle to panel node.



Examples:

dcu: dcu@2ce0000 {

	compatible = "fsl,ls1021a-dcu";

	reg = <0x0 0x2ce0000 0x0 0x10000>;

	clocks = <&platform_clk 0>;

	clock-names = "dcu";

	big-endian;

	fsl,panel = <&panel>;

};

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -3555,6 +3555,15 @@ F: drivers/gpu/drm/exynos/ 
F:	include/drm/exynos*

F:	include/uapi/drm/exynos*



DRM DRIVERS FOR FREESCALE DCU

M:	Jianwei Wang <jianwei.wang.chn@gmail.com>

M:	Alison Wang <alison.wang@freescale.com>

L:	dri-devel@lists.freedesktop.org

S:	Supported

F:	drivers/gpu/drm/fsl-dcu/

F:	Documentation/devicetree/bindings/video/fsl,dcu.txt

F:	Documentation/devicetree/bindings/panel/nec,nl4827hc19_05b.txt



DRM DRIVERS FOR FREESCALE IMX

M:	Philipp Zabel <p.zabel@pengutronix.de>

L:	dri-devel@lists.freedesktop.org

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,8 @@ source "drivers/gpu/drm/virtio/Kconfig" 


source "drivers/gpu/drm/msm/Kconfig"



source "drivers/gpu/drm/fsl-dcu/Kconfig"



source "drivers/gpu/drm/tegra/Kconfig"



source "drivers/gpu/drm/panel/Kconfig"

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -70,3 +70,4 @@ obj-$(CONFIG_DRM_IMX) += imx/ 
obj-y			+= i2c/

obj-y			+= panel/

obj-y			+= bridge/

obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu/