]> git.sur5r.net Git - u-boot/blobdiff - drivers/video/exynos/exynos_fb.c
libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>
[u-boot] / drivers / video / exynos / exynos_fb.c
index e13d35af78a183a910b4ff20c41e909edfc93d97..a2879a9c57100e4c12d76d07f9c664805fbddcfa 100644 (file)
 
 #include <config.h>
 #include <common.h>
+#include <display.h>
 #include <div64.h>
-#include <lcd.h>
+#include <dm.h>
 #include <fdtdec.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
+#include <panel.h>
+#include <video.h>
+#include <video_bridge.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/mipi_dsim.h>
 #include <asm/arch/dp_info.h>
+#include <asm/arch/fb.h>
+#include <asm/arch/pinmux.h>
 #include <asm/arch/system.h>
 #include <asm/gpio.h>
-#include <asm-generic/errno.h>
-
-#include "exynos_fb.h"
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-struct vidinfo panel_info  = {
-       /*
-        * Insert a value here so that we don't end up in the BSS
-        * Reference: drivers/video/tegra.c
-        */
-       .vl_col = -1,
+enum {
+       FIMD_RGB_INTERFACE = 1,
+       FIMD_CPU_INTERFACE = 2,
+};
+
+enum exynos_fb_rgb_mode_t {
+       MODE_RGB_P = 0,
+       MODE_BGR_P = 1,
+       MODE_RGB_S = 2,
+       MODE_BGR_S = 3,
 };
 
-static void exynos_fimd_set_dualrgb(struct vidinfo *pvid, unsigned int enabled)
+struct exynos_fb_priv {
+       ushort vl_col;          /* Number of columns (i.e. 640) */
+       ushort vl_row;          /* Number of rows (i.e. 480) */
+       ushort vl_rot;          /* Rotation of Display (0, 1, 2, 3) */
+       ushort vl_width;        /* Width of display area in millimeters */
+       ushort vl_height;       /* Height of display area in millimeters */
+
+       /* LCD configuration register */
+       u_char vl_freq;         /* Frequency */
+       u_char vl_clkp;         /* Clock polarity */
+       u_char vl_oep;          /* Output Enable polarity */
+       u_char vl_hsp;          /* Horizontal Sync polarity */
+       u_char vl_vsp;          /* Vertical Sync polarity */
+       u_char vl_dp;           /* Data polarity */
+       u_char vl_bpix;         /* Bits per pixel */
+
+       /* Horizontal control register. Timing from data sheet */
+       u_char vl_hspw;         /* Horz sync pulse width */
+       u_char vl_hfpd;         /* Wait before of line */
+       u_char vl_hbpd;         /* Wait end of line */
+
+       /* Vertical control register. */
+       u_char  vl_vspw;        /* Vertical sync pulse width */
+       u_char  vl_vfpd;        /* Wait before of frame */
+       u_char  vl_vbpd;        /* Wait end of frame */
+       u_char  vl_cmd_allow_len; /* Wait end of frame */
+
+       unsigned int win_id;
+       unsigned int init_delay;
+       unsigned int power_on_delay;
+       unsigned int reset_delay;
+       unsigned int interface_mode;
+       unsigned int mipi_enabled;
+       unsigned int dp_enabled;
+       unsigned int cs_setup;
+       unsigned int wr_setup;
+       unsigned int wr_act;
+       unsigned int wr_hold;
+       unsigned int logo_on;
+       unsigned int logo_width;
+       unsigned int logo_height;
+       int logo_x_offset;
+       int logo_y_offset;
+       unsigned long logo_addr;
+       unsigned int rgb_mode;
+       unsigned int resolution;
+
+       /* parent clock name(MPLL, EPLL or VPLL) */
+       unsigned int pclk_name;
+       /* ratio value for source clock from parent clock. */
+       unsigned int sclk_div;
+
+       unsigned int dual_lcd_enabled;
+       struct exynos_fb *reg;
+       struct exynos_platform_mipi_dsim *dsim_platform_data_dt;
+};
+
+static void exynos_fimd_set_dualrgb(struct exynos_fb_priv *priv, bool enabled)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
 
        if (enabled) {
@@ -45,32 +110,33 @@ static void exynos_fimd_set_dualrgb(struct vidinfo *pvid, unsigned int enabled)
                        EXYNOS_DUALRGB_VDEN_EN_ENABLE;
 
                /* in case of Line Split mode, MAIN_CNT doesn't neet to set. */
-               cfg |= EXYNOS_DUALRGB_SUB_CNT(pvid->vl_col / 2) |
+               cfg |= EXYNOS_DUALRGB_SUB_CNT(priv->vl_col / 2) |
                        EXYNOS_DUALRGB_MAIN_CNT(0);
        }
 
-       writel(cfg, &fimd_ctrl->dualrgb);
+       writel(cfg, &reg->dualrgb);
 }
 
-static void exynos_fimd_set_dp_clkcon(struct vidinfo *pvid,
+static void exynos_fimd_set_dp_clkcon(struct exynos_fb_priv *priv,
                                      unsigned int enabled)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
 
        if (enabled)
                cfg = EXYNOS_DP_CLK_ENABLE;
 
-       writel(cfg, &fimd_ctrl->dp_mie_clkcon);
+       writel(cfg, &reg->dp_mie_clkcon);
 }
 
-static void exynos_fimd_set_par(struct vidinfo *pvid, unsigned int win_id)
+static void exynos_fimd_set_par(struct exynos_fb_priv *priv,
+                               unsigned int win_id)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
 
        /* set window control */
-       cfg = readl((unsigned int)&fimd_ctrl->wincon0 +
+       cfg = readl((unsigned int)&reg->wincon0 +
                        EXYNOS_WINCON(win_id));
 
        cfg &= ~(EXYNOS_WINCON_BITSWP_ENABLE | EXYNOS_WINCON_BYTESWP_ENABLE |
@@ -86,7 +152,7 @@ static void exynos_fimd_set_par(struct vidinfo *pvid, unsigned int win_id)
        /* dma burst is 16 */
        cfg |= EXYNOS_WINCON_BURSTLEN_16WORD;
 
-       switch (pvid->vl_bpix) {
+       switch (priv->vl_bpix) {
        case 4:
                cfg |= EXYNOS_WINCON_BPPMODE_16BPP_565;
                break;
@@ -95,72 +161,72 @@ static void exynos_fimd_set_par(struct vidinfo *pvid, unsigned int win_id)
                break;
        }
 
-       writel(cfg, (unsigned int)&fimd_ctrl->wincon0 +
+       writel(cfg, (unsigned int)&reg->wincon0 +
                        EXYNOS_WINCON(win_id));
 
        /* set window position to x=0, y=0*/
        cfg = EXYNOS_VIDOSD_LEFT_X(0) | EXYNOS_VIDOSD_TOP_Y(0);
-       writel(cfg, (unsigned int)&fimd_ctrl->vidosd0a +
+       writel(cfg, (unsigned int)&reg->vidosd0a +
                        EXYNOS_VIDOSD(win_id));
 
-       cfg = EXYNOS_VIDOSD_RIGHT_X(pvid->vl_col - 1) |
-               EXYNOS_VIDOSD_BOTTOM_Y(pvid->vl_row - 1) |
+       cfg = EXYNOS_VIDOSD_RIGHT_X(priv->vl_col - 1) |
+               EXYNOS_VIDOSD_BOTTOM_Y(priv->vl_row - 1) |
                EXYNOS_VIDOSD_RIGHT_X_E(1) |
                EXYNOS_VIDOSD_BOTTOM_Y_E(0);
 
-       writel(cfg, (unsigned int)&fimd_ctrl->vidosd0b +
+       writel(cfg, (unsigned int)&reg->vidosd0b +
                        EXYNOS_VIDOSD(win_id));
 
        /* set window size for window0*/
-       cfg = EXYNOS_VIDOSD_SIZE(pvid->vl_col * pvid->vl_row);
-       writel(cfg, (unsigned int)&fimd_ctrl->vidosd0c +
+       cfg = EXYNOS_VIDOSD_SIZE(priv->vl_col * priv->vl_row);
+       writel(cfg, (unsigned int)&reg->vidosd0c +
                        EXYNOS_VIDOSD(win_id));
 }
 
-static void exynos_fimd_set_buffer_address(struct vidinfo *pvid,
+static void exynos_fimd_set_buffer_address(struct exynos_fb_priv *priv,
                                           unsigned int win_id,
                                           ulong lcd_base_addr)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned long start_addr, end_addr;
 
        start_addr = lcd_base_addr;
-       end_addr = start_addr + ((pvid->vl_col * (NBITS(pvid->vl_bpix) / 8)) *
-                               pvid->vl_row);
+       end_addr = start_addr + ((priv->vl_col * (VNBITS(priv->vl_bpix) / 8)) *
+                               priv->vl_row);
 
-       writel(start_addr, (unsigned int)&fimd_ctrl->vidw00add0b0 +
+       writel(start_addr, (unsigned int)&reg->vidw00add0b0 +
                        EXYNOS_BUFFER_OFFSET(win_id));
-       writel(end_addr, (unsigned int)&fimd_ctrl->vidw00add1b0 +
+       writel(end_addr, (unsigned int)&reg->vidw00add1b0 +
                        EXYNOS_BUFFER_OFFSET(win_id));
 }
 
-static void exynos_fimd_set_clock(struct vidinfo *pvid)
+static void exynos_fimd_set_clock(struct exynos_fb_priv *priv)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0, div = 0, remainder, remainder_div;
        unsigned long pixel_clock;
        unsigned long long src_clock;
 
-       if (pvid->dual_lcd_enabled) {
-               pixel_clock = pvid->vl_freq *
-                               (pvid->vl_hspw + pvid->vl_hfpd +
-                                pvid->vl_hbpd + pvid->vl_col / 2) *
-                               (pvid->vl_vspw + pvid->vl_vfpd +
-                                pvid->vl_vbpd + pvid->vl_row);
-       } else if (pvid->interface_mode == FIMD_CPU_INTERFACE) {
-               pixel_clock = pvid->vl_freq *
-                               pvid->vl_width * pvid->vl_height *
-                               (pvid->cs_setup + pvid->wr_setup +
-                                pvid->wr_act + pvid->wr_hold + 1);
+       if (priv->dual_lcd_enabled) {
+               pixel_clock = priv->vl_freq *
+                               (priv->vl_hspw + priv->vl_hfpd +
+                                priv->vl_hbpd + priv->vl_col / 2) *
+                               (priv->vl_vspw + priv->vl_vfpd +
+                                priv->vl_vbpd + priv->vl_row);
+       } else if (priv->interface_mode == FIMD_CPU_INTERFACE) {
+               pixel_clock = priv->vl_freq *
+                               priv->vl_width * priv->vl_height *
+                               (priv->cs_setup + priv->wr_setup +
+                                priv->wr_act + priv->wr_hold + 1);
        } else {
-               pixel_clock = pvid->vl_freq *
-                               (pvid->vl_hspw + pvid->vl_hfpd +
-                                pvid->vl_hbpd + pvid->vl_col) *
-                               (pvid->vl_vspw + pvid->vl_vfpd +
-                                pvid->vl_vbpd + pvid->vl_row);
+               pixel_clock = priv->vl_freq *
+                               (priv->vl_hspw + priv->vl_hfpd +
+                                priv->vl_hbpd + priv->vl_col) *
+                               (priv->vl_vspw + priv->vl_vfpd +
+                                priv->vl_vbpd + priv->vl_row);
        }
 
-       cfg = readl(&fimd_ctrl->vidcon0);
+       cfg = readl(&reg->vidcon0);
        cfg &= ~(EXYNOS_VIDCON0_CLKSEL_MASK | EXYNOS_VIDCON0_CLKVALUP_MASK |
                EXYNOS_VIDCON0_CLKVAL_F(0xFF) | EXYNOS_VIDCON0_VCLKEN_MASK |
                EXYNOS_VIDCON0_CLKDIR_MASK);
@@ -181,32 +247,32 @@ static void exynos_fimd_set_clock(struct vidinfo *pvid)
                div++;
 
        /* in case of dual lcd mode. */
-       if (pvid->dual_lcd_enabled)
+       if (priv->dual_lcd_enabled)
                div--;
 
        cfg |= EXYNOS_VIDCON0_CLKVAL_F(div - 1);
-       writel(cfg, &fimd_ctrl->vidcon0);
+       writel(cfg, &reg->vidcon0);
 }
 
-void exynos_set_trigger(struct vidinfo *pvid)
+void exynos_set_trigger(struct exynos_fb_priv *priv)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
 
-       cfg = readl(&fimd_ctrl->trigcon);
+       cfg = readl(&reg->trigcon);
 
        cfg |= (EXYNOS_I80SOFT_TRIG_EN | EXYNOS_I80START_TRIG);
 
-       writel(cfg, &fimd_ctrl->trigcon);
+       writel(cfg, &reg->trigcon);
 }
 
-int exynos_is_i80_frame_done(struct vidinfo *pvid)
+int exynos_is_i80_frame_done(struct exynos_fb_priv *priv)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
        int status;
 
-       cfg = readl(&fimd_ctrl->trigcon);
+       cfg = readl(&reg->trigcon);
 
        /* frame done func is valid only when TRIMODE[0] is set to 1. */
        status = (cfg & EXYNOS_I80STATUS_TRIG_DONE) ==
@@ -215,58 +281,59 @@ int exynos_is_i80_frame_done(struct vidinfo *pvid)
        return status;
 }
 
-static void exynos_fimd_lcd_on(struct vidinfo *pvid)
+static void exynos_fimd_lcd_on(struct exynos_fb_priv *priv)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
 
        /* display on */
-       cfg = readl(&fimd_ctrl->vidcon0);
+       cfg = readl(&reg->vidcon0);
        cfg |= (EXYNOS_VIDCON0_ENVID_ENABLE | EXYNOS_VIDCON0_ENVID_F_ENABLE);
-       writel(cfg, &fimd_ctrl->vidcon0);
+       writel(cfg, &reg->vidcon0);
 }
 
-static void exynos_fimd_window_on(struct vidinfo *pvid, unsigned int win_id)
+static void exynos_fimd_window_on(struct exynos_fb_priv *priv,
+                                 unsigned int win_id)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
 
        /* enable window */
-       cfg = readl((unsigned int)&fimd_ctrl->wincon0 +
+       cfg = readl((unsigned int)&reg->wincon0 +
                        EXYNOS_WINCON(win_id));
        cfg |= EXYNOS_WINCON_ENWIN_ENABLE;
-       writel(cfg, (unsigned int)&fimd_ctrl->wincon0 +
+       writel(cfg, (unsigned int)&reg->wincon0 +
                        EXYNOS_WINCON(win_id));
 
-       cfg = readl(&fimd_ctrl->winshmap);
+       cfg = readl(&reg->winshmap);
        cfg |= EXYNOS_WINSHMAP_CH_ENABLE(win_id);
-       writel(cfg, &fimd_ctrl->winshmap);
+       writel(cfg, &reg->winshmap);
 }
 
-void exynos_fimd_lcd_off(struct vidinfo *pvid)
+void exynos_fimd_lcd_off(struct exynos_fb_priv *priv)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
 
-       cfg = readl(&fimd_ctrl->vidcon0);
+       cfg = readl(&reg->vidcon0);
        cfg &= (EXYNOS_VIDCON0_ENVID_DISABLE | EXYNOS_VIDCON0_ENVID_F_DISABLE);
-       writel(cfg, &fimd_ctrl->vidcon0);
+       writel(cfg, &reg->vidcon0);
 }
 
-void exynos_fimd_window_off(struct vidinfo *pvid, unsigned int win_id)
+void exynos_fimd_window_off(struct exynos_fb_priv *priv, unsigned int win_id)
 {
-       struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl;
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
 
-       cfg = readl((unsigned int)&fimd_ctrl->wincon0 +
+       cfg = readl((unsigned int)&reg->wincon0 +
                        EXYNOS_WINCON(win_id));
        cfg &= EXYNOS_WINCON_ENWIN_DISABLE;
-       writel(cfg, (unsigned int)&fimd_ctrl->wincon0 +
+       writel(cfg, (unsigned int)&reg->wincon0 +
                        EXYNOS_WINCON(win_id));
 
-       cfg = readl(&fimd_ctrl->winshmap);
+       cfg = readl(&reg->winshmap);
        cfg &= ~EXYNOS_WINSHMAP_CH_DISABLE(win_id);
-       writel(cfg, &fimd_ctrl->winshmap);
+       writel(cfg, &reg->winshmap);
 }
 
 /*
@@ -307,380 +374,347 @@ void exynos_fimd_disable_sysmmu(void)
        }
 }
 
-void exynos_fimd_lcd_init(struct vidinfo *pvid, ulong lcd_base_address)
+void exynos_fimd_lcd_init(struct udevice *dev)
 {
-       struct exynos_fb *fimd_ctrl;
+       struct exynos_fb_priv *priv = dev_get_priv(dev);
+       struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
+       struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0, rgb_mode;
        unsigned int offset;
        unsigned int node;
 
-       node = fdtdec_next_compatible(gd->fdt_blob,
-                                       0, COMPAT_SAMSUNG_EXYNOS_FIMD);
-       if (node <= 0)
-               debug("exynos_fb: Can't get device node for fimd\n");
-
-       fimd_ctrl = (struct exynos_fb *)fdtdec_get_addr(gd->fdt_blob, node,
-                                                       "reg");
-       if (fimd_ctrl == NULL)
-               debug("Can't get the FIMD base address\n");
-       pvid->fimd_ctrl = fimd_ctrl;
-
+       node = dev_of_offset(dev);
        if (fdtdec_get_bool(gd->fdt_blob, node, "samsung,disable-sysmmu"))
                exynos_fimd_disable_sysmmu();
 
        offset = exynos_fimd_get_base_offset();
 
-       rgb_mode = pvid->rgb_mode;
+       rgb_mode = priv->rgb_mode;
 
-       if (pvid->interface_mode == FIMD_RGB_INTERFACE) {
+       if (priv->interface_mode == FIMD_RGB_INTERFACE) {
                cfg |= EXYNOS_VIDCON0_VIDOUT_RGB;
-               writel(cfg, &fimd_ctrl->vidcon0);
+               writel(cfg, &reg->vidcon0);
 
-               cfg = readl(&fimd_ctrl->vidcon2);
+               cfg = readl(&reg->vidcon2);
                cfg &= ~(EXYNOS_VIDCON2_WB_MASK |
                        EXYNOS_VIDCON2_TVFORMATSEL_MASK |
                        EXYNOS_VIDCON2_TVFORMATSEL_YUV_MASK);
                cfg |= EXYNOS_VIDCON2_WB_DISABLE;
-               writel(cfg, &fimd_ctrl->vidcon2);
+               writel(cfg, &reg->vidcon2);
 
                /* set polarity */
                cfg = 0;
-               if (!pvid->vl_clkp)
+               if (!priv->vl_clkp)
                        cfg |= EXYNOS_VIDCON1_IVCLK_RISING_EDGE;
-               if (!pvid->vl_hsp)
+               if (!priv->vl_hsp)
                        cfg |= EXYNOS_VIDCON1_IHSYNC_INVERT;
-               if (!pvid->vl_vsp)
+               if (!priv->vl_vsp)
                        cfg |= EXYNOS_VIDCON1_IVSYNC_INVERT;
-               if (!pvid->vl_dp)
+               if (!priv->vl_dp)
                        cfg |= EXYNOS_VIDCON1_IVDEN_INVERT;
 
-               writel(cfg, (unsigned int)&fimd_ctrl->vidcon1 + offset);
+               writel(cfg, (unsigned int)&reg->vidcon1 + offset);
 
                /* set timing */
-               cfg = EXYNOS_VIDTCON0_VFPD(pvid->vl_vfpd - 1);
-               cfg |= EXYNOS_VIDTCON0_VBPD(pvid->vl_vbpd - 1);
-               cfg |= EXYNOS_VIDTCON0_VSPW(pvid->vl_vspw - 1);
-               writel(cfg, (unsigned int)&fimd_ctrl->vidtcon0 + offset);
+               cfg = EXYNOS_VIDTCON0_VFPD(priv->vl_vfpd - 1);
+               cfg |= EXYNOS_VIDTCON0_VBPD(priv->vl_vbpd - 1);
+               cfg |= EXYNOS_VIDTCON0_VSPW(priv->vl_vspw - 1);
+               writel(cfg, (unsigned int)&reg->vidtcon0 + offset);
 
-               cfg = EXYNOS_VIDTCON1_HFPD(pvid->vl_hfpd - 1);
-               cfg |= EXYNOS_VIDTCON1_HBPD(pvid->vl_hbpd - 1);
-               cfg |= EXYNOS_VIDTCON1_HSPW(pvid->vl_hspw - 1);
+               cfg = EXYNOS_VIDTCON1_HFPD(priv->vl_hfpd - 1);
+               cfg |= EXYNOS_VIDTCON1_HBPD(priv->vl_hbpd - 1);
+               cfg |= EXYNOS_VIDTCON1_HSPW(priv->vl_hspw - 1);
 
-               writel(cfg, (unsigned int)&fimd_ctrl->vidtcon1 + offset);
+               writel(cfg, (unsigned int)&reg->vidtcon1 + offset);
 
                /* set lcd size */
-               cfg = EXYNOS_VIDTCON2_HOZVAL(pvid->vl_col - 1) |
-                       EXYNOS_VIDTCON2_LINEVAL(pvid->vl_row - 1) |
-                       EXYNOS_VIDTCON2_HOZVAL_E(pvid->vl_col - 1) |
-                       EXYNOS_VIDTCON2_LINEVAL_E(pvid->vl_row - 1);
+               cfg = EXYNOS_VIDTCON2_HOZVAL(priv->vl_col - 1) |
+                       EXYNOS_VIDTCON2_LINEVAL(priv->vl_row - 1) |
+                       EXYNOS_VIDTCON2_HOZVAL_E(priv->vl_col - 1) |
+                       EXYNOS_VIDTCON2_LINEVAL_E(priv->vl_row - 1);
 
-               writel(cfg, (unsigned int)&fimd_ctrl->vidtcon2 + offset);
+               writel(cfg, (unsigned int)&reg->vidtcon2 + offset);
        }
 
        /* set display mode */
-       cfg = readl(&fimd_ctrl->vidcon0);
+       cfg = readl(&reg->vidcon0);
        cfg &= ~EXYNOS_VIDCON0_PNRMODE_MASK;
        cfg |= (rgb_mode << EXYNOS_VIDCON0_PNRMODE_SHIFT);
-       writel(cfg, &fimd_ctrl->vidcon0);
+       writel(cfg, &reg->vidcon0);
 
        /* set par */
-       exynos_fimd_set_par(pvid, pvid->win_id);
+       exynos_fimd_set_par(priv, priv->win_id);
 
        /* set memory address */
-       exynos_fimd_set_buffer_address(pvid, pvid->win_id, lcd_base_address);
+       exynos_fimd_set_buffer_address(priv, priv->win_id, plat->base);
 
        /* set buffer size */
-       cfg = EXYNOS_VIDADDR_PAGEWIDTH(pvid->vl_col *
-                       NBITS(pvid->vl_bpix) / 8) |
-               EXYNOS_VIDADDR_PAGEWIDTH_E(pvid->vl_col *
-                       NBITS(pvid->vl_bpix) / 8) |
+       cfg = EXYNOS_VIDADDR_PAGEWIDTH(priv->vl_col *
+                       VNBITS(priv->vl_bpix) / 8) |
+               EXYNOS_VIDADDR_PAGEWIDTH_E(priv->vl_col *
+                       VNBITS(priv->vl_bpix) / 8) |
                EXYNOS_VIDADDR_OFFSIZE(0) |
                EXYNOS_VIDADDR_OFFSIZE_E(0);
 
-       writel(cfg, (unsigned int)&fimd_ctrl->vidw00add2 +
-                                       EXYNOS_BUFFER_SIZE(pvid->win_id));
+       writel(cfg, (unsigned int)&reg->vidw00add2 +
+                                       EXYNOS_BUFFER_SIZE(priv->win_id));
 
        /* set clock */
-       exynos_fimd_set_clock(pvid);
+       exynos_fimd_set_clock(priv);
 
        /* set rgb mode to dual lcd. */
-       exynos_fimd_set_dualrgb(pvid, pvid->dual_lcd_enabled);
+       exynos_fimd_set_dualrgb(priv, priv->dual_lcd_enabled);
 
        /* display on */
-       exynos_fimd_lcd_on(pvid);
+       exynos_fimd_lcd_on(priv);
 
        /* window on */
-       exynos_fimd_window_on(pvid, pvid->win_id);
-
-       exynos_fimd_set_dp_clkcon(pvid, pvid->dp_enabled);
-}
+       exynos_fimd_window_on(priv, priv->win_id);
 
-unsigned long exynos_fimd_calc_fbsize(struct vidinfo *pvid)
-{
-       return pvid->vl_col * pvid->vl_row * (NBITS(pvid->vl_bpix) / 8);
-}
-
-ushort *configuration_get_cmap(void)
-{
-#if defined(CONFIG_LCD_LOGO)
-       return bmp_logo_palette;
-#else
-       return NULL;
-#endif
-}
-
-static void exynos_lcd_init(struct vidinfo *vid, ulong lcd_base)
-{
-       exynos_fimd_lcd_init(vid, lcd_base);
-
-       /* Enable flushing after LCD writes if requested */
-       lcd_set_flush_dcache(1);
-}
-
-__weak void exynos_cfg_lcd_gpio(void)
-{
+       exynos_fimd_set_dp_clkcon(priv, priv->dp_enabled);
 }
 
-__weak void exynos_backlight_on(unsigned int onoff)
+unsigned long exynos_fimd_calc_fbsize(struct exynos_fb_priv *priv)
 {
+       return priv->vl_col * priv->vl_row * (VNBITS(priv->vl_bpix) / 8);
 }
 
-__weak void exynos_reset_lcd(void)
+int exynos_fb_ofdata_to_platdata(struct udevice *dev)
 {
-}
-
-__weak void exynos_lcd_power_on(void)
-{
-}
-
-__weak void exynos_cfg_ldo(void)
-{
-}
-
-__weak void exynos_enable_ldo(unsigned int onoff)
-{
-}
-
-__weak void exynos_backlight_reset(void)
-{
-}
-
-__weak int exynos_lcd_misc_init(struct vidinfo *vid)
-{
-       return 0;
-}
-
-static void lcd_panel_on(struct vidinfo *vid)
-{
-       struct gpio_desc pwm_out_gpio;
-       struct gpio_desc bl_en_gpio;
-       unsigned int node;
-
-       udelay(vid->init_delay);
-
-       exynos_backlight_reset();
+       struct exynos_fb_priv *priv = dev_get_priv(dev);
+       unsigned int node = dev_of_offset(dev);
+       const void *blob = gd->fdt_blob;
+       fdt_addr_t addr;
 
-       exynos_cfg_lcd_gpio();
-
-       exynos_lcd_power_on();
-
-       udelay(vid->power_on_delay);
-
-       if (vid->dp_enabled)
-               exynos_init_dp();
-
-       exynos_reset_lcd();
-
-       udelay(vid->reset_delay);
-
-       exynos_backlight_on(1);
-
-       node = fdtdec_next_compatible(gd->fdt_blob, 0,
-                                               COMPAT_SAMSUNG_EXYNOS_FIMD);
-       if (node <= 0) {
-               debug("FIMD: Can't get device node for FIMD\n");
-               return;
-       }
-       gpio_request_by_name_nodev(gd->fdt_blob, node, "samsung,pwm-out-gpio",
-                                  0, &pwm_out_gpio,
-                                  GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
-
-       gpio_request_by_name_nodev(gd->fdt_blob, node, "samsung,bl-en-gpio", 0,
-                                  &bl_en_gpio,
-                                  GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
-
-       exynos_cfg_ldo();
-
-       exynos_enable_ldo(1);
-
-       if (vid->mipi_enabled)
-               exynos_mipi_dsi_init(panel_info.dsim_platform_data_dt);
-}
-
-int exynos_lcd_early_init(const void *blob)
-{
-       unsigned int node;
-       node = fdtdec_next_compatible(blob, 0, COMPAT_SAMSUNG_EXYNOS_FIMD);
-       if (node <= 0) {
-               debug("exynos_fb: Can't get device node for fimd\n");
-               return -ENODEV;
+       addr = devfdt_get_addr(dev);
+       if (addr == FDT_ADDR_T_NONE) {
+               debug("Can't get the FIMD base address\n");
+               return -EINVAL;
        }
+       priv->reg = (struct exynos_fb *)addr;
 
-       panel_info.vl_col = fdtdec_get_int(blob, node, "samsung,vl-col", 0);
-       if (panel_info.vl_col == 0) {
+       priv->vl_col = fdtdec_get_int(blob, node, "samsung,vl-col", 0);
+       if (priv->vl_col == 0) {
                debug("Can't get XRES\n");
                return -ENXIO;
        }
 
-       panel_info.vl_row = fdtdec_get_int(blob, node, "samsung,vl-row", 0);
-       if (panel_info.vl_row == 0) {
+       priv->vl_row = fdtdec_get_int(blob, node, "samsung,vl-row", 0);
+       if (priv->vl_row == 0) {
                debug("Can't get YRES\n");
                return -ENXIO;
        }
 
-       panel_info.vl_width = fdtdec_get_int(blob, node,
+       priv->vl_width = fdtdec_get_int(blob, node,
                                                "samsung,vl-width", 0);
 
-       panel_info.vl_height = fdtdec_get_int(blob, node,
+       priv->vl_height = fdtdec_get_int(blob, node,
                                                "samsung,vl-height", 0);
 
-       panel_info.vl_freq = fdtdec_get_int(blob, node, "samsung,vl-freq", 0);
-       if (panel_info.vl_freq == 0) {
+       priv->vl_freq = fdtdec_get_int(blob, node, "samsung,vl-freq", 0);
+       if (priv->vl_freq == 0) {
                debug("Can't get refresh rate\n");
                return -ENXIO;
        }
 
        if (fdtdec_get_bool(blob, node, "samsung,vl-clkp"))
-               panel_info.vl_clkp = CONFIG_SYS_LOW;
+               priv->vl_clkp = VIDEO_ACTIVE_LOW;
 
        if (fdtdec_get_bool(blob, node, "samsung,vl-oep"))
-               panel_info.vl_oep = CONFIG_SYS_LOW;
+               priv->vl_oep = VIDEO_ACTIVE_LOW;
 
        if (fdtdec_get_bool(blob, node, "samsung,vl-hsp"))
-               panel_info.vl_hsp = CONFIG_SYS_LOW;
+               priv->vl_hsp = VIDEO_ACTIVE_LOW;
 
        if (fdtdec_get_bool(blob, node, "samsung,vl-vsp"))
-               panel_info.vl_vsp = CONFIG_SYS_LOW;
+               priv->vl_vsp = VIDEO_ACTIVE_LOW;
 
        if (fdtdec_get_bool(blob, node, "samsung,vl-dp"))
-               panel_info.vl_dp = CONFIG_SYS_LOW;
+               priv->vl_dp = VIDEO_ACTIVE_LOW;
 
-       panel_info.vl_bpix = fdtdec_get_int(blob, node, "samsung,vl-bpix", 0);
-       if (panel_info.vl_bpix == 0) {
+       priv->vl_bpix = fdtdec_get_int(blob, node, "samsung,vl-bpix", 0);
+       if (priv->vl_bpix == 0) {
                debug("Can't get bits per pixel\n");
                return -ENXIO;
        }
 
-       panel_info.vl_hspw = fdtdec_get_int(blob, node, "samsung,vl-hspw", 0);
-       if (panel_info.vl_hspw == 0) {
+       priv->vl_hspw = fdtdec_get_int(blob, node, "samsung,vl-hspw", 0);
+       if (priv->vl_hspw == 0) {
                debug("Can't get hsync width\n");
                return -ENXIO;
        }
 
-       panel_info.vl_hfpd = fdtdec_get_int(blob, node, "samsung,vl-hfpd", 0);
-       if (panel_info.vl_hfpd == 0) {
+       priv->vl_hfpd = fdtdec_get_int(blob, node, "samsung,vl-hfpd", 0);
+       if (priv->vl_hfpd == 0) {
                debug("Can't get right margin\n");
                return -ENXIO;
        }
 
-       panel_info.vl_hbpd = (u_char)fdtdec_get_int(blob, node,
+       priv->vl_hbpd = (u_char)fdtdec_get_int(blob, node,
                                                        "samsung,vl-hbpd", 0);
-       if (panel_info.vl_hbpd == 0) {
+       if (priv->vl_hbpd == 0) {
                debug("Can't get left margin\n");
                return -ENXIO;
        }
 
-       panel_info.vl_vspw = (u_char)fdtdec_get_int(blob, node,
+       priv->vl_vspw = (u_char)fdtdec_get_int(blob, node,
                                                        "samsung,vl-vspw", 0);
-       if (panel_info.vl_vspw == 0) {
+       if (priv->vl_vspw == 0) {
                debug("Can't get vsync width\n");
                return -ENXIO;
        }
 
-       panel_info.vl_vfpd = fdtdec_get_int(blob, node,
+       priv->vl_vfpd = fdtdec_get_int(blob, node,
                                                        "samsung,vl-vfpd", 0);
-       if (panel_info.vl_vfpd == 0) {
+       if (priv->vl_vfpd == 0) {
                debug("Can't get lower margin\n");
                return -ENXIO;
        }
 
-       panel_info.vl_vbpd = fdtdec_get_int(blob, node, "samsung,vl-vbpd", 0);
-       if (panel_info.vl_vbpd == 0) {
+       priv->vl_vbpd = fdtdec_get_int(blob, node, "samsung,vl-vbpd", 0);
+       if (priv->vl_vbpd == 0) {
                debug("Can't get upper margin\n");
                return -ENXIO;
        }
 
-       panel_info.vl_cmd_allow_len = fdtdec_get_int(blob, node,
+       priv->vl_cmd_allow_len = fdtdec_get_int(blob, node,
                                                "samsung,vl-cmd-allow-len", 0);
 
-       panel_info.win_id = fdtdec_get_int(blob, node, "samsung,winid", 0);
-       panel_info.init_delay = fdtdec_get_int(blob, node,
+       priv->win_id = fdtdec_get_int(blob, node, "samsung,winid", 0);
+       priv->init_delay = fdtdec_get_int(blob, node,
                                                "samsung,init-delay", 0);
-       panel_info.power_on_delay = fdtdec_get_int(blob, node,
+       priv->power_on_delay = fdtdec_get_int(blob, node,
                                                "samsung,power-on-delay", 0);
-       panel_info.reset_delay = fdtdec_get_int(blob, node,
+       priv->reset_delay = fdtdec_get_int(blob, node,
                                                "samsung,reset-delay", 0);
-       panel_info.interface_mode = fdtdec_get_int(blob, node,
+       priv->interface_mode = fdtdec_get_int(blob, node,
                                                "samsung,interface-mode", 0);
-       panel_info.mipi_enabled = fdtdec_get_int(blob, node,
+       priv->mipi_enabled = fdtdec_get_int(blob, node,
                                                "samsung,mipi-enabled", 0);
-       panel_info.dp_enabled = fdtdec_get_int(blob, node,
+       priv->dp_enabled = fdtdec_get_int(blob, node,
                                                "samsung,dp-enabled", 0);
-       panel_info.cs_setup = fdtdec_get_int(blob, node,
+       priv->cs_setup = fdtdec_get_int(blob, node,
                                                "samsung,cs-setup", 0);
-       panel_info.wr_setup = fdtdec_get_int(blob, node,
+       priv->wr_setup = fdtdec_get_int(blob, node,
                                                "samsung,wr-setup", 0);
-       panel_info.wr_act = fdtdec_get_int(blob, node, "samsung,wr-act", 0);
-       panel_info.wr_hold = fdtdec_get_int(blob, node, "samsung,wr-hold", 0);
+       priv->wr_act = fdtdec_get_int(blob, node, "samsung,wr-act", 0);
+       priv->wr_hold = fdtdec_get_int(blob, node, "samsung,wr-hold", 0);
 
-       panel_info.logo_on = fdtdec_get_int(blob, node, "samsung,logo-on", 0);
-       if (panel_info.logo_on) {
-               panel_info.logo_width = fdtdec_get_int(blob, node,
+       priv->logo_on = fdtdec_get_int(blob, node, "samsung,logo-on", 0);
+       if (priv->logo_on) {
+               priv->logo_width = fdtdec_get_int(blob, node,
                                                "samsung,logo-width", 0);
-               panel_info.logo_height = fdtdec_get_int(blob, node,
+               priv->logo_height = fdtdec_get_int(blob, node,
                                                "samsung,logo-height", 0);
-               panel_info.logo_addr = fdtdec_get_int(blob, node,
+               priv->logo_addr = fdtdec_get_int(blob, node,
                                                "samsung,logo-addr", 0);
        }
 
-       panel_info.rgb_mode = fdtdec_get_int(blob, node,
+       priv->rgb_mode = fdtdec_get_int(blob, node,
                                                "samsung,rgb-mode", 0);
-       panel_info.pclk_name = fdtdec_get_int(blob, node,
+       priv->pclk_name = fdtdec_get_int(blob, node,
                                                "samsung,pclk-name", 0);
-       panel_info.sclk_div = fdtdec_get_int(blob, node,
+       priv->sclk_div = fdtdec_get_int(blob, node,
                                                "samsung,sclk-div", 0);
-       panel_info.dual_lcd_enabled = fdtdec_get_int(blob, node,
+       priv->dual_lcd_enabled = fdtdec_get_int(blob, node,
                                                "samsung,dual-lcd-enabled", 0);
 
        return 0;
 }
 
-void lcd_ctrl_init(void *lcdbase)
+static int exynos_fb_probe(struct udevice *dev)
 {
+       struct video_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct exynos_fb_priv *priv = dev_get_priv(dev);
+       struct udevice *panel, *bridge;
+       struct udevice *dp;
+       int ret;
+
+       debug("%s: start\n", __func__);
        set_system_display_ctrl();
        set_lcd_clk();
 
 #ifdef CONFIG_EXYNOS_MIPI_DSIM
        exynos_init_dsim_platform_data(&panel_info);
 #endif
-       exynos_lcd_misc_init(&panel_info);
+       exynos_fimd_lcd_init(dev);
 
-       exynos_lcd_init(&panel_info, (ulong)lcdbase);
-}
+       ret = uclass_first_device(UCLASS_PANEL, &panel);
+       if (ret) {
+               printf("LCD panel failed to probe\n");
+               return ret;
+       }
+       if (!panel) {
+               printf("LCD panel not found\n");
+               return -ENODEV;
+       }
 
-void lcd_enable(void)
-{
-       if (panel_info.logo_on) {
-               memset((void *)gd->fb_base, 0,
-                      panel_info.vl_width * panel_info.vl_height *
-                               (NBITS(panel_info.vl_bpix) >> 3));
+       ret = uclass_first_device(UCLASS_DISPLAY, &dp);
+       if (ret) {
+               debug("%s: Display device error %d\n", __func__, ret);
+               return ret;
+       }
+       if (!dev) {
+               debug("%s: Display device missing\n", __func__);
+               return -ENODEV;
+       }
+       ret = display_enable(dp, 18, NULL);
+       if (ret) {
+               debug("%s: Display enable error %d\n", __func__, ret);
+               return ret;
        }
 
-       lcd_panel_on(&panel_info);
+       /* backlight / pwm */
+       ret = panel_enable_backlight(panel);
+       if (ret) {
+               debug("%s: backlight error: %d\n", __func__, ret);
+               return ret;
+       }
+
+       ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &bridge);
+       if (!ret)
+               ret = video_bridge_set_backlight(bridge, 80);
+       if (ret) {
+               debug("%s: No video bridge, or no backlight on bridge\n",
+                     __func__);
+               exynos_pinmux_config(PERIPH_ID_PWM0, 0);
+       }
+
+       uc_priv->xsize = priv->vl_col;
+       uc_priv->ysize = priv->vl_row;
+       uc_priv->bpix = priv->vl_bpix;
+
+       /* Enable flushing after LCD writes if requested */
+       video_set_flush_dcache(dev, true);
+
+       return 0;
 }
 
-/* dummy function */
-void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue)
+static int exynos_fb_bind(struct udevice *dev)
 {
-       return;
+       struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
+
+       /* This is the maximum panel size we expect to see */
+       plat->size = 1920 * 1080 * 2;
+
+       return 0;
 }
+
+static const struct video_ops exynos_fb_ops = {
+};
+
+static const struct udevice_id exynos_fb_ids[] = {
+       { .compatible = "samsung,exynos-fimd" },
+       { }
+};
+
+U_BOOT_DRIVER(exynos_fb) = {
+       .name   = "exynos_fb",
+       .id     = UCLASS_VIDEO,
+       .of_match = exynos_fb_ids,
+       .ops    = &exynos_fb_ops,
+       .bind   = exynos_fb_bind,
+       .probe  = exynos_fb_probe,
+       .ofdata_to_platdata     = exynos_fb_ofdata_to_platdata,
+       .priv_auto_alloc_size   = sizeof(struct exynos_fb_priv),
+};