From 2dcf143398ad89ac960e02c7149521ae420db43b Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 21 Jan 2016 19:45:00 -0700
Subject: dm: video: Repurpose the 'displayport' uclass to 'display'

The current DisplayPort uclass is too specific. The operations it provides
are shared with other types of output devices, such as HDMI and LVDS LCD
displays.

Generalise the uclass so that it can be used with these devices as well.
Adjust the uclass to handle the EDID reading and conversion to
display_timing internally.

Also update nyan-big which is affected by this.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 include/display.h      | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 include/displayport.h  | 60 -------------------------------------------
 include/dm/uclass-id.h |  2 +-
 include/edid.h         |  1 +
 4 files changed, 71 insertions(+), 61 deletions(-)
 create mode 100644 include/display.h
 delete mode 100644 include/displayport.h

(limited to 'include')

diff --git a/include/display.h b/include/display.h
new file mode 100644
index 0000000..c180e76
--- /dev/null
+++ b/include/display.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef _DISPLAY_H
+#define _DISPLAY_H
+
+struct udevice;
+struct display_timing;
+
+/**
+ * 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
+ * @return 0 if OK, -ve on error
+ */
+int display_read_timing(struct udevice *dev, struct display_timing *timing);
+
+/**
+ * display_port_enable() - Enable a display port device
+ *
+ * @dev:	Device to enable
+ * @panel_bpp:	Number of bits per pixel for panel
+ * @timing:	Display timings
+ * @return 0 if OK, -ve on error
+ */
+int display_enable(struct udevice *dev, int panel_bpp,
+		   const struct display_timing *timing);
+
+struct dm_display_ops {
+	/**
+	 * read_edid() - Read 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
+	 */
+	int (*read_edid)(struct udevice *dev, u8 *buf, int buf_size);
+
+	/**
+	 * enable() - Enable the display port device
+	 *
+	 * @dev:	Device to enable
+	 * @panel_bpp:	Number of bits per pixel for panel
+	 * @timing:	Display timings
+	 * @return 0 if OK, -ve on error
+	 */
+	int (*enable)(struct udevice *dev, int panel_bpp,
+		      const struct display_timing *timing);
+};
+
+#define display_get_ops(dev)	((struct dm_display_ops *)(dev)->driver->ops)
+
+#endif
diff --git a/include/displayport.h b/include/displayport.h
deleted file mode 100644
index f7c7e25..0000000
--- a/include/displayport.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#ifndef _DISPLAYPORT_H
-#define _DISPLAYPORT_H
-
-struct udevice;
-struct display_timing;
-
-/**
- * display_port_read_edid() - Read 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
- */
-int display_port_read_edid(struct udevice *dev, u8 *buf, int buf_size);
-
-/**
- * display_port_enable() - Enable a display port device
- *
- * @dev:	Device to enable
- * @panel_bpp:	Number of bits per pixel for panel
- * @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);
-
-struct dm_display_port_ops {
-	/**
-	 * read_edid() - Read 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
-	 */
-	int (*read_edid)(struct udevice *dev, u8 *buf, int buf_size);
-
-	/**
-	 * enable() - Enable the display port device
-	 *
-	 * @dev:	Device to enable
-	 * @panel_bpp:	Number of bits per pixel for panel
-	 * @timing:	Display timings
-	 * @return 0 if OK, -ve on error
-	 */
-	int (*enable)(struct udevice *dev, int panel_bpp,
-		      const struct display_timing *timing);
-};
-
-#define display_port_get_ops(dev)	\
-	((struct dm_display_port_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)
-- 
cgit v1.1