Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next

Texas Instruments DRA7x Display Subsystem

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

See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic

description about OMAP Display Subsystem bindings.

DSS Core

--------

Required properties:

- compatible: "ti,dra7-dss"

- reg: address and length of the register spaces for 'dss'

- ti,hwmods: "dss_core"

- clocks: handle to fclk

- clock-names: "fck"

- syscon: phandle to control module core syscon node

Optional properties:

Some DRA7xx SoCs have one dedicated video PLL, some have two. These properties

can be used to describe the video PLLs:

- reg: address and length of the register spaces for 'pll1_clkctrl',

  'pll1', 'pll2_clkctrl', 'pll2'

- clocks: handle to video1 pll clock and video2 pll clock

- clock-names: "video1_clk" and "video2_clk"

Required nodes:

- DISPC

Optional nodes:

- DSS Submodules: HDMI

- Video port for DPI output

DPI Endpoint required properties:

- data-lines: number of lines used

DISPC

-----

Required properties:

- compatible: "ti,dra7-dispc"

- reg: address and length of the register space

- ti,hwmods: "dss_dispc"

- interrupts: the DISPC interrupt

- clocks: handle to fclk

- clock-names: "fck"

HDMI

----

Required properties:

- compatible: "ti,dra7-hdmi"

- reg: addresses and lengths of the register spaces for 'wp', 'pll', 'phy',

       'core'

- reg-names: "wp", "pll", "phy", "core"

- interrupts: the HDMI interrupt line

- ti,hwmods: "dss_hdmi"

- vdda-supply: vdda power supply

- clocks: handles to fclk and pll clock

- clock-names: "fck", "sys_clk"

Optional nodes:

- Video port for HDMI output

HDMI Endpoint optional properties:

- lanes: list of 8 pin numbers for the HDMI lanes: CLK+, CLK-, D0+, D0-,

  D1+, D1-, D2+, D2-. (default: 0,1,2,3,4,5,6,7)

OPA362 analog video amplifier

Required properties:

- compatible: "ti,opa362"

- enable-gpios: enable/disable output gpio

Required node:

- Video port 0 for opa362 input

- Video port 1 for opa362 output

Example:

tv_amp: opa362 {

	compatible = "ti,opa362";

	enable-gpios = <&gpio1 23 0>;  /* GPIO to enable video out amplifier */

	ports {

		#address-cells = <1>;

		#size-cells = <0>;

		port@0 {

			reg = <0>;

			opa_in: endpoint@0 {

				remote-endpoint = <&venc_out>;

			};

		};

		port@1 {

			reg = <1>;

			opa_out: endpoint@0 {

				remote-endpoint = <&tv_connector_in>;

			};

		};

	};

};

menu "OMAP Display Device Drivers (new device model)"

        depends on OMAP2_DSS

config DISPLAY_ENCODER_OPA362

	tristate "OPA362 external analog amplifier"

	help

	  Driver for OPA362 external analog TV amplifier controlled

	  through a GPIO.

config DISPLAY_ENCODER_TFP410

        tristate "TFP410 DPI to DVI Encoder"

	help

obj-$(CONFIG_DISPLAY_ENCODER_OPA362) += encoder-opa362.o

obj-$(CONFIG_DISPLAY_ENCODER_TFP410) += encoder-tfp410.o

obj-$(CONFIG_DISPLAY_ENCODER_TPD12S015) += encoder-tpd12s015.o

obj-$(CONFIG_DISPLAY_CONNECTOR_DVI) += connector-dvi.o

	ddata->in = in;

	ddata->connector_type = pdata->connector_type;

	ddata->invert_polarity = ddata->invert_polarity;

	ddata->invert_polarity = pdata->invert_polarity;

	dssdev = &ddata->dssdev;

	dssdev->name = pdata->name;