diff options
| author | Tom Rini <trini@konsulko.com> | 2017-10-29 10:11:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-29 10:11:08 -0400 |
| commit | 2d5e6b4aac59d3a93773f19839fbb86d9e704fb7 (patch) | |
| tree | 988476ddf97741742c05bf1850a5136f8272a19a /include | |
| parent | 405835645a2db17152e6d6cdb4c9d1893f9501cc (diff) | |
| parent | 9b73bcc6c3f9a5fdff75159fc8e1ecddf1c290e8 (diff) | |
Merge git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sunxi-common.h | 9 | ||||
| -rw-r--r-- | include/video_bridge.h | 20 |
2 files changed, 22 insertions, 7 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 91751171ec..4207398eb9 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -268,18 +268,13 @@ extern int soft_i2c_gpio_scl; /* GPIO */ #define CONFIG_SUNXI_GPIO -#ifdef CONFIG_VIDEO +#ifdef CONFIG_VIDEO_SUNXI /* * The amount of RAM to keep free at the top of RAM when relocating u-boot, * to use as framebuffer. This must be a multiple of 4096. */ #define CONFIG_SUNXI_MAX_FB_SIZE (16 << 20) -/* Do we want to initialize a simple FB? */ -#define CONFIG_VIDEO_DT_SIMPLEFB - -#define CONFIG_VIDEO_SUNXI - #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_STD_TIMINGS #define CONFIG_I2C_EDID @@ -288,7 +283,7 @@ extern int soft_i2c_gpio_scl; /* allow both serial and cfb console. */ /* stop x86 thinking in cfbconsole from trying to init a pc keyboard */ -#endif /* CONFIG_VIDEO */ +#endif /* CONFIG_VIDEO_SUNXI */ /* Ethernet support */ #ifdef CONFIG_SUNXI_EMAC diff --git a/include/video_bridge.h b/include/video_bridge.h index c7b8681849..0699a8dda8 100644 --- a/include/video_bridge.h +++ b/include/video_bridge.h @@ -53,6 +53,16 @@ struct video_bridge_ops { * @return 0 if OK, -ve on error */ int (*set_backlight)(struct udevice *dev, int percent); + + /** + * read_edid() - Read information from EDID + * + * @dev: Device to read from + * @buf: Buffer to read into + * @buf_size: Buffer size + * @return number of bytes read, <=0 for error + */ + int (*read_edid)(struct udevice *dev, u8 *buf, int buf_size); }; #define video_bridge_get_ops(dev) \ @@ -89,4 +99,14 @@ int video_bridge_set_active(struct udevice *dev, bool active); */ int video_bridge_check_attached(struct udevice *dev); +/** + * video_bridge_read_edid() - Read information from EDID + * + * @dev: Device to read from + * @buf: Buffer to read into + * @buf_size: Buffer size + * @return number of bytes read, <=0 for error + */ +int video_bridge_read_edid(struct udevice *dev, u8 *buf, int buf_size); + #endif |