Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / drivers / video / omap3_dss.c

diff --git a/drivers/video/omap3_dss.c b/drivers/video/omap3_dss.c
index b1424bfd038aae79da271dd04c834832734bcad2..6efba122e7876fc24b3d8d7444be66bcc54995c8 100644 (file)
--- a/drivers/video/omap3_dss.c
+++ b/drivers/video/omap3_dss.c
@@ -121,7 +121,7 @@ void omap3_dss_panel_config(const struct panel_config *panel_cfg)
        if (!panel_cfg->frame_buffer)
                return;
 
-       writel(8 << GFX_FORMAT_SHIFT | GFX_ENABLE, &dispc->gfx_attributes);
+       writel(panel_cfg->gfx_format | GFX_ENABLE, &dispc->gfx_attributes);
        writel(1, &dispc->gfx_row_inc);
        writel(1, &dispc->gfx_pixel_inc);
        writel(panel_cfg->lcd_size, &dispc->gfx_size);