summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2008-12-16 11:44:08 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2008-12-16 15:40:20 +0100
commitd6ed5755ac26044473bcc9c9d2659624003652c8 (patch)
treeae7b5eba4ca7fbb8b059b33b39fd81fd730c199a /drivers/video
parenti.MX Framebuffer: Use readl/writel instead of direct pointer deref (diff)
downloadlinux-d6ed5755ac26044473bcc9c9d2659624003652c8.tar.xz
linux-d6ed5755ac26044473bcc9c9d2659624003652c8.zip
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/imxfb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 1bccf5ad0c7d..feaae73f56ac 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),