exynos: video: Convert several boards to driver model for video
authorSimon Glass <sjg@chromium.org>
Mon, 22 Feb 2016 04:09:01 +0000 (21:09 -0700)
committerMinkyu Kang <mk7.kang@samsung.com>
Wed, 25 May 2016 04:25:19 +0000 (13:25 +0900)
Update several boards to use driver model for video. This involves changes
to the EDP and FIMD (frame buffer) drivers. Existing PWM, simple-panel and
pwm-backlight drivers are used. These work without additional configuration
since they use the device tree settings in the same way as Linux.

Boards converted are:
- snow
- spring
- peach-pit
- peach-pi

All have been tested. Not converted:

- MIPI display driver
- s5pc210_universal
- smdk5420
- smdk5250
- trats
- trats2

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
arch/arm/mach-exynos/include/mach/dp_info.h
board/samsung/common/board.c
configs/peach-pi_defconfig
configs/peach-pit_defconfig
configs/snow_defconfig
configs/spring_defconfig
drivers/video/exynos/exynos_dp.c
drivers/video/exynos/exynos_fb.c
drivers/video/simple_panel.c
include/configs/exynos5-common.h
include/configs/exynos5-dt-common.h

index 8ce33d64d7fdc3b71a89a5f77baa48e5df13a74a..1079e1ef1e0bb280ce009d5df75cbc5ab23970a2 100644 (file)
@@ -72,6 +72,7 @@ struct exynos_dp_priv {
        unsigned char dpcd_rev;
        /*support enhanced frame cap */
        unsigned char dpcd_efc;
+       struct exynos_dp *regs;
 };
 
 enum analog_power_block {
index 799517428db70fe2bda29b08f8ab1e5330785067..0eb066ce4782a5c281556c572a155d62428d8104 100644 (file)
@@ -158,21 +158,6 @@ int board_early_init_f(void)
        board_i2c_init(gd->fdt_blob);
 #endif
 
-#if defined(CONFIG_EXYNOS_FB)
-       /*
-        * board_init_f(arch/arm/lib/board.c) calls lcd_setmem() which needs
-        * panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix,
-        * to reserve frame-buffer memory at a very early stage. So, we need
-        * to fill panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix
-        * before lcd_setmem() is called.
-        */
-       err = exynos_lcd_early_init(gd->fdt_blob);
-       if (err) {
-               debug("LCD early init failed\n");
-               return err;
-       }
-#endif
-
        return exynos_early_init_f();
 }
 #endif
index ce07052992cc97916e131440f04c45d2134ab2c2..fea8bde324431b4a21164975b932ab02a7be6692 100644 (file)
@@ -47,6 +47,8 @@ CONFIG_DM_PMIC=y
 CONFIG_PMIC_TPS65090=y
 CONFIG_DM_REGULATOR=y
 CONFIG_REGULATOR_TPS65090=y
+CONFIG_DM_PWM=y
+CONFIG_PWM_EXYNOS=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
@@ -56,6 +58,8 @@ CONFIG_EXYNOS_SPI=y
 CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_TPM=y
index 4479fe8c228f3b28a927f22a2a9d590ecad8fc2b..41c3d1208de8bdbbe414939407dbcc83b715f0c5 100644 (file)
@@ -47,6 +47,8 @@ CONFIG_DM_PMIC=y
 CONFIG_PMIC_TPS65090=y
 CONFIG_DM_REGULATOR=y
 CONFIG_REGULATOR_TPS65090=y
+CONFIG_DM_PWM=y
+CONFIG_PWM_EXYNOS=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
@@ -56,6 +58,8 @@ CONFIG_EXYNOS_SPI=y
 CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_TPM=y
index 77b97a3292306447a663380d37d5edaff160396a..c16c90c4533f12bdd35a4964d48310a60076c010 100644 (file)
@@ -52,6 +52,8 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_REGULATOR_TPS65090=y
+CONFIG_DM_PWM=y
+CONFIG_PWM_EXYNOS=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_S5P=y
 CONFIG_DEBUG_UART_BASE=0x12c30000
@@ -65,6 +67,8 @@ CONFIG_EXYNOS_SPI=y
 CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y
index d3b174a54820873ca1c2a1308ff9dc174b45cd1b..b68cab054326698184e6d22e988843fd92e2e081 100644 (file)
@@ -52,6 +52,8 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_REGULATOR_TPS65090=y
+CONFIG_DM_PWM=y
+CONFIG_PWM_EXYNOS=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_S5P=y
 CONFIG_DEBUG_UART_BASE=0x12c30000
@@ -65,6 +67,8 @@ CONFIG_EXYNOS_SPI=y
 CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_TPM=y
index d7bccc3708f3701b49ba22a66a5385496dc7b5d8..fc39f2c5620bca1cd00265ca837b895733b2e417 100644 (file)
@@ -7,17 +7,21 @@
  */
 
 #include <config.h>
+#include <dm.h>
 #include <common.h>
+#include <display.h>
+#include <fdtdec.h>
+#include <libfdt.h>
 #include <malloc.h>
+#include <video_bridge.h>
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/dp_info.h>
 #include <asm/arch/dp.h>
+#include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
-#include <fdtdec.h>
-#include <libfdt.h>
 
 #include "exynos_dp_lowlevel.h"
 
@@ -872,15 +876,19 @@ static unsigned int exynos_dp_config_video(struct exynos_dp *regs,
        return ret;
 }
 
-int exynos_dp_parse_dt(const void *blob, struct exynos_dp_priv *priv)
+static int exynos_dp_ofdata_to_platdata(struct udevice *dev)
 {
-       unsigned int node = fdtdec_next_compatible(blob, 0,
-                                               COMPAT_SAMSUNG_EXYNOS5_DP);
-       if (node <= 0) {
-               debug("exynos_dp: Can't get device node for dp\n");
-               return -ENODEV;
-       }
+       struct exynos_dp_priv *priv = dev_get_priv(dev);
+       const void *blob = gd->fdt_blob;
+       unsigned int node = dev->of_offset;
+       fdt_addr_t addr;
 
+       addr = dev_get_addr(dev);
+       if (addr == FDT_ADDR_T_NONE) {
+               debug("Can't get the DP base address\n");
+               return -EINVAL;
+       }
+       priv->regs = (struct exynos_dp *)addr;
        priv->disp_info.h_res = fdtdec_get_int(blob, node,
                                                        "samsung,h-res", 0);
        priv->disp_info.h_sync_width = fdtdec_get_int(blob, node,
@@ -926,34 +934,97 @@ int exynos_dp_parse_dt(const void *blob, struct exynos_dp_priv *priv)
        return 0;
 }
 
-unsigned int exynos_init_dp(void)
+static int exynos_dp_bridge_init(struct udevice *dev)
 {
-       unsigned int ret;
-       struct exynos_dp_priv *priv;
-       struct exynos_dp *regs;
-       int node;
+       const int max_tries = 10;
+       int num_tries;
+       int ret;
 
-       priv = kzalloc(sizeof(struct exynos_dp_priv), GFP_KERNEL);
-       if (!priv) {
-               debug("failed to allocate edp device object.\n");
-               return -EFAULT;
+       debug("%s\n", __func__);
+       ret = video_bridge_attach(dev);
+       if (ret) {
+               debug("video bridge init failed: %d\n", ret);
+               return ret;
        }
 
-       if (exynos_dp_parse_dt(gd->fdt_blob, priv))
-               debug("unable to parse DP DT node\n");
+       /*
+        * We need to wait for 90ms after bringing up the bridge since there
+        * is a phantom "high" on the HPD chip during its bootup.  The phantom
+        * high comes within 7ms of de-asserting PD and persists for at least
+        * 15ms.  The real high comes roughly 50ms after PD is de-asserted. The
+        * phantom high makes it hard for us to know when the NXP chip is up.
+        */
+       mdelay(90);
 
-       node = fdtdec_next_compatible(gd->fdt_blob, 0,
-                                     COMPAT_SAMSUNG_EXYNOS5_DP);
-       if (node <= 0)
-               debug("exynos_dp: Can't get device node for dp\n");
+       for (num_tries = 0; num_tries < max_tries; num_tries++) {
+               /* Check HPD. If it's high, or we don't have it, all is well */
+               ret = video_bridge_check_attached(dev);
+               if (!ret || ret == -ENOENT)
+                       return 0;
 
-       regs = (struct exynos_dp *)fdtdec_get_addr(gd->fdt_blob, node,
-                                                     "reg");
-       if (regs == NULL)
-               debug("Can't get the DP base address\n");
+               debug("%s: eDP bridge failed to come up; try %d of %d\n",
+                     __func__, num_tries, max_tries);
+       }
+
+       /* Immediately go into bridge reset if the hp line is not high */
+       return -EIO;
+}
+
+static int exynos_dp_bridge_setup(const void *blob)
+{
+       const int max_tries = 2;
+       int num_tries;
+       struct udevice *dev;
+       int ret;
+
+       /* Configure I2C registers for Parade bridge */
+       ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &dev);
+       if (ret) {
+               debug("video bridge init failed: %d\n", ret);
+               return ret;
+       }
+
+       if (strncmp(dev->driver->name, "parade", 6)) {
+               /* Mux HPHPD to the special hotplug detect mode */
+               exynos_pinmux_config(PERIPH_ID_DPHPD, 0);
+       }
+
+       for (num_tries = 0; num_tries < max_tries; num_tries++) {
+               ret = exynos_dp_bridge_init(dev);
+               if (!ret)
+                       return 0;
+               if (num_tries == max_tries - 1)
+                       break;
+
+               /*
+               * If we're here, the bridge chip failed to initialise.
+               * Power down the bridge in an attempt to reset.
+               */
+               video_bridge_set_active(dev, false);
+
+               /*
+               * Arbitrarily wait 300ms here with DP_N low.  Don't know for
+               * sure how long we should wait, but we're being paranoid.
+               */
+               mdelay(300);
+       }
 
+       return ret;
+}
+int exynos_dp_enable(struct udevice *dev, int panel_bpp,
+                    const struct display_timing *timing)
+{
+       struct exynos_dp_priv *priv = dev_get_priv(dev);
+       struct exynos_dp *regs = priv->regs;
+       unsigned int ret;
+
+       debug("%s: start\n", __func__);
        exynos_dp_disp_info(&priv->disp_info);
 
+       ret = exynos_dp_bridge_setup(gd->fdt_blob);
+       if (ret && ret != -ENODEV)
+               printf("LCD bridge failed to enable: %d\n", ret);
+
        exynos_dp_phy_ctrl(1);
 
        ret = exynos_dp_init_dp(regs);
@@ -992,3 +1063,22 @@ unsigned int exynos_init_dp(void)
 
        return ret;
 }
+
+
+static const struct dm_display_ops exynos_dp_ops = {
+       .enable = exynos_dp_enable,
+};
+
+static const struct udevice_id exynos_dp_ids[] = {
+       { .compatible = "samsung,exynos5-dp" },
+       { }
+};
+
+U_BOOT_DRIVER(exynos_dp) = {
+       .name   = "eexynos_dp",
+       .id     = UCLASS_DISPLAY,
+       .of_match = exynos_dp_ids,
+       .ops    = &exynos_dp_ops,
+       .ofdata_to_platdata     = exynos_dp_ofdata_to_platdata,
+       .priv_auto_alloc_size   = sizeof(struct exynos_dp_priv),
+};
index 83b1187c989e921ab394eb7e628187baa6d66627..c8fef63937f36ba76e7e356594b7acbb0b8ee0fa 100644 (file)
@@ -9,33 +9,98 @@
 
 #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 <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"
-
 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 *priv, 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 *reg = priv->reg;
        unsigned int cfg = 0;
@@ -52,7 +117,7 @@ static void exynos_fimd_set_dualrgb(struct vidinfo *priv, unsigned int enabled)
        writel(cfg, &reg->dualrgb);
 }
 
-static void exynos_fimd_set_dp_clkcon(struct vidinfo *priv,
+static void exynos_fimd_set_dp_clkcon(struct exynos_fb_priv *priv,
                                      unsigned int enabled)
 {
        struct exynos_fb *reg = priv->reg;
@@ -64,7 +129,8 @@ static void exynos_fimd_set_dp_clkcon(struct vidinfo *priv,
        writel(cfg, &reg->dp_mie_clkcon);
 }
 
-static void exynos_fimd_set_par(struct vidinfo *priv, unsigned int win_id)
+static void exynos_fimd_set_par(struct exynos_fb_priv *priv,
+                               unsigned int win_id)
 {
        struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
@@ -117,7 +183,7 @@ static void exynos_fimd_set_par(struct vidinfo *priv, unsigned int win_id)
                        EXYNOS_VIDOSD(win_id));
 }
 
-static void exynos_fimd_set_buffer_address(struct vidinfo *priv,
+static void exynos_fimd_set_buffer_address(struct exynos_fb_priv *priv,
                                           unsigned int win_id,
                                           ulong lcd_base_addr)
 {
@@ -125,7 +191,7 @@ static void exynos_fimd_set_buffer_address(struct vidinfo *priv,
        unsigned long start_addr, end_addr;
 
        start_addr = lcd_base_addr;
-       end_addr = start_addr + ((priv->vl_col * (NBITS(priv->vl_bpix) / 8)) *
+       end_addr = start_addr + ((priv->vl_col * (VNBITS(priv->vl_bpix) / 8)) *
                                priv->vl_row);
 
        writel(start_addr, (unsigned int)&reg->vidw00add0b0 +
@@ -134,7 +200,7 @@ static void exynos_fimd_set_buffer_address(struct vidinfo *priv,
                        EXYNOS_BUFFER_OFFSET(win_id));
 }
 
-static void exynos_fimd_set_clock(struct vidinfo *priv)
+static void exynos_fimd_set_clock(struct exynos_fb_priv *priv)
 {
        struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0, div = 0, remainder, remainder_div;
@@ -188,7 +254,7 @@ static void exynos_fimd_set_clock(struct vidinfo *priv)
        writel(cfg, &reg->vidcon0);
 }
 
-void exynos_set_trigger(struct vidinfo *priv)
+void exynos_set_trigger(struct exynos_fb_priv *priv)
 {
        struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
@@ -200,7 +266,7 @@ void exynos_set_trigger(struct vidinfo *priv)
        writel(cfg, &reg->trigcon);
 }
 
-int exynos_is_i80_frame_done(struct vidinfo *priv)
+int exynos_is_i80_frame_done(struct exynos_fb_priv *priv)
 {
        struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
@@ -215,7 +281,7 @@ int exynos_is_i80_frame_done(struct vidinfo *priv)
        return status;
 }
 
-static void exynos_fimd_lcd_on(struct vidinfo *priv)
+static void exynos_fimd_lcd_on(struct exynos_fb_priv *priv)
 {
        struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
@@ -226,7 +292,8 @@ static void exynos_fimd_lcd_on(struct vidinfo *priv)
        writel(cfg, &reg->vidcon0);
 }
 
-static void exynos_fimd_window_on(struct vidinfo *priv, unsigned int win_id)
+static void exynos_fimd_window_on(struct exynos_fb_priv *priv,
+                                 unsigned int win_id)
 {
        struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
@@ -243,7 +310,7 @@ static void exynos_fimd_window_on(struct vidinfo *priv, unsigned int win_id)
        writel(cfg, &reg->winshmap);
 }
 
-void exynos_fimd_lcd_off(struct vidinfo *priv)
+void exynos_fimd_lcd_off(struct exynos_fb_priv *priv)
 {
        struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
@@ -253,7 +320,7 @@ void exynos_fimd_lcd_off(struct vidinfo *priv)
        writel(cfg, &reg->vidcon0);
 }
 
-void exynos_fimd_window_off(struct vidinfo *priv, unsigned int win_id)
+void exynos_fimd_window_off(struct exynos_fb_priv *priv, unsigned int win_id)
 {
        struct exynos_fb *reg = priv->reg;
        unsigned int cfg = 0;
@@ -307,24 +374,16 @@ void exynos_fimd_disable_sysmmu(void)
        }
 }
 
-void exynos_fimd_lcd_init(struct vidinfo *priv, ulong lcd_base_address)
+void exynos_fimd_lcd_init(struct udevice *dev)
 {
-       struct exynos_fb *reg;
+       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");
-
-       reg = (struct exynos_fb *)fdtdec_get_addr(gd->fdt_blob, node,
-                                                       "reg");
-       if (reg == NULL)
-               debug("Can't get the FIMD base address\n");
-       priv->reg = reg;
-
+       node = dev->of_offset;
        if (fdtdec_get_bool(gd->fdt_blob, node, "samsung,disable-sysmmu"))
                exynos_fimd_disable_sysmmu();
 
@@ -387,13 +446,13 @@ void exynos_fimd_lcd_init(struct vidinfo *priv, ulong lcd_base_address)
        exynos_fimd_set_par(priv, priv->win_id);
 
        /* set memory address */
-       exynos_fimd_set_buffer_address(priv, priv->win_id, lcd_base_address);
+       exynos_fimd_set_buffer_address(priv, priv->win_id, plat->base);
 
        /* set buffer size */
        cfg = EXYNOS_VIDADDR_PAGEWIDTH(priv->vl_col *
-                       NBITS(priv->vl_bpix) / 8) |
+                       VNBITS(priv->vl_bpix) / 8) |
                EXYNOS_VIDADDR_PAGEWIDTH_E(priv->vl_col *
-                       NBITS(priv->vl_bpix) / 8) |
+                       VNBITS(priv->vl_bpix) / 8) |
                EXYNOS_VIDADDR_OFFSIZE(0) |
                EXYNOS_VIDADDR_OFFSIZE_E(0);
 
@@ -415,26 +474,9 @@ void exynos_fimd_lcd_init(struct vidinfo *priv, ulong lcd_base_address)
        exynos_fimd_set_dp_clkcon(priv, priv->dp_enabled);
 }
 
-unsigned long exynos_fimd_calc_fbsize(struct vidinfo *priv)
-{
-       return priv->vl_col * priv->vl_row * (NBITS(priv->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)
+unsigned long exynos_fimd_calc_fbsize(struct exynos_fb_priv *priv)
 {
-       exynos_fimd_lcd_init(vid, lcd_base);
-
-       /* Enable flushing after LCD writes if requested */
-       lcd_set_flush_dcache(1);
+       return priv->vl_col * priv->vl_row * (VNBITS(priv->vl_bpix) / 8);
 }
 
 __weak void exynos_cfg_lcd_gpio(void)
@@ -470,217 +512,242 @@ __weak int exynos_lcd_misc_init(struct vidinfo *vid)
        return 0;
 }
 
-static void lcd_panel_on(struct vidinfo *vid)
+int exynos_fb_ofdata_to_platdata(struct udevice *dev)
 {
-       struct gpio_desc pwm_out_gpio;
-       struct gpio_desc bl_en_gpio;
-       unsigned int node;
-
-       udelay(vid->init_delay);
-
-       exynos_backlight_reset();
-
-       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();
+       struct exynos_fb_priv *priv = dev_get_priv(dev);
+       unsigned int node = dev->of_offset;
+       const void *blob = gd->fdt_blob;
+       fdt_addr_t addr;
 
-       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 = dev_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),
+};
index 621930009707de1ceca28183c5d1e21f11f0d7a8..b2fe345ce3dea58be3b4ae11cfcb2b566877646b 100644 (file)
@@ -88,6 +88,8 @@ static const struct panel_ops simple_panel_ops = {
 static const struct udevice_id simple_panel_ids[] = {
        { .compatible = "simple-panel" },
        { .compatible = "auo,b133xtn01" },
+       { .compatible = "auo,b116xw03" },
+       { .compatible = "auo,b133htn01" },
        { }
 };
 
index b2ff4dd9277d2327526b535966a9c7b01b3e1a62..311fd09d6bc6e5a28055b8316a768ae65f89cbcb 100644 (file)
 #define CONFIG_SYS_I2C_S3C24X0
 #define CONFIG_SYS_I2C_S3C24X0_SPEED   100000          /* 100 Kbps */
 #define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x0
-#define CONFIG_I2C_EDID
 
 /* SPI */
 #ifdef CONFIG_SPI_FLASH
index 8b61a52c5a27200a922c63e1c4034e11babf371d..3d81f9457d8881c639b327cf57392dad086857d5 100644 (file)
@@ -13,8 +13,8 @@
 #undef EXYNOS_DEVICE_SETTINGS
 #define EXYNOS_DEVICE_SETTINGS \
                "stdin=serial,cros-ec-keyb\0" \
-               "stdout=serial,lcd\0" \
-               "stderr=serial,lcd\0"
+               "stdout=serial,vidconsole\0" \
+               "stderr=serial,vidconsole\0"
 
 #define CONFIG_EXYNOS5_DT
 
@@ -32,6 +32,7 @@
 #define CONFIG_EXYNOS_FB
 #define CONFIG_EXYNOS_DP
 #define LCD_BPP                        LCD_COLOR16
+#define CONFIG_SYS_WHITE_ON_BLACK
 #endif
 
 /* Enable keyboard */