Merge tag 'drm-hisilicon-next-2016-04-29' of github.com:xin3liang/linux into drm-next

Device-Tree bindings for DesignWare DSI Host Controller v1.20a driver

A DSI Host Controller resides in the middle of display controller and external

HDMI converter or panel.

Required properties:

- compatible: value should be "hisilicon,hi6220-dsi".

- reg: physical base address and length of dsi controller's registers.

- clocks: contains APB clock phandle + clock-specifier pair.

- clock-names: should be "pclk".

- ports: contains DSI controller input and output sub port.

  The input port connects to ADE output port with the reg value "0".

  The output port with the reg value "1", it could connect to panel or

  any other bridge endpoints.

  See Documentation/devicetree/bindings/graph.txt for more device graph info.

A example of HiKey board hi6220 SoC and board specific DT entry:

Example:

SoC specific:

	dsi: dsi@f4107800 {

		compatible = "hisilicon,hi6220-dsi";

		reg = <0x0 0xf4107800 0x0 0x100>;

		clocks = <&media_ctrl  HI6220_DSI_PCLK>;

		clock-names = "pclk";

		status = "disabled";

		ports {

			#address-cells = <1>;

			#size-cells = <0>;

			/* 0 for input port */

			port@0 {

				reg = <0>;

				dsi_in: endpoint {

					remote-endpoint = <&ade_out>;

				};

			};

		};

	};

Board specific:

	&dsi {

		status = "ok";

		ports {

			/* 1 for output port */

			port@1 {

				reg = <1>;

				dsi_out0: endpoint@0 {

					remote-endpoint = <&adv7533_in>;

				};

			};

		};

	};

	&i2c2 {

		...

		adv7533: adv7533@39 {

			...

			port {

				adv7533_in: endpoint {

					remote-endpoint = <&dsi_out0>;

				};

			};

		};

	};

Device-Tree bindings for hisilicon ADE display controller driver

ADE (Advanced Display Engine) is the display controller which grab image

data from memory, do composition, do post image processing, generate RGB

timing stream and transfer to DSI.

Required properties:

- compatible: value should be "hisilicon,hi6220-ade".

- reg: physical base address and length of the ADE controller's registers.

- hisilicon,noc-syscon: ADE NOC QoS syscon.

- resets: The ADE reset controller node.

- interrupt: the ldi vblank interrupt number used.

- clocks: a list of phandle + clock-specifier pairs, one for each entry

  in clock-names.

- clock-names: should contain:

  "clk_ade_core" for the ADE core clock.

  "clk_codec_jpeg" for the media NOC QoS clock, which use the same clock with

  jpeg codec.

  "clk_ade_pix" for the ADE pixel clok.

- assigned-clocks: Should contain "clk_ade_core" and "clk_codec_jpeg" clocks'

  phandle + clock-specifier pairs.

- assigned-clock-rates: clock rates, one for each entry in assigned-clocks.

  The rate of "clk_ade_core" could be "360000000" or "180000000";

  The rate of "clk_codec_jpeg" could be or less than "1440000000".

  These rate values could be configured according to performance and power

  consumption.

- port: the output port. This contains one endpoint subnode, with its

  remote-endpoint set to the phandle of the connected DSI input endpoint.

  See Documentation/devicetree/bindings/graph.txt for more device graph info.

Optional properties:

- dma-coherent: Present if dma operations are coherent.

A example of HiKey board hi6220 SoC specific DT entry:

Example:

	ade: ade@f4100000 {

		compatible = "hisilicon,hi6220-ade";

		reg = <0x0 0xf4100000 0x0 0x7800>;

		reg-names = "ade_base";

		hisilicon,noc-syscon = <&medianoc_ade>;

		resets = <&media_ctrl MEDIA_ADE>;

		interrupts = <0 115 4>; /* ldi interrupt */

		clocks = <&media_ctrl HI6220_ADE_CORE>,

			 <&media_ctrl HI6220_CODEC_JPEG>,

			 <&media_ctrl HI6220_ADE_PIX_SRC>;

		/*clock name*/

		clock-names  = "clk_ade_core",

			       "clk_codec_jpeg",

			       "clk_ade_pix";

		assigned-clocks = <&media_ctrl HI6220_ADE_CORE>,

			<&media_ctrl HI6220_CODEC_JPEG>;

		assigned-clock-rates = <360000000>, <288000000>;

		dma-coherent;

		port {

			ade_out: endpoint {

				remote-endpoint = <&dsi_in>;

			};

		};

	};

S:	Maintained

F:	drivers/gpu/drm/gma500/

DRM DRIVERS FOR HISILICON

M:	Xinliang Liu <z.liuxinliang@hisilicon.com>

R:	Xinwei Kong <kong.kongxinwei@hisilicon.com>

R:	Chen Feng <puck.chen@hisilicon.com>

L:	dri-devel@lists.freedesktop.org

T:	git git://github.com/xin3liang/linux.git

S:	Maintained

F:	drivers/gpu/drm/hisilicon/

F:	Documentation/devicetree/bindings/display/hisilicon/

DRM DRIVERS FOR NVIDIA TEGRA

M:	Thierry Reding <thierry.reding@gmail.com>

M:	Terje Bergström <tbergstrom@nvidia.com>

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

source "drivers/gpu/drm/arc/Kconfig"

source "drivers/gpu/drm/hisilicon/Kconfig"

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

obj-$(CONFIG_DRM_ETNAVIV) += etnaviv/

obj-$(CONFIG_DRM_ARCPGU)+= arc/

obj-y			+= hisilicon/