summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/display.h (renamed from include/displayport.h)33
-rw-r--r--include/dm/uclass-id.h2
-rw-r--r--include/edid.h1
3 files changed, 23 insertions, 13 deletions
diff --git a/include/displayport.h b/include/display.h
index f7c7e25..c180e76 100644
--- a/include/displayport.h
+++ b/include/display.h
@@ -4,21 +4,31 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef _DISPLAYPORT_H
-#define _DISPLAYPORT_H
+#ifndef _DISPLAY_H
+#define _DISPLAY_H
struct udevice;
struct display_timing;
/**
- * display_port_read_edid() - Read information from EDID
+ * Display uclass platform data for each device
+ *
+ * @source_id: ID for the source of the display data, typically a video
+ * controller
+ * @src_dev: Source device providing the video
+ */
+struct display_plat {
+ int source_id;
+ struct udevice *src_dev;
+};
+
+/**
+ * display_read_timing() - Read timing information from EDID
*
* @dev: Device to read from
- * @buf: Buffer to read into (should be EDID_SIZE bytes)
- * @buf_size: Buffer size (should be EDID_SIZE)
- * @return number of bytes read, <=0 for error
+ * @return 0 if OK, -ve on error
*/
-int display_port_read_edid(struct udevice *dev, u8 *buf, int buf_size);
+int display_read_timing(struct udevice *dev, struct display_timing *timing);
/**
* display_port_enable() - Enable a display port device
@@ -28,10 +38,10 @@ int display_port_read_edid(struct udevice *dev, u8 *buf, int buf_size);
* @timing: Display timings
* @return 0 if OK, -ve on error
*/
-int display_port_enable(struct udevice *dev, int panel_bpp,
- const struct display_timing *timing);
+int display_enable(struct udevice *dev, int panel_bpp,
+ const struct display_timing *timing);
-struct dm_display_port_ops {
+struct dm_display_ops {
/**
* read_edid() - Read information from EDID
*
@@ -54,7 +64,6 @@ struct dm_display_port_ops {
const struct display_timing *timing);
};
-#define display_port_get_ops(dev) \
- ((struct dm_display_port_ops *)(dev)->driver->ops)
+#define display_get_ops(dev) ((struct dm_display_ops *)(dev)->driver->ops)
#endif
diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
index 8308c23..8391e38 100644
--- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h
@@ -29,7 +29,7 @@ enum uclass_id {
UCLASS_CLK, /* Clock source, e.g. used by peripherals */
UCLASS_CPU, /* CPU, typically part of an SoC */
UCLASS_CROS_EC, /* Chrome OS EC */
- UCLASS_DISPLAY_PORT, /* Display port video */
+ UCLASS_DISPLAY, /* Display (e.g. DisplayPort, HDMI) */
UCLASS_RAM, /* RAM controller */
UCLASS_ETH, /* Ethernet device */
UCLASS_GPIO, /* Bank of general-purpose I/O pins */
diff --git a/include/edid.h b/include/edid.h
index 88b4b7d..8b022fa 100644
--- a/include/edid.h
+++ b/include/edid.h
@@ -17,6 +17,7 @@
/* Size of the EDID data */
#define EDID_SIZE 128
+#define EDID_EXT_SIZE 256
#define GET_BIT(_x, _pos) \
(((_x) >> (_pos)) & 1)