[PATCH 0/2] drivers/video: mxs-fb: build fixes

[PATCH 0/2] drivers/video: mxs-fb: build fixes

[Markus Pargmann]

Hi,

mxs-fb commit

669406534b4abb827d1bdc39bb5e2d5255818ae2 video: mxsfb: get display timings from device tree

creates a build failure together with those commits:

a38884f681a4d044befd30d9f3d19a0821bae63a videomode: simplify videomode Kconfig and Makefile
6cd2c7db41eab204b6474534df4ca68a7dc53d86 videomode: videomode_from_timing work

All of them are in linux-next, so mxs-fb fails to build there.

Regards,

Markus

[PATCH 1/2] drivers/video: Kconfig, fix mxsfb build

[Markus Pargmann]

From: Markus Pargmann <mpargmann@allfex.org>

Kernel build fails with commit 669406534b4abb827d1bdc39bb5e2d5255818ae2

This patch replaces OF_VIDEOMODE symbol by VIDEOMODE_HELPERS.

Signed-off-by: Markus Pargmann <mpargmann@allfex.org>
---
 drivers/video/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d8ecc52..6246056 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -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.
 
-- 
1.8.1.5

[PATCH 2/2] drivers/video: mxs-fb: Fix build, use renamed function

[Markus Pargmann]

From: Markus Pargmann <mpargmann@allfex.org>

Kernel build fails with commit 669406534b4abb827d1bdc39bb5e2d5255818ae2

This patch renames videomode_from_timing to videomode_from_timings and
vm.data_flags to vm.flags.

Signed-off-by: Markus Pargmann <mpargmann@allfex.org>
---
 drivers/video/mxsfb.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 1b2c26d..d78827e 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -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);
 	}
-- 
1.8.1.5

[PATCH 0/2] drivers/video: mxs-fb: build fixes

[Markus Pargmann]

Sorry, I messed up the email addresses in the last two patches, the following
two are exactly the same just with the correct addresses.

Regards,

Markus

[PATCH 1/2] drivers/video: Kconfig, fix mxsfb build

[Markus Pargmann]

Kernel build fails with commit 669406534b4abb827d1bdc39bb5e2d5255818ae2

This patch replaces OF_VIDEOMODE symbol by VIDEOMODE_HELPERS.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 drivers/video/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d8ecc52..6246056 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -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.
 
-- 
1.8.1.5

[PATCH 2/2] drivers/video: mxs-fb: Fix build, use renamed function

[Markus Pargmann]

Kernel build fails with commit 669406534b4abb827d1bdc39bb5e2d5255818ae2

This patch renames videomode_from_timing to videomode_from_timings and
vm.data_flags to vm.flags.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 drivers/video/mxsfb.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 1b2c26d..d78827e 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -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);
 	}
-- 
1.8.1.5

[PATCH 0/2] drivers/video: mxs-fb: build fixes

[Markus Pargmann]

On Wed, Apr 24, 2013 at 10:08:12AM +0200, Markus Pargmann wrote:
> Hi,
> 
> mxs-fb commit
> 
> 669406534b4abb827d1bdc39bb5e2d5255818ae2 video: mxsfb: get display timings from device tree
> 
> creates a build failure together with those commits:
> 
> a38884f681a4d044befd30d9f3d19a0821bae63a videomode: simplify videomode Kconfig and Makefile
> 6cd2c7db41eab204b6474534df4ca68a7dc53d86 videomode: videomode_from_timing work
> 
> All of them are in linux-next, so mxs-fb fails to build there.
> 
> Regards,
> 
> Markus
> 
> 
> 

Sorry for the noise. This was already fixed and queued for 3.10-rc.

Regards,

Markus

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 0/2] drivers/video: mxs-fb: build fixes

[Shawn Guo]

On Wed, Apr 24, 2013 at 10:08:12AM +0200, Markus Pargmann wrote:
> Hi,
> 
> mxs-fb commit
> 
> 669406534b4abb827d1bdc39bb5e2d5255818ae2 video: mxsfb: get display timings from device tree
> 
> creates a build failure together with those commits:
> 
> a38884f681a4d044befd30d9f3d19a0821bae63a videomode: simplify videomode Kconfig and Makefile
> 6cd2c7db41eab204b6474534df4ca68a7dc53d86 videomode: videomode_from_timing work
> 
> All of them are in linux-next, so mxs-fb fails to build there.

Fabio already had a patch [1] for that.  I will send it mainline during
3.10-rc.

Shawn

[1] http://thread.gmane.org/gmane.linux.ports.arm.kernel/230938

[PATCH 1/2] drivers/video: Kconfig, fix mxsfb build

[Sergei Shtylyov]

Hello.

On 24-04-2013 12:22, Markus Pargmann wrote:

> Kernel build fails with commit 669406534b4abb827d1bdc39bb5e2d5255818ae2

   Please also specify the summary line of that commit in parens.

> This patch replaces OF_VIDEOMODE symbol by VIDEOMODE_HELPERS.

> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>

WBR, Sergei