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

Commit 8127b39e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev updates from Tomi Valkeinen:

 - use vm_iomap_memory() in various fb drivers to map the fb memory to
   userspace

 - Cleanups for the videomode and display_timing features

 - Updates to vt8500, wm8505 and auo-k190x fb drivers

* tag 'fbdev-for-3.10' of git://gitorious.org/linux-omap-dss2/linux: (36 commits)
  fbdev: fix check for fb_mmap's mmio availability
  fbdev: improve fb_mmap bounds checks
  fbdev/ps3fb: use vm_iomap_memory()
  fbdev/sgivwfb: use vm_iomap_memory()
  fbdev/vermillion: use vm_iomap_memory()
  fbdev/sa1100fb: use vm_iomap_memory()
  fbdev/fb-puv3: use vm_iomap_memory()
  fbdev/controlfb: use vm_iomap_memory()
  fbdev/omapfb: use vm_iomap_memory()
  video: vt8500: fix Kconfig for videomode
  video/s3c: move platform_data out of arch/arm
  video/exynos: remove unnecessary header inclusions
  drivers/video: fsl-diu-fb: add hardware cursor support
  drivers: video: use module_platform_driver_probe()
  ARM: OMAP: remove "config FB_OMAP_CONSISTENT_DMA_SIZE"
  video: wm8505fb: Convert to devm_ioremap_resource()
  AUO-K190x: Add resolutions for portrait displays
  AUO-K190x: add framebuffer rotation support
  AUO-K190x: add a 16bit truecolor mode
  AUO-K190x: make color handling more flexible
  ...
parents 96a3e8af 9bf9d47a

Documentation/devicetree/bindings/video/via,vt8500-fb.txt

+11 −37
Original line number Diff line number Diff line
@@ -5,58 +5,32 @@ Required properties: 
- compatible : "via,vt8500-fb"

- reg : Should contain 1 register ranges(address and length)

- interrupts : framebuffer controller interrupt

- display: a phandle pointing to the display node

- bits-per-pixel : bit depth of framebuffer (16 or 32)



Required nodes:

- display: a display node is required to initialize the lcd panel

	This should be in the board dts.

- default-mode: a videomode within the display with timing parameters

	as specified below.

Required subnodes:

- display-timings: see display-timing.txt for information



Example:



	fb@d800e400 {

	fb@d8050800 {

		compatible = "via,vt8500-fb";

		reg = <0xd800e400 0x400>;

		interrupts = <12>;

		display = <&display>;

		default-mode = <&mode0>;

	};



VIA VT8500 Display

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

Required properties (as per of_videomode_helper):



 - hactive, vactive: Display resolution

 - hfront-porch, hback-porch, hsync-len: Horizontal Display timing parameters

   in pixels

   vfront-porch, vback-porch, vsync-len: Vertical display timing parameters in

   lines

 - clock: displayclock in Hz

 - bpp: lcd panel bit-depth.

	<16> for RGB565, <32> for RGB888



Optional properties (as per of_videomode_helper):

 - width-mm, height-mm: Display dimensions in mm

 - hsync-active-high (bool): Hsync pulse is active high

 - vsync-active-high (bool): Vsync pulse is active high

 - interlaced (bool): This is an interlaced mode

 - doublescan (bool): This is a doublescan mode

		bits-per-pixel = <16>;



Example:

	display: display@0 {

		modes {

			mode0: mode@0 {

		display-timings {

			native-mode = <&timing0>;

			timing0: 800x480 {

				clock-frequency = <0>; /* unused but required */

				hactive = <800>;

				vactive = <480>;

				hback-porch = <88>;

				hfront-porch = <40>;

				hback-porch = <88>;

				hsync-len = <0>;

				vback-porch = <32>;

				vfront-porch = <11>;

				vsync-len = <1>;

				clock = <0>;	/* unused but required */

				bpp = <16>;	/* non-standard but required */

			};

		};

	};

Documentation/devicetree/bindings/video/wm,wm8505-fb.txt

+21 −11
Original line number Diff line number Diff line
@@ -4,20 +4,30 @@ Wondermedia WM8505 Framebuffer 
Required properties:

- compatible : "wm,wm8505-fb"

- reg : Should contain 1 register ranges(address and length)

- via,display: a phandle pointing to the display node

- bits-per-pixel : bit depth of framebuffer (16 or 32)



Required nodes:

- display: a display node is required to initialize the lcd panel

	This should be in the board dts. See definition in

	Documentation/devicetree/bindings/video/via,vt8500-fb.txt

- default-mode: a videomode node as specified in

	Documentation/devicetree/bindings/video/via,vt8500-fb.txt

Required subnodes:

- display-timings: see display-timing.txt for information



Example:



	fb@d8050800 {

	fb@d8051700 {

		compatible = "wm,wm8505-fb";

		reg = <0xd8050800 0x200>;

		display = <&display>;

		default-mode = <&mode0>;

		reg = <0xd8051700 0x200>;

		bits-per-pixel = <16>;



		display-timings {

			native-mode = <&timing0>;

			timing0: 800x480 {

				clock-frequency = <0>; /* unused but required */

				hactive = <800>;

				vactive = <480>;

				hfront-porch = <40>;

				hback-porch = <88>;

				hsync-len = <0>;

				vback-porch = <32>;

				vfront-porch = <11>;

				vsync-len = <1>;

			};

		};

	};

arch/arm/boot/dts/vt8500-bv07.dts

+15 −19
Original line number Diff line number Diff line
@@ -11,26 +11,22 @@ 


/ {

	model = "Benign BV07 Netbook";

};



	/*

	 * Display node is based on Sascha Hauer's patch on dri-devel.

	 * Added a bpp property to calculate the size of the framebuffer

	 * until the binding is formalized.

	 */

	display: display@0 {

		modes {

			mode0: mode@0 {

&fb {

	bits-per-pixel = <16>;

	display-timings {

		native-mode = <&timing0>;

		timing0: 800x480 {

			clock-frequency = <0>; /* unused but required */

			hactive = <800>;

			vactive = <480>;

				hback-porch = <88>;

			hfront-porch = <40>;

			hback-porch = <88>;

			hsync-len = <0>;

			vback-porch = <32>;

			vfront-porch = <11>;

			vsync-len = <1>;

				clock = <0>;	/* unused but required */

				bpp = <16>;	/* non-standard but required */

			};

		};

	};

};

arch/arm/boot/dts/vt8500.dtsi

+1 −3
Original line number Diff line number Diff line
@@ -98,12 +98,10 @@ 
			interrupts = <43>;

		};



		fb@d800e400 {

		fb: fb@d8050800 {

			compatible = "via,vt8500-fb";

			reg = <0xd800e400 0x400>;

			interrupts = <12>;

			display = <&display>;

			default-mode = <&mode0>;

		};



		ge_rops@d8050400 {

arch/arm/boot/dts/wm8505-ref.dts

+15 −19
Original line number Diff line number Diff line
@@ -11,26 +11,22 @@ 


/ {

	model = "Wondermedia WM8505 Netbook";

};



	/*

	 * Display node is based on Sascha Hauer's patch on dri-devel.

	 * Added a bpp property to calculate the size of the framebuffer

	 * until the binding is formalized.

	 */

	display: display@0 {

		modes {

			mode0: mode@0 {

&fb {

	bits-per-pixel = <32>;

	display-timings {

		native-mode = <&timing0>;

		timing0: 800x480 {

			clock-frequency = <0>; /* unused but required */

			hactive = <800>;

			vactive = <480>;

				hback-porch = <88>;

			hfront-porch = <40>;

			hback-porch = <88>;

			hsync-len = <0>;

			vback-porch = <32>;

			vfront-porch = <11>;

			vsync-len = <1>;

				clock = <0>;	/* unused but required */

				bpp = <32>;	/* non-standard but required */

			};

		};

	};

};