diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h
index 47f45c1512a8686f3df1d729f5cc8ba196cdc202..017d55f412ed01b9e871f7300c85a083cb5686dd 100644
--- a/arch/arm/mach-mvebu/include/mach/cpu.h
+++ b/arch/arm/mach-mvebu/include/mach/cpu.h
@@ -145,5 +145,18 @@ int serdes_phy_config(void);
* drivers/ddr/marvell
*/
int ddr3_init(void);
+
+struct mvebu_lcd_info {
+ u32 fb_base;
+ int x_res;
+ int y_res;
+ int x_fp; /* frontporch */
+ int y_fp;
+ int x_bp; /* backporch */
+ int y_bp;
+};
+
+int mvebu_lcd_register_init(struct mvebu_lcd_info *lcd_info);
+
#endif /* __ASSEMBLY__ */
#endif /* _MVEBU_CPU_H */
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index cb216bc2cc61d5c2a14139d4538afcaefa43f70a..b31794036691e4f6e0f6aa7e071682c02b5c8c65 100644
--- a/arch/arm/mach-mvebu/include/mach/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
@@ -67,6 +67,7 @@
#define MVEBU_SATA0_BASE (MVEBU_REGISTER(0xa8000))
#define MVEBU_NAND_BASE (MVEBU_REGISTER(0xd0000))
#define MVEBU_SDIO_BASE (MVEBU_REGISTER(0xd8000))
+#define MVEBU_LCD_BASE (MVEBU_REGISTER(0xe0000))
#define SOC_COHERENCY_FABRIC_CTRL_REG (MVEBU_REGISTER(0x20200))
#define MBUS_ERR_PROP_EN (1 << 8)
diff --git a/common/lcd.c b/common/lcd.c
index 2f3594a4176cb673bc9bfa095a58b6c22098d059..51705adeaf79918bce59a374a3319c6cb98a3cce 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -89,13 +89,24 @@ static void lcd_stub_puts(struct stdio_dev *dev, const char *s)
/* Small utility to check that you got the colours right */
#ifdef LCD_TEST_PATTERN
+#if LCD_BPP == LCD_COLOR8
#define N_BLK_VERT 2
#define N_BLK_HOR 3
static int test_colors[N_BLK_HOR * N_BLK_VERT] = {
CONSOLE_COLOR_RED, CONSOLE_COLOR_GREEN, CONSOLE_COLOR_YELLOW,
CONSOLE_COLOR_BLUE, CONSOLE_COLOR_MAGENTA, CONSOLE_COLOR_CYAN,
+}; /*LCD_BPP == LCD_COLOR8 */
+
+#elif LCD_BPP == LCD_COLOR16
+#define N_BLK_VERT 2
+#define N_BLK_HOR 4
+
+static int test_colors[N_BLK_HOR * N_BLK_VERT] = {
+ CONSOLE_COLOR_RED, CONSOLE_COLOR_GREEN, CONSOLE_COLOR_YELLOW, CONSOLE_COLOR_BLUE,
+ CONSOLE_COLOR_MAGENTA, CONSOLE_COLOR_CYAN, CONSOLE_COLOR_GREY, CONSOLE_COLOR_WHITE,
};
+#endif /*LCD_BPP == LCD_COLOR16 */
static void test_pattern(void)
{
@@ -104,12 +115,15 @@ static void test_pattern(void)
ushort v_step = (v_max + N_BLK_VERT - 1) / N_BLK_VERT;
ushort h_step = (h_max + N_BLK_HOR - 1) / N_BLK_HOR;
ushort v, h;
+#if LCD_BPP == LCD_COLOR8
uchar *pix = (uchar *)lcd_base;
+#elif LCD_BPP == LCD_COLOR16
+ ushort *pix = (ushort *)lcd_base;
+#endif
printf("[LCD] Test Pattern: %d x %d [%d x %d]\n",
h_max, v_max, h_step, v_step);
- /* WARNING: Code silently assumes 8bit/pixel */
for (v = 0; v < v_max; ++v) {
uchar iy = v / v_step;
for (h = 0; h < h_max; ++h) {
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 27e53c14c6c21cb6ac9eaebb08b04f6f2dbd156d..bd8b9649ced719e164f70dace0422c06db2061e3 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -55,6 +55,8 @@ CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y
CONFIG_ROCKCHIP_SPI=y
CONFIG_DM_VIDEO=y
+CONFIG_I2C_EDID=y
+CONFIG_DISPLAY=y
CONFIG_VIDEO_ROTATION=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index 15eb4d87b9ffcf666f77be64e7057ac256b34277..3b29158f4acab6504f0acd5ed1d868db29c6aace 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -47,6 +47,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y
CONFIG_DM_VIDEO=y
+CONFIG_I2C_EDID=y
+CONFIG_DISPLAY=y
CONFIG_VIDEO_ROTATION=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 03348a6987a427e1fcfdad15dbda1f09ca43c6d1..ca0f9e067bfe853b5072810336bcbdc52cd74489 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -26,6 +26,7 @@ CONFIG_TPM_TIS_INFINEON=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_DISPLAY=y
+CONFIG_I2C_EDID=y
CONFIG_VIDEO_TEGRA124=y
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_TPM=y
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index 2563775c6b759abaee00bb920c4c679d935a5480..68e3b367a33b2e46d932726c4fa2ceb38d2bfc55 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -45,6 +45,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y
CONFIG_DM_VIDEO=y
+CONFIG_I2C_EDID=y
+CONFIG_DISPLAY=y
CONFIG_VIDEO_ROTATION=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 912e397881080d100766dcc9a317223c8eb3c316..f54631cc17288e790a65e11610c344d7edbc7031 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -293,10 +293,25 @@ config VIDEO_LCD_SPI_MISO
option takes a string in the format understood by 'name_to_gpio'
function, e.g. PH1 for pin 1 of port H.
+config VIDEO_MVEBU
+ bool "Armada XP LCD controller"
+ default n
+ ---help---
+ Support for the LCD controller integrated in the Marvell
+ Armada XP SoC.
+
+config I2C_EDID
+ bool "Enable EDID library"
+ depends on DM_I2C
+ default n
+ help
+ This enables library for accessing EDID data from an LCD panel.
+
config DISPLAY
bool "Enable Display support"
depends on DM
- default y
+ default n
+ select I2C_EDID
help
This supports drivers that provide a display, such as eDP (Embedded
DisplayPort) and HDMI (High Definition Multimedia Interface).
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 0910510c748fa5f62d962535e28d1f8d15a9432e..be908f6ed8f788324d865b68261a1fe29c04da97 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_VIDEO_LCD_SSD2828) += ssd2828.o
obj-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o
obj-$(CONFIG_VIDEO_MX3) += mx3fb.o videomodes.o
obj-$(CONFIG_VIDEO_IPUV3) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o
+obj-$(CONFIG_VIDEO_MVEBU) += mvebu_lcd.o
obj-$(CONFIG_VIDEO_MXS) += mxsfb.o videomodes.o
obj-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o
obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o
diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
new file mode 100644
index 0000000000000000000000000000000000000000..86dae523c65510335a07e6fde71d1b4f3365b6eb
--- /dev/null
+++ b/drivers/video/mvebu_lcd.c
@@ -0,0 +1,532 @@
+/*
+ * Video driver for Marvell Armada XP SoC
+ *
+ * Initialization of LCD interface and setup of SPLASH screen image
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <video_fb.h>
+#include <linux/mbus.h>
+#include <asm/io.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/soc.h>
+
+#define MVEBU_LCD_WIN_CONTROL(w) (MVEBU_LCD_BASE + 0xf000 + ((w) << 4))
+#define MVEBU_LCD_WIN_BASE(w) (MVEBU_LCD_BASE + 0xf004 + ((w) << 4))
+#define MVEBU_LCD_WIN_REMAP(w) (MVEBU_LCD_BASE + 0xf00c + ((w) << 4))
+
+#define MVEBU_LCD_CFG_DMA_START_ADDR_0 (MVEBU_LCD_BASE + 0x00cc)
+#define MVEBU_LCD_CFG_DMA_START_ADDR_1 (MVEBU_LCD_BASE + 0x00dc)
+
+#define MVEBU_LCD_CFG_GRA_START_ADDR0 (MVEBU_LCD_BASE + 0x00f4)
+#define MVEBU_LCD_CFG_GRA_START_ADDR1 (MVEBU_LCD_BASE + 0x00f8)
+#define MVEBU_LCD_CFG_GRA_PITCH (MVEBU_LCD_BASE + 0x00fc)
+#define MVEBU_LCD_SPU_GRA_OVSA_HPXL_VLN (MVEBU_LCD_BASE + 0x0100)
+#define MVEBU_LCD_SPU_GRA_HPXL_VLN (MVEBU_LCD_BASE + 0x0104)
+#define MVEBU_LCD_SPU_GZM_HPXL_VLN (MVEBU_LCD_BASE + 0x0108)
+#define MVEBU_LCD_SPU_HWC_OVSA_HPXL_VLN (MVEBU_LCD_BASE + 0x010c)
+#define MVEBU_LCD_SPU_HWC_HPXL_VLN (MVEBU_LCD_BASE + 0x0110)
+#define MVEBU_LCD_SPUT_V_H_TOTAL (MVEBU_LCD_BASE + 0x0114)
+#define MVEBU_LCD_SPU_V_H_ACTIVE (MVEBU_LCD_BASE + 0x0118)
+#define MVEBU_LCD_SPU_H_PORCH (MVEBU_LCD_BASE + 0x011c)
+#define MVEBU_LCD_SPU_V_PORCH (MVEBU_LCD_BASE + 0x0120)
+#define MVEBU_LCD_SPU_BLANKCOLOR (MVEBU_LCD_BASE + 0x0124)
+#define MVEBU_LCD_SPU_ALPHA_COLOR1 (MVEBU_LCD_BASE + 0x0128)
+#define MVEBU_LCD_SPU_ALPHA_COLOR2 (MVEBU_LCD_BASE + 0x012c)
+#define MVEBU_LCD_SPU_COLORKEY_Y (MVEBU_LCD_BASE + 0x0130)
+#define MVEBU_LCD_SPU_COLORKEY_U (MVEBU_LCD_BASE + 0x0134)
+#define MVEBU_LCD_SPU_COLORKEY_V (MVEBU_LCD_BASE + 0x0138)
+#define MVEBU_LCD_CFG_RDREG4F (MVEBU_LCD_BASE + 0x013c)
+#define MVEBU_LCD_SPU_SPI_RXDATA (MVEBU_LCD_BASE + 0x0140)
+#define MVEBU_LCD_SPU_ISA_RXDATA (MVEBU_LCD_BASE + 0x0144)
+#define MVEBU_LCD_SPU_DBG_ISA (MVEBU_LCD_BASE + 0x0148)
+
+#define MVEBU_LCD_SPU_HWC_RDDAT (MVEBU_LCD_BASE + 0x0158)
+#define MVEBU_LCD_SPU_GAMMA_RDDAT (MVEBU_LCD_BASE + 0x015c)
+#define MVEBU_LCD_SPU_PALETTE_RDDAT (MVEBU_LCD_BASE + 0x0160)
+#define MVEBU_LCD_SPU_IOPAD_IN (MVEBU_LCD_BASE + 0x0178)
+#define MVEBU_LCD_FRAME_COUNT (MVEBU_LCD_BASE + 0x017c)
+#define MVEBU_LCD_SPU_DMA_CTRL0 (MVEBU_LCD_BASE + 0x0190)
+#define MVEBU_LCD_SPU_DMA_CTRL1 (MVEBU_LCD_BASE + 0x0194)
+#define MVEBU_LCD_SPU_SRAM_CTRL (MVEBU_LCD_BASE + 0x0198)
+#define MVEBU_LCD_SPU_SRAM_WRDAT (MVEBU_LCD_BASE + 0x019c)
+#define MVEBU_LCD_SPU_SRAM_PARA0 (MVEBU_LCD_BASE + 0x01a0)
+#define MVEBU_LCD_SPU_SRAM_PARA1 (MVEBU_LCD_BASE + 0x01a4)
+#define MVEBU_LCD_CFG_SCLK_DIV (MVEBU_LCD_BASE + 0x01a8)
+#define MVEBU_LCD_SPU_CONTRAST (MVEBU_LCD_BASE + 0x01ac)
+#define MVEBU_LCD_SPU_SATURATION (MVEBU_LCD_BASE + 0x01b0)
+#define MVEBU_LCD_SPU_CBSH_HUE (MVEBU_LCD_BASE + 0x01b4)
+#define MVEBU_LCD_SPU_DUMB_CTRL (MVEBU_LCD_BASE + 0x01b8)
+#define MVEBU_LCD_SPU_IOPAD_CONTROL (MVEBU_LCD_BASE + 0x01bc)
+#define MVEBU_LCD_SPU_IRQ_ENA_2 (MVEBU_LCD_BASE + 0x01d8)
+#define MVEBU_LCD_SPU_IRQ_ISR_2 (MVEBU_LCD_BASE + 0x01dc)
+#define MVEBU_LCD_SPU_IRQ_ENA (MVEBU_LCD_BASE + 0x01c0)
+#define MVEBU_LCD_SPU_IRQ_ISR (MVEBU_LCD_BASE + 0x01c4)
+#define MVEBU_LCD_ADLL_CTRL (MVEBU_LCD_BASE + 0x01c8)
+#define MVEBU_LCD_CLK_DIS (MVEBU_LCD_BASE + 0x01cc)
+#define MVEBU_LCD_VGA_HVSYNC_DELAY (MVEBU_LCD_BASE + 0x01d4)
+#define MVEBU_LCD_CLK_CFG_0 (MVEBU_LCD_BASE + 0xf0a0)
+#define MVEBU_LCD_CLK_CFG_1 (MVEBU_LCD_BASE + 0xf0a4)
+#define MVEBU_LCD_LVDS_CLK_CFG (MVEBU_LCD_BASE + 0xf0ac)
+
+#define MVEBU_LVDS_PADS_REG (MVEBU_SYSTEM_REG_BASE + 0xf0)
+
+/* Setup Mbus Bridge Windows for LCD */
+static void mvebu_lcd_conf_mbus_registers(void)
+{
+ const struct mbus_dram_target_info *dram;
+ int i;
+
+ dram = mvebu_mbus_dram_info();
+
+ /* Disable windows, set size/base/remap to 0 */
+ for (i = 0; i < 6; i++) {
+ writel(0, MVEBU_LCD_WIN_CONTROL(i));
+ writel(0, MVEBU_LCD_WIN_BASE(i));
+ writel(0, MVEBU_LCD_WIN_REMAP(i));
+ }
+
+ /* Write LCD bridge window registers */
+ for (i = 0; i < dram->num_cs; i++) {
+ const struct mbus_dram_window *cs = dram->cs + i;
+ writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) |
+ (dram->mbus_dram_target_id << 4) | 1,
+ MVEBU_LCD_WIN_CONTROL(i));
+
+ writel(cs->base & 0xffff0000, MVEBU_LCD_WIN_BASE(i));
+ }
+}
+
+/* Initialize LCD registers */
+int mvebu_lcd_register_init(struct mvebu_lcd_info *lcd_info)
+{
+ /* Local variable for easier handling */
+ int x = lcd_info->x_res;
+ int y = lcd_info->y_res;
+ u32 val;
+
+ /* Setup Mbus Bridge Windows */
+ mvebu_lcd_conf_mbus_registers();
+
+ /*
+ * Set LVDS Pads Control Register
+ * wr 0 182F0 FFE00000
+ */
+ clrbits_le32(MVEBU_LVDS_PADS_REG, 0x1f << 16);
+
+ /*
+ * Set the LCD_CFG_GRA_START_ADDR0/1 Registers
+ * This is supposed to point to the "physical" memory at memory
+ * end (currently 1GB-64MB but also may be 2GB-64MB).
+ * See also the Window 0 settings!
+ */
+ writel(lcd_info->fb_base, MVEBU_LCD_CFG_GRA_START_ADDR0);
+ writel(lcd_info->fb_base, MVEBU_LCD_CFG_GRA_START_ADDR1);
+
+ /*
+ * Set the LCD_CFG_GRA_PITCH Register
+ * Bits 31-28: Duty Cycle of Backlight. value/16=High (0x8=Mid Setting)
+ * Bits 25-16: Backlight divider from 32kHz Clock
+ * (here 16=0x10 for 1kHz)
+ * Bits 15-00: Line Length in Bytes
+ * 240*2 (for RGB1555)=480=0x1E0
+ */
+ writel(0x80100000 + 2 * x, MVEBU_LCD_CFG_GRA_PITCH);
+
+ /*
+ * Set the LCD_SPU_GRA_OVSA_HPXL_VLN Register
+ * Bits 31-16: Vertical start of graphical overlay on screen
+ * Bits 15-00: Horizontal start of graphical overlay on screen
+ */
+ writel(0x00000000, MVEBU_LCD_SPU_GRA_OVSA_HPXL_VLN);
+
+ /*
+ * Set the LCD_SPU_GRA_HPXL_VLN Register
+ * Bits 31-16: Vertical size of graphical overlay 320=0x140
+ * Bits 15-00: Horizontal size of graphical overlay 240=0xF0
+ * Values before zooming
+ */
+ writel((y << 16) | x, MVEBU_LCD_SPU_GRA_HPXL_VLN);
+
+ /*
+ * Set the LCD_SPU_GZM_HPXL_VLN Register
+ * Bits 31-16: Vertical size of graphical overlay 320=0x140
+ * Bits 15-00: Horizontal size of graphical overlay 240=0xF0
+ * Values after zooming
+ */
+ writel((y << 16) | x, MVEBU_LCD_SPU_GZM_HPXL_VLN);
+
+ /*
+ * Set the LCD_SPU_HWC_OVSA_HPXL_VLN Register
+ * Bits 31-16: Vertical position of HW Cursor 320=0x140
+ * Bits 15-00: Horizontal position of HW Cursor 240=0xF0
+ */
+ writel((y << 16) | x, MVEBU_LCD_SPU_HWC_OVSA_HPXL_VLN);
+
+ /*
+ * Set the LCD_SPU_HWC_OVSA_HPXL_VLN Register
+ * Bits 31-16: Vertical size of HW Cursor
+ * Bits 15-00: Horizontal size of HW Cursor
+ */
+ writel(0x00000000, MVEBU_LCD_SPU_HWC_HPXL_VLN);
+
+ /*
+ * Set the LCD_SPU_HWC_OVSA_HPXL_VLN Register
+ * Bits 31-16: Screen total vertical lines:
+ * VSYNC = 1
+ * Vertical Front Porch = 2
+ * Vertical Lines = 320
+ * Vertical Back Porch = 2
+ * SUM = 325 = 0x0145
+ * Bits 15-00: Screen total horizontal pixels:
+ * HSYNC = 1
+ * Horizontal Front Porch = 44
+ * Horizontal Lines = 240
+ * Horizontal Back Porch = 2
+ * SUM = 287 = 0x011F
+ * Note: For the display the backporch is between SYNC and
+ * the start of the pixels.
+ * This is not certain for the Marvell (!?)
+ */
+ val = ((y + lcd_info->y_fp + lcd_info->y_bp + 1) << 16) |
+ (x + lcd_info->x_fp + lcd_info->x_bp + 1);
+ writel(val, MVEBU_LCD_SPUT_V_H_TOTAL);
+
+ /*
+ * Set the LCD_SPU_V_H_ACTIVE Register
+ * Bits 31-16: Screen active vertical lines 320=0x140
+ * Bits 15-00: Screen active horizontakl pixels 240=0x00F0
+ */
+ writel((y << 16) | x, MVEBU_LCD_SPU_V_H_ACTIVE);
+
+ /*
+ * Set the LCD_SPU_H_PORCH Register
+ * Bits 31-16: Screen horizontal backporch 44=0x2c
+ * Bits 15-00: Screen horizontal frontporch 2=0x02
+ * Note: The terms "front" and "back" for the Marvell seem to be
+ * exactly opposite to the display.
+ */
+ writel((lcd_info->x_fp << 16) | lcd_info->x_bp, MVEBU_LCD_SPU_H_PORCH);
+
+ /*
+ * Set the LCD_SPU_V_PORCH Register
+ * Bits 31-16: Screen vertical backporch 2=0x02
+ * Bits 15-00: Screen vertical frontporch 2=0x02
+ * Note: The terms "front" and "back" for the Marvell seem to be exactly
+ * opposite to the display.
+ */
+ writel((lcd_info->y_fp << 16) | lcd_info->y_bp, MVEBU_LCD_SPU_V_PORCH);
+
+ /*
+ * Set the LCD_SPU_BLANKCOLOR Register
+ * This should be black = 0
+ * For tests this is magenta=00FF00FF
+ */
+ writel(0x00FF00FF, MVEBU_LCD_SPU_BLANKCOLOR);
+
+ /*
+ * Registers in the range of 0x0128 to 0x012C are colors for the cursor
+ * Registers in the range of 0x0130 to 0x0138 are colors for video
+ * color keying
+ */
+
+ /*
+ * Set the LCD_SPU_RDREG4F Register
+ * Bits 31-12: Reservd
+ * Bit 11: SRAM Wait
+ * Bit 10: Smart display fast TX (must be 1)
+ * Bit 9: DMA Arbitration Video/Graphics overlay: 0=interleaved
+ * Bit 8: FIFO watermark for DMA: 0=disable
+ * Bits 07-00: Empty 8B FIFO entries to trigger DMA, default=0x80
+ */
+ writel(0x00000780, MVEBU_LCD_CFG_RDREG4F);
+
+ /*
+ * Set the LCD_SPU_DMACTRL 0 Register
+ * Bit 31: Disable overlay blending 1=disable
+ * Bit 30: Gamma correction enable, 0=disable
+ * Bit 29: Video Contrast/Saturation/Hue Adjust enable, 0=disable
+ * Bit 28: Color palette enable, 0=disable
+ * Bit 27: DMA AXI Arbiter, 1=default
+ * Bit 26: HW Cursor 1-bit mode
+ * Bit 25: HW Cursor or 1- or 2-bit mode
+ * Bit 24: HW Cursor enabled, 0=disable
+ * Bits 23-20: Graphics Memory Color Format: 0x1=RGB1555
+ * Bits 19-16: Video Memory Color Format: 0x1=RGB1555
+ * Bit 15: Memory Toggle between frame 0 and 1: 0=disable
+ * Bit 14: Graphics horizontal scaling enable: 0=disable
+ * Bit 13: Graphics test mode: 0=disable
+ * Bit 12: Graphics SWAP R and B: 0=disable
+ * Bit 11: Graphics SWAP U and V: 0=disable
+ * Bit 10: Graphics SWAP Y and U/V: 0=disable
+ * Bit 09: Graphic YUV to RGB Conversion: 0=disable
+ * Bit 08: Graphic Transfer: 1=enable
+ * Bit 07: Memory Toggle: 0=disable
+ * Bit 06: Video horizontal scaling enable: 0=disable
+ * Bit 05: Video test mode: 0=disable
+ * Bit 04: Video SWAP R and B: 0=disable
+ * Bit 03: Video SWAP U and V: 0=disable
+ * Bit 02: Video SWAP Y and U/V: 0=disable
+ * Bit 01: Video YUV to RGB Conversion: 0=disable
+ * Bit 00: Video Transfer: 0=disable
+ */
+ writel(0x88111100, MVEBU_LCD_SPU_DMA_CTRL0);
+
+ /*
+ * Set the LCD_SPU_DMA_CTRL1 Register
+ * Bit 31: Manual DMA Trigger = 0
+ * Bits 30-28: DMA Trigger Source: 0x2 VSYNC
+ * Bit 28: VSYNC_INV: 0=Rising Edge, 1=Falling Edge
+ * Bits 26-24: Color Key Mode: 0=disable
+ * Bit 23: Fill low bits: 0=fill with zeroes
+ * Bit 22: Reserved
+ * Bit 21: Gated Clock: 0=disable
+ * Bit 20: Power Save enable: 0=disable
+ * Bits 19-18: Reserved
+ * Bits 17-16: Configure Video/Graphic Path: 0x1: Graphic path alpha.
+ * Bits 15-08: Configure Alpha: 0x00.
+ * Bits 07-00: Reserved.
+ */
+ writel(0x20010000, MVEBU_LCD_SPU_DMA_CTRL1);
+
+ /*
+ * Set the LCD_SPU_SRAM_CTRL Register
+ * Reset to default = 0000C000
+ * Bits 15-14: SRAM control: init=0x3, Read=0, Write=2
+ * Bits 11-08: SRAM address ID: 0=gamma_yr, 1=gammy_ug, 2=gamma_vb,
+ * 3=palette, 15=cursor
+ */
+ writel(0x0000C000, MVEBU_LCD_SPU_SRAM_CTRL);
+
+ /*
+ * LCD_SPU_SRAM_WRDAT register: 019C
+ * LCD_SPU_SRAM_PARA0 register: 01A0
+ * LCD_SPU_SRAM_PARA1 register: 01A4 - Cursor control/Power settings
+ */
+ writel(0x00000000, MVEBU_LCD_SPU_SRAM_PARA1);
+
+
+ /* Clock settings in the at 01A8 and in the range F0A0 see below */
+
+ /*
+ * Set LCD_SPU_CONTRAST
+ * Bits 31-16: Brightness sign ext. 8-bit value +255 to -255: default=0
+ * Bits 15-00: Contrast sign ext. 8-bit value +255 to -255: default=0
+ */
+ writel(0x00000000, MVEBU_LCD_SPU_CONTRAST);
+
+ /*
+ * Set LCD_SPU_SATURATION
+ * Bits 31-16: Multiplier signed 4.12 fixed point value
+ * Bits 15-00: Saturation signed 4.12 fixed point value
+ */
+ writel(0x10001000, MVEBU_LCD_SPU_SATURATION);
+
+ /*
+ * Set LCD_SPU_HUE
+ * Bits 31-16: Sine signed 2.14 fixed point value
+ * Bits 15-00: Cosine signed 2.14 fixed point value
+ */
+ writel(0x00000000, MVEBU_LCD_SPU_CBSH_HUE);
+
+ /*
+ * Set LCD_SPU_DUMB_CTRL
+ * Bits 31-28: LCD Type: 3=18 bit RGB | 6=24 bit RGB888
+ * Bits 27-12: Reserved
+ * Bit 11: LCD DMA Pipeline Enable: 1=Enable
+ * Bits 10-09: Reserved
+ * Bit 8: LCD GPIO pin (??)
+ * Bit 7: Reverse RGB
+ * Bit 6: Invert composite blank signal DE/EN (??)
+ * Bit 5: Invert composite sync signal
+ * Bit 4: Invert Pixel Valid Enable DE/EN (??)
+ * Bit 3: Invert VSYNC
+ * Bit 2: Invert HSYNC
+ * Bit 1: Invert Pixel Clock
+ * Bit 0: Enable LCD Panel: 1=Enable
+ * Question: Do we have to disable Smart and Dumb LCD
+ * and separately enable LVDS?
+ */
+ writel(0x6000080F, MVEBU_LCD_SPU_DUMB_CTRL);
+
+ /*
+ * Set LCD_SPU_IOPAD_CTRL
+ * Bits 31-20: Reserved
+ * Bits 19-18: Vertical Interpolation: 0=Disable
+ * Bits 17-16: Reserved
+ * Bit 15: Graphics Vertical Mirror enable: 0=disable
+ * Bit 14: Reserved
+ * Bit 13: Video Vertical Mirror enable: 0=disable
+ * Bit 12: Reserved
+ * Bit 11: Command Vertical Mirror enable: 0=disable
+ * Bit 10: Reserved
+ * Bits 09-08: YUV to RGB Color space conversion: 0 (Not used)
+ * Bits 07-04: AXI Bus Master: 0x4: no crossing of 4k boundary,
+ * 128 Bytes burst
+ * Bits 03-00: LCD pins: ??? 0=24-bit Dump panel ??
+ */
+ writel(0x000000C0, MVEBU_LCD_SPU_IOPAD_CONTROL);
+
+ /*
+ * Set SUP_IRQ_ENA_2: Disable all interrupts
+ */
+ writel(0x00000000, MVEBU_LCD_SPU_IRQ_ENA_2);
+
+ /*
+ * Set SUP_IRQ_ENA: Disable all interrupts.
+ */
+ writel(0x00000000, MVEBU_LCD_SPU_IRQ_ENA);
+
+ /*
+ * Set up ADDL Control Register
+ * Bits 31-29: 0x0 = Fastest Delay Line (default)
+ * 0x3 = Slowest Delay Line (default)
+ * Bit 28: Calibration done status.
+ * Bit 27: Reserved
+ * Bit 26: Set Pixel Clock to ADDL output
+ * Bit 25: Reduce CAL Enable
+ * Bits 24-22: Manual calibration value.
+ * Bit 21: Manual calibration enable.
+ * Bit 20: Restart Auto Cal
+ * Bits 19-16: Calibration Threshold voltage, default= 0x2
+ * Bite 15-14: Reserved
+ * Bits 13-11: Divisor for ADDL Clock: 0x1=/2, 0x3=/8, 0x5=/16
+ * Bit 10: Power Down ADDL module, default = 1!
+ * Bits 09-08: Test point configuration: 0x2=Bias, 0x3=High-z
+ * Bit 07: Reset ADDL
+ * Bit 06: Invert ADLL Clock
+ * Bits 05-00: Delay taps, 0x3F=Half Cycle, 0x00=No delay
+ * Note: ADLL is used for a VGA interface with DAC - not used here
+ */
+ writel(0x00000000, MVEBU_LCD_ADLL_CTRL);
+
+ /*
+ * Set the LCD_CLK_DIS Register:
+ * Bits 3 and 4 must be 1
+ */
+ writel(0x00000018, MVEBU_LCD_CLK_DIS);
+
+ /*
+ * Set the LCD_VGA_HSYNC/VSYNC Delay Register:
+ * Bits 03-00: Sets the delay for the HSYNC and VSYNC signals
+ */
+ writel(0x00000000, MVEBU_LCD_VGA_HVSYNC_DELAY);
+
+ /*
+ * Clock registers
+ * See page 475 in the functional spec.
+ */
+
+ /* Step 1 and 2: Disable the PLL */
+
+ /*
+ * Disable PLL, see "LCD Clock Configuration 1 Register" below
+ */
+ writel(0x8FF40007, MVEBU_LCD_CLK_CFG_1);
+
+ /*
+ * Powerdown, see "LCD Clock Configuration 0 Register" below
+ */
+ writel(0x94000174, MVEBU_LCD_CLK_CFG_0);
+
+ /*
+ * Set the LCD_CFG_SCLK_DIV Register
+ * This is set fix to 0x40000001 for the LVDS output:
+ * Bits 31-30: SCLCK Source: 0=AXIBus, 1=AHBus, 2=PLLDivider0
+ * Bits 15-01: Clock Divider: Bypass for LVDS=0x0001
+ * See page 475 in section 28.5.
+ */
+ writel(0x80000001, MVEBU_LCD_CFG_SCLK_DIV);
+
+ /*
+ * Set the LCD Clock Configuration 0 Register:
+ * Bit 31: Powerdown: 0=Power up
+ * Bits 30-29: Reserved
+ * Bits 28-26: PLL_KDIV: This encodes K
+ * K=16 => 0x5
+ * Bits 25-17: PLL_MDIV: This is M-1:
+ * M=1 => 0x0
+ * Bits 16-13: VCO band: 0x1 for 700-920MHz
+ * Bits 12-04: PLL_NDIV: This is N-1 and corresponds to R1_CTRL!
+ * N=28=0x1C => 0x1B
+ * Bits 03-00: R1_CTRL (for N=28 => 0x4)
+ */
+ writel(0x940021B4, MVEBU_LCD_CLK_CFG_0);
+
+ /*
+ * Set the LCD Clock Configuration 1 Register:
+ * Bits 31-19: Reserved
+ * Bit 18: Select PLL: Core PLL, 1=Dedicated PPL
+ * Bit 17: Clock Output Enable: 0=disable, 1=enable
+ * Bit 16: Select RefClk: 0=RefClk (25MHz), 1=External
+ * Bit 15: Half-Div, Device Clock by DIV+0.5*Half-Dev
+ * Bits 14-13: Reserved
+ * Bits 12-00: PLL Full Divider [Note: Assumed to be the Post-Divider
+ * M' for LVDS=7!]
+ */
+ writel(0x8FF40007, MVEBU_LCD_CLK_CFG_1);
+
+ /*
+ * Set the LVDS Clock Configuration Register:
+ * Bit 31: Clock Gating for the input clock to the LVDS
+ * Bit 30: LVDS Serializer enable: 1=Enabled
+ * Bits 29-11: Reserved
+ * Bit 11-08: LVDS Clock delay: 0x02 (default): by 2 pixel clock/7
+ * Bits 07-02: Reserved
+ * Bit 01: 24bbp Option: 0=Option_1,1=Option2
+ * Bit 00: 1=24bbp Panel: 0=18bpp Panel
+ * Note: Bits 0 and must be verified with the help of the
+ * Interface/display
+ */
+ writel(0xC0000201, MVEBU_LCD_LVDS_CLK_CFG);
+
+ /*
+ * Power up PLL (Clock Config 0)
+ */
+ writel(0x140021B4, MVEBU_LCD_CLK_CFG_0);
+
+ /* wait 10 ms */
+ mdelay(10);
+
+ /*
+ * Enable PLL (Clock Config 1)
+ */
+ writel(0x8FF60007, MVEBU_LCD_CLK_CFG_1);
+
+ return 0;
+}
+
+int __weak board_video_init(void)
+{
+ return -1;
+}
+
+void *video_hw_init(void)
+{
+ static GraphicDevice mvebufb;
+ GraphicDevice *pGD = &mvebufb;
+ u32 val;
+
+ /*
+ * The board code needs to call mvebu_lcd_register_init()
+ * in its board_video_init() implementation, with the board
+ * specific parameters for its LCD.
+ */
+ if (board_video_init() || !readl(MVEBU_LCD_CFG_GRA_START_ADDR0))
+ return NULL;
+
+ /* Provide the necessary values for the U-Boot video IF */
+ val = readl(MVEBU_LCD_SPU_V_H_ACTIVE);
+ pGD->winSizeY = val >> 16;
+ pGD->winSizeX = val & 0x0000ffff;
+ pGD->gdfBytesPP = 2;
+ pGD->gdfIndex = GDF_15BIT_555RGB;
+ pGD->frameAdrs = readl(MVEBU_LCD_CFG_GRA_START_ADDR0);
+
+ debug("LCD: buffer at 0x%08x resolution %dx%d\n", pGD->frameAdrs,
+ pGD->winSizeX, pGD->winSizeY);
+
+ return pGD;
+}
diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h
index 150e8765d642cb6664ea558c148f4a139aae8eca..67f45c0f908c36ac5f3687c08be007e7c836bed6 100644
--- a/include/configs/chromebook_jerry.h
+++ b/include/configs/chromebook_jerry.h
@@ -30,7 +30,6 @@
#define CONFIG_SPL_POWER_SUPPORT
#define CONFIG_SPL_I2C_SUPPORT
-#define CONFIG_I2C_EDID
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_CONSOLE_SCROLL_LINES 10
diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h
index d6423e7e554d21bd989fb71d91613735741e8ce0..a29f55709dd815dd187b54eea724e0023ae473c5 100644
--- a/include/configs/firefly-rk3288.h
+++ b/include/configs/firefly-rk3288.h
@@ -24,7 +24,6 @@
*/
#define CONFIG_ENV_OFFSET (96 * 1024)
-#define CONFIG_I2C_EDID
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_CONSOLE_SCROLL_LINES 10
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 9464153f58460bf4332b2593ca0fe2f72409ceab..176f6e902b3b3f911eaa225da9bf7a509536eef3 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -37,8 +37,6 @@
#define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
-#define CONFIG_I2C_EDID
-
/* LCD support */
#define CONFIG_LCD
#define CONFIG_PWM_TEGRA
diff --git a/include/configs/rock2.h b/include/configs/rock2.h
index d6423e7e554d21bd989fb71d91613735741e8ce0..a29f55709dd815dd187b54eea724e0023ae473c5 100644
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.h
@@ -24,7 +24,6 @@
*/
#define CONFIG_ENV_OFFSET (96 * 1024)
-#define CONFIG_I2C_EDID
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_CONSOLE_SCROLL_LINES 10
diff --git a/include/lcd.h b/include/lcd.h
index d7651a8f0801e4c14fe6c786e2c1815a2a5afb45..f76fca77f9f57f03fd2a79bd4e54c470f7d0ee96 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -195,8 +195,15 @@ void lcd_sync(void);
#define CONSOLE_COLOR_WHITE 0x00ffffff /* Must remain last / highest */
#define NBYTES(bit_code) (NBITS(bit_code) >> 3)
#else /* 16bpp color definitions */
-#define CONSOLE_COLOR_BLACK 0x0000
-#define CONSOLE_COLOR_WHITE 0xffff /* Must remain last / highest */
+# define CONSOLE_COLOR_BLACK 0x0000
+# define CONSOLE_COLOR_RED 0xF800
+# define CONSOLE_COLOR_GREEN 0x07E0
+# define CONSOLE_COLOR_YELLOW 0xFFE0
+# define CONSOLE_COLOR_BLUE 0x001F
+# define CONSOLE_COLOR_MAGENTA 0xF81F
+# define CONSOLE_COLOR_CYAN 0x07FF
+# define CONSOLE_COLOR_GREY 0xC618
+# define CONSOLE_COLOR_WHITE 0xffff /* Must remain last / highest */
#endif /* color definitions */
#if LCD_BPP == LCD_COLOR16