at91: video: Support driver-model for the HLCD driver
authorSongjun Wu <songjun.wu@microchip.com>
Tue, 11 Apr 2017 08:33:30 +0000 (16:33 +0800)
committerAnatolij Gustschin <agust@denx.de>
Fri, 14 Apr 2017 12:51:35 +0000 (14:51 +0200)
Add driver-model support to this driver.

Signed-off-by: Songjun Wu <songjun.wu@microchip.com>
drivers/video/Kconfig
drivers/video/atmel_hlcdfb.c

index d1b017cfad45b5a677cc441520b9969db866aaa9..19e97452bda4f025266e77fb9c6526362a0e956a 100644 (file)
@@ -371,6 +371,12 @@ config DISPLAY
           The devices provide a simple interface to start up the display,
           read display information and enable it.
 
+config ATMEL_HLCD
+       bool "Enable ATMEL video support using HLCDC"
+       depends on DM_VIDEO
+       help
+          HLCDC supports video output to an attached LCD panel.
+
 config VIDEO_BROADWELL_IGD
        bool "Enable Intel Broadwell integrated graphics device"
        depends on X86
index 960b474b76b863aa9cc59c9c8158631e88860c48..59b9c45616e78eab725a939fefbfeae146a25609 100644 (file)
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
+#include <clk.h>
+#include <dm.h>
+#include <fdtdec.h>
 #include <lcd.h>
+#include <video.h>
+#include <wait_bit.h>
 #include <atmel_hlcdc.h>
 
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
+#ifndef CONFIG_DM_VIDEO
+
 /* configurable parameters */
 #define ATMEL_LCDC_CVAL_DEFAULT                0xc8
 #define ATMEL_LCDC_DMA_BURST_LEN       8
 
 #define ATMEL_LCDC_FIFO_SIZE           512
 
-#define lcdc_readl(reg)                __raw_readl((reg))
-#define lcdc_writel(reg, val)  __raw_writel((val), (reg))
-
 /*
  * the CLUT register map as following
  * RCLUT(24 ~ 16), GCLUT(15 ~ 8), BCLUT(7 ~ 0)
  */
 void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue)
 {
-       lcdc_writel(((red << LCDC_BASECLUT_RCLUT_Pos) & LCDC_BASECLUT_RCLUT_Msk)
-               | ((green << LCDC_BASECLUT_GCLUT_Pos) & LCDC_BASECLUT_GCLUT_Msk)
-               | ((blue << LCDC_BASECLUT_BCLUT_Pos) & LCDC_BASECLUT_BCLUT_Msk),
-               panel_info.mmio + ATMEL_LCDC_LUT(regno));
+       writel(panel_info.mmio + ATMEL_LCDC_LUT(regno),
+              ((red << LCDC_BASECLUT_RCLUT_Pos) & LCDC_BASECLUT_RCLUT_Msk)
+              | ((green << LCDC_BASECLUT_GCLUT_Pos) & LCDC_BASECLUT_GCLUT_Msk)
+              | ((blue << LCDC_BASECLUT_BCLUT_Pos) & LCDC_BASECLUT_BCLUT_Msk));
 }
 
 ushort *configuration_get_cmap(void)
@@ -55,6 +61,7 @@ void lcd_ctrl_init(void *lcdbase)
        unsigned long value;
        struct lcd_dma_desc *desc;
        struct atmel_hlcd_regs *regs;
+       int ret;
 
        if (!has_lcdc())
                return;     /* No lcdc */
@@ -62,21 +69,29 @@ void lcd_ctrl_init(void *lcdbase)
        regs = (struct atmel_hlcd_regs *)panel_info.mmio;
 
        /* Disable DISP signal */
-       lcdc_writel(&regs->lcdc_lcddis, LCDC_LCDDIS_DISPDIS);
-       while ((lcdc_readl(&regs->lcdc_lcdsr) & LCDC_LCDSR_DISPSTS))
-               udelay(1);
+       writel(LCDC_LCDDIS_DISPDIS, &regs->lcdc_lcddis);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
+                          false, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
        /* Disable synchronization */
-       lcdc_writel(&regs->lcdc_lcddis, LCDC_LCDDIS_SYNCDIS);
-       while ((lcdc_readl(&regs->lcdc_lcdsr) & LCDC_LCDSR_LCDSTS))
-               udelay(1);
+       writel(LCDC_LCDDIS_SYNCDIS, &regs->lcdc_lcddis);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
+                          false, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
        /* Disable pixel clock */
-       lcdc_writel(&regs->lcdc_lcddis, LCDC_LCDDIS_CLKDIS);
-       while ((lcdc_readl(&regs->lcdc_lcdsr) & LCDC_LCDSR_CLKSTS))
-               udelay(1);
+       writel(LCDC_LCDDIS_CLKDIS, &regs->lcdc_lcddis);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
+                          false, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
        /* Disable PWM */
-       lcdc_writel(&regs->lcdc_lcddis, LCDC_LCDDIS_PWMDIS);
-       while ((lcdc_readl(&regs->lcdc_lcdsr) & LCDC_LCDSR_PWMSTS))
-               udelay(1);
+       writel(LCDC_LCDDIS_PWMDIS, &regs->lcdc_lcddis);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
+                          false, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
 
        /* Set pixel clock */
        value = get_lcdc_clk_rate(0) / panel_info.vl_clk;
@@ -85,23 +100,23 @@ void lcd_ctrl_init(void *lcdbase)
 
        if (value < 1) {
                /* Using system clock as pixel clock */
-               lcdc_writel(&regs->lcdc_lcdcfg0,
-                                       LCDC_LCDCFG0_CLKDIV(0)
-                                       | LCDC_LCDCFG0_CGDISHCR
-                                       | LCDC_LCDCFG0_CGDISHEO
-                                       | LCDC_LCDCFG0_CGDISOVR1
-                                       | LCDC_LCDCFG0_CGDISBASE
-                                       | panel_info.vl_clk_pol
-                                       | LCDC_LCDCFG0_CLKSEL);
+               writel(LCDC_LCDCFG0_CLKDIV(0)
+                       | LCDC_LCDCFG0_CGDISHCR
+                       | LCDC_LCDCFG0_CGDISHEO
+                       | LCDC_LCDCFG0_CGDISOVR1
+                       | LCDC_LCDCFG0_CGDISBASE
+                       | panel_info.vl_clk_pol
+                       | LCDC_LCDCFG0_CLKSEL,
+                       &regs->lcdc_lcdcfg0);
 
        } else {
-               lcdc_writel(&regs->lcdc_lcdcfg0,
-                               LCDC_LCDCFG0_CLKDIV(value - 2)
-                               | LCDC_LCDCFG0_CGDISHCR
-                               | LCDC_LCDCFG0_CGDISHEO
-                               | LCDC_LCDCFG0_CGDISOVR1
-                               | LCDC_LCDCFG0_CGDISBASE
-                               | panel_info.vl_clk_pol);
+               writel(LCDC_LCDCFG0_CLKDIV(value - 2)
+                       | LCDC_LCDCFG0_CGDISHCR
+                       | LCDC_LCDCFG0_CGDISHEO
+                       | LCDC_LCDCFG0_CGDISOVR1
+                       | LCDC_LCDCFG0_CGDISBASE
+                       | panel_info.vl_clk_pol,
+                       &regs->lcdc_lcdcfg0);
        }
 
        /* Initialize control register 5 */
@@ -134,50 +149,50 @@ void lcd_ctrl_init(void *lcdbase)
 
        value |= LCDC_LCDCFG5_GUARDTIME(ATMEL_LCDC_GUARD_TIME);
        value |= (LCDC_LCDCFG5_DISPDLY | LCDC_LCDCFG5_VSPDLYS);
-       lcdc_writel(&regs->lcdc_lcdcfg5, value);
+       writel(value, &regs->lcdc_lcdcfg5);
 
        /* Vertical & Horizontal Timing */
        value = LCDC_LCDCFG1_VSPW(panel_info.vl_vsync_len - 1);
        value |= LCDC_LCDCFG1_HSPW(panel_info.vl_hsync_len - 1);
-       lcdc_writel(&regs->lcdc_lcdcfg1, value);
+       writel(value, &regs->lcdc_lcdcfg1);
 
        value = LCDC_LCDCFG2_VBPW(panel_info.vl_upper_margin);
        value |= LCDC_LCDCFG2_VFPW(panel_info.vl_lower_margin - 1);
-       lcdc_writel(&regs->lcdc_lcdcfg2, value);
+       writel(value, &regs->lcdc_lcdcfg2);
 
        value = LCDC_LCDCFG3_HBPW(panel_info.vl_left_margin - 1);
        value |= LCDC_LCDCFG3_HFPW(panel_info.vl_right_margin - 1);
-       lcdc_writel(&regs->lcdc_lcdcfg3, value);
+       writel(value, &regs->lcdc_lcdcfg3);
 
        /* Display size */
        value = LCDC_LCDCFG4_RPF(panel_info.vl_row - 1);
        value |= LCDC_LCDCFG4_PPL(panel_info.vl_col - 1);
-       lcdc_writel(&regs->lcdc_lcdcfg4, value);
+       writel(value, &regs->lcdc_lcdcfg4);
 
-       lcdc_writel(&regs->lcdc_basecfg0,
-                       LCDC_BASECFG0_BLEN_AHB_INCR4 | LCDC_BASECFG0_DLBO);
+       writel(LCDC_BASECFG0_BLEN_AHB_INCR4 | LCDC_BASECFG0_DLBO,
+              &regs->lcdc_basecfg0);
 
        switch (NBITS(panel_info.vl_bpix)) {
        case 16:
-               lcdc_writel(&regs->lcdc_basecfg1,
-                       LCDC_BASECFG1_RGBMODE_16BPP_RGB_565);
+               writel(LCDC_BASECFG1_RGBMODE_16BPP_RGB_565,
+                      &regs->lcdc_basecfg1);
                break;
        case 32:
-               lcdc_writel(&regs->lcdc_basecfg1,
-                       LCDC_BASECFG1_RGBMODE_24BPP_RGB_888);
+               writel(LCDC_BASECFG1_RGBMODE_24BPP_RGB_888,
+                      &regs->lcdc_basecfg1);
                break;
        default:
                BUG();
                break;
        }
 
-       lcdc_writel(&regs->lcdc_basecfg2, LCDC_BASECFG2_XSTRIDE(0));
-       lcdc_writel(&regs->lcdc_basecfg3, 0);
-       lcdc_writel(&regs->lcdc_basecfg4, LCDC_BASECFG4_DMA);
+       writel(LCDC_BASECFG2_XSTRIDE(0), &regs->lcdc_basecfg2);
+       writel(0, &regs->lcdc_basecfg3);
+       writel(LCDC_BASECFG4_DMA, &regs->lcdc_basecfg4);
 
        /* Disable all interrupts */
-       lcdc_writel(&regs->lcdc_lcdidr, ~0UL);
-       lcdc_writel(&regs->lcdc_baseidr, ~0UL);
+       writel(~0UL, &regs->lcdc_lcdidr);
+       writel(~0UL, &regs->lcdc_baseidr);
 
        /* Setup the DMA descriptor, this descriptor will loop to itself */
        desc = (struct lcd_dma_desc *)(lcdbase - 16);
@@ -191,30 +206,355 @@ void lcd_ctrl_init(void *lcdbase)
        /* Flush the DMA descriptor if we enabled dcache */
        flush_dcache_range((u32)desc, (u32)desc + sizeof(*desc));
 
-       lcdc_writel(&regs->lcdc_baseaddr, desc->address);
-       lcdc_writel(&regs->lcdc_basectrl, desc->control);
-       lcdc_writel(&regs->lcdc_basenext, desc->next);
-       lcdc_writel(&regs->lcdc_basecher, LCDC_BASECHER_CHEN |
-                                         LCDC_BASECHER_UPDATEEN);
+       writel(desc->address, &regs->lcdc_baseaddr);
+       writel(desc->control, &regs->lcdc_basectrl);
+       writel(desc->next, &regs->lcdc_basenext);
+       writel(LCDC_BASECHER_CHEN | LCDC_BASECHER_UPDATEEN,
+              &regs->lcdc_basecher);
 
        /* Enable LCD */
-       value = lcdc_readl(&regs->lcdc_lcden);
-       lcdc_writel(&regs->lcdc_lcden, value | LCDC_LCDEN_CLKEN);
-       while (!(lcdc_readl(&regs->lcdc_lcdsr) & LCDC_LCDSR_CLKSTS))
-               udelay(1);
-       value = lcdc_readl(&regs->lcdc_lcden);
-       lcdc_writel(&regs->lcdc_lcden, value | LCDC_LCDEN_SYNCEN);
-       while (!(lcdc_readl(&regs->lcdc_lcdsr) & LCDC_LCDSR_LCDSTS))
-               udelay(1);
-       value = lcdc_readl(&regs->lcdc_lcden);
-       lcdc_writel(&regs->lcdc_lcden, value | LCDC_LCDEN_DISPEN);
-       while (!(lcdc_readl(&regs->lcdc_lcdsr) & LCDC_LCDSR_DISPSTS))
-               udelay(1);
-       value = lcdc_readl(&regs->lcdc_lcden);
-       lcdc_writel(&regs->lcdc_lcden, value | LCDC_LCDEN_PWMEN);
-       while (!(lcdc_readl(&regs->lcdc_lcdsr) & LCDC_LCDSR_PWMSTS))
-               udelay(1);
+       value = readl(&regs->lcdc_lcden);
+       writel(value | LCDC_LCDEN_CLKEN, &regs->lcdc_lcden);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
+                          true, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+       value = readl(&regs->lcdc_lcden);
+       writel(value | LCDC_LCDEN_SYNCEN, &regs->lcdc_lcden);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
+                          true, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+       value = readl(&regs->lcdc_lcden);
+       writel(value | LCDC_LCDEN_DISPEN, &regs->lcdc_lcden);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
+                          true, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+       value = readl(&regs->lcdc_lcden);
+       writel(value | LCDC_LCDEN_PWMEN, &regs->lcdc_lcden);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
+                          true, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
 
        /* Enable flushing if we enabled dcache */
        lcd_set_flush_dcache(1);
 }
+
+#else
+
+enum {
+       LCD_MAX_WIDTH           = 1024,
+       LCD_MAX_HEIGHT          = 768,
+       LCD_MAX_LOG2_BPP        = VIDEO_BPP16,
+};
+
+struct atmel_hlcdc_priv {
+       struct atmel_hlcd_regs *regs;
+       struct display_timing timing;
+       unsigned int vl_bpix;
+       unsigned int output_mode;
+       unsigned int guard_time;
+       ulong clk_rate;
+};
+
+static int at91_hlcdc_enable_clk(struct udevice *dev)
+{
+       struct atmel_hlcdc_priv *priv = dev_get_priv(dev);
+       struct clk clk;
+       ulong clk_rate;
+       int ret;
+
+       ret = clk_get_by_index(dev, 0, &clk);
+       if (ret)
+               return -EINVAL;
+
+       ret = clk_enable(&clk);
+       if (ret)
+               return ret;
+
+       clk_rate = clk_get_rate(&clk);
+       if (!clk_rate) {
+               clk_disable(&clk);
+               return -ENODEV;
+       }
+
+       priv->clk_rate = clk_rate;
+
+       clk_free(&clk);
+
+       return 0;
+}
+
+static void atmel_hlcdc_init(struct udevice *dev)
+{
+       struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
+       struct atmel_hlcdc_priv *priv = dev_get_priv(dev);
+       struct atmel_hlcd_regs *regs = priv->regs;
+       struct display_timing *timing = &priv->timing;
+       struct lcd_dma_desc *desc;
+       unsigned long value, vl_clk_pol;
+       int ret;
+
+       /* Disable DISP signal */
+       writel(LCDC_LCDDIS_DISPDIS, &regs->lcdc_lcddis);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
+                          false, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+       /* Disable synchronization */
+       writel(LCDC_LCDDIS_SYNCDIS, &regs->lcdc_lcddis);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
+                          false, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+       /* Disable pixel clock */
+       writel(LCDC_LCDDIS_CLKDIS, &regs->lcdc_lcddis);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
+                          false, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+       /* Disable PWM */
+       writel(LCDC_LCDDIS_PWMDIS, &regs->lcdc_lcddis);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
+                          false, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+
+       /* Set pixel clock */
+       value = priv->clk_rate / timing->pixelclock.typ;
+       if (priv->clk_rate % timing->pixelclock.typ)
+               value++;
+
+       vl_clk_pol = 0;
+       if (timing->flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
+               vl_clk_pol = LCDC_LCDCFG0_CLKPOL;
+
+       if (value < 1) {
+               /* Using system clock as pixel clock */
+               writel(LCDC_LCDCFG0_CLKDIV(0)
+                       | LCDC_LCDCFG0_CGDISHCR
+                       | LCDC_LCDCFG0_CGDISHEO
+                       | LCDC_LCDCFG0_CGDISOVR1
+                       | LCDC_LCDCFG0_CGDISBASE
+                       | vl_clk_pol
+                       | LCDC_LCDCFG0_CLKSEL,
+                       &regs->lcdc_lcdcfg0);
+
+       } else {
+               writel(LCDC_LCDCFG0_CLKDIV(value - 2)
+                       | LCDC_LCDCFG0_CGDISHCR
+                       | LCDC_LCDCFG0_CGDISHEO
+                       | LCDC_LCDCFG0_CGDISOVR1
+                       | LCDC_LCDCFG0_CGDISBASE
+                       | vl_clk_pol,
+                       &regs->lcdc_lcdcfg0);
+       }
+
+       /* Initialize control register 5 */
+       value = 0;
+
+       if (!(timing->flags & DISPLAY_FLAGS_HSYNC_HIGH))
+               value |= LCDC_LCDCFG5_HSPOL;
+       if (!(timing->flags & DISPLAY_FLAGS_VSYNC_HIGH))
+               value |= LCDC_LCDCFG5_VSPOL;
+
+       switch (priv->output_mode) {
+       case 12:
+               value |= LCDC_LCDCFG5_MODE_OUTPUT_12BPP;
+               break;
+       case 16:
+               value |= LCDC_LCDCFG5_MODE_OUTPUT_16BPP;
+               break;
+       case 18:
+               value |= LCDC_LCDCFG5_MODE_OUTPUT_18BPP;
+               break;
+       case 24:
+               value |= LCDC_LCDCFG5_MODE_OUTPUT_24BPP;
+               break;
+       default:
+               BUG();
+               break;
+       }
+
+       value |= LCDC_LCDCFG5_GUARDTIME(priv->guard_time);
+       value |= (LCDC_LCDCFG5_DISPDLY | LCDC_LCDCFG5_VSPDLYS);
+       writel(value, &regs->lcdc_lcdcfg5);
+
+       /* Vertical & Horizontal Timing */
+       value = LCDC_LCDCFG1_VSPW(timing->vsync_len.typ - 1);
+       value |= LCDC_LCDCFG1_HSPW(timing->hsync_len.typ - 1);
+       writel(value, &regs->lcdc_lcdcfg1);
+
+       value = LCDC_LCDCFG2_VBPW(timing->vback_porch.typ);
+       value |= LCDC_LCDCFG2_VFPW(timing->vfront_porch.typ - 1);
+       writel(value, &regs->lcdc_lcdcfg2);
+
+       value = LCDC_LCDCFG3_HBPW(timing->hback_porch.typ - 1);
+       value |= LCDC_LCDCFG3_HFPW(timing->hfront_porch.typ - 1);
+       writel(value, &regs->lcdc_lcdcfg3);
+
+       /* Display size */
+       value = LCDC_LCDCFG4_RPF(timing->vactive.typ - 1);
+       value |= LCDC_LCDCFG4_PPL(timing->hactive.typ - 1);
+       writel(value, &regs->lcdc_lcdcfg4);
+
+       writel(LCDC_BASECFG0_BLEN_AHB_INCR4 | LCDC_BASECFG0_DLBO,
+              &regs->lcdc_basecfg0);
+
+       switch (VNBITS(priv->vl_bpix)) {
+       case 16:
+               writel(LCDC_BASECFG1_RGBMODE_16BPP_RGB_565,
+                      &regs->lcdc_basecfg1);
+               break;
+       case 32:
+               writel(LCDC_BASECFG1_RGBMODE_24BPP_RGB_888,
+                      &regs->lcdc_basecfg1);
+               break;
+       default:
+               BUG();
+               break;
+       }
+
+       writel(LCDC_BASECFG2_XSTRIDE(0), &regs->lcdc_basecfg2);
+       writel(0, &regs->lcdc_basecfg3);
+       writel(LCDC_BASECFG4_DMA, &regs->lcdc_basecfg4);
+
+       /* Disable all interrupts */
+       writel(~0UL, &regs->lcdc_lcdidr);
+       writel(~0UL, &regs->lcdc_baseidr);
+
+       /* Setup the DMA descriptor, this descriptor will loop to itself */
+       desc = (struct lcd_dma_desc *)(uc_plat->base - 16);
+
+       desc->address = (u32)uc_plat->base;
+
+       /* Disable DMA transfer interrupt & descriptor loaded interrupt. */
+       desc->control = LCDC_BASECTRL_ADDIEN | LCDC_BASECTRL_DSCRIEN
+                       | LCDC_BASECTRL_DMAIEN | LCDC_BASECTRL_DFETCH;
+       desc->next = (u32)desc;
+
+       /* Flush the DMA descriptor if we enabled dcache */
+       flush_dcache_range((u32)desc, (u32)desc + sizeof(*desc));
+
+       writel(desc->address, &regs->lcdc_baseaddr);
+       writel(desc->control, &regs->lcdc_basectrl);
+       writel(desc->next, &regs->lcdc_basenext);
+       writel(LCDC_BASECHER_CHEN | LCDC_BASECHER_UPDATEEN,
+              &regs->lcdc_basecher);
+
+       /* Enable LCD */
+       value = readl(&regs->lcdc_lcden);
+       writel(value | LCDC_LCDEN_CLKEN, &regs->lcdc_lcden);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
+                          true, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+       value = readl(&regs->lcdc_lcden);
+       writel(value | LCDC_LCDEN_SYNCEN, &regs->lcdc_lcden);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
+                          true, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+       value = readl(&regs->lcdc_lcden);
+       writel(value | LCDC_LCDEN_DISPEN, &regs->lcdc_lcden);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
+                          true, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+       value = readl(&regs->lcdc_lcden);
+       writel(value | LCDC_LCDEN_PWMEN, &regs->lcdc_lcden);
+       ret = wait_for_bit(__func__, &regs->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
+                          true, 1000, false);
+       if (ret)
+               printf("%s: %d: Timeout!\n", __func__, __LINE__);
+}
+
+static int atmel_hlcdc_probe(struct udevice *dev)
+{
+       struct video_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct atmel_hlcdc_priv *priv = dev_get_priv(dev);
+       int ret;
+
+       ret = at91_hlcdc_enable_clk(dev);
+       if (ret)
+               return ret;
+
+       atmel_hlcdc_init(dev);
+
+       uc_priv->xsize = priv->timing.hactive.typ;
+       uc_priv->ysize = priv->timing.vactive.typ;
+       uc_priv->bpix = priv->vl_bpix;
+
+       /* Enable flushing if we enabled dcache */
+       video_set_flush_dcache(dev, true);
+
+       return 0;
+}
+
+static int atmel_hlcdc_ofdata_to_platdata(struct udevice *dev)
+{
+       struct atmel_hlcdc_priv *priv = dev_get_priv(dev);
+       const void *blob = gd->fdt_blob;
+       int node = dev->of_offset;
+
+       priv->regs = (struct atmel_hlcd_regs *)dev_get_addr(dev);
+       if (!priv->regs) {
+               debug("%s: No display controller address\n", __func__);
+               return -EINVAL;
+       }
+
+       if (fdtdec_decode_display_timing(blob, dev->of_offset,
+                                        0, &priv->timing)) {
+               debug("%s: Failed to decode display timing\n", __func__);
+               return -EINVAL;
+       }
+
+       if (priv->timing.hactive.typ > LCD_MAX_WIDTH)
+               priv->timing.hactive.typ = LCD_MAX_WIDTH;
+
+       if (priv->timing.vactive.typ > LCD_MAX_HEIGHT)
+               priv->timing.vactive.typ = LCD_MAX_HEIGHT;
+
+       priv->vl_bpix = fdtdec_get_int(blob, node, "atmel,vl-bpix", 0);
+       if (!priv->vl_bpix) {
+               debug("%s: Failed to get bits per pixel\n", __func__);
+               return -EINVAL;
+       }
+
+       priv->output_mode = fdtdec_get_int(blob, node, "atmel,output-mode", 24);
+       priv->guard_time = fdtdec_get_int(blob, node, "atmel,guard-time", 1);
+
+       return 0;
+}
+
+static int atmel_hlcdc_bind(struct udevice *dev)
+{
+       struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
+
+       uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT *
+                               (1 << LCD_MAX_LOG2_BPP) / 8;
+
+       debug("%s: Frame buffer size %x\n", __func__, uc_plat->size);
+
+       return 0;
+}
+
+static const struct udevice_id atmel_hlcdc_ids[] = {
+       { .compatible = "atmel,sama5d2-hlcdc" },
+       { .compatible = "atmel,at91sam9x5-hlcdc" },
+       { }
+};
+
+U_BOOT_DRIVER(atmel_hlcdfb) = {
+       .name   = "atmel_hlcdfb",
+       .id     = UCLASS_VIDEO,
+       .of_match = atmel_hlcdc_ids,
+       .bind   = atmel_hlcdc_bind,
+       .probe  = atmel_hlcdc_probe,
+       .ofdata_to_platdata = atmel_hlcdc_ofdata_to_platdata,
+       .priv_auto_alloc_size = sizeof(struct atmel_hlcdc_priv),
+};
+
+#endif