diff options
| author | Tom Rini <trini@ti.com> | 2014-10-27 09:08:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-27 09:08:42 -0400 |
| commit | 0ce4af99c07acebf4fce9a91f1099d2460629293 (patch) | |
| tree | d87d969bfc91662e7a90b3c4fcce35acf4a3cdaf /board/freescale | |
| parent | 5aa7bece1045c28806ce919099616ebe8fa63325 (diff) | |
| parent | 3f97af5302ee15530411232b464d255eb2ff2ffb (diff) | |
| download | u-boot-imx-0ce4af99c07acebf4fce9a91f1099d2460629293.zip u-boot-imx-0ce4af99c07acebf4fce9a91f1099d2460629293.tar.gz u-boot-imx-0ce4af99c07acebf4fce9a91f1099d2460629293.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'board/freescale')
| -rw-r--r-- | board/freescale/mx6qsabreauto/mx6qsabreauto.c | 61 | ||||
| -rw-r--r-- | board/freescale/mx6slevk/mx6slevk.c | 1 |
2 files changed, 61 insertions, 1 deletions
diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c index 1cb7561..0dc0160 100644 --- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c +++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c @@ -17,12 +17,16 @@ #include <asm/imx-common/iomux-v3.h> #include <asm/imx-common/mxc_i2c.h> #include <asm/imx-common/boot_mode.h> +#include <asm/imx-common/spi.h> #include <mmc.h> #include <fsl_esdhc.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/sys_proto.h> #include <i2c.h> +#include <asm/arch/mxc_hdmi.h> +#include <asm/imx-common/video.h> +#include <asm/arch/crm_regs.h> DECLARE_GLOBAL_DATA_PTR; @@ -234,10 +238,65 @@ u32 get_board_rev(void) return (get_cpu_rev() & ~(0xF << 8)) | rev; } +#if defined(CONFIG_VIDEO_IPUV3) +static void do_enable_hdmi(struct display_info_t const *dev) +{ + imx_enable_hdmi_phy(); +} + +struct display_info_t const displays[] = {{ + .bus = -1, + .addr = 0, + .pixfmt = IPU_PIX_FMT_RGB24, + .detect = detect_hdmi, + .enable = do_enable_hdmi, + .mode = { + .name = "HDMI", + .refresh = 60, + .xres = 1024, + .yres = 768, + .pixclock = 15385, + .left_margin = 220, + .right_margin = 40, + .upper_margin = 21, + .lower_margin = 7, + .hsync_len = 60, + .vsync_len = 10, + .sync = FB_SYNC_EXT, + .vmode = FB_VMODE_NONINTERLACED, +} } }; +size_t display_count = ARRAY_SIZE(displays); + +static void setup_display(void) +{ + struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + int reg; + + enable_ipu_clock(); + imx_setup_hdmi(); + + reg = readl(&mxc_ccm->chsccdr); + reg |= (CHSCCDR_CLK_SEL_LDB_DI0 + << MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET); + writel(reg, &mxc_ccm->chsccdr); +} +#endif /* CONFIG_VIDEO_IPUV3 */ + +/* + * Do not overwrite the console + * Use always serial for U-Boot console + */ +int overwrite_console(void) +{ + return 1; +} + int board_early_init_f(void) { setup_iomux_uart(); - +#ifdef CONFIG_VIDEO_IPUV3 + setup_display(); +#endif return 0; } diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index a0832f4..a500133 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -13,6 +13,7 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/spi.h> #include <asm/io.h> #include <linux/sizes.h> #include <common.h> |