From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 16 Dec 2008 10:44:08 +0000 (+0100)
Subject: i.MX Framebuffer: fix margins
X-Git-Tag: v2.6.29-rc1~559^2~12^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d6ed5755ac26044473bcc9c9d2659624003652c8;p=linux-2.6-omap-h63xx.git

i.MX Framebuffer: fix margins

The upper/lower and left/right margins are mixed up in the driver.
Fix it

Acked-by: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 1bccf5ad0c7..feaae73f56a 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -410,13 +410,13 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
 #endif
 
 	writel(HCR_H_WIDTH(var->hsync_len) |
-		HCR_H_WAIT_1(var->left_margin) |
-		HCR_H_WAIT_2(var->right_margin),
+		HCR_H_WAIT_1(var->right_margin) |
+		HCR_H_WAIT_2(var->left_margin),
 		fbi->regs + LCDC_HCR);
 
 	writel(VCR_V_WIDTH(var->vsync_len) |
-		VCR_V_WAIT_1(var->upper_margin) |
-		VCR_V_WAIT_2(var->lower_margin),
+		VCR_V_WAIT_1(var->lower_margin) |
+		VCR_V_WAIT_2(var->upper_margin),
 		fbi->regs + LCDC_VCR);
 
 	writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),