Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d7321df327a1f5a7dd3cb5c51c887c5a43362379

Authored by Fabio Estevam
Committed by Olof Johansson
1 parent 60371952e1
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

video: mxsfb: Adapt to new videomode API 

commit 6cd2c7db4 (videomode: videomode_from_timing work) changed the name of
the function from videomode_from_timing() to videomode_from_timings().

commit 32ed6ef1 (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>

Showing 2 changed files with 5 additions and 5 deletions Side-by-side Diff

drivers/video/Kconfig
Diff comments   View file @ d7321df
... ... @@ -2429,7 +2429,7 @@
2429 2429 select FB_CFB_COPYAREA
2430 2430 select FB_CFB_IMAGEBLIT
2431 2431 select FB_MODE_HELPERS
2432   - select OF_VIDEOMODE
  2432 + select VIDEOMODE_HELPERS
2433 2433 help
2434 2434 Framebuffer support for the MXS SoC.
2435 2435  
drivers/video/mxsfb.c
Diff comments   View file @ d7321df
... ... @@ -42,7 +42,6 @@
42 42 #include <linux/module.h>
43 43 #include <linux/kernel.h>
44 44 #include <linux/of_device.h>
45   -#include <video/of_display_timing.h>
46 45 #include <linux/platform_device.h>
47 46 #include <linux/clk.h>
48 47 #include <linux/dma-mapping.h>
... ... @@ -50,6 +49,7 @@
50 49 #include <linux/pinctrl/consumer.h>
51 50 #include <linux/fb.h>
52 51 #include <linux/regulator/consumer.h>
  52 +#include <video/of_display_timing.h>
53 53 #include <video/videomode.h>
54 54  
55 55 #define REG_SET 4
56 56  
57 57  
... ... @@ -777,16 +777,16 @@
777 777 struct videomode vm;
778 778 struct fb_videomode fb_vm;
779 779  
780   - ret = videomode_from_timing(timings, &vm, i);
  780 + ret = videomode_from_timings(timings, &vm, i);
781 781 if (ret < 0)
782 782 goto put_timings_node;
783 783 ret = fb_videomode_from_videomode(&vm, &fb_vm);
784 784 if (ret < 0)
785 785 goto put_timings_node;
786 786  
787   - if (vm.data_flags & DISPLAY_FLAGS_DE_HIGH)
  787 + if (vm.flags & DISPLAY_FLAGS_DE_HIGH)
788 788 host->sync |= MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
789   - if (vm.data_flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
  789 + if (vm.flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
790 790 host->sync |= MXSFB_SYNC_DOTCLK_FALLING_ACT;
791 791 fb_add_videomode(&fb_vm, &fb_info->modelist);
792 792 }