Loading Documentation/devicetree/bindings/video/simple-framebuffer-sunxi.txt 0 → 100644 +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"; }; }; Documentation/devicetree/bindings/video/simple-framebuffer.txt +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" Loading @@ -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. MAINTAINERS +8 −0 Original line number Diff line number Diff line Loading @@ -8442,6 +8442,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 Loading drivers/video/console/fbcon.c +1 −1 Original line number Diff line number Diff line Loading @@ -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 Loading drivers/video/fbdev/omap2/displays-new/connector-hdmi.c +0 −99 Original line number Diff line number Diff line Loading @@ -170,98 +170,6 @@ static bool hdmic_detect(struct omap_dss_device *dssdev) return in->ops.hdmi->detect(in); } static int hdmic_audio_enable(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; int r; /* enable audio only if the display is active */ if (!omapdss_device_is_enabled(dssdev)) return -EPERM; r = in->ops.hdmi->audio_enable(in); if (r) return r; dssdev->audio_state = OMAP_DSS_AUDIO_ENABLED; return 0; } static void hdmic_audio_disable(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; in->ops.hdmi->audio_disable(in); dssdev->audio_state = OMAP_DSS_AUDIO_DISABLED; } static int hdmic_audio_start(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; int r; /* * No need to check the panel state. It was checked when trasitioning * to AUDIO_ENABLED. */ if (dssdev->audio_state != OMAP_DSS_AUDIO_ENABLED) return -EPERM; r = in->ops.hdmi->audio_start(in); if (r) return r; dssdev->audio_state = OMAP_DSS_AUDIO_PLAYING; return 0; } static void hdmic_audio_stop(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; in->ops.hdmi->audio_stop(in); dssdev->audio_state = OMAP_DSS_AUDIO_ENABLED; } static bool hdmic_audio_supported(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; if (!omapdss_device_is_enabled(dssdev)) return false; return in->ops.hdmi->audio_supported(in); } static int hdmic_audio_config(struct omap_dss_device *dssdev, struct omap_dss_audio *audio) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; int r; /* config audio only if the display is active */ if (!omapdss_device_is_enabled(dssdev)) return -EPERM; r = in->ops.hdmi->audio_config(in, audio); if (r) return r; dssdev->audio_state = OMAP_DSS_AUDIO_CONFIGURED; return 0; } static int hdmic_set_hdmi_mode(struct omap_dss_device *dssdev, bool hdmi_mode) { struct panel_drv_data *ddata = to_panel_data(dssdev); Loading Loading @@ -296,13 +204,6 @@ static struct omap_dss_driver hdmic_driver = { .detect = hdmic_detect, .set_hdmi_mode = hdmic_set_hdmi_mode, .set_hdmi_infoframe = hdmic_set_infoframe, .audio_enable = hdmic_audio_enable, .audio_disable = hdmic_audio_disable, .audio_start = hdmic_audio_start, .audio_stop = hdmic_audio_stop, .audio_supported = hdmic_audio_supported, .audio_config = hdmic_audio_config, }; static int hdmic_probe_pdata(struct platform_device *pdev) Loading Loading
Documentation/devicetree/bindings/video/simple-framebuffer-sunxi.txt 0 → 100644 +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"; }; };
Documentation/devicetree/bindings/video/simple-framebuffer.txt +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" Loading @@ -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.
MAINTAINERS +8 −0 Original line number Diff line number Diff line Loading @@ -8442,6 +8442,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 Loading
drivers/video/console/fbcon.c +1 −1 Original line number Diff line number Diff line Loading @@ -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 Loading
drivers/video/fbdev/omap2/displays-new/connector-hdmi.c +0 −99 Original line number Diff line number Diff line Loading @@ -170,98 +170,6 @@ static bool hdmic_detect(struct omap_dss_device *dssdev) return in->ops.hdmi->detect(in); } static int hdmic_audio_enable(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; int r; /* enable audio only if the display is active */ if (!omapdss_device_is_enabled(dssdev)) return -EPERM; r = in->ops.hdmi->audio_enable(in); if (r) return r; dssdev->audio_state = OMAP_DSS_AUDIO_ENABLED; return 0; } static void hdmic_audio_disable(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; in->ops.hdmi->audio_disable(in); dssdev->audio_state = OMAP_DSS_AUDIO_DISABLED; } static int hdmic_audio_start(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; int r; /* * No need to check the panel state. It was checked when trasitioning * to AUDIO_ENABLED. */ if (dssdev->audio_state != OMAP_DSS_AUDIO_ENABLED) return -EPERM; r = in->ops.hdmi->audio_start(in); if (r) return r; dssdev->audio_state = OMAP_DSS_AUDIO_PLAYING; return 0; } static void hdmic_audio_stop(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; in->ops.hdmi->audio_stop(in); dssdev->audio_state = OMAP_DSS_AUDIO_ENABLED; } static bool hdmic_audio_supported(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; if (!omapdss_device_is_enabled(dssdev)) return false; return in->ops.hdmi->audio_supported(in); } static int hdmic_audio_config(struct omap_dss_device *dssdev, struct omap_dss_audio *audio) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; int r; /* config audio only if the display is active */ if (!omapdss_device_is_enabled(dssdev)) return -EPERM; r = in->ops.hdmi->audio_config(in, audio); if (r) return r; dssdev->audio_state = OMAP_DSS_AUDIO_CONFIGURED; return 0; } static int hdmic_set_hdmi_mode(struct omap_dss_device *dssdev, bool hdmi_mode) { struct panel_drv_data *ddata = to_panel_data(dssdev); Loading Loading @@ -296,13 +204,6 @@ static struct omap_dss_driver hdmic_driver = { .detect = hdmic_detect, .set_hdmi_mode = hdmic_set_hdmi_mode, .set_hdmi_infoframe = hdmic_set_infoframe, .audio_enable = hdmic_audio_enable, .audio_disable = hdmic_audio_disable, .audio_start = hdmic_audio_start, .audio_stop = hdmic_audio_stop, .audio_supported = hdmic_audio_supported, .audio_config = hdmic_audio_config, }; static int hdmic_probe_pdata(struct platform_device *pdev) Loading
