diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-05 20:20:04 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-05 20:20:04 +0200 |
| commit | 057df193b40d31799d41d43bc832a972f658bfe4 (patch) | |
| tree | 597e81f4f6e9e2e921f8aba89de830e055a3b2f1 /drivers | |
| parent | 6342fa00b20fa01e93c8c6886376ea27ee9a7a73 (diff) | |
| parent | 14dace70580df099deb9cdce8f9cfb16a31e9d1b (diff) | |
| download | u-boot-imx-057df193b40d31799d41d43bc832a972f658bfe4.zip u-boot-imx-057df193b40d31799d41d43bc832a972f658bfe4.tar.gz u-boot-imx-057df193b40d31799d41d43bc832a972f658bfe4.tar.bz2 | |
Merge remote-tracking branch 'u-boot-ti/master' into m
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/omap3_dss.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/omap3_dss.c b/drivers/video/omap3_dss.c index 6686718..b1424bf 100644 --- a/drivers/video/omap3_dss.c +++ b/drivers/video/omap3_dss.c @@ -112,7 +112,7 @@ void omap3_dss_panel_config(const struct panel_config *panel_cfg) writel(panel_cfg->pol_freq, &dispc->pol_freq); writel(panel_cfg->divisor, &dispc->divisor); writel(panel_cfg->lcd_size, &dispc->size_lcd); - writel(panel_cfg->load_mode << FRAME_MODE_SHIFT, &dispc->config); + writel(panel_cfg->load_mode << LOADMODE_SHIFT, &dispc->config); writel(panel_cfg->panel_type << TFTSTN_SHIFT | panel_cfg->data_lines << DATALINES_SHIFT, &dispc->control); writel(panel_cfg->panel_color, &dispc->default_color0); @@ -121,7 +121,6 @@ void omap3_dss_panel_config(const struct panel_config *panel_cfg) if (!panel_cfg->frame_buffer) return; - writel(panel_cfg->load_mode << LOADMODE_SHIFT, &dispc->config); writel(8 << GFX_FORMAT_SHIFT | GFX_ENABLE, &dispc->gfx_attributes); writel(1, &dispc->gfx_row_inc); writel(1, &dispc->gfx_pixel_inc); |