edid: Use edid_mode struct to reduce redundancy

This replaces various timing mode parameters parameters with
an edid_mode struct within the edid struct.

BUG=none
BRANCH=firmware-veyron
TEST=built and booted on Mickey, saw display come up, also
compiled for link,falco,peppy,rambi,nyan_big,rush,smaug

[pg: extended to also cover peach_pit, daisy and lenovo/t530]

Change-Id: Icd0d67bfd3c422be087976261806b9525b2b9c7e
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Original-Commit-Id: abcbf25c81b25fadf71cae106e01b3e36391f5e9
Original-Change-Id: I1bfba5b06a708d042286db56b37f67302f61fff6
Original-Signed-off-by: David Hendricks <dhendrix@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/289964
Original-Reviewed-by: Yakir Yang <ykk@rock-chips.com>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: http://review.coreboot.org/11388
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

4 files changed, 12 insertions, 12 deletions

diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c
index b4b9e50cb5..9bbd88edee 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -48,8 +48,8 @@
 #define DRAM_END	(DRAM_START + DRAM_SIZE)	/* plus one... */
 
 static struct edid edid = {
-	.ha = 1366,
-	.va = 768,
+	.mode.ha = 1366,
+	.mode.va = 768,
 	.framebuffer_bits_per_pixel = 16,
 	.x_resolution = 1366,
 	.y_resolution = 768,
diff --git a/src/mainboard/google/falco/gma.c b/src/mainboard/google/falco/gma.c
index 68f1e4544d..6c936d700a 100644
--- a/src/mainboard/google/falco/gma.c
+++ b/src/mainboard/google/falco/gma.c
@@ -234,8 +234,8 @@ int panel_lightup(struct intel_dp *dp, unsigned int init_fb)
 
 	palette();
 
-	pixels = dp->edid.ha * (dp->edid.va-4) * 4;
-	printk(BIOS_SPEW, "ha=%d, va=%d\n",dp->edid.ha, dp->edid.va);
+	pixels = dp->edid.mode.ha * (dp->edid.mode.va-4) * 4;
+	printk(BIOS_SPEW, "ha=%d, va=%d\n",dp->edid.mode.ha, dp->edid.mode.va);
 
 	test_gfx(dp);
 
diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c
index b5d2410acf..37f5986524 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -47,8 +47,8 @@
 #define DRAM_SIZE	CONFIG_DRAM_SIZE_MB
 
 static struct edid edid = {
-	.ha = 1366,
-	.va = 768,
+	.mode.ha = 1366,
+	.mode.va = 768,
 	.framebuffer_bits_per_pixel = 16,
 	.x_resolution = 1366,
 	.y_resolution = 768,
diff --git a/src/mainboard/google/peppy/gma.c b/src/mainboard/google/peppy/gma.c
index 735ad65f9e..4e2fc5f56a 100644
--- a/src/mainboard/google/peppy/gma.c
+++ b/src/mainboard/google/peppy/gma.c
@@ -151,12 +151,12 @@ static void test_gfx(struct intel_dp *dp)
 	   are made right. Thus, to be used only for testing, not otherwise
 	*/
 
-	for (i = 0; i < (dp->edid.va - 4); i++) {
+	for (i = 0; i < (dp->edid.mode.va - 4); i++) {
 		u32 *l;
 		int j;
 		u32 tcolor = 0x0ff;
-		for (j = 0; j < (dp->edid.ha-4); j++) {
-			if (j == (dp->edid.ha/2)) {
+		for (j = 0; j < (dp->edid.mode.ha-4); j++) {
+			if (j == (dp->edid.mode.ha/2)) {
 				tcolor = 0xff00;
 			}
 			l = (u32*)(dp->graphics + i * dp->stride + j * sizeof(tcolor));
@@ -246,7 +246,7 @@ int panel_lightup(struct intel_dp *dp, unsigned int init_fb)
 	compute_display_params(dp);
 
 	printk(BIOS_SPEW, "pixel_clock is %i, link_clock is %i\n",
-	       dp->edid.pixel_clock, dp->edid.link_clock);
+	       dp->edid.mode.pixel_clock, dp->edid.link_clock);
 
 	intel_ddi_set_pipe_settings(dp);
 
@@ -254,8 +254,8 @@ int panel_lightup(struct intel_dp *dp, unsigned int init_fb)
 
 	palette();
 
-	pixels = dp->edid.ha * (dp->edid.va-4) * 4;
-	printk(BIOS_SPEW, "ha=%d, va=%d\n",dp->edid.ha, dp->edid.va);
+	pixels = dp->edid.mode.ha * (dp->edid.mode.va-4) * 4;
+	printk(BIOS_SPEW, "ha=%d, va=%d\n",dp->edid.mode.ha, dp->edid.mode.va);
 	test_gfx(dp);
 
 	set_vbe_mode_info_valid(&dp->edid, (uintptr_t)dp->graphics);