s5pc110: lcd: code clean

diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index 3735346..7a2ff7e 100644 (file)
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -1331,8 +1331,7 @@ struct spi_platform_data {
 extern void s6e63m0_set_platform_data(struct spi_platform_data *pd);
 extern void s6d16a0x_set_platform_data(struct spi_platform_data *pd);
 
-struct spi_platform_data s6e63m0_pd;
-struct spi_platform_data s6d16a0x_pd;
+struct spi_platform_data spi_pd;
 
 struct s5pc110_gpio *gpio_base = (struct s5pc110_gpio *) S5PC110_GPIO_BASE;
 
@@ -1396,28 +1395,28 @@ void lcd_cfg_gpio(void)
 
        if (machine_is_aquila()) {
                if (board_is_neptune()) {
-                       s6d16a0x_pd.cs_bank = &gpio_base->gpio_mp0_1;
-                       s6d16a0x_pd.cs_num = 1;
-                       s6d16a0x_pd.clk_bank = &gpio_base->gpio_mp0_4;
-                       s6d16a0x_pd.clk_num = 1;
-                       s6d16a0x_pd.si_bank = &gpio_base->gpio_mp0_4;
-                       s6d16a0x_pd.si_num = 3;
-                       s6d16a0x_pd.so_bank = &gpio_base->gpio_mp0_4;
-                       s6d16a0x_pd.so_num = 2;
-                       s6d16a0x_set_platform_data(&s6d16a0x_pd);
+                       spi_pd.cs_bank = &gpio_base->gpio_mp0_1;
+                       spi_pd.cs_num = 1;
+                       spi_pd.clk_bank = &gpio_base->gpio_mp0_4;
+                       spi_pd.clk_num = 1;
+                       spi_pd.si_bank = &gpio_base->gpio_mp0_4;
+                       spi_pd.si_num = 3;
+                       spi_pd.so_bank = &gpio_base->gpio_mp0_4;
+                       spi_pd.so_num = 2;
+                       s6d16a0x_set_platform_data(&spi_pd);
                } else {
-                       s6e63m0_pd.cs_bank = &gpio_base->gpio_mp0_1;
-                       s6e63m0_pd.cs_num = 1;
-                       s6e63m0_pd.clk_bank = &gpio_base->gpio_mp0_4;
-                       s6e63m0_pd.clk_num = 1;
-                       s6e63m0_pd.si_bank = &gpio_base->gpio_mp0_4;
-                       s6e63m0_pd.si_num = 3;
-                       s6e63m0_pd.so_bank = &gpio_base->gpio_mp0_4;
-                       s6e63m0_pd.so_num = 2;
+                       spi_pd.cs_bank = &gpio_base->gpio_mp0_1;
+                       spi_pd.cs_num = 1;
+                       spi_pd.clk_bank = &gpio_base->gpio_mp0_4;
+                       spi_pd.clk_num = 1;
+                       spi_pd.si_bank = &gpio_base->gpio_mp0_4;
+                       spi_pd.si_num = 3;
+                       spi_pd.so_bank = &gpio_base->gpio_mp0_4;
+                       spi_pd.so_num = 2;
 
                        if (board_is_media())
-                               s6e63m0_pd.board_is_media = 1;
-                       s6e63m0_set_platform_data(&s6e63m0_pd);
+                               spi_pd.board_is_media = 1;
+                       s6e63m0_set_platform_data(&spi_pd);
                }
                /* these data would be sent to s6e63m0 lcd panel driver. */
        }
@@ -1441,15 +1440,15 @@ void lcd_cfg_gpio(void)
                pd_cs.bank = &gpio_base->gpio_mp0_1;
                pd_cs.num = 0;
 #endif
-               s6e63m0_pd.cs_bank = &gpio_base->gpio_mp0_5;
-               s6e63m0_pd.cs_num = 1;
-               s6e63m0_pd.clk_bank = &gpio_base->gpio_mp0_4;
-               s6e63m0_pd.clk_num = 0;
-               s6e63m0_pd.si_bank = &gpio_base->gpio_mp0_4;
-               s6e63m0_pd.si_num = 2;
+               spi_pd.cs_bank = &gpio_base->gpio_mp0_5;
+               spi_pd.cs_num = 1;
+               spi_pd.clk_bank = &gpio_base->gpio_mp0_4;
+               spi_pd.clk_num = 0;
+               spi_pd.si_bank = &gpio_base->gpio_mp0_4;
+               spi_pd.si_num = 2;
 
                /* these data would be sent to s6e63m0 lcd panel driver. */
-               s6e63m0_set_platform_data(&s6e63m0_pd);
+               s6e63m0_set_platform_data(&spi_pd);
        }
 
        return;

diff --git a/drivers/video/s5p-spi.h b/drivers/video/s5p-spi.h
new file mode 100644 (file)
index 0000000..bef43cc
--- /dev/null
+++ b/drivers/video/s5p-spi.h
@@ -0,0 +1,23 @@
+
+#define SLEEPMSEC              0x1000
+#define ENDDEF                 0x2000
+#define        DEFMASK                 0xFF00
+#define COMMAND_ONLY           0xFE
+#define DATA_ONLY              0xFF
+
+#define PACKET_LEN             8
+
+struct spi_platform_data {
+       struct s5pc1xx_gpio_bank *cs_bank;
+       struct s5pc1xx_gpio_bank *clk_bank;
+       struct s5pc1xx_gpio_bank *si_bank;
+       struct s5pc1xx_gpio_bank *so_bank;
+
+       unsigned int cs_num;
+       unsigned int clk_num;
+       unsigned int si_num;
+       unsigned int so_num;
+
+       unsigned int board_is_media;
+};
+

diff --git a/drivers/video/s6d16a0x.c b/drivers/video/s6d16a0x.c
index 74b82a0..8c29638 100644 (file)
--- a/drivers/video/s6d16a0x.c
+++ b/drivers/video/s6d16a0x.c
@@ -25,37 +25,10 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/gpio.h>
-
-#define SLEEPMSEC              0x1000
-#define ENDDEF                 0x2000
-#define        DEFMASK                 0xFF00
-#define COMMAND_ONLY           0xFE
-#define DATA_ONLY              0xFF
-
-#define PACKET_LEN             8
-
-struct s6d16a0x_platform_data {
-       struct s5pc11x_gpio_bank *cs_bank;
-       struct s5pc11x_gpio_bank *clk_bank;
-       struct s5pc11x_gpio_bank *si_bank;
-       struct s5pc11x_gpio_bank *so_bank;
-
-       unsigned int cs_num;
-       unsigned int clk_num;
-       unsigned int si_num;
-       unsigned int so_num;
-
-       struct device                   *dev;
-       struct spi_device               *spi;
-       unsigned int                    power;
-       struct lcd_device               *ld;
-       //struct backlight_device               *bd;
-       struct s6d16a0x_platform_data   *pdata;
-}
-;
+#include "s5p-spi.h"
 
 /* these machine specific platform data would be setting at universal.c */
-struct s6d16a0x_platform_data *s6d16a0x;
+struct spi_platform_data *s6d16a0x;
 
 void cs_low_(void)
 {
@@ -455,7 +428,6 @@ static void s6d16a0x_c110_spi_write_byte(unsigned char address, unsigned char co
        udelay(Delay);
 }
 
-
 static unsigned char s6d16a0x_c110_spi_read_byte(unsigned char select, unsigned char address)
 {
        int     j;
@@ -572,7 +544,7 @@ void s6d16a0x_enable_ldo(unsigned int onoff)
 }
 
 /* this function would be called at universal.c */
-void s6d16a0x_set_platform_data(struct s6d16a0x_platform_data *pd)
+void s6d16a0x_set_platform_data(struct spi_platform_data *pd)
 {
        if (pd == NULL) {
                printf("pd is NULL.\n");
@@ -581,3 +553,4 @@ void s6d16a0x_set_platform_data(struct s6d16a0x_platform_data *pd)
 
        s6d16a0x = pd;
 }
+

diff --git a/drivers/video/s6e63m0.c b/drivers/video/s6e63m0.c
index 3f5b586..90c46c2 100644 (file)
--- a/drivers/video/s6e63m0.c
+++ b/drivers/video/s6e63m0.c
@@ -25,31 +25,10 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/gpio.h>
-
-#define SLEEPMSEC              0x1000
-#define ENDDEF                 0x2000
-#define        DEFMASK                 0xFF00
-#define COMMAND_ONLY           0xFE
-#define DATA_ONLY              0xFF
-
-#define PACKET_LEN             8
-
-struct s6e63m0_platform_data {
-       struct s5pc1xx_gpio_bank *cs_bank;
-       struct s5pc1xx_gpio_bank *clk_bank;
-       struct s5pc1xx_gpio_bank *si_bank;
-       struct s5pc1xx_gpio_bank *so_bank;
-
-       unsigned int cs_num;
-       unsigned int clk_num;
-       unsigned int si_num;
-       unsigned int so_num;
-
-       unsigned int board_is_media;
-};
+#include "s5p-spi.h"
 
 /* these machine specific platform data would be setting at universal.c */
-struct s6e63m0_platform_data *s6e63m0;
+struct spi_platform_data *s6e63m0;
 
 void cs_low(void)
 {
@@ -559,7 +538,7 @@ void s6e63m0_enable_ldo(unsigned int onoff)
 }
 
 /* this function would be called at universal.c */
-void s6e63m0_set_platform_data(struct s6e63m0_platform_data *pd)
+void s6e63m0_set_platform_data(struct spi_platform_data *pd)
 {
        if (pd == NULL) {
                printf("pd is NULL.\n");