diff --git a/drivers/lcd/tda19988.c b/drivers/lcd/tda19988.c
index f38bcc9e662..8b47b4f8369 100644
--- a/drivers/lcd/tda19988.c
+++ b/drivers/lcd/tda19988.c
@@ -56,6 +56,7 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/drivers/drivers.h>
+#include <nuttx/lcd/edid.h>
 #include <nuttx/lcd/tda19988.h>
 
 #include "tda19988.h"
@@ -732,7 +733,7 @@ static int tda19988_fetch_edid(struct tda1988_dev_s *priv)
       goto done;
     }
 
-  blocks = priv->edid[0x7e];
+  blocks = priv->edid[EDID_TRAILER_NEXTENSIONS];
   if (blocks > 0)
     {
       FAR uint8_t *edid;
diff --git a/drivers/lcd/tda19988.h b/drivers/lcd/tda19988.h
index ef59dccd9f9..1e32c3a3d50 100644
--- a/drivers/lcd/tda19988.h
+++ b/drivers/lcd/tda19988.h
@@ -292,22 +292,4 @@
 
 #define HDMI_PAGE_SELECT_REG                     MKREG(HDMI_NO_PAGE, 0xff)
 
-/* EDID Definitions */
-
-#define EDID_LENGTH                              128
-
-/* EDID fields */
-
-#define EDID_MODES0                              35
-#define EDID_MODES1                              36
-#define EDID_TIMING_START                        38
-#define EDID_TIMING_END                          54
-#define EDID_TIMING_X(v)                         (((v) + 31) * 8)
-#define EDID_FREQ(v)                             (((v) & 0x3f) + 60)
-#define EDID_RATIO(v)                            (((v) >> 6) & 0x3)
-#define EDID_RATIO_10x16                         0
-#define EDID_RATIO_3x4                           1
-#define EDID_RATIO_4x5                           2
-#define EDID_RATIO_9x16                          3
-
 #endif /* __DRIVERS_LCD_TDA19988_H */
diff --git a/include/nuttx/lcd/edid.h b/include/nuttx/lcd/edid.h
index e19dce5c19c..1a32a1feed0 100644
--- a/include/nuttx/lcd/edid.h
+++ b/include/nuttx/lcd/edid.h
@@ -111,6 +111,8 @@
 #define EDID_STDTIMING_6              48
 #define EDID_STDTIMING_7              50
 #define EDID_STDTIMING_8              52
+
+#define EDID_STDTIMING_NUMBER         8
 #define EDID_STDTIMING_SIZE           2
 
 /* Bytes 54-125:  Descriptor Blocks */
@@ -119,6 +121,8 @@
 #define EDID_DESCRIPTOR_2             72
 #define EDID_DESCRIPTOR_3             90
 #define EDID_DESCRIPTOR_4             108
+
+#define EDID_DESCRIPTOR_NUMBER        4
 #define EDID_DESCRIPTOR_SIZE          18
 
 /* Bits 126-127:  Trailer */