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

Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de/git/lst/linux into drm-next 

here is the pull request for the etnaviv DRM driver. It includes the DT bindings
and the driver itself, platform devicetree changes will be merged through the
respective SoC trees. Otherwise it's just a squashed version of the V2 patches
that have been on the list for a while.

* 'drm-etnaviv-next' of git://git.pengutronix.de/git/lst/linux:
  MAINTAINERS: add maintainer and reviewers for the etnaviv DRM driver
  drm/etnaviv: add initial etnaviv DRM driver
  drm/etnaviv: add devicetree bindings
  devicetree: add vendor prefix for Vivante Corporation
parents 45ad5ccf 8bb0bce9

Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt

0 → 100644
+54 −0
Original line number Diff line number Diff line 
Etnaviv DRM master device

=========================



The Etnaviv DRM master device is a virtual device needed to list all

Vivante GPU cores that comprise the GPU subsystem.



Required properties:

- compatible: Should be one of

    "fsl,imx-gpu-subsystem"

    "marvell,dove-gpu-subsystem"

- cores: Should contain a list of phandles pointing to Vivante GPU devices



example:



gpu-subsystem {

	compatible = "fsl,imx-gpu-subsystem";

	cores = <&gpu_2d>, <&gpu_3d>;

};





Vivante GPU core devices

========================



Required properties:

- compatible: Should be "vivante,gc"

  A more specific compatible is not needed, as the cores contain chip

  identification registers at fixed locations, which provide all the

  necessary information to the driver.

- reg: should be register base and length as documented in the

  datasheet

- interrupts: Should contain the cores interrupt line

- clocks: should contain one clock for entry in clock-names

  see Documentation/devicetree/bindings/clock/clock-bindings.txt

- clock-names:

   - "bus":    AXI/register clock

   - "core":   GPU core clock

   - "shader": Shader clock (only required if GPU has feature PIPE_3D)



Optional properties:

- power-domains: a power domain consumer specifier according to

  Documentation/devicetree/bindings/power/power_domain.txt



example:



gpu_3d: gpu@00130000 {

	compatible = "vivante,gc";

	reg = <0x00130000 0x4000>;

	interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&clks IMX6QDL_CLK_GPU3D_AXI>,

	         <&clks IMX6QDL_CLK_GPU3D_CORE>,

	         <&clks IMX6QDL_CLK_GPU3D_SHADER>;

	clock-names = "bus", "core", "shader";

	power-domains = <&gpc 1>;

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ v3 V3 Semiconductor 
variscite	Variscite Ltd.

via	VIA Technologies, Inc.

virtio	Virtual I/O Device Specification, developed by the OASIS consortium

vivante	Vivante Corporation

voipac	Voipac Technologies s.r.o.

wexler	Wexler

winbond Winbond Electronics corp.

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -3743,6 +3743,15 @@ S: Maintained 
F:	drivers/gpu/drm/sti

F:	Documentation/devicetree/bindings/display/st,stih4xx.txt



DRM DRIVERS FOR VIVANTE GPU IP

M:	Lucas Stach <l.stach@pengutronix.de>

R:	Russell King <linux+etnaviv@arm.linux.org.uk>

R:	Christian Gmeiner <christian.gmeiner@gmail.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained

F:	drivers/gpu/drm/etnaviv

F:	Documentation/devicetree/bindings/display/etnaviv



DSBR100 USB FM RADIO DRIVER

M:	Alexey Klimov <klimov.linux@gmail.com>

L:	linux-media@vger.kernel.org

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -266,3 +266,5 @@ source "drivers/gpu/drm/amd/amdkfd/Kconfig" 
source "drivers/gpu/drm/imx/Kconfig"



source "drivers/gpu/drm/vc4/Kconfig"



source "drivers/gpu/drm/etnaviv/Kconfig"

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -75,3 +75,4 @@ obj-y += i2c/ 
obj-y			+= panel/

obj-y			+= bridge/

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

obj-$(CONFIG_DRM_ETNAVIV) += etnaviv/

CRA Git | Maintained and supported by SUSTech CRA and CCSE