diff options
| author | Tom Rini <trini@ti.com> | 2014-05-13 07:31:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-13 07:31:00 -0400 |
| commit | e7d4a88e69459547a46906dbe021ccc83c614361 (patch) | |
| tree | 5237f1c81bf8b8d5e93e5f9570f02937ca50d3a4 /drivers/video/atmel_hlcdfb.c | |
| parent | 69c0d323e325f48f3124fb0696de3d68fcbcae8e (diff) | |
| parent | 1161f98db687a1cb263cbacdc7eb548a0354218d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers/video/atmel_hlcdfb.c')
| -rw-r--r-- | drivers/video/atmel_hlcdfb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 853303b5e5..bb4d7d8c14 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -128,12 +128,12 @@ void lcd_ctrl_init(void *lcdbase) value |= LCDC_LCDCFG1_HSPW(panel_info.vl_hsync_len - 1); lcdc_writel(®s->lcdc_lcdcfg1, value); - value = LCDC_LCDCFG2_VBPW(panel_info.vl_lower_margin); - value |= LCDC_LCDCFG2_VFPW(panel_info.vl_upper_margin - 1); + value = LCDC_LCDCFG2_VBPW(panel_info.vl_upper_margin); + value |= LCDC_LCDCFG2_VFPW(panel_info.vl_lower_margin - 1); lcdc_writel(®s->lcdc_lcdcfg2, value); - value = LCDC_LCDCFG3_HBPW(panel_info.vl_right_margin - 1); - value |= LCDC_LCDCFG3_HFPW(panel_info.vl_left_margin - 1); + value = LCDC_LCDCFG3_HBPW(panel_info.vl_left_margin - 1); + value |= LCDC_LCDCFG3_HFPW(panel_info.vl_right_margin - 1); lcdc_writel(®s->lcdc_lcdcfg3, value); /* Display size */ |