video: exynos_fb: Remove callbacks from the driver

Replaced the functionality of callbacks by using a standard set of functions.
Instead of implementing and hooking up a callback, put the same code in one of
the standard set of functions by overriding it.

This patch is tested only on SMDK5250.
For Trats and universal_c210 board, it is only compile tested.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
index 217c6df30185f14d6ba4797e65f3300fd6f3b4eb..9f467db67f5d280f55d6cd0d47688d204a2c9aa5 100644 (file)
--- a/board/samsung/smdk5250/smdk5250.c
+++ b/board/samsung/smdk5250/smdk5250.c
@@ -454,7 +454,7 @@ int board_early_init_f(void)
 #endif
 
 #ifdef CONFIG_LCD
-void cfg_lcd_gpio(void)
+void exynos_cfg_lcd_gpio(void)
 {
        struct exynos5_gpio_part1 *gpio1 =
                (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
@@ -494,10 +494,6 @@ vidinfo_t panel_info = {
        .vl_cmd_allow_len = 0xf,
 
        .win_id         = 3,
-       .cfg_gpio       = cfg_lcd_gpio,
-       .backlight_on   = NULL,
-       .lcd_power_on   = NULL,
-       .reset_lcd      = NULL,
        .dual_lcd_enabled = 0,
 
        .init_delay     = 0,

diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 920764664cc0ca69c0bf65dbd4359645eb44a5a4..e20fb3d2e30d030ad1375aee6eb0fb441e277789 100644 (file)
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -635,7 +635,7 @@ int board_early_init_f(void)
        return 0;
 }
 
-static void lcd_reset(void)
+void exynos_reset_lcd(void)
 {
        struct exynos4_gpio_part2 *gpio2 =
                (struct exynos4_gpio_part2 *)samsung_get_base_gpio_part2();
@@ -755,10 +755,6 @@ vidinfo_t panel_info = {
        .vl_cmd_allow_len = 0xf,
 
        .win_id         = 3,
-       .cfg_gpio       = NULL,
-       .backlight_on   = NULL,
-       .lcd_power_on   = NULL, /* lcd_power_on in mipi dsi driver */
-       .reset_lcd      = lcd_reset,
        .dual_lcd_enabled = 0,
 
        .init_delay     = 0,

diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index e742707f79659dca95b19fb4b6b91f27f093e0e8..9b2770f9d117ad44ec8c5d1907127c4fdeae5315 100644 (file)
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -384,7 +384,7 @@ static void init_pmic_lcd(void)
                puts("LCD pmic initialisation error!\n");
 }
 
-static void lcd_cfg_gpio(void)
+void exynos_cfg_lcd_gpio(void)
 {
        unsigned int i, f3_end = 4;
 
@@ -423,7 +423,7 @@ static void lcd_cfg_gpio(void)
        spi_init();
 }
 
-static void reset_lcd(void)
+void exynos_reset_lcd(void)
 {
        s5p_gpio_set_value(&gpio2->y4, 5, 1);
        udelay(10000);
@@ -433,7 +433,7 @@ static void reset_lcd(void)
        udelay(100);
 }
 
-static void lcd_power_on(void)
+void exynos_lcd_power_on(void)
 {
        struct pmic *p = pmic_get("MAX8998_PMIC");
 
@@ -471,10 +471,6 @@ vidinfo_t panel_info = {
        .vl_cmd_allow_len = 0xf,
 
        .win_id         = 0,
-       .cfg_gpio       = lcd_cfg_gpio,
-       .backlight_on   = NULL,
-       .lcd_power_on   = lcd_power_on,
-       .reset_lcd      = reset_lcd,
        .dual_lcd_enabled = 0,
 
        .init_delay     = 0,
@@ -484,6 +480,16 @@ vidinfo_t panel_info = {
        .mipi_enabled   = 0,
 };
 
+void exynos_cfg_ldo(void)
+{
+       ld9040_cfg_ldo();
+}
+
+void exynos_enable_ldo(unsigned int onoff)
+{
+       ld9040_enable_ldo(onoff);
+}
+
 void init_panel_info(vidinfo_t *vid)
 {
        vid->logo_on    = 1;
@@ -498,9 +504,6 @@ void init_panel_info(vidinfo_t *vid)
        vid->pclk_name = 1;     /* MPLL */
        vid->sclk_div = 1;
 
-       vid->cfg_ldo = ld9040_cfg_ldo;
-       vid->enable_ldo = ld9040_enable_ldo;
-
        setenv("lcdinfo", "lcd=ld9040");
 }
 

diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c
index ee0ed06d6fe60d711a420b8710e996cb487fa9e8..a2637df4733a68bd8b60d29fab5245371ae44a5c 100644 (file)
--- a/drivers/video/exynos_fb.c
+++ b/drivers/video/exynos_fb.c
@@ -93,37 +93,72 @@ static void draw_logo(void)
 }
 #endif
 
+void __exynos_cfg_lcd_gpio(void)
+{
+}
+void exynos_cfg_lcd_gpio(void)
+       __attribute__((weak, alias("__exynos_cfg_lcd_gpio")));
+
+void __exynos_backlight_on(unsigned int onoff)
+{
+}
+void exynos_backlight_on(unsigned int onoff)
+       __attribute__((weak, alias("__exynos_cfg_lcd_gpio")));
+
+void __exynos_reset_lcd(void)
+{
+}
+void exynos_reset_lcd(void)
+       __attribute__((weak, alias("__exynos_reset_lcd")));
+
+void __exynos_lcd_power_on(void)
+{
+}
+void exynos_lcd_power_on(void)
+       __attribute__((weak, alias("__exynos_lcd_power_on")));
+
+void __exynos_cfg_ldo(void)
+{
+}
+void exynos_cfg_ldo(void)
+       __attribute__((weak, alias("__exynos_cfg_ldo")));
+
+void __exynos_enable_ldo(unsigned int onoff)
+{
+}
+void exynos_enable_ldo(unsigned int onoff)
+       __attribute__((weak, alias("__exynos_enable_ldo")));
+
+void __exynos_backlight_reset(void)
+{
+}
+void exynos_backlight_reset(void)
+       __attribute__((weak, alias("__exynos_backlight_reset")));
+
 static void lcd_panel_on(vidinfo_t *vid)
 {
        udelay(vid->init_delay);
 
-       if (vid->backlight_reset)
-               vid->backlight_reset();
+       exynos_backlight_reset();
 
-       if (vid->cfg_gpio)
-               vid->cfg_gpio();
+       exynos_cfg_lcd_gpio();
 
-       if (vid->lcd_power_on)
-               vid->lcd_power_on();
+       exynos_lcd_power_on();
 
        udelay(vid->power_on_delay);
 
        if (vid->dp_enabled)
                exynos_init_dp();
 
-       if (vid->reset_lcd) {
-               vid->reset_lcd();
-               udelay(vid->reset_delay);
-       }
+       exynos_reset_lcd();
+
+       udelay(vid->reset_delay);
 
-       if (vid->backlight_on)
-               vid->backlight_on(1);
+       exynos_backlight_on(1);
 
-       if (vid->cfg_ldo)
-               vid->cfg_ldo();
+       exynos_cfg_ldo();
 
-       if (vid->enable_ldo)
-               vid->enable_ldo(1);
+       exynos_enable_ldo(1);
 
        if (vid->mipi_enabled)
                exynos_mipi_dsi_init();

diff --git a/include/lcd.h b/include/lcd.h
index 4ac4ddd1e0edc35648c6e87f44974bdc23846c33..a6822d29fe2a946310c2f537590f17c81a298522 100644 (file)
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -234,15 +234,6 @@ typedef struct vidinfo {
        u_char  vl_vbpd;        /* Wait end of frame */
        u_char  vl_cmd_allow_len; /* Wait end of frame */
 
-       void (*cfg_gpio)(void);
-       void (*backlight_on)(unsigned int onoff);
-       void (*reset_lcd)(void);
-       void (*lcd_power_on)(void);
-       void (*cfg_ldo)(void);
-       void (*enable_ldo)(unsigned int onoff);
-       void (*mipi_power)(void);
-       void (*backlight_reset)(void);
-
        unsigned int win_id;
        unsigned int init_delay;
        unsigned int power_on_delay;