fb: vt8500: patches for 3.10
Subsystems (2)
v3 cover fb: vt8500: patches for 3.10
V3 Changes:
Tidied up patch 1 as requested by Jean-Christophe - Makes the patch much simpler.
V2 Changes:
Split the SoC and board portions of the binding into their respective files. Removed the forced non-interlaced code from wm8505fb.c and vt8500lcdfb.c
Julia Lawall (1):
drivers/video/wm8505fb.c: use devm_ functions
Tony Prisk (5):
video: vt8500: Make wmt_ge_rops optional
video: vt8500: Remove unused platform_data/video-vt8500lcdfb.h
video: vt8500: Correct descriptions in video/Kconfig
video: vt8500: Adjust contrast in wm8505 framebuffer driver.
video: fb: vt8500: Convert framebuffer drivers to standardized
binding
.../devicetree/bindings/video/via,vt8500-fb.txt | 48 ++----- .../devicetree/bindings/video/wm,wm8505-fb.txt | 32 +++-- arch/arm/boot/dts/vt8500-bv07.dts | 34 ++--- arch/arm/boot/dts/vt8500.dtsi | 4 +- arch/arm/boot/dts/wm8505-ref.dts | 34 ++--- arch/arm/boot/dts/wm8505.dtsi | 4 +- arch/arm/boot/dts/wm8650-mid.dts | 36 +++-- arch/arm/boot/dts/wm8650.dtsi | 4 +- arch/arm/boot/dts/wm8850-w70v2.dts | 40 +++--- arch/arm/boot/dts/wm8850.dtsi | 4 +- drivers/video/Kconfig | 37 +++-- drivers/video/vt8500lcdfb.c | 55 +++----- drivers/video/wm8505fb.c | 144 ++++++-------------- drivers/video/wmt_ge_rops.h | 23 ++++ include/linux/platform_data/video-vt8500lcdfb.h | 31 ----- 15 files changed, 211 insertions(+), 319 deletions(-) delete mode 100644 include/linux/platform_data/video-vt8500lcdfb.h
Signature · 1 line
1.7.9.5
PATCH v3 1/6 video: vt8500: Make wmt_ge_rops optional
wmt_ge_rops is a seperate driver to vt8500/wm8505 framebuffer driver but is currently a required option. This patch makes accelerated raster ops optional.
--- drivers/video/Kconfig | 22 ++++++++++++---------- drivers/video/wmt_ge_rops.h | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+), 10 deletions(-)
drivers/video/Kconfig +12 -10
@@ -212,14 +212,6 @@ config FB_SYS_FOPS depends on FB default n -config FB_WMT_GE_ROPS - tristate - depends on FB - default n - ---help--- - Include functions for accelerated rectangle filling and area - copying using WonderMedia Graphics Engine operations. - config FB_DEFERRED_IO bool depends on FB
@@ -1799,7 +1791,8 @@ config FB_AU1200 config FB_VT8500 bool "VT8500 LCD Driver" depends on (FB = y) && ARM && ARCH_VT8500 - select FB_WMT_GE_ROPS + select FB_SYS_FILLRECT if (!FB_WMT_GE_ROPS) + select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS) select FB_SYS_IMAGEBLIT help This is the framebuffer driver for VIA VT8500 integrated LCD
@@ -1808,12 +1801,21 @@ config FB_VT8500 config FB_WM8505 bool "WM8505 frame buffer support" depends on (FB = y) && ARM && ARCH_VT8500 - select FB_WMT_GE_ROPS + select FB_SYS_FILLRECT if (!FB_WMT_GE_ROPS) + select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS) select FB_SYS_IMAGEBLIT help This is the framebuffer driver for WonderMedia WM8505/WM8650 integrated LCD controller. +config FB_WMT_GE_ROPS + bool "VT8500/WM85xx accelerated raster ops support" + depends on (FB = y) && (FB_VT8500 || FB_WM8505) + default n + help + This adds support for accelerated raster operations on the + VIA VT8500 and Wondermedia 85xx series SoCs. + source "drivers/video/geode/Kconfig" config FB_HIT
drivers/video/wmt_ge_rops.h +23 -0
@@ -1,5 +1,28 @@ +#ifdef CONFIG_FB_WMT_GE_ROPS +extern void wmt_ge_fillrect (struct fb_info *info,const struct fb_fillrect *rect);extern void wmt_ge_copyarea (struct fb_info *info,const struct fb_copyarea *area);extern int wmt_ge_sync (struct fb_info *info); + +#else + +static inline int wmt_ge_sync (struct fb_info *p) +{ +return 0 ; +} + +static inline void wmt_ge_fillrect (struct fb_info *p, +const struct fb_fillrect *rect) +{ +sys_fillrect (p, rect); +} + +static inline void wmt_ge_copyarea (struct fb_info *p, +const struct fb_copyarea *area) +{ +sys_copyarea (p, area); +} + +#endif
Signature · 1 line
1.7.9.5
PATCH v3 2/6 video: vt8500: Remove unused platform_data/video-vt8500lcdfb.h
In reply to Tony PriskWith the conversion to devicetree only for arch-vt8500, this header is no longer required. This patch removes the #include from the two framebuffer drivers that used it, and the header file.
--- drivers/video/vt8500lcdfb.c | 2 -- drivers/video/wm8505fb.c | 2 -- include/linux/platform_data/video-vt8500lcdfb.h | 31 ----------------------- 3 files changed, 35 deletions(-) delete mode 100644 include/linux/platform_data/video-vt8500lcdfb.h
drivers/video/vt8500lcdfb.c +0 -2
@@ -30,8 +30,6 @@#include <linux/platform_device.h> #include <linux/wait.h> -#include <linux/platform_data/video-vt8500lcdfb.h> -#include "vt8500lcdfb.h" #include "wmt_ge_rops.h"
drivers/video/wm8505fb.c +0 -2
@@ -32,8 +32,6 @@#include <linux/of_fdt.h> #include <linux/memblock.h> -#include <linux/platform_data/video-vt8500lcdfb.h> -#include "wm8505fb_regs.h" #include "wmt_ge_rops.h"
include/linux/platform_data/video-vt8500lcdfb.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* -* VT8500/WM8505 Frame Buffer platform data definitions -* -* Copyright (C) 2010 Ed Spiridonov <[email protected]> -* -* This software is licensed under the terms of the GNU General Public -* License version 2, as published by the Free Software Foundation, and -* may be copied, distributed, and modified under those terms. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -*/ - -#ifndef _VT8500FB_H -#define _VT8500FB_H - -#include <linux/fb.h> - -struct vt8500fb_platform_data { -struct fb_videomode mode; -u32 xres_virtual; -u32 yres_virtual; -u32 bpp; -unsigned long video_mem_phys; -void *video_mem_virt; -unsigned long video_mem_len; -}; - -#endif /* _VT8500FB_H */
Signature · 1 line
1.7.9.5
PATCH v3 3/6 video: vt8500: Correct descriptions in video/Kconfig
In reply to Tony PriskThis patch corrects the descriptions for the VIA VT8500 and Wondermedia WM8xxx-series framebuffer drivers to correctly reflect which hardware they support.
--- drivers/video/Kconfig | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/video/Kconfig +6 -5
@@ -1789,7 +1789,7 @@ config FB_AU1200 option au1200fb:panel=<name>. config FB_VT8500 - bool "VT8500 LCD Driver" + bool "VIA VT8500 framebuffer support" depends on (FB = y) && ARM && ARCH_VT8500 select FB_SYS_FILLRECT if (!FB_WMT_GE_ROPS) select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS)
@@ -1799,17 +1799,18 @@ config FB_VT8500 controller. config FB_WM8505 - bool "WM8505 frame buffer support" + bool "Wondermedia WM8xxx-series frame buffer support" depends on (FB = y) && ARM && ARCH_VT8500 select FB_SYS_FILLRECT if (!FB_WMT_GE_ROPS) select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS) select FB_SYS_IMAGEBLIT help - This is the framebuffer driver for WonderMedia WM8505/WM8650 - integrated LCD controller. + This is the framebuffer driver for WonderMedia WM8xxx-series + integrated LCD controller. This driver covers the WM8505, WM8650 + and WM8850 SoCs. config FB_WMT_GE_ROPS - bool "VT8500/WM85xx accelerated raster ops support" + bool "VT8500/WM8xxx accelerated raster ops support" depends on (FB = y) && (FB_VT8500 || FB_WM8505) default n help
Signature · 1 line
1.7.9.5
PATCH v3 4/6 drivers/video/wm8505fb.c: use devm_ functions
In reply to Tony PriskFrom: Julia Lawall <[email protected]>
The various devm_ functions allocate memory that is released when a driver detaches. This patch uses these functions for data that is allocated in the probe function of a platform device and is only freed in the remove function.
The patch makes some other cleanups. First, the original code used devm_kzalloc, but kfree. This would lead to a double free. The problem was found using the following semantic match (http://coccinelle.lip6.fr/):
// <smpl>
@@
expression x,e;
@@
x = devm_kzalloc(...)
... when != x = e
?-kfree(x,...);
// </smpl>
The error-handing code of devm_request_and_ioremap does not print any warning message, because devm_request_and_ioremap does this.
The call to dma_alloc_coherent is converted to its devm equivalent, dmam_alloc_coherent. This implicitly introduces a call to dmam_free_coherent, which was completly missing in the original code.
A semicolon is removed at the end of the error-handling code for the call to dma_alloc_coherent.
The block of code calling fb_alloc_cmap is moved below the block of code calling wm8505fb_set_par, so that the error-handing code of the call to wm8505fb_set_par can just return ret. This way there is only one block of error-handling code that needs to call fb_dealloc_cmap, and so this is moved up to the place where it is needed, eliminating the need for all gotos and labels in the function. This was suggested by Tony Prisk.
The initializations of fbi and ret at the beginning of the function are not necessary and are removed. The call platform_set_drvdata(pdev, NULL); at the end of the function is also removed.
--- drivers/video/wm8505fb.c | 79 +++++++++++----------------------------------- 1 file changed, 19 insertions(+), 60 deletions(-)
drivers/video/wm8505fb.c +19 -60
@@ -272,15 +272,11 @@ static int wm8505fb_probe(struct platform_device *pdev)unsigned long fb_mem_len;void *fb_mem_virt; - ret = -ENOMEM ; - fbi =NULL ; - fbi =devm_kzalloc (&pdev->dev,sizeof (struct wm8505fb_info ) +sizeof (u32) *16 ,GFP_KERNEL );if (!fbi) {dev_err (&pdev->dev,"Failed to initialize framebuffer device\n" ); - ret = -ENOMEM ; - goto failed; +return -ENOMEM ; }strcpy (fbi->fb.fix.id,DRIVER_NAME );
@@ -306,31 +302,14 @@ static int wm8505fb_probe(struct platform_device *pdev) fbi->fb.pseudo_palette = addr; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (res ==NULL ) { -dev_err (&pdev->dev,"no I/O memory resource defined\n" ); - ret = -ENODEV ; - goto failed_fbi; - } - - res =request_mem_region (res->start,resource_size (res),DRIVER_NAME ); -if (res ==NULL ) { -dev_err (&pdev->dev,"failed to request I/O memory\n" ); - ret = -EBUSY ; - goto failed_fbi; - } - - fbi->regbase =ioremap (res->start,resource_size (res)); -if (fbi->regbase ==NULL ) { -dev_err (&pdev->dev,"failed to map I/O memory\n" ); - ret = -EBUSY ; - goto failed_free_res; - } + fbi->regbase =devm_request_and_ioremap (&pdev->dev, res); +if (fbi->regbase ==NULL ) +return -EBUSY ; np =of_parse_phandle (pdev->dev.of_node,"default-mode" ,0 );if (!np) {pr_err ("%s: No display description in Device Tree\n" , __func__); - ret = -EINVAL ; - goto failed_free_res; +return -EINVAL ; }/*
@@ -349,7 +328,7 @@ static int wm8505fb_probe(struct platform_device *pdev) ret |=of_property_read_u32 (np,"bpp" , &bpp);if (ret) {pr_err ("%s: Unable to read display properties\n" , __func__); - goto failed_free_res; +return -EINVAL ; } of_mode.vmode =FB_VMODE_NONINTERLACED ;
@@ -363,12 +342,12 @@ static int wm8505fb_probe(struct platform_device *pdev)/* try allocating the framebuffer */ fb_mem_len = of_mode.xres * of_mode.yres *2 * (bpp /8 ); - fb_mem_virt =dma_alloc_coherent (&pdev->dev, fb_mem_len, &fb_mem_phys, + fb_mem_virt =dmam_alloc_coherent (&pdev->dev, fb_mem_len, &fb_mem_phys,GFP_KERNEL );if (!fb_mem_virt) {pr_err ("%s: Failed to allocate framebuffer\n" , __func__);return -ENOMEM ; - }; + } fbi->fb.var.xres_virtual = of_mode.xres; fbi->fb.var.yres_virtual = of_mode.yres *2 ;
@@ -379,28 +358,29 @@ static int wm8505fb_probe(struct platform_device *pdev) fbi->fb.screen_base = fb_mem_virt; fbi->fb.screen_size = fb_mem_len; -if (fb_alloc_cmap (&fbi->fb.cmap,256 ,0 ) <0 ) { -dev_err (&pdev->dev,"Failed to allocate color map\n" ); - ret = -ENOMEM ; - goto failed_free_io; - } - -wm8505fb_init_hw (&fbi->fb); - fbi->contrast =0x80 ; ret =wm8505fb_set_par (&fbi->fb);if (ret) {dev_err (&pdev->dev,"Failed to set parameters\n" ); - goto failed_free_cmap; +return ret; } +if (fb_alloc_cmap (&fbi->fb.cmap,256 ,0 ) <0 ) { +dev_err (&pdev->dev,"Failed to allocate color map\n" ); +return -ENOMEM ; + } + +wm8505fb_init_hw (&fbi->fb); +platform_set_drvdata (pdev, fbi); ret =register_framebuffer (&fbi->fb);if (ret <0 ) {dev_err (&pdev->dev,"Failed to register framebuffer device: %d\n" , ret); - goto failed_free_cmap; +if (fbi->fb.cmap.len) +fb_dealloc_cmap (&fbi->fb.cmap); +return ret; } ret =device_create_file (&pdev->dev, &dev_attr_contrast);
@@ -414,25 +394,11 @@ static int wm8505fb_probe(struct platform_device *pdev) fbi->fb.fix.smem_start + fbi->fb.fix.smem_len - 1);return 0 ; - -failed_free_cmap: -if (fbi->fb.cmap.len) -fb_dealloc_cmap (&fbi->fb.cmap); -failed_free_io: -iounmap (fbi->regbase); -failed_free_res: -release_mem_region (res->start,resource_size (res)); -failed_fbi: -platform_set_drvdata (pdev,NULL ); -kfree (fbi); -failed: -return ret; }static int wm8505fb_remove (struct platform_device *pdev) {struct wm8505fb_info *fbi =platform_get_drvdata (pdev); -struct resource *res;device_remove_file (&pdev->dev, &dev_attr_contrast);
@@ -443,13 +409,6 @@ static int wm8505fb_remove(struct platform_device *pdev)if (fbi->fb.cmap.len)fb_dealloc_cmap (&fbi->fb.cmap); -iounmap (fbi->regbase); - - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -release_mem_region (res->start,resource_size (res)); - -kfree (fbi); -return 0 ; }
Signature · 1 line
1.7.9.5
PATCH v3 5/6 video: vt8500: Adjust contrast in wm8505 framebuffer driver.
In reply to Tony PriskThe contrast value was typo'd on the original commit (0x80 instead of 0x08). Following feedback from an enduser, a value of 0x10 seems more suitable due to the default backlight being <100%.
--- drivers/video/wm8505fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/wm8505fb.c +1 -1
@@ -358,7 +358,7 @@ static int wm8505fb_probe(struct platform_device *pdev) fbi->fb.screen_base = fb_mem_virt; fbi->fb.screen_size = fb_mem_len; - fbi->contrast =0x80 ; + fbi->contrast =0x10 ; ret =wm8505fb_set_par (&fbi->fb);if (ret) {dev_err (&pdev->dev,"Failed to set parameters\n" );
Signature · 1 line
1.7.9.5
PATCH v3 6/6 video: fb: vt8500: Convert framebuffer drivers to standardized binding
In reply to Tony PriskNow that a display timing binding is available, convert our almost identical binding to use the standard binding.
This patch converts the vt8500 and wm8505 framebuffer drivers and associated dts/dtsi files to use the standard binding as defined in bindings/video/display-timing.txt.
There are two side-effects of making this conversion:
1) The fb node should now be in the board file, rather than the soc file as the display-timing node is a child of the fb node.
2) We still require a bits per pixel property to initialize the framebuffer for the different lcd panels. Rather than including this as part of the display timing, it is moved into the framebuffer node.
I have also taken the opportunity to alphabetise the includes of each driver to avoid double-ups.
--- .../devicetree/bindings/video/via,vt8500-fb.txt | 48 ++++---------- .../devicetree/bindings/video/wm,wm8505-fb.txt | 32 ++++++---- arch/arm/boot/dts/vt8500-bv07.dts | 34 +++++----- arch/arm/boot/dts/vt8500.dtsi | 4 +- arch/arm/boot/dts/wm8505-ref.dts | 34 +++++----- arch/arm/boot/dts/wm8505.dtsi | 4 +- arch/arm/boot/dts/wm8650-mid.dts | 36 +++++------ arch/arm/boot/dts/wm8650.dtsi | 4 +- arch/arm/boot/dts/wm8850-w70v2.dts | 40 ++++++------ arch/arm/boot/dts/wm8850.dtsi | 4 +- drivers/video/Kconfig | 6 ++ drivers/video/vt8500lcdfb.c | 53 ++++++---------- drivers/video/wm8505fb.c | 67 ++++++++------------ 13 files changed, 154 insertions(+), 212 deletions(-)
Documentation/devicetree/bindings/video/via,vt8500-fb.txt +11 -37
@@ -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 at d800e400 { + fb at 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 at 0 { - modes { - mode0: mode at 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
@@ -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 at d8050800 { + fb at 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
@@ -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 at 0 { - modes { - mode0: mode at 0 { - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hfront-porch = <40>; - hsync-len = <0>; - vback-porch = <32>; - vfront-porch = <11>; - vsync-len = <1>; - clock = <0>; /* unused but required */ - bpp = <16>; /* non-standard but required */ - }; +&fb { + 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.dtsi +1 -3
@@ -98,12 +98,10 @@ interrupts = <43>; }; - fb at d800e400 { + fb: fb at d8050800 { compatible = "via,vt8500-fb"; reg = <0xd800e400 0x400>; interrupts = <12>; - display = <&display>; - default-mode = <&mode0>; }; ge_rops at d8050400 {
arch/arm/boot/dts/wm8505-ref.dts +15 -19
@@ -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 at 0 { - modes { - mode0: mode at 0 { - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hfront-porch = <40>; - hsync-len = <0>; - vback-porch = <32>; - vfront-porch = <11>; - vsync-len = <1>; - clock = <0>; /* unused but required */ - bpp = <32>; /* non-standard but required */ - }; +&fb { + bits-per-pixel = <32>; + 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/wm8505.dtsi +1 -3
@@ -128,11 +128,9 @@ interrupts = <0>; }; - fb at d8050800 { + fb: fb at d8050800 { compatible = "wm,wm8505-fb"; reg = <0xd8050800 0x200>; - display = <&display>; - default-mode = <&mode0>; }; ge_rops at d8050400 {
arch/arm/boot/dts/wm8650-mid.dts +17 -19
@@ -11,26 +11,24 @@ / { model = "Wondermedia WM8650-MID Tablet"; +}; + +&fb { + bits-per-pixel = <16>; - /* - * 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 at 0 { - modes { - mode0: mode at 0 { - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hfront-porch = <40>; - hsync-len = <0>; - vback-porch = <32>; - vfront-porch = <11>; - vsync-len = <1>; - clock = <0>; /* unused but required */ - bpp = <16>; /* non-standard but required */ - }; + 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/wm8650.dtsi +1 -3
@@ -128,11 +128,9 @@ interrupts = <43>; }; - fb at d8050800 { + fb: fb at d8050800 { compatible = "wm,wm8505-fb"; reg = <0xd8050800 0x200>; - display = <&display>; - default-mode = <&mode0>; }; ge_rops at d8050400 {
arch/arm/boot/dts/wm8850-w70v2.dts +18 -22
@@ -15,28 +15,6 @@ / { model = "Wondermedia WM8850-W70v2 Tablet"; - /* - * 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 at 0 { - modes { - mode0: mode at 0 { - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hfront-porch = <40>; - hsync-len = <0>; - vback-porch = <32>; - vfront-porch = <11>; - vsync-len = <1>; - clock = <0>; /* unused but required */ - bpp = <16>; /* non-standard but required */ - }; - }; - }; - backlight { compatible = "pwm-backlight"; pwms = <&pwm 0 50000 1>; /* duty inverted */
@@ -45,3 +23,21 @@ default-brightness-level = <5>; }; }; + +&fb { + 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/wm8850.dtsi +1 -3
@@ -135,11 +135,9 @@ }; }; - fb at d8051700 { + fb: fb at d8051700 { compatible = "wm,wm8505-fb"; reg = <0xd8051700 0x200>; - display = <&display>; - default-mode = <&mode0>; }; ge_rops at d8050400 {
drivers/video/Kconfig +6 -0
@@ -1794,6 +1794,9 @@ config FB_VT8500 select FB_SYS_FILLRECT if (!FB_WMT_GE_ROPS) select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS) select FB_SYS_IMAGEBLIT + select FB_MODE_HELPERS + select OF_DISPLAY_TIMING + select OF_VIDEOMODE help This is the framebuffer driver for VIA VT8500 integrated LCD controller.
@@ -1804,6 +1807,9 @@ config FB_WM8505 select FB_SYS_FILLRECT if (!FB_WMT_GE_ROPS) select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS) select FB_SYS_IMAGEBLIT + select FB_MODE_HELPERS + select OF_DISPLAY_TIMING + select OF_VIDEOMODE help This is the framebuffer driver for WonderMedia WM8xxx-series integrated LCD controller. This driver covers the WM8505, WM8650
drivers/video/vt8500lcdfb.c +20 -33
83 lines not on this page · raw message
drivers/video/wm8505fb.c +27 -40
110 lines not on this page · raw message
Signature · 1 line
1.7.9.5
On 07:20 Wed 03 Apr , Tony Prisk wrote:
on the whole serie
Best Regards,
J.
Quoted 40 lines
V3 Changes:
Tidied up patch 1 as requested by Jean-Christophe - Makes the patch much simpler.V2 Changes:
Split the SoC and board portions of the binding into their respective files. Removed the forced non-interlaced code fromwm8505fb.candvt8500lcdfb.cJulia Lawall (1):
drivers/video/wm8505fb.c: usedevm_functionsTony Prisk (5):
video: vt8500: Makewmt_ge_ropsoptional
video: vt8500: Remove unusedplatform_data/video-vt8500lcdfb.h
video: vt8500: Correct descriptions in video/Kconfig
video: vt8500: Adjust contrast in wm8505 framebuffer driver.
video: fb: vt8500: Convert framebuffer drivers to standardized
binding.../devicetree/bindings/video/via,vt8500-fb.txt | 48 ++----- .../devicetree/bindings/video/wm,wm8505-fb.txt | 32 +++-- arch/arm/boot/dts/vt8500-bv07.dts | 34 ++--- arch/arm/boot/dts/vt8500.dtsi | 4 +- arch/arm/boot/dts/wm8505-ref.dts | 34 ++--- arch/arm/boot/dts/wm8505.dtsi | 4 +- arch/arm/boot/dts/wm8650-mid.dts | 36 +++-- arch/arm/boot/dts/wm8650.dtsi | 4 +- arch/arm/boot/dts/wm8850-w70v2.dts | 40 +++--- arch/arm/boot/dts/wm8850.dtsi | 4 +- drivers/video/Kconfig | 37 +++-- drivers/video/vt8500lcdfb.c | 55 +++----- drivers/video/wm8505fb.c | 144 ++++++-------------- drivers/video/wmt_ge_rops.h | 23 ++++ include/linux/platform_data/video-vt8500lcdfb.h | 31 ----- 15 files changed, 211 insertions(+), 319 deletions(-) delete mode 100644 include/linux/platform_data/video-vt8500lcdfb.hSignature · 1 line
1.7.9.5
Quoted 35 lines · Tony Prisk
V3 Changes:
Tidied up patch 1 as requested by Jean-Christophe - Makes the patch much simpler.V2 Changes:
Split the SoC and board portions of the binding into their respective files. Removed the forced non-interlaced code fromwm8505fb.candvt8500lcdfb.cJulia Lawall (1):
drivers/video/wm8505fb.c: usedevm_functionsTony Prisk (5):
video: vt8500: Makewmt_ge_ropsoptional
video: vt8500: Remove unusedplatform_data/video-vt8500lcdfb.h
video: vt8500: Correct descriptions in video/Kconfig
video: vt8500: Adjust contrast in wm8505 framebuffer driver.
video: fb: vt8500: Convert framebuffer drivers to standardized
binding.../devicetree/bindings/video/via,vt8500-fb.txt | 48 ++----- .../devicetree/bindings/video/wm,wm8505-fb.txt | 32 +++-- arch/arm/boot/dts/vt8500-bv07.dts | 34 ++--- arch/arm/boot/dts/vt8500.dtsi | 4 +- arch/arm/boot/dts/wm8505-ref.dts | 34 ++--- arch/arm/boot/dts/wm8505.dtsi | 4 +- arch/arm/boot/dts/wm8650-mid.dts | 36 +++-- arch/arm/boot/dts/wm8650.dtsi | 4 +- arch/arm/boot/dts/wm8850-w70v2.dts | 40 +++--- arch/arm/boot/dts/wm8850.dtsi | 4 +- drivers/video/Kconfig | 37 +++-- drivers/video/vt8500lcdfb.c | 55 +++----- drivers/video/wm8505fb.c | 144 ++++++-------------- drivers/video/wmt_ge_rops.h | 23 ++++ include/linux/platform_data/video-vt8500lcdfb.h | 31 ----- 15 files changed, 211 insertions(+), 319 deletions(-)
Quoted 2 lines
delete mode 100644
include/linux/platform_data/video-vt8500lcdfb.h
Tomi,
If no one has any further comments, are you still prepared to take this series? If so, I will send a pull-request.
With regards to the earlier concern about your current patch series, I think its easiest if you do take this series then you could do a fixup patch if this one is merged first. From what I remember of your series, it is basically a rename of of_get_display_timings() to of_get_display_timing() and some new code which I don't use. Seems a rather trivial patch for a fixup later.
Let me know what you want to do.
Regards
Tony P
Quoted 5 lines · Tony Prisk
Tomi,
If no one has any further comments, are you still prepared to take this series?
If so, I will send a pull-request.
Yes, I can take it. No need for pull-request, it was simple enough to apply. I'll push it to linux-next today or tomorrow.
Quoted 6 lines
With regards to the earlier concern about your current patch series, I think its easiest if you do take this series then you could do a fixup patch if this one is merged first. From what I remember of your series, it is basically a rename of
of_get_display_timings()toof_get_display_timing()and some new code which I don't use. Seems a rather trivial patch for a fixup later.
Yes, I can fix it. Should be trivial.
Tomi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130404/a56e2ab5/attachment.sig>