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

Commit cf2585a4 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

fbdev: Merge fbdev topic branches

Merge branches '3.10/auo-k190x', '3.10/misc', '3.10/videomode' and '3.10/vt8500' into for-next
Loading
Loading
Loading
Loading
+11 −37
Original line number Original line Diff line number Diff line
@@ -5,58 +5,32 @@ Required properties:
- compatible : "via,vt8500-fb"
- compatible : "via,vt8500-fb"
- reg : Should contain 1 register ranges(address and length)
- reg : Should contain 1 register ranges(address and length)
- interrupts : framebuffer controller interrupt
- interrupts : framebuffer controller interrupt
- display: a phandle pointing to the display node
- bits-per-pixel : bit depth of framebuffer (16 or 32)


Required nodes:
Required subnodes:
- display: a display node is required to initialize the lcd panel
- display-timings: see display-timing.txt for information
	This should be in the board dts.
- default-mode: a videomode within the display with timing parameters
	as specified below.


Example:
Example:


	fb@d800e400 {
	fb@d8050800 {
		compatible = "via,vt8500-fb";
		compatible = "via,vt8500-fb";
		reg = <0xd800e400 0x400>;
		reg = <0xd800e400 0x400>;
		interrupts = <12>;
		interrupts = <12>;
		display = <&display>;
		bits-per-pixel = <16>;
		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


Example:
		display-timings {
	display: display@0 {
			native-mode = <&timing0>;
		modes {
			timing0: 800x480 {
			mode0: mode@0 {
				clock-frequency = <0>; /* unused but required */
				hactive = <800>;
				hactive = <800>;
				vactive = <480>;
				vactive = <480>;
				hback-porch = <88>;
				hfront-porch = <40>;
				hfront-porch = <40>;
				hback-porch = <88>;
				hsync-len = <0>;
				hsync-len = <0>;
				vback-porch = <32>;
				vback-porch = <32>;
				vfront-porch = <11>;
				vfront-porch = <11>;
				vsync-len = <1>;
				vsync-len = <1>;
				clock = <0>;	/* unused but required */
				bpp = <16>;	/* non-standard but required */
			};
			};
		};
		};
	};
	};
+21 −11
Original line number Original line Diff line number Diff line
@@ -4,20 +4,30 @@ Wondermedia WM8505 Framebuffer
Required properties:
Required properties:
- compatible : "wm,wm8505-fb"
- compatible : "wm,wm8505-fb"
- reg : Should contain 1 register ranges(address and length)
- 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:
Required subnodes:
- display: a display node is required to initialize the lcd panel
- display-timings: see display-timing.txt for information
	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


Example:
Example:


	fb@d8050800 {
	fb@d8051700 {
		compatible = "wm,wm8505-fb";
		compatible = "wm,wm8505-fb";
		reg = <0xd8050800 0x200>;
		reg = <0xd8051700 0x200>;
		display = <&display>;
		bits-per-pixel = <16>;
		default-mode = <&mode0>;

		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>;
			};
		};
	};
	};
+15 −19
Original line number Original line Diff line number Diff line
@@ -11,26 +11,22 @@


/ {
/ {
	model = "Benign BV07 Netbook";
	model = "Benign BV07 Netbook";
};


	/*
&fb {
	 * Display node is based on Sascha Hauer's patch on dri-devel.
	bits-per-pixel = <16>;
	 * Added a bpp property to calculate the size of the framebuffer
	display-timings {
	 * until the binding is formalized.
		native-mode = <&timing0>;
	 */
		timing0: 800x480 {
	display: display@0 {
			clock-frequency = <0>; /* unused but required */
		modes {
			mode0: mode@0 {
			hactive = <800>;
			hactive = <800>;
			vactive = <480>;
			vactive = <480>;
				hback-porch = <88>;
			hfront-porch = <40>;
			hfront-porch = <40>;
			hback-porch = <88>;
			hsync-len = <0>;
			hsync-len = <0>;
			vback-porch = <32>;
			vback-porch = <32>;
			vfront-porch = <11>;
			vfront-porch = <11>;
			vsync-len = <1>;
			vsync-len = <1>;
				clock = <0>;	/* unused but required */
				bpp = <16>;	/* non-standard but required */
			};
		};
		};
	};
	};
};
};
+1 −3
Original line number Original line Diff line number Diff line
@@ -98,12 +98,10 @@
			interrupts = <43>;
			interrupts = <43>;
		};
		};


		fb@d800e400 {
		fb: fb@d8050800 {
			compatible = "via,vt8500-fb";
			compatible = "via,vt8500-fb";
			reg = <0xd800e400 0x400>;
			reg = <0xd800e400 0x400>;
			interrupts = <12>;
			interrupts = <12>;
			display = <&display>;
			default-mode = <&mode0>;
		};
		};


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


/ {
/ {
	model = "Wondermedia WM8505 Netbook";
	model = "Wondermedia WM8505 Netbook";
};


	/*
&fb {
	 * Display node is based on Sascha Hauer's patch on dri-devel.
	bits-per-pixel = <32>;
	 * Added a bpp property to calculate the size of the framebuffer
	display-timings {
	 * until the binding is formalized.
		native-mode = <&timing0>;
	 */
		timing0: 800x480 {
	display: display@0 {
			clock-frequency = <0>; /* unused but required */
		modes {
			mode0: mode@0 {
			hactive = <800>;
			hactive = <800>;
			vactive = <480>;
			vactive = <480>;
				hback-porch = <88>;
			hfront-porch = <40>;
			hfront-porch = <40>;
			hback-porch = <88>;
			hsync-len = <0>;
			hsync-len = <0>;
			vback-porch = <32>;
			vback-porch = <32>;
			vfront-porch = <11>;
			vfront-porch = <11>;
			vsync-len = <1>;
			vsync-len = <1>;
				clock = <0>;	/* unused but required */
				bpp = <32>;	/* non-standard but required */
			};
		};
		};
	};
	};
};
};
Loading