Commit 4cc4d24e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (140 commits)
  MAINTAINERS: de-orphan fbdev.
  MAINTAINERS: Add file pattern for fb dt bindings.
  video: Move sm501fb devicetree binding documentation to a better place.
  fbcon: fix situation where fbcon gets deinitialised and can't reinit.
  video, sm501: add OF binding to support SM501
  video, sm501: add edid and commandline support
  video, sm501: add I/O functions for use on powerpc
  video: Fix EDID macros H_SYNC_WIDTH and H_SYNC_OFFSET
  fbcon: Bugfix soft cursor detection in Tile Blitting
  video: add missing framebuffer_release in error path
  video: metronomefb: add __devexit_p around reference to metronomefb_remove
  video: hecubafb: add __devexit_p around reference to hecubafb_remove
  drivers:video:aty:radeon_base Fix typo occationally to occasionally
  atmel_lcdfb: add fb_blank function
  atmel_lcdfb: implement inverted contrast pwm
  video: s3c-fb: return proper error if clk_get fails
  uvesafb,vesafb: create WC or WB PAT-entries
  video: ffb: fix ffb_probe error path
  radeonfb: Let hwmon driver probe the "monid" I2C bus
  fbdev: sh_mobile_lcdc: checking NULL instead of IS_ERR()
  ...
parents b81a618d 56be1416

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Andreas Herrmann <aherrman@de.ibm.com> 
Andrew Morton <akpm@osdl.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

Archit Taneja <archit@ti.com>

Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Axel Dyks <xl@xlsigned.net>
@@ -70,6 +71,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com> 
Linas Vepstas <linas@austin.ibm.com>

Mark Brown <broonie@sirena.org.uk>

Matthieu CASTET <castet.matthieu@free.fr>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <mb@bu3sch.de>

Michael Buesch <mbuesch@freenet.de>

Michel Dänzer <michel@tungstengraphics.com>
@@ -78,6 +80,7 @@ Morten Welinder <terra@gnome.org> 
Morten Welinder <welinder@anemone.rentec.com>

Morten Welinder <welinder@darter.rentec.com>

Morten Welinder <welinder@troll.com>

Mythri P K <mythripk@ti.com>

Nguyen Anh Quynh <aquynh@gmail.com>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>
@@ -98,6 +101,7 @@ S.Çağlar Onur <caglar@pardus.org.tr> 
Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Sumit Semwal <sumit.semwal@ti.com>

Tejun Heo <htejun@gmail.com>

Thomas Graf <tgraf@suug.ch>

Tony Luck <tony.luck@intel.com>

Documentation/devicetree/bindings/fb/sm501fb.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
* SM SM501



The SM SM501 is a LCD controller, with proper hardware, it can also

drive DVI monitors.



Required properties:

- compatible : should be "smi,sm501".

- reg : contain two entries:

    - First entry: System Configuration register

    - Second entry: IO space (Display Controller register)

- interrupts : SMI interrupt to the cpu should be described here.

- interrupt-parent : the phandle for the interrupt controller that

  services interrupts for this device.



Optional properties:

- mode : select a video mode:

    <xres>x<yres>[-<bpp>][@<refresh>]

- edid : verbatim EDID data block describing attached display.

  Data from the detailed timing descriptor will be used to

  program the display controller.

- little-endian: availiable on big endian systems, to

  set different foreign endian.

- big-endian: availiable on little endian systems, to

  set different foreign endian.



Example for MPC5200:

	display@1,0 {

		compatible = "smi,sm501";

		reg = <1 0x00000000 0x00800000

		       1 0x03e00000 0x00200000>;

		interrupts = <1 1 3>;

		mode = "640x480-32@60";

		edid = [edid-data];

	};

Documentation/fb/sm501.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Configuration:



You can pass the following kernel command line options to sm501 videoframebuffer:



	sm501fb.bpp=	SM501 Display driver:

			Specifiy bits-per-pixel if not specified by 'mode'



	sm501fb.mode=	SM501 Display driver:

			Specify resolution as

			"<xres>x<yres>[-<bpp>][@<refresh>]"

MAINTAINERS

+5 −3
Original line number Diff line number Diff line
@@ -2631,12 +2631,14 @@ F: drivers/net/wan/dlci.c 
F:	drivers/net/wan/sdla.c



FRAMEBUFFER LAYER

M:	Paul Mundt <lethal@linux-sh.org>

L:	linux-fbdev@vger.kernel.org

W:	http://linux-fbdev.sourceforge.net/

Q:	http://patchwork.kernel.org/project/linux-fbdev/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git

S:	Orphan

S:	Maintained

F:	Documentation/fb/

F:	Documentation/devicetree/bindings/fb/

F:	drivers/video/

F:	include/video/

F:	include/linux/fb.h
@@ -4535,14 +4537,14 @@ S: Maintained 
F:	sound/soc/omap/



OMAP FRAMEBUFFER SUPPORT

M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>

M:	Tomi Valkeinen <tomi.valkeinen@ti.com>

L:	linux-fbdev@vger.kernel.org

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/video/omap/



OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)

M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>

M:	Tomi Valkeinen <tomi.valkeinen@ti.com>

L:	linux-omap@vger.kernel.org

L:	linux-fbdev@vger.kernel.org

S:	Maintained

arch/arm/configs/omap2plus_defconfig

+11 −0
Original line number Diff line number Diff line
@@ -193,6 +193,17 @@ CONFIG_FIRMWARE_EDID=y 
CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

CONFIG_FB_OMAP_LCD_VGA=y

CONFIG_OMAP2_DSS=m

CONFIG_OMAP2_DSS_RFBI=y

CONFIG_OMAP2_DSS_SDI=y

CONFIG_OMAP2_DSS_DSI=y

CONFIG_FB_OMAP2=m

CONFIG_PANEL_GENERIC_DPI=m

CONFIG_PANEL_SHARP_LS037V7DW01=m

CONFIG_PANEL_NEC_NL8048HL11_01B=m

CONFIG_PANEL_TAAL=m

CONFIG_PANEL_TPO_TD043MTEA1=m

CONFIG_PANEL_ACX565AKM=m

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_PLATFORM=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE