diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-16 17:56:50 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-16 17:56:50 +0200 |
| commit | 6a2f30a03acbf226aeb5a93783e6172aa0682d78 (patch) | |
| tree | 0c105d2974cac3eb1767b61d01d2bedf29a2ab46 /arch/arm/include/asm/imx-common | |
| parent | a90bed77a6ec51cf8032a4d731014f9381ec6466 (diff) | |
| parent | e7f9350525d73233d4eaf1793f8fe618e9fd4910 (diff) | |
| download | u-boot-imx-6a2f30a03acbf226aeb5a93783e6172aa0682d78.zip u-boot-imx-6a2f30a03acbf226aeb5a93783e6172aa0682d78.tar.gz u-boot-imx-6a2f30a03acbf226aeb5a93783e6172aa0682d78.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/imx-common')
| -rw-r--r-- | arch/arm/include/asm/imx-common/iomux-v3.h | 5 | ||||
| -rw-r--r-- | arch/arm/include/asm/imx-common/video.h | 24 |
2 files changed, 29 insertions, 0 deletions
diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index dec11a1..cca920b 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -111,6 +111,11 @@ typedef u64 iomux_v3_cfg_t; #define PAD_CTL_DSE_40ohm (6 << 3) #define PAD_CTL_DSE_34ohm (7 << 3) +#if defined CONFIG_MX6SL +#define PAD_CTL_LVE (1 << 1) +#define PAD_CTL_LVE_BIT (1 << 22) +#endif + #elif defined(CONFIG_VF610) #define PAD_MUX_MODE_SHIFT 20 diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h new file mode 100644 index 0000000..2d94850 --- /dev/null +++ b/arch/arm/include/asm/imx-common/video.h @@ -0,0 +1,24 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __IMX_VIDEO_H_ +#define __IMX_VIDEO_H_ + +#include <linux/fb.h> +#include <ipu_pixfmt.h> + +struct display_info_t { + int bus; + int addr; + int pixfmt; + int (*detect)(struct display_info_t const *dev); + void (*enable)(struct display_info_t const *dev); + struct fb_videomode mode; +}; + +#ifdef CONFIG_IMX_HDMI +extern int detect_hdmi(struct display_info_t const *dev); +#endif + +#endif |