From ce35c2f7b1bedb6df927eb5daf8c55cb342103c8 Mon Sep 17 00:00:00 2001
From: Li-Ta Lo <ollie@lanl.gov>
Date: Fri, 22 Dec 2000 02:42:55 +0000
Subject: [PATCH] clean up for SiS630S

---
 src/northsouthbridge/sis/630/630_regs.inc  |  4 +--
 src/northsouthbridge/sis/630/630s_regs.inc | 30 +++++++++++++++++++---
 src/northsouthbridge/sis/630/ipl.S         |  4 +--
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/northsouthbridge/sis/630/630_regs.inc b/src/northsouthbridge/sis/630/630_regs.inc
index f0220f08e1..a182874a85 100644
--- a/src/northsouthbridge/sis/630/630_regs.inc
+++ b/src/northsouthbridge/sis/630/630_regs.inc
@@ -90,7 +90,7 @@ northbridge_init_table:
 	.byte	0x98,	0x00	#
 	.byte	0x9C,	0x02	# CPU to VGA MEM Posted Write
 
-	/* DRAM Priority Timer Control REgister */
+	/* DRAM Priority Timer Control Register */
 	.byte	0xA0,	0x00
 	.byte	0xA1,	0x00
 	.byte	0xA2,	0x03
@@ -99,7 +99,5 @@ northbridge_init_table:
 	/* AGP Command Register */
 	.byte	0xC8,	0x04	# AGP 4X
 	.byte	0xC9,	0x00	# AGP Disabled
-	.byte	0xCA,	0x00
-	.byte	0xCB,	0x00
 
 northbridge_init_table_end:
\ No newline at end of file
diff --git a/src/northsouthbridge/sis/630/630s_regs.inc b/src/northsouthbridge/sis/630/630s_regs.inc
index b3da29eae0..27c75860f8 100644
--- a/src/northsouthbridge/sis/630/630s_regs.inc
+++ b/src/northsouthbridge/sis/630/630s_regs.inc
@@ -44,7 +44,7 @@ northbridge_init_table:
 
 	/* DRAM Control */
 	.byte	0x52,	0xC5	#	
-	.byte	0x53,	0x0b	#
+	.byte	0x53,	0x0b	# FixMe: Confilct with document
 
 	.byte	0x54,	0x00	# 0x00 -> 66/100 MHZ, 0x08 -> 133 MHZ
 	.byte	0x55,	0x05	# 0x05 -> 66/100 MHZ, 0x01 -> 133 MHZ
@@ -62,15 +62,15 @@ northbridge_init_table:
 	/* MISC Control */
 	.byte	0x6A,	0xC6	#
 	.byte	0x6B,	0x00	#
-	.byte	0x6C,	0x2f	# 0x2E -> 66 MHZ, 0x20 -> 100 MHZ, 0x2C -> 133 MHZ
+	.byte	0x6C,	0x2F	# 0x2E -> 66 MHZ, 0x20 -> 100 MHZ, 0x2C -> 133 MHZ
  
 	/* PCI Interface */
 	.byte	0x80,	0x23	#
 	.byte	0x81,	0xFF	#
 	.byte	0x82,	0x7F	#
-	.byte	0x83,	0x1f	#
+	.byte	0x83,	0x1F	#
 
-	.byte	0x84,	0xf0	#
+	.byte	0x84,	0xF0	#
 	.byte	0x85,	0x00	#
 	.byte	0x86,	0x01	#
 	.byte	0x87,	0x40	#
@@ -102,4 +102,26 @@ northbridge_init_table:
 	.byte	0xCA,	0x00
 	.byte	0xCB,	0x00
 
+	.byte	0xD0,	0x48
+	.byte	0xD1,	0x81
+	.byte	0xD2,	0x40
+	.byte	0xD3,	0x5E
+
+	.byte	0xD4,	0x0D
+	.byte	0xD6,	0x00
+	.byte	0xD7,	0x80
+
+	.byte	0xD8,	0x60
+	.byte	0xD9,	0x60
+	.byte	0xDA,	0xAA
+	.byte	0xDB,	0x06
+
+	.byte	0xDC,	0x40
+	.byte	0xDD,	0x00
+	.byte	0xDE,	0x40
+
+	.byte	0xE0,	0x88
+	.byte	0xE1,	0x01
+	.byte	0xE2,	0x03
+
 northbridge_init_table_end:
diff --git a/src/northsouthbridge/sis/630/ipl.S b/src/northsouthbridge/sis/630/ipl.S
index 81c13ab781..6932f07f32 100644
--- a/src/northsouthbridge/sis/630/ipl.S
+++ b/src/northsouthbridge/sis/630/ipl.S
@@ -177,7 +177,7 @@ no_sdram:
 	movw	%fs, %ax
 	movb	$0x63, %ah
 #ifdef HAVE_FRAMEBUFFER
-        orb	$0x90, %al			# enable SMA 4 MB for VGA
+        orb	$0xA0, %al			# enable SMA 8 MB for VGA
 #endif /* HAVE_FRAMEBUFFER */
 
 #else /* !SIZE_ALL */
@@ -185,7 +185,7 @@ no_sdram:
 no_sdram:
 #ifdef HAVE_FRAMEBUFFER
                                                 # enable DIMM 0 and 
-        movw        $0x6391, %ax		# enable SMA 4 MB for VGA
+        movw        $0x63A1, %ax		# enable SMA 8 MB for VGA
 #else /* HAVE_FRAMEBUFFER */
         movw        $0x6301, %ax		# enable DIMM 0 
 #endif /* HAVE_FRAMEBUFFER */