video: mxsfb: Adapt to new videomode API (d7321df3) · Commits · 戴 / test

commit (videomode: videomode_from_timing work) changed the name of the function from videomode_from_timing() to videomode_from_timings(). commit (videomode: create enum for videomode's display flags) changed the 'data_flags' field in videomode structure to 'flags' Adapt to these changes in order to fix the following errors: drivers/video/mxsfb.c:761:3: error: too many arguments to function 'videomode_from_timing' drivers/video/mxsfb.c:761:7: error: void value not ignored as it ought to be drivers/video/mxsfb.c:768:9: error: 'struct videomode' has no member named 'data_flags' drivers/video/mxsfb.c:770:9: error: 'struct videomode' has no member named 'data_flags' Also, select VIDEOMODE_HELPER instead of OF_VIDEOMODE, as this one is deprecated. Signed-off-by:

Fabio Estevam <fabio.estevam@freescale.com> Acked-by:

Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by:

Shawn Guo <shawn.guo@linaro.org> Signed-off-by:

Olof Johansson <olof@lixom.net>

drivers/video/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -2429,7 +2429,7 @@ config FB_MXS
		select FB_CFB_COPYAREA
		select FB_CFB_IMAGEBLIT
		select FB_MODE_HELPERS
		select OF_VIDEOMODE
		select VIDEOMODE_HELPERS
		help
		Framebuffer support for the MXS SoC.

drivers/video/mxsfb.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@
		#include <linux/module.h>
		#include <linux/kernel.h>
		#include <linux/of_device.h>
		#include <video/of_display_timing.h>
		#include <linux/platform_device.h>
		#include <linux/clk.h>
		#include <linux/dma-mapping.h>
		@@ -50,6 +49,7 @@
		#include <linux/pinctrl/consumer.h>
		#include <linux/fb.h>
		#include <linux/regulator/consumer.h>
		#include <video/of_display_timing.h>
		#include <video/videomode.h>

		#define REG_SET 4
		@@ -777,16 +777,16 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host)
		struct videomode vm;
		struct fb_videomode fb_vm;

		ret = videomode_from_timing(timings, &vm, i);
		ret = videomode_from_timings(timings, &vm, i);
		if (ret < 0)
		goto put_timings_node;
		ret = fb_videomode_from_videomode(&vm, &fb_vm);
		if (ret < 0)
		goto put_timings_node;

		if (vm.data_flags & DISPLAY_FLAGS_DE_HIGH)
		if (vm.flags & DISPLAY_FLAGS_DE_HIGH)
		host->sync \|= MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
		if (vm.data_flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
		if (vm.flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
		host->sync \|= MXSFB_SYNC_DOTCLK_FALLING_ACT;
		fb_add_videomode(&fb_vm, &fb_info->modelist);
		}

Admin message