diff mbox

[U-Boot,v2,7/9] video: drop duplicate set of DISPC_CONFIG register

Message ID 1346156513-6953-8-git-send-email-sbabic@denx.de
State Accepted
Commit baee780013cdb4190f582abd1e53fcd788c70182
Delegated to: Tom Rini
Headers show

Commit Message

Stefano Babic Aug. 28, 2012, 12:21 p.m. UTC 
Signed-off-by: Stefano Babic <sbabic@denx.de>
---

 arch/arm/include/asm/arch-omap3/dss.h |    1 -
 drivers/video/omap3_dss.c             |    3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

Comments

Jeroen Hofstee Aug. 28, 2012, 8:49 p.m. UTC | #1 
On 08/28/2012 02:21 PM, Stefano Babic wrote:
> Signed-off-by Stefano Babic <sbabic@denx.de>
> ---
>
>   arch/arm/include/asm/arch-omap3/dss.h |    1 -
>   drivers/video/omap3_dss.c             |    3 +--
>   2 files changed, 1 insertion(+), 3 deletions(-)
>
Acked-by: Jeroen Hofstee <jeroen@myspectrum.nl>

Regards,
Jeroen
diff mbox

Patch

diff --git a/arch/arm/include/asm/arch-omap3/dss.h b/arch/arm/include/asm/arch-omap3/dss.h
index a830c43..8913a71 100644
--- a/arch/arm/include/asm/arch-omap3/dss.h
+++ b/arch/arm/include/asm/arch-omap3/dss.h
@@ -142,7 +142,6 @@  struct venc_regs {
 };
 
 /* Few Register Offsets */
-#define FRAME_MODE_SHIFT			1
 #define TFTSTN_SHIFT				3
 #define DATALINES_SHIFT				8
 
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);