summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Hofstee <jhofstee@victronenergy.com>2012-05-18 00:51:01 +0000
committerAnatolij Gustschin <agust@denx.de>2012-05-25 15:35:25 +0200
commit8da2efb6610b5b33ec4758b0fcf97e55fa25acac (patch)
treea2f5cb280b1b57f578f9e4d51dc9a5b03aeb7fe3
parentd9c13aac14126c2f9446715b33a69f536336b2c0 (diff)
downloadu-boot-imx-8da2efb6610b5b33ec4758b0fcf97e55fa25acac.zip
u-boot-imx-8da2efb6610b5b33ec4758b0fcf97e55fa25acac.tar.gz
u-boot-imx-8da2efb6610b5b33ec4758b0fcf97e55fa25acac.tar.bz2
omap3_dss: cosmetic changes
Remove unnecessary brackets. Unwrap lines which are below 80 chars. Single line comment as single line (as the rest). Moved init values to the source code. cc: s-paulraj@ti.com cc: khasim@ti.com Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
-rw-r--r--arch/arm/include/asm/arch-omap3/dss.h24
-rw-r--r--drivers/video/omap3_dss.c33
2 files changed, 17 insertions, 40 deletions
diff --git a/arch/arm/include/asm/arch-omap3/dss.h b/arch/arm/include/asm/arch-omap3/dss.h
index 101e8c8..a830c43 100644
--- a/arch/arm/include/asm/arch-omap3/dss.h
+++ b/arch/arm/include/asm/arch-omap3/dss.h
@@ -28,9 +28,7 @@
#ifndef DSS_H
#define DSS_H
-/*
- * DSS Base Registers
- */
+/* DSS Base Registers */
#define OMAP3_DSS_BASE 0x48050000
#define OMAP3_DISPC_BASE 0x48050400
#define OMAP3_VENC_BASE 0x48050C00
@@ -163,26 +161,14 @@ struct venc_regs {
#define GP_OUT0 (1 << 15)
#define GP_OUT1 (1 << 16)
-#define DISPC_ENABLE (LCD_ENABLE | \
- DIG_ENABLE | \
- GO_LCD | \
- GO_DIG | \
- GP_OUT0| \
- GP_OUT1)
-
/* Configure VENC DSS Params */
#define VENC_CLK_ENABLE (1 << 3)
#define DAC_DEMEN (1 << 4)
#define DAC_POWERDN (1 << 5)
#define VENC_OUT_SEL (1 << 6)
#define DIG_LPP_SHIFT 16
-#define VENC_DSS_CONFIG (VENC_CLK_ENABLE | \
- DAC_DEMEN | \
- DAC_POWERDN | \
- VENC_OUT_SEL)
-/*
- * Panel Configuration
- */
+
+/* Panel Configuration */
struct panel_config {
u32 timing_h;
u32 timing_v;
@@ -196,9 +182,7 @@ struct panel_config {
void *frame_buffer;
};
-/*
- * Generic DSS Functions
- */
+/* Generic DSS Functions */
void omap3_dss_venc_config(const struct venc_regs *venc_cfg,
u32 height, u32 width);
void omap3_dss_panel_config(const struct panel_config *panel_cfg);
diff --git a/drivers/video/omap3_dss.c b/drivers/video/omap3_dss.c
index dfe61b3..6686718 100644
--- a/drivers/video/omap3_dss.c
+++ b/drivers/video/omap3_dss.c
@@ -30,9 +30,7 @@
#include <asm/arch/dss.h>
#include <video_fb.h>
-/*
- * Configure VENC for a given Mode (NTSC / PAL)
- */
+/* Configure VENC for a given Mode (NTSC / PAL) */
void omap3_dss_venc_config(const struct venc_regs *venc_cfg,
u32 height, u32 width)
{
@@ -65,10 +63,8 @@ void omap3_dss_venc_config(const struct venc_regs *venc_cfg,
writel(venc_cfg->savid__eavid, &venc->savid__eavid);
writel(venc_cfg->flen__fal, &venc->flen__fal);
writel(venc_cfg->lal__phase_reset, &venc->lal__phase_reset);
- writel(venc_cfg->hs_int_start_stop_x,
- &venc->hs_int_start_stop_x);
- writel(venc_cfg->hs_ext_start_stop_x,
- &venc->hs_ext_start_stop_x);
+ writel(venc_cfg->hs_int_start_stop_x, &venc->hs_int_start_stop_x);
+ writel(venc_cfg->hs_ext_start_stop_x, &venc->hs_ext_start_stop_x);
writel(venc_cfg->vs_int_start_x, &venc->vs_int_start_x);
writel(venc_cfg->vs_int_stop_x__vs_int_start_y,
&venc->vs_int_stop_x__vs_int_start_y);
@@ -94,15 +90,14 @@ void omap3_dss_venc_config(const struct venc_regs *venc_cfg,
writel(venc_cfg->dac_b__dac_c, &venc->dac_b__dac_c);
/* Configure DSS for VENC Settings */
- writel(VENC_DSS_CONFIG, &dss->control);
+ writel(VENC_CLK_ENABLE | DAC_DEMEN | DAC_POWERDN | VENC_OUT_SEL,
+ &dss->control);
/* Configure height and width for Digital out */
- writel(((height << DIG_LPP_SHIFT) | width), &dispc->size_dig);
+ writel(height << DIG_LPP_SHIFT | width, &dispc->size_dig);
}
-/*
- * Configure Panel Specific Parameters
- */
+/* Configure Panel Specific Parameters */
void omap3_dss_panel_config(const struct panel_config *panel_cfg)
{
struct dispc_regs *dispc = (struct dispc_regs *) OMAP3_DISPC_BASE;
@@ -117,9 +112,9 @@ 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->panel_type << TFTSTN_SHIFT) |
- (panel_cfg->data_lines << DATALINES_SHIFT)), &dispc->control);
+ writel(panel_cfg->load_mode << FRAME_MODE_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);
writel((u32) panel_cfg->frame_buffer, &dispc->gfx_ba0);
@@ -133,16 +128,14 @@ void omap3_dss_panel_config(const struct panel_config *panel_cfg)
writel(panel_cfg->lcd_size, &dispc->gfx_size);
}
-/*
- * Enable LCD and DIGITAL OUT in DSS
- */
+/* Enable LCD and DIGITAL OUT in DSS */
void omap3_dss_enable(void)
{
struct dispc_regs *dispc = (struct dispc_regs *) OMAP3_DISPC_BASE;
- u32 l = 0;
+ u32 l;
l = readl(&dispc->control);
- l |= DISPC_ENABLE;
+ l |= LCD_ENABLE | GO_LCD | DIG_ENABLE | GO_DIG | GP_OUT0 | GP_OUT1;
writel(l, &dispc->control);
}