Merge tag 'fbdev-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

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>;

			};

		};

	};

};

config DUMMY_CONSOLE_COLUMNS

        int "Initial number of console screen columns"

        depends on PARISC && DUMMY_CONSOLE

        default "160"

        depends on DUMMY_CONSOLE && !ARM

        default 160 if PARISC

        default 80

        help

          The default value is 160, which should fit a 1280x1024 monitor.

          On PA-RISC, the default value is 160, which should fit a 1280x1024

          monitor.

          Select 80 if you use a 640x480 resolution by default.

config DUMMY_CONSOLE_ROWS

        int "Initial number of console screen rows"

        depends on PARISC && DUMMY_CONSOLE

        default "64"

        depends on DUMMY_CONSOLE && !ARM

        default 64 if PARISC

        default 25

        help

          The default value is 64, which should fit a 1280x1024 monitor.

          On PA-RISC, the default value is 64, which should fit a 1280x1024

          monitor.

          Select 25 if you use a 640x480 resolution by default.

config FRAMEBUFFER_CONSOLE

#if defined(__arm__)

#define DUMMY_COLUMNS	screen_info.orig_video_cols

#define DUMMY_ROWS	screen_info.orig_video_lines

#elif defined(__hppa__)

#else

/* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */

#define DUMMY_COLUMNS	CONFIG_DUMMY_CONSOLE_COLUMNS

#define DUMMY_ROWS	CONFIG_DUMMY_CONSOLE_ROWS

#else

#define DUMMY_COLUMNS	80

#define DUMMY_ROWS	25

#endif

static const char *dummycon_startup(void)

static int fbcon_set_origin(struct vc_data *);

#define CURSOR_DRAW_DELAY		(1)

static int vbl_cursor_cnt;

static int fbcon_cursor_noblink;

#define divides(a, b)	((!(a) || (b)%(a)) ? 0 : 1)

	ops->cursor(vc, info, mode, y, get_color(vc, info, c, 1),

		    get_color(vc, info, c, 0));

	vbl_cursor_cnt = CURSOR_DRAW_DELAY;

}

static int scrollback_phys_max = 0;