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

Commit 413fd0e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull fbdev updates from Tomi Valkeinen:
 - support for mx6sl and mx6sx
 - OMAP HDMI audio rewrite to make it finally work
 - OMAP video PLL work to prepare for new DRA7xx SoCs
 - simplefb DT related improvements

* tag 'fbdev-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (81 commits)
  video: uvesafb: Deletion of an unnecessary check before the function call "platform_device_put"
  video: fbdev-VIA: Deletion of an unnecessary check before the function call "framebuffer_release"
  video: fbdev-MMP: Deletion of an unnecessary check before the function call "mmp_unregister_path"
  video: mx3fb: Deletion of an unnecessary check before the function call "backlight_device_unregister"
  video: fbdev-OMAP2: Deletion of unnecessary checks before the function call "i2c_put_adapter"
  video: fbdev-SIS: Deletion of unnecessary checks before the function call "pci_dev_put"
  video: smscufx: Deletion of unnecessary checks before the function call "vfree"
  video: udlfb: Deletion of unnecessary checks before the function call "vfree"
  video: uvesafb: Deletion of an unnecessary check before the function call "uvesafb_free"
  video: fbdev-LCDC: Deletion of an unnecessary check before the function call "vfree"
  video: fbdev: arkfb: suppress build warning
  video: fbdev: s3fb: suppress build warning
  video: fbdev: vt8623fb: suppress build warning
  OMAPDSS: hdmi5: Fix bit field for IEC958_AES2_CON_SOURCE
  OMAPDSS: hdmi: Remove __exit qualifier from hdmi_uninit_output()
  OMAPDSS: hdmi5: Change hdmi_wp idlemode to to no_idle for audio playback
  OMAPDSS: Remove all references to obsolete HDMI audio callbacks
  ASoC: omap: Remove obsolete HDMI audio code and Kconfig options
  OMAPDSS: hdmi5: Register ASoC platform device for omap hdmi audio
  OMAPDSS: hdmi5: Remove callbacks for the old ASoC DAI driver
  ...
parents 6b9e2cea 3315764e
Loading
Loading
Loading
Loading
+33 −0
Original line number Diff line number Diff line
Sunxi specific Simple Framebuffer bindings

This binding documents sunxi specific extensions to the simple-framebuffer
bindings. The sunxi simplefb u-boot code relies on the devicetree containing
pre-populated simplefb nodes.

These extensions are intended so that u-boot can select the right node based
on which pipeline is being used. As such they are solely intended for
firmware / bootloader use, and the OS should ignore them.

Required properties:
- compatible: "allwinner,simple-framebuffer"
- allwinner,pipeline, one of:
  "de_be0-lcd0"
  "de_be1-lcd1"
  "de_be0-lcd0-hdmi"
  "de_be1-lcd1-hdmi"

Example:

chosen {
	#address-cells = <1>;
	#size-cells = <1>;
	ranges;

	framebuffer@0 {
		compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
		allwinner,pipeline = "de_be0-lcd0-hdmi";
		clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
			 <&ahb_gates 44>;
		status = "disabled";
	};
};
+64 −4
Original line number Diff line number Diff line
Simple Framebuffer

A simple frame-buffer describes a raw memory region that may be rendered to,
with the assumption that the display hardware has already been set up to scan
out from that buffer.
A simple frame-buffer describes a frame-buffer setup by firmware or
the bootloader, with the assumption that the display hardware has already
been set up to scan out from the memory pointed to by the reg property.

Since simplefb nodes represent runtime information they must be sub-nodes of
the chosen node (*). Simplefb nodes must be named "framebuffer@<address>".

If the devicetree contains nodes for the display hardware used by a simplefb,
then the simplefb node must contain a property called "display", which
contains a phandle pointing to the primary display hw node, so that the OS
knows which simplefb to disable when handing over control to a driver for the
real hardware. The bindings for the hw nodes must specify which node is
considered the primary node.

It is advised to add display# aliases to help the OS determine how to number
things. If display# aliases are used, then if the simplefb node contains a
"display" property then the /aliases/display# path must point to the display
hw node the "display" property points to, otherwise it must point directly
to the simplefb node.

If a simplefb node represents the preferred console for user interaction,
then the chosen node's stdout-path property should point to it, or to the
primary display hw node, as with display# aliases. If display aliases are
used then it should be set to the alias instead.

It is advised that devicetree files contain pre-filled, disabled framebuffer
nodes, so that the firmware only needs to update the mode information and
enable them. This way if e.g. later on support for more display clocks get
added, the simplefb nodes will already contain this info and the firmware
does not need to be updated.

If pre-filled framebuffer nodes are used, the firmware may need extra
information to find the right node. In that case an extra platform specific
compatible and platform specific properties should be used and documented,
see e.g. simple-framebuffer-sunxi.txt .

Required properties:
- compatible: "simple-framebuffer"
@@ -14,13 +46,41 @@ Required properties:
  - r5g6b5 (16-bit pixels, d[15:11]=r, d[10:5]=g, d[4:0]=b).
  - a8b8g8r8 (32-bit pixels, d[31:24]=a, d[23:16]=b, d[15:8]=g, d[7:0]=r).

Optional properties:
- clocks : List of clocks used by the framebuffer. Clocks listed here
           are expected to already be configured correctly. The OS must
           ensure these clocks are not modified or disabled while the
           simple framebuffer remains active.
- display : phandle pointing to the primary display hardware node

Example:

	framebuffer {
aliases {
	display0 = &lcdc0;
}

chosen {
	framebuffer0: framebuffer@1d385000 {
		compatible = "simple-framebuffer";
		reg = <0x1d385000 (1600 * 1200 * 2)>;
		width = <1600>;
		height = <1200>;
		stride = <(1600 * 2)>;
		format = "r5g6b5";
		clocks = <&ahb_gates 36>, <&ahb_gates 43>, <&ahb_gates 44>;
		display = <&lcdc0>;
	};
	stdout-path = "display0";
};

soc@01c00000 {
	lcdc0: lcdc@1c0c000 {
		compatible = "allwinner,sun4i-a10-lcdc";
		...
	};
};


*) Older devicetree files may have a compatible = "simple-framebuffer" node
in a different place, operating systems must first enumerate any compatible
nodes found under chosen and then check for other compatible nodes.
+8 −0
Original line number Diff line number Diff line
@@ -8586,6 +8586,14 @@ F: drivers/media/usb/siano/
F:	drivers/media/usb/siano/
F:	drivers/media/mmc/siano/

SIMPLEFB FB DRIVER
M:	Hans de Goede <hdegoede@redhat.com>
L:	linux-fbdev@vger.kernel.org
S:	Maintained
F:	Documentation/devicetree/bindings/video/simple-framebuffer.txt
F:	drivers/video/fbdev/simplefb.c
F:	include/linux/platform_data/simplefb.h

SH_VEU V4L2 MEM2MEM DRIVER
L:	linux-media@vger.kernel.org
S:	Orphan
+1 −1
Original line number Diff line number Diff line
@@ -3624,7 +3624,7 @@ static int __init fb_console_init(void)
	return 0;
}

module_init(fb_console_init);
fs_initcall(fb_console_init);

#ifdef MODULE

+1 −1
Original line number Diff line number Diff line
@@ -2408,7 +2408,7 @@ config FB_JZ4740

config FB_MXS
	tristate "MXS LCD framebuffer support"
	depends on FB && ARCH_MXS
	depends on FB && (ARCH_MXS || ARCH_MXC)
	select FB_CFB_FILLRECT
	select FB_CFB_COPYAREA
	select FB_CFB_IMAGEBLIT
Loading