[S] Change in coreboot[master]: drivers/aspeed/common/ast_tables.h: Update to linux master

[Elyes Haouas (Code Review)]

Elyes Haouas has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69676 )

Change subject: drivers/aspeed/common/ast_tables.h: Update to linux master
......................................................................

drivers/aspeed/common/ast_tables.h: Update to linux master

Update to master branch at SHA 71dee0361bd04f31c37525e69817654c6e23c97a

Change-Id: I89b24a87d4542b6035649f995c14888309a395fa
Signed-off-by: Elyes Haouas 
---
M src/drivers/aspeed/common/ast_tables.h
1 file changed, 24 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/69676/1

diff --git a/src/drivers/aspeed/common/ast_tables.h b/src/drivers/aspeed/common/ast_tables.h
index bfd8f52..7dc6954 100644
--- a/src/drivers/aspeed/common/ast_tables.h
+++ b/src/drivers/aspeed/common/ast_tables.h
@@ -77,7 +77,7 @@
    {0x67, 0x22, 0x00},		/* 0E: VCLK157_5 */
    {0x6A, 0x22, 0x00},		/* 0F: VCLK162 */
    {0x4d, 0x4c, 0x80},		/* 10: VCLK154 */
-	{0xa7, 0x78, 0x80},		/* 11: VCLK83.5 */
+	{0x68, 0x6f, 0x80},		/* 11: VCLK83.5 */
    {0x28, 0x49, 0x80},		/* 12: VCLK106.5 */
    {0x37, 0x49, 0x80},		/* 13: VCLK146.25 */
    {0x1f, 0x45, 0x80},		/* 14: VCLK148.5 */
@@ -119,7 +119,7 @@
    {0x44, 0x20, 0x43},			/* 1A: VCLK118_25	*/
 };

-static struct ast_vbios_stdtable vbios_stdtable[] = {
+static const struct ast_vbios_stdtable vbios_stdtable[] = {
    /* MD_2_3_400 */
    {
    	0x67,
@@ -251,6 +251,13 @@
     (SyncPP | Charx8Dot), 0xFF, 1, 0x33 },
 };

+static const struct ast_vbios_enhtable res_1152x864[] = {
+	{1600, 1152, 64, 128,  900,  864, 1, 3, VCLK108,	/* 75Hz */
+	 (SyncPP | Charx8Dot | NewModeInfo), 75, 1, 0x3B },
+	{1600, 1152, 64, 128,  900,  864, 1, 3, VCLK108,	/* end */
+	 (SyncPP | Charx8Dot | NewModeInfo), 0xFF, 1, 0x3B },
+};
+
 /* 16:9 */
 static const struct ast_vbios_enhtable res_1360x768[] = {
    {1792, 1360, 64, 112, 795, 768, 3, 6, VCLK85_5,		/* 60Hz */
@@ -272,10 +279,10 @@

static const struct ast_vbios_enhtable res_1920x1080[] = {
    {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5,	/* 60Hz */
-	 (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+	 (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
      AST2500PreCatchCRT), 60, 1, 0x38 },
    {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5,	/* 60Hz */
-	 (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+	 (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
      AST2500PreCatchCRT), 0xFF, 1, 0x38 },
 };

@@ -319,4 +326,5 @@
     (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
      AST2500PreCatchCRT), 0xFF, 1, 0x34 },
 };
+
 #endif