diff --git a/drivers/media/i2c/tc358840.c b/drivers/media/i2c/tc358840.c
index d4901ec0946..860f3b28082 100644
--- a/drivers/media/i2c/tc358840.c
+++ b/drivers/media/i2c/tc358840.c
@@ -115,88 +115,26 @@ static int tc358840_s_dv_timings(
  * FIXME: The final version shouldn't have a hardcoded EDID. This is only done
  * for the sake of simplicity.
  *
- * Preferred native timing: 1080p60
  */
- /*
 static const u32 EDID_DATA[] = {
-	0xFFFFFF00, 0x00FFFFFF, 0x02096252, 0x01010101,
-	0x030114FF, 0x785AA080, 0xA0C90D0A, 0x27984757,
-	0x2F4C4812, 0x808100CF, 0x01010101, 0x01010101,
-	0x01010101, 0x3A020101, 0x38711880, 0x2C58402D,
-	0x84400045, 0x1E000063, 0xB0502166, 0x301B0051,
-	0x00367040, 0x0063843A, 0x00001E00, 0x5400FC00,
-	0x4948534F, 0x542D4142, 0x20200A56, 0xFD000000,
-	0x0F4C1700, 0x0A000F51, 0x20202020, 0xA9012020,
-	0x70250302, 0x04051049, 0x06020703, 0x09262001,
-	0x07150707, 0x0C036CC0, 0x38003000, 0x2B2BCF2D,
-	0x00E23333, 0x801D017F, 0x161C7118, 0x252C5820,
-	0x63844000, 0x8C9E0000, 0x208AD00A, 0x10102DE0,
-	0xB000963E, 0x00004384, 0x001F0E18, 0x1E005180,
-	0x37804030, 0x5384DC00, 0xF11C0000, 0x51A00027,
-	0x50302500, 0xDC003780, 0x00005384, 0x001AA91C,
-	0x160050A0, 0x37203030, 0x5384DC00, 0xA21A0000
-};
-*/
-// TESTING: Preferred native timing 2160p30 30Hz @262.92MHz PClk
-// Max PClk: 290MHz.
-static const u32 EDID_DATA[] = {
-/* This EDID has no checksum errors but fallback is 720p */
-/*
-	0xffffff00, 0x00ffffff, 0x88886252, 0x88888800,
-	0x0301151c, 0x78000080, 0xa0c90d0a, 0x27984757,
-	0x004c4812, 0x01010000, 0x01010101, 0x01010101,
-	0x01010101, 0x66b40101, 0x70f0a000, 0x2030801f,
-	0x88800035, 0x1c000042, 0xa00068ec, 0x803770f0,
-	0x003a2030, 0x00f87000, 0x00001c00, 0x5400fc00,
-	0x6968736f, 0x552d6162, 0x0a433248, 0xfd000000,
-	0x0f3d1700, 0x00001e8c, 0x00000000, 0x13010000,
-	0x74170302, 0x03130447, 0x01060702, 0x01070923,
-	0x000c0366, 0x8c800030, 0x68ecd00a, 0x70f0a000,
-	0x20308037, 0x7000003a, 0x1c0000f8, 0xa00068ec,
-	0x803770f0, 0x003a2030, 0x00f87000, 0x68ec1c00,
-	0x70f0a000, 0x20308037, 0x7000003a, 0x1c0000f8,
-	0xa00068ec, 0x803770f0, 0x003a2030, 0x00f87000,
-	0x00001c00, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0xdc000000
-*/
-/* This EDID has 1 checksum errors in block 1 but works on all tested devices */
-/*
-	0xffffff00, 0x00ffffff, 0x0029ce1c, 0x00000000,
-	0x03010000, 0x78000082, 0xa391ee3e, 0x26994c54,
-	0x0054500f, 0x01010000, 0x01010101, 0x01010101,
-	0x01010101, 0x74040101, 0x70f23000, 0x58b0805a,
-	0x0910008a, 0x1e000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x5200fc00,
-	0x4f584f49, 0x2020200a, 0x20202020, 0xfd000000,
-	0x441e1e00, 0x0a001e44, 0x20202020, 0xa5012020,
-	0x31160302, 0x036f5f41, 0x0000000c, 0x00e03b00,
-	0x00000000, 0x00000120, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x5a000000
-*/
-/* Preferred native:2160p30. Fallback: 1080p60. Provides also some other res.
- No checksums errors. Made with AW Editor. */
+/* Preferred native:2160p30, 1080p50. Extended: 2160p30, 1080p60, 720p29.97/30, 
+1080p30, 1080p50, 1080p29.97/30. No checksums errors. Made with AW Editor. */
 	0xffffff00, 0x00ffffff, 0x88886252, 0x88888800,
 	0x0301151c, 0x78000080, 0xa0c90d0a, 0x27984757,
 	0x004c4812, 0x01010000, 0x01010101, 0x01010101,
 	0x01010101, 0x66b40101, 0x70f0a000, 0x2030801f,
-	0x88800035, 0x1c000042, 0xa0803629, 0x401f3870,
+	0x88800035, 0x1c000042, 0xa0802ced, 0x401a3870,
 	0x00352030, 0x00214440, 0x00001c00, 0x5400fc00,
 	0x6968736f, 0x552d6162, 0x0a433248, 0xfd000000,
-	0x0f3d1700, 0x00001e8c, 0x00000000, 0x60010000,
-	0x74170302, 0x03130447, 0x01060702, 0x01070923,
-	0x000c0366, 0x8c800030, 0x68ecd00a, 0x70f0a000,
-	0x20308037, 0x7000003a, 0x1c0000f8, 0xa00068ec,
-	0x803770f0, 0x003a2030, 0x00f87000, 0x68ec1c00,
-	0x70f0a000, 0x20308037, 0x7000003a, 0x1c0000f8,
-	0xa00068ec, 0x803770f0, 0x003a2030, 0x00f87000,
-	0x00001c00, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0xdc000000
+	0x0f3d1700, 0x00001e8c, 0x00000000, 0xab010000,
+	0x741a0302, 0x43105f4a, 0x201f223e, 0x234a4c21,
+	0x66010709, 0x30000c03, 0x66b48000, 0x70f0a000,
+	0x2030801f, 0x88800035, 0xf8000042, 0xec1c0000,
+	0xf0a00068, 0x30803770, 0x00003a20, 0x0000f870,
+	0x0068ec1c, 0x3770f0a0, 0x3a203080, 0xf8700000,
+	0xec1c0000, 0xf0a00068, 0x30803770, 0x00003a20,
+	0x0000f870, 0x0000001c, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0xdb000000
 };
 
 static struct v4l2_subdev_edid EDID_1080p = {