From e332cce9fadf53467c3c1060c36b6193971cf9e5 Mon Sep 17 00:00:00 2001 From: daeinki Date: Mon, 17 Aug 2009 17:48:28 +0900 Subject: [PATCH] s5pc110: fb: code clean. Signed-off-by: daeinki --- drivers/video/eltz_lcd.c | 12 ++++++------ drivers/video/s5p-dualfb.c | 6 +++--- drivers/video/s5p-dualfimd.c | 8 ++++---- drivers/video/s5p-fb.c | 4 ++-- drivers/video/s5p-fimd.c | 4 ++-- drivers/video/tl2796.c | 20 ++++++++++---------- drivers/video/tl2796_dual.c | 18 +++++++++--------- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/drivers/video/eltz_lcd.c b/drivers/video/eltz_lcd.c index 7b31679..f29e7db 100644 --- a/drivers/video/eltz_lcd.c +++ b/drivers/video/eltz_lcd.c @@ -37,7 +37,7 @@ #define GPL3_CFG 0xE0300380 #define GPL4_CFG 0xE03003A0 -/* GPIO for LCD_ON */ +/* GPIO for LCD_ON */ #define GPH0_CFG 0xE0300C00 #define GPK0_DATA 0xE03002A4 @@ -89,7 +89,7 @@ static void sublcd_write_register_16(unsigned char address, unsigned short data) SUBLCD_BASE_B = address; SUBLCD_RS_HIGH; - SUBLCD_BASE_W = data; + SUBLCD_BASE_W = data; } static void sublcd_write_GRAM(void) @@ -125,17 +125,17 @@ static void sublcd_power_on(void) SUBLCD_RESETB_HIGH; udelay(5000); - + /* change to I80 18bit mode */ SUBLCD_RS_LOW; SUBLCD_BASE_B = 0x23; /* set data bus width to 16bit for SROMC*/ __raw_writel(__raw_readl(SMC_BW) | 0x00000003, SMC_BW); - + /* change to I80 16bit mode */ sublcd_write_register_16(0x03, 0x0030); - + /* Power Setting Sequence */ sublcd_write_register_16(0x11, 0x000f); sublcd_write_register_16(0x12, 0x0008); @@ -229,7 +229,7 @@ static void draw_test(void) read_image16(SUBLCD_BASE, 0, 0, 240, 320, makepixel565((i * 12345678) & 255, (i * 50) & 255, (i * 87654321) & 255)); - + if (++i > 255) i = 0; } diff --git a/drivers/video/s5p-dualfb.c b/drivers/video/s5p-dualfb.c index f5d2d6c..ea1e873 100644 --- a/drivers/video/s5p-dualfb.c +++ b/drivers/video/s5p-dualfb.c @@ -31,9 +31,9 @@ #include "s5p-fb.h" #include "opening_wvga_32.h" -#define PANEL_WIDTH 480 +#define PANEL_WIDTH 480 #define PANEL_HEIGHT 800 -#define S5P_LCD_BPP 32 +#define S5P_LCD_BPP 32 /* for DUAL LCD */ #define SCREEN_WIDTH (480 * 2) @@ -124,7 +124,7 @@ static void s5pc_lcd_init_mem(void *lcdbase, vidinfo_t *vid) { unsigned long palette_size, palette_mem_size; unsigned int fb_size; - + fb_size = vid->vl_row * vid->vl_col * (vid->vl_bpix / 8); lcd_base = lcdbase; diff --git a/drivers/video/s5p-dualfimd.c b/drivers/video/s5p-dualfimd.c index 90c32ae..ea42622 100644 --- a/drivers/video/s5p-dualfimd.c +++ b/drivers/video/s5p-dualfimd.c @@ -98,9 +98,9 @@ void s5pc_c110_gpio_setup(void) S5PC1XX_GPIO_DRV_OFFSET)); /* set gpio configuration pin for SUBLCD_RST(MP0_2[1]) and SUBLCD_ON(MP0_2[0] */ writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET)) & 0xffffff00, - S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET)); + S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET)); writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET)) | 0x00000011, - S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET)); + S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET)); /* set gpio confituration pin for SUB_DISPLAY_CS(MP0_1[2]) */ writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_1_OFFSET)) & 0xfffff0ff, S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_1_OFFSET)); @@ -302,7 +302,7 @@ void s5pc_fimd_lcd_init(vidinfo_t *vid) /* 3.5inch TL2796 LCD Panel */ //rgb_mode = MODE_RGB_P; - cfg = readl(ctrl_base + S5P_VIDCON0); + cfg = readl(ctrl_base + S5P_VIDCON0); cfg &= ~S5P_VIDCON0_VIDOUT_MASK; /* clock source is HCLK */ @@ -345,7 +345,7 @@ void s5pc_fimd_lcd_init(vidinfo_t *vid) cfg = 0; cfg |= S5P_VIDTCON2_HOZVAL(pvid->vl_col - 1); cfg |= S5P_VIDTCON2_LINEVAL(pvid->vl_row - 1); - + writel(cfg, ctrl_base + S5P_VIDTCON2); udebug("vidtcon2 = %x\n", cfg); diff --git a/drivers/video/s5p-fb.c b/drivers/video/s5p-fb.c index 44974e9..269f025 100644 --- a/drivers/video/s5p-fb.c +++ b/drivers/video/s5p-fb.c @@ -33,7 +33,7 @@ #define PANEL_WIDTH 480 #define PANEL_HEIGHT 800 -#define S5P_LCD_BPP 32 +#define S5P_LCD_BPP 32 extern void tl2796_panel_power_on(void); extern void tl2796_panel_enable(void); @@ -118,7 +118,7 @@ static void s5pc_lcd_init_mem(void *lcdbase, vidinfo_t *vid) { unsigned long palette_size, palette_mem_size; unsigned int fb_size; - + fb_size = vid->vl_row * vid->vl_col * (vid->vl_bpix / 8); lcd_base = lcdbase; diff --git a/drivers/video/s5p-fimd.c b/drivers/video/s5p-fimd.c index c2f5bbb..d506106 100644 --- a/drivers/video/s5p-fimd.c +++ b/drivers/video/s5p-fimd.c @@ -280,7 +280,7 @@ void s5pc_fimd_lcd_init(vidinfo_t *vid) /* set output to RGB */ rgb_mode = MODE_RGB_P; - cfg = readl(ctrl_base + S5P_VIDCON0); + cfg = readl(ctrl_base + S5P_VIDCON0); cfg &= ~S5P_VIDCON0_VIDOUT_MASK; /* clock source is HCLK */ @@ -320,7 +320,7 @@ void s5pc_fimd_lcd_init(vidinfo_t *vid) cfg = 0; cfg |= S5P_VIDTCON2_HOZVAL(pvid->vl_col - 1); cfg |= S5P_VIDTCON2_LINEVAL(pvid->vl_row - 1); - + writel(cfg, ctrl_base + S5P_VIDTCON2); udebug("vidtcon2 = %x\n", cfg); diff --git a/drivers/video/tl2796.c b/drivers/video/tl2796.c index 1e0be7d..3589dd3 100644 --- a/drivers/video/tl2796.c +++ b/drivers/video/tl2796.c @@ -42,10 +42,10 @@ S5PC1XX_GPIO_DAT_OFFSET)) #define S5PCFB_C100_CLK_HIGH writel(readl(S5PC100_GPIO_BASE(S5PC100_GPIO_K3_OFFSET+\ S5PC1XX_GPIO_DAT_OFFSET)) | 0x40, S5PC100_GPIO_BASE(S5PC100_GPIO_K3_OFFSET+\ - S5PC1XX_GPIO_DAT_OFFSET)) + S5PC1XX_GPIO_DAT_OFFSET)) #define S5PCFB_C100_SDA_LOW writel(readl(S5PC100_GPIO_BASE(S5PC100_GPIO_K3_OFFSET+\ S5PC1XX_GPIO_DAT_OFFSET)) & 0x7f, S5PC100_GPIO_BASE(S5PC100_GPIO_K3_OFFSET+\ - S5PC1XX_GPIO_DAT_OFFSET)) + S5PC1XX_GPIO_DAT_OFFSET)) #define S5PCFB_C100_SDA_HIGH writel(readl(S5PC100_GPIO_BASE(S5PC100_GPIO_K3_OFFSET+\ S5PC1XX_GPIO_DAT_OFFSET)) | 0x80, S5PC100_GPIO_BASE(S5PC100_GPIO_K3_OFFSET+\ S5PC1XX_GPIO_DAT_OFFSET)) @@ -147,7 +147,7 @@ const unsigned short SEQ_SETTING[] = { static void tl2796_c100_spi_write_byte(unsigned char address, unsigned char command) { - int j; + int j; unsigned char DELAY=1; unsigned short data; @@ -166,11 +166,11 @@ static void tl2796_c100_spi_write_byte(unsigned char address, unsigned char comm S5PCFB_C100_CLK_LOW; /* data high or low */ - if ((data >> j) & 0x0001) + if ((data >> j) & 0x0001) S5PCFB_C100_SDA_HIGH; else S5PCFB_C100_SDA_LOW; - + udelay(DELAY); S5PCFB_C100_CLK_HIGH; @@ -183,7 +183,7 @@ static void tl2796_c100_spi_write_byte(unsigned char address, unsigned char comm static void tl2796_c110_spi_write_byte(unsigned char address, unsigned char command) { - int j; + int j; unsigned char DELAY=1; unsigned short data; @@ -202,11 +202,11 @@ static void tl2796_c110_spi_write_byte(unsigned char address, unsigned char comm S5PCFB_C110_CLK_LOW; /* data high or low */ - if ((data >> j) & 0x0001) + if ((data >> j) & 0x0001) S5PCFB_C110_SDA_HIGH; else S5PCFB_C110_SDA_LOW; - + udelay(DELAY); S5PCFB_C110_CLK_HIGH; @@ -380,10 +380,10 @@ void tl2796_c110_panel_init(void) writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_4_OFFSET+ S5PC1XX_GPIO_DAT_OFFSET)) | 0x02, S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_4_OFFSET+ - S5PC1XX_GPIO_DAT_OFFSET)); + S5PC1XX_GPIO_DAT_OFFSET)); /* set gpio pin for DISPLAY_SI to HIGH */ writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_4_OFFSET+ S5PC1XX_GPIO_DAT_OFFSET)) | 0x08, S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_4_OFFSET+ - S5PC1XX_GPIO_DAT_OFFSET)); + S5PC1XX_GPIO_DAT_OFFSET)); } diff --git a/drivers/video/tl2796_dual.c b/drivers/video/tl2796_dual.c index e5ff649..3ea67d1 100644 --- a/drivers/video/tl2796_dual.c +++ b/drivers/video/tl2796_dual.c @@ -157,7 +157,7 @@ extern int dual_lcd; static void tl2796_spi_write_byte(unsigned char address, unsigned char command) { - int j; + int j; unsigned char DELAY=1; unsigned short data; @@ -170,7 +170,7 @@ static void tl2796_spi_write_byte(unsigned char address, unsigned char command) S5PCFB_CLK_HIGH; udelay(DELAY); - if (dual_lcd) + if (dual_lcd) S5PCFB_SUB_CS_LOW; S5PCFB_CS_LOW; udelay(DELAY); @@ -180,11 +180,11 @@ static void tl2796_spi_write_byte(unsigned char address, unsigned char command) S5PCFB_CLK_LOW; /* data high or low */ - if ((data >> j) & 0x0001) + if ((data >> j) & 0x0001) S5PCFB_SDA_HIGH; else S5PCFB_SDA_LOW; - + udelay(DELAY); S5PCFB_CLK_HIGH; @@ -250,7 +250,7 @@ void tl2796_c110_panel_power_on(void) writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET+ S5PC1XX_GPIO_DAT_OFFSET)) | 0x02, S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET+ - S5PC1XX_GPIO_DAT_OFFSET)); + S5PC1XX_GPIO_DAT_OFFSET)); /* set gpio data for SUBLCD_ON to HIGH */ writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET+ S5PC1XX_GPIO_DAT_OFFSET)) | 0x01, @@ -262,13 +262,13 @@ void tl2796_c110_panel_power_on(void) writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET+ S5PC1XX_GPIO_DAT_OFFSET)) & 0xfd, S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET+ - S5PC1XX_GPIO_DAT_OFFSET)); + S5PC1XX_GPIO_DAT_OFFSET)); udelay(20); /* set gpio data for SUBLCD_RST to HIGH */ writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET+ S5PC1XX_GPIO_DAT_OFFSET)) | 0x02, S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_2_OFFSET+ - S5PC1XX_GPIO_DAT_OFFSET)); + S5PC1XX_GPIO_DAT_OFFSET)); } udelay(20000); @@ -313,12 +313,12 @@ void tl2796_c110_panel_init(void) writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_4_OFFSET+ S5PC1XX_GPIO_DAT_OFFSET)) | 0x02, S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_4_OFFSET+ - S5PC1XX_GPIO_DAT_OFFSET)); + S5PC1XX_GPIO_DAT_OFFSET)); /* set gpio pin for DISPLAY_SI to HIGH */ writel(readl(S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_4_OFFSET+ S5PC1XX_GPIO_DAT_OFFSET)) | 0x08, S5PC110_GPIO_BASE(S5PC110_GPIO_MP0_4_OFFSET+ - S5PC1XX_GPIO_DAT_OFFSET)); + S5PC1XX_GPIO_DAT_OFFSET)); if (dual_lcd) /* set gpio pin for SUB_DISPLAY_CS to HIGH */ -- 2.7.4