diff options
| author | Ye Li <ye.li@nxp.com> | 2016-02-23 15:29:29 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:04:30 +0800 |
| commit | 37f58a1bcefe48261a736df0211f007835074db7 (patch) | |
| tree | b297a3645356f1804155e69db4c6134a90827a47 | |
| parent | 084bda6704db850e4a1717a35c511bc82e76f2c8 (diff) | |
| download | u-boot-imx-37f58a1bcefe48261a736df0211f007835074db7.zip u-boot-imx-37f58a1bcefe48261a736df0211f007835074db7.tar.gz u-boot-imx-37f58a1bcefe48261a736df0211f007835074db7.tar.bz2 | |
MLK-12437-5 mx6ulevk: Update display to support panel selection
Change to panel environment for display at default. Align this feature to
v2015.04 uboot.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit ea93a34a3348f80462ea5b61a4ca2e9a1d267f4c)
| -rw-r--r-- | board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 34 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h | 4 |
2 files changed, 28 insertions, 10 deletions
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index 14e4430..4233025 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -22,12 +22,14 @@ #include <miiphy.h> #include <linux/sizes.h> #include <mmc.h> +#include <mxsfb.h> #include <netdev.h> #include <power/pmic.h> #include <power/pfuze3000_pmic.h> #include "../common/pfuze.h" #include <usb.h> #include <usb/ehci-ci.h> +#include <asm/imx-common/video.h> DECLARE_GLOBAL_DATA_PTR; @@ -598,9 +600,9 @@ static iomux_v3_cfg_t const lcd_pads[] = { MX6_PAD_GPIO1_IO08__GPIO1_IO08 | MUX_PAD_CTRL(NO_PAD_CTRL), }; -static int setup_lcd(void) +void do_enable_parallel_lcd(struct display_info_t const *dev) { - enable_lcdif_clock(LCDIF1_BASE_ADDR, 1); + enable_lcdif_clock(dev->bus, 1); imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); @@ -611,9 +613,29 @@ static int setup_lcd(void) /* Set Brightness to high */ gpio_direction_output(IMX_GPIO_NR(1, 8) , 1); - - return 0; } + +struct display_info_t const displays[] = {{ + .bus = MX6UL_LCDIF1_BASE_ADDR, + .addr = 0, + .pixfmt = 24, + .detect = NULL, + .enable = do_enable_parallel_lcd, + .mode = { + .name = "TFT43AB", + .xres = 480, + .yres = 272, + .pixclock = 108695, + .left_margin = 8, + .right_margin = 4, + .upper_margin = 2, + .lower_margin = 4, + .hsync_len = 41, + .vsync_len = 10, + .sync = 0, + .vmode = FB_VMODE_NONINTERLACED +} } }; +size_t display_count = ARRAY_SIZE(displays); #endif int board_early_init_f(void) @@ -648,10 +670,6 @@ int board_init(void) board_qspi_init(); #endif -#ifdef CONFIG_VIDEO_MXS - setup_lcd(); -#endif - return 0; } diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 128181d..c9f11ae 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -69,7 +69,7 @@ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ - "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \ + "panel=TFT43AB\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ @@ -232,7 +232,7 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO -#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR +#define CONFIG_IMX_VIDEO_SKIP #endif #endif |