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

Commit 2b831888 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux 

Pull fbdev changes from Tomi Valkeinen:
 "OMAPDSS changes, including:
   - use dynanic debug prints
   - OMAP platform dependency removals
   - Creation of compat-layer, helping us to improve omapdrm
   - Misc cleanups, aiming to make omadss more in line with the upcoming
     common display framework

  Exynos DP changes for the 3.8 merge window:
   - Device Tree support for Samsung Exynos DP
   - SW Link training is cleaned up.
   - HPD interrupt is supported.

  Samsung Framebuffer changes for the 3.8 merge window:
   - The bit definitions of header file are updated.
   - Some minor typos are fixed.
   - Some minor bugs of s3c_fb_check_var() are fixed.

  FB related changes for SH Mobile, Freescale DIU

  Add support for the Solomon SSD1307 OLED Controller"

* tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
  OMAPDSS: fix TV-out issue with DSI PLL
  Revert "OMAPFB: simplify locking"
  OMAPFB: remove silly loop in fb2display()
  OMAPFB: fix error handling in omapfb_find_best_mode()
  OMAPFB: use devm_kzalloc to allocate omapfb2_device
  OMAPDSS: DISPC: remove dispc fck uses
  OMAPDSS: DISPC: get dss clock rate from dss driver
  drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
  drivers/video: add support for the Solomon SSD1307 OLED Controller
  OMAPDSS: use omapdss_compat_init() in other drivers
  OMAPDSS: export dispc functions
  OMAPDSS: export dss_feat functions
  OMAPDSS: export dss_mgr_ops functions
  OMAPDSS: separate compat files in the Makefile
  OMAPDSS: move display sysfs init to compat layer
  OMAPDSS: DPI: use dispc's check_timings
  OMAPDSS: DISPC: add dispc_ovl_check()
  OMAPDSS: move irq handling to dispc-compat
  OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
  OMAPDSS: move blocking mgr enable/disable to compat layer
  ...

Conflicts:
	arch/arm/mach-davinci/devices-da8xx.c
	arch/arm/plat-omap/common.c
	drivers/media/platform/omap/omap_vout.c
parents e81d372f e7f5c9a1

Documentation/arm/OMAP/DSS

+4 −6
Original line number Diff line number Diff line
@@ -285,7 +285,10 @@ FB0 +-- GFX ---- LCD ---- LCD 
Misc notes

----------



OMAP FB allocates the framebuffer memory using the OMAP VRAM allocator.

OMAP FB allocates the framebuffer memory using the standard dma allocator. You

can enable Contiguous Memory Allocator (CONFIG_CMA) to improve the dma

allocator, and if CMA is enabled, you use "cma=" kernel parameter to increase

the global memory area for CMA.



Using DSI DPLL to generate pixel clock it is possible produce the pixel clock

of 86.5MHz (max possible), and with that you get 1280x1024@57 output from DVI.
@@ -301,11 +304,6 @@ framebuffer parameters. 
Kernel boot arguments

---------------------



vram=<size>[,<physaddr>]

	- Amount of total VRAM to preallocate and optionally a physical start

	  memory address. For example, "10M". omapfb allocates memory for

	  framebuffers from VRAM.



omapfb.mode=<display>:<mode>[,...]

	- Default video mode for specified displays. For example,

	  "dvi:800x400MR-24@60".  See drivers/video/modedb.c.

Documentation/devicetree/bindings/video/exynos_dp.txt

0 → 100644
+80 −0
Original line number Diff line number Diff line 
The Exynos display port interface should be configured based on

the type of panel connected to it.



We use two nodes:

	-dp-controller node

	-dptx-phy node(defined inside dp-controller node)



For the DP-PHY initialization, we use the dptx-phy node.

Required properties for dptx-phy:

	-reg:

		Base address of DP PHY register.

	-samsung,enable-mask:

		The bit-mask used to enable/disable DP PHY.



For the Panel initialization, we read data from dp-controller node.

Required properties for dp-controller:

	-compatible:

		should be "samsung,exynos5-dp".

	-reg:

		physical base address of the controller and length

		of memory mapped region.

	-interrupts:

		interrupt combiner values.

	-interrupt-parent:

		phandle to Interrupt combiner node.

	-samsung,color-space:

		input video data format.

			COLOR_RGB = 0, COLOR_YCBCR422 = 1, COLOR_YCBCR444 = 2

	-samsung,dynamic-range:

		dynamic range for input video data.

			VESA = 0, CEA = 1

	-samsung,ycbcr-coeff:

		YCbCr co-efficients for input video.

			COLOR_YCBCR601 = 0, COLOR_YCBCR709 = 1

	-samsung,color-depth:

		number of bits per colour component.

			COLOR_6 = 0, COLOR_8 = 1, COLOR_10 = 2, COLOR_12 = 3

	-samsung,link-rate:

		link rate supported by the panel.

			LINK_RATE_1_62GBPS = 0x6, LINK_RATE_2_70GBPS = 0x0A

	-samsung,lane-count:

		number of lanes supported by the panel.

			LANE_COUNT1 = 1, LANE_COUNT2 = 2, LANE_COUNT4 = 4



Optional properties for dp-controller:

	-interlaced:

		interlace scan mode.

			Progressive if defined, Interlaced if not defined

	-vsync-active-high:

		VSYNC polarity configuration.

			High if defined, Low if not defined

	-hsync-active-high:

		HSYNC polarity configuration.

			High if defined, Low if not defined



Example:



SOC specific portion:

	dp-controller {

		compatible = "samsung,exynos5-dp";

		reg = <0x145b0000 0x10000>;

		interrupts = <10 3>;

		interrupt-parent = <&combiner>;



		dptx-phy {

			reg = <0x10040720>;

			samsung,enable-mask = <1>;

		};



	};



Board Specific portion:

	dp-controller {

		samsung,color-space = <0>;

		samsung,dynamic-range = <0>;

		samsung,ycbcr-coeff = <0>;

		samsung,color-depth = <1>;

		samsung,link-rate = <0x0a>;

		samsung,lane-count = <4>;

	};

Documentation/devicetree/bindings/video/ssd1307fb.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
* Solomon SSD1307 Framebuffer Driver



Required properties:

  - compatible: Should be "solomon,ssd1307fb-<bus>". The only supported bus for

    now is i2c.

  - reg: Should contain address of the controller on the I2C bus. Most likely

         0x3c or 0x3d

  - pwm: Should contain the pwm to use according to the OF device tree PWM

         specification [0]

  - reset-gpios: Should contain the GPIO used to reset the OLED display



Optional properties:

  - reset-active-low: Is the reset gpio is active on physical low?



[0]: Documentation/devicetree/bindings/pwm/pwm.txt



Examples:

ssd1307: oled@3c {

        compatible = "solomon,ssd1307fb-i2c";

        reg = <0x3c>;

        pwms = <&pwm 4 3000>;

        reset-gpios = <&gpio2 7>;

        reset-active-low;

};

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -3162,6 +3162,12 @@ F: drivers/video/ 
F:	include/video/

F:	include/linux/fb.h



FREESCALE DIU FRAMEBUFFER DRIVER

M:	Timur Tabi <timur@freescale.com>

L:	linux-fbdev@vger.kernel.org

S:	Supported

F:	drivers/video/fsl-diu-fb.*



FREESCALE DMA DRIVER

M:	Li Yang <leoli@freescale.com>

M:	Zhang Wei <zw@zh-kernel.org>

arch/arm/mach-davinci/da830.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static struct clk_lookup da830_clks[] = { 
	CLK(NULL,		"pwm2",		&pwm2_clk),

	CLK("eqep.0",		NULL,		&eqep0_clk),

	CLK("eqep.1",		NULL,		&eqep1_clk),

	CLK("da8xx_lcdc.0",	NULL,		&lcdc_clk),

	CLK("da8xx_lcdc.0",	"fck",		&lcdc_clk),

	CLK("davinci-mcasp.0",	NULL,		&mcasp0_clk),

	CLK("davinci-mcasp.1",	NULL,		&mcasp1_clk),

	CLK("davinci-mcasp.2",	NULL,		&mcasp2_clk),