diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-15 12:01:17 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-15 12:01:17 (GMT) |
| commit | 4d339a9e8a758889de5da16b562aff5601bb3d8d (patch) | |
| tree | 1c1ac403b33a156efbd8f42c8970d771a6ce8f5c /include | |
| parent | e6de55ec5bf306df3b3cc8e7a4cc17fa1e78ca6c (diff) | |
| parent | 00b1d2d3178747c113dd8f939cf3e2d449bfaf54 (diff) | |
| download | u-boot-fsl-qoriq-4d339a9e8a758889de5da16b562aff5601bb3d8d.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 6 | ||||
| -rw-r--r-- | include/display.h | 11 | ||||
| -rw-r--r-- | include/dt-bindings/video/rk3288.h | 11 |
3 files changed, 26 insertions, 2 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 29d1f91..a6d821b 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -225,7 +225,11 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_IPUV3_CLK 260000000 +#ifdef CONFIG_MX6DL +#define CONFIG_IPUV3_CLK 198000000 +#else +#define CONFIG_IPUV3_CLK 264000000 +#endif #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/display.h b/include/display.h index c180e76..b1c4766 100644 --- a/include/display.h +++ b/include/display.h @@ -23,7 +23,7 @@ struct display_plat { }; /** - * display_read_timing() - Read timing information from EDID + * display_read_timing() - Read timing information * * @dev: Device to read from * @return 0 if OK, -ve on error @@ -43,6 +43,15 @@ int display_enable(struct udevice *dev, int panel_bpp, struct dm_display_ops { /** + * read_timing() - Read information directly + * + * @dev: Device to read from + * @timing: Display timings + * @return 0 if OK, -ve on error + */ + int (*read_timing)(struct udevice *dev, struct display_timing *timing); + + /** * read_edid() - Read information from EDID * * @dev: Device to read from diff --git a/include/dt-bindings/video/rk3288.h b/include/dt-bindings/video/rk3288.h new file mode 100644 index 0000000..7bfd247 --- /dev/null +++ b/include/dt-bindings/video/rk3288.h @@ -0,0 +1,11 @@ +#ifndef __DT_BINDINGS_VIDEO_RK3288_H__ +#define __DT_BINDINGS_VIDEO_RK3288_H__ + +#define LVDS_OUTPUT_RGB 0 +#define LVDS_OUTPUT_SINGLE 1 +#define LVDS_OUTPUT_DUAL 2 + +#define LVDS_FORMAT_VESA 0 +#define LVDS_FORMAT_JEIDA 1 + +#endif |