remaining part of the patch.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2933 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 41 insertions, 261 deletions

diff --git a/src/southbridge/sis/sis966/sis966_early_smbus.c b/src/southbridge/sis/sis966/sis966_early_smbus.c
index f8b8ac6c86..378016fa5d 100644
--- a/src/southbridge/sis/sis966/sis966_early_smbus.c
+++ b/src/southbridge/sis/sis966/sis966_early_smbus.c
@@ -134,7 +134,7 @@ static const uint8_t	SiS_SBPCIE_init[13][3]={
 };
 
 
-#if 1
+
 static const uint8_t	SiS_NB_init[56][3]={
 {0x04, 0x00 ,0x07},					//Reg 0x04
 {0x05, 0x00 ,0x00},					//Reg 0x05 // alex
@@ -191,85 +191,11 @@ static const uint8_t	SiS_NB_init[56][3]={
 {0x97, 0x00 ,0x00},					//Reg 0x97
 {0x98, 0x00 ,0x00},					//Reg 0x98
 {0x99, 0x00 ,0x00},					//Reg 0x99
-// alex
-//{0xD7, 0x00 ,0x00},					//Reg 0x99
-//{0xDD, 0x00 ,0x02},					//Reg 0x99
-//
-//{0x13, 0x00 ,0xF0},					//Reg 0x99
-
-{0x00, 0x00, 0x00}					//End of table
-};
-
-#else
-static const uint8_t	SiS_NB_init[61][3]={
-{0x04, 0x00 ,0x07},					//Reg 0x04
-{0x05, 0x00 ,0x00},					//Reg 0x05 // alex
-{0x0D, 0x00 ,0x20},					//Reg 0x0D
-{0x2C, 0x00 ,0x39},					//Reg 0x2C
-{0x2D, 0x00 ,0x10},					//Reg 0x2D
-{0x2E, 0x00 ,0x61},					//Reg 0x2E
-{0x2F, 0x00 ,0x07},					//Reg 0x2F
-{0x34, 0x00 ,0xA0},					//Reg 0x34
-{0x40, 0x00 ,0x36},					//Reg 0x40
-{0x42, 0x00 ,0xB9},					//Reg 0x42
-{0x43, 0x00 ,0x8B},					//Reg 0x43
-{0x44, 0x00 ,0x05},					//Reg 0x44
-{0x45, 0x00 ,0xFF},					//Reg 0x45
-{0x46, 0x00 ,0x90},					//Reg 0x46
-{0x47, 0x00 ,0xA0},					//Reg 0x47
-{0x4C, 0xFF ,0x50},					//Reg 0x4C //  SiS307 enable
-{0x4E, 0x00 ,0x00},					//Reg 0x4E
-{0x4F, 0x00 ,0x02},					//Reg 0x4F
-{0x5B, 0x00 ,0x44},					//Reg 0x5B
-{0x5D, 0x00 ,0x00},					//Reg 0x5D
-{0x5E, 0x00 ,0x25},					//Reg 0x5E
-{0x61, 0x00 ,0xB0},					//Reg 0x61
-{0x65, 0x00 ,0xB0},					//Reg 0x65
-{0x68, 0x00 ,0x4C},					//Reg 0x68
-{0x69, 0x00 ,0xD0},					//Reg 0x69
-{0x6B, 0x00 ,0x07},					//Reg 0x6B
-{0x6C, 0x00 ,0xDD},					//Reg 0x6C
-{0x6D, 0x00 ,0xAD},					//Reg 0x6D
-{0x6E, 0x00 ,0xE8},					//Reg 0x6E
-{0x6F, 0x00 ,0x4D},					//Reg 0x6F
-{0x70, 0x00 ,0x00},					//Reg 0x70
-{0x71, 0x00 ,0x80},					//Reg 0x71
-{0x72, 0x00 ,0x00},					//Reg 0x72
-{0x73, 0x00 ,0x00},					//Reg 0x73
-{0x74, 0x00 ,0x01},					//Reg 0x74
-{0x75, 0x00 ,0x10},					//Reg 0x75
-{0x7E, 0x00 ,0x29},					//Reg 0x7E
-{0x8B, 0x00 ,0x10},					//Reg 0x8B
-{0x8D, 0x00 ,0x03},					//Reg 0x8D
-{0xA1, 0x00 ,0xD0},					//Reg 0xA1
-{0xA2, 0x00 ,0x30},					//Reg 0xA2
-{0xA4, 0x00 ,0x0B},					//Reg 0xA4
-{0xA9, 0x00 ,0x02},					//Reg 0xA9
-{0xB0, 0x00 ,0x30},					//Reg 0xB0
-{0xB4, 0x00 ,0x30},					//Reg 0xB4
-{0x90, 0x00 ,0x00},					//Reg 0x90
-{0x91, 0x00 ,0x00},					//Reg 0x91
-{0x92, 0x00 ,0x00},					//Reg 0x92
-{0x93, 0x00 ,0x00},					//Reg 0x93
-{0x94, 0x00 ,0x00},					//Reg 0x94
-{0x95, 0x00 ,0x00},					//Reg 0x95
-{0x96, 0x00 ,0x00},					//Reg 0x96
-{0x97, 0x00 ,0x00},					//Reg 0x97
-{0x98, 0x00 ,0x00},					//Reg 0x98
-{0x99, 0x00 ,0x00},					//Reg 0x99
-// alex
-{0x86, 0x00 ,0x14},					//Reg 0x99
-{0x87, 0x00 ,0xC8},					//Reg 0x99
-{0xF4, 0x00 ,0x01},
-//
-{0x13, 0x00 ,0xF0},					//Reg 0x99
 
 {0x00, 0x00, 0x00}					//End of table
 };
 
 
-#endif
-#if 1
 static const uint8_t SiS_NBAGP_init[34][3]={
 {0xCF, 0xDF, 0x00},      //HT issue
 {0x06, 0xDF, 0x20},
@@ -309,78 +235,6 @@ static const uint8_t SiS_NBAGP_init[34][3]={
 {0x00, 0x00, 0x00}     //End of table
 };
 
-
-
-#else
-
-//uint8_t SiS_NBAGP_init[53][3]={
-static const uint8_t SiS_NBAGP_init[40][3]={
-{0x04, 0x00 ,0x07},					//Reg 0x04
-{0x05, 0x00 ,0x01},					//Reg 0x05 // alex
-
-{0xCF, 0xDF, 0x00},      //HT issue
-{0x06, 0xDF, 0x20},
-{0x1E, 0xDF, 0x20},
-{0x50, 0x00, 0x02},
-{0x51, 0x00, 0x00},
-{0x54, 0x00, 0x09},
-{0x55, 0x00, 0x00},
-{0x56, 0x00, 0x80},
-{0x58, 0x00, 0x08},
-{0x60, 0x00, 0xB1},
-{0x61, 0x00, 0x02},
-{0x62, 0x00, 0x60},
-{0x63, 0x00, 0x60},
-{0x64, 0x00, 0xAA},
-{0x65, 0x00, 0x18},
-{0x68, 0x00, 0x23},
-{0x69, 0x00, 0x23},
-{0x6A, 0x00, 0xC8},
-{0x6B, 0x00, 0x08},
-{0x6C, 0x00, 0x00},
-{0x6D, 0x00, 0x00},
-{0x6E, 0x00, 0x08},
-{0x6F, 0x00, 0x00},
-{0xBB, 0x00, 0x00},
-{0xB5, 0x00, 0x30},
-{0xB0, 0x00, 0xDB},
-{0xB6, 0x00, 0x73},
-{0xB7, 0x00, 0x50},
-{0xBA, 0xBF, 0x41},
-{0xB4, 0x3F, 0xC0},
-{0xBF, 0xF9, 0x06},
-{0xBA, 0x00, 0x61},
-{0xBD, 0x7F, 0x80},
-
-
-
-{0x0D, 0x00 ,0x40},					//Reg 0x05 // alex
-/*
-{0x19, 0x00 ,0x01},					//Reg 0x05 // alex
-{0x1A, 0x00 ,0x01},					//Reg 0x05 // alex
-{0x1B, 0x00 ,0x40},					//Reg 0x05 // alex
-{0x1C, 0x00 ,0xE0},					//Reg 0x05 // alex
-{0x1D, 0x00 ,0xE0},					//Reg 0x05 // alex
-{0x20, 0x00 ,0xB0},					//Reg 0x05 // alex
-{0x21, 0x00 ,0xFE},					//Reg 0x05 // alex
-{0x22, 0x00 ,0xB0},					//Reg 0x05 // alex
-{0x23, 0x00 ,0xFE},					//Reg 0x05 // alex
-{0x24, 0x00 ,0x00},					//Reg 0x05 // alex
-{0x25, 0x00 ,0xD8},					//Reg 0x05 // alex
-{0x26, 0x00 ,0xF0},					//Reg 0x05 // alex
-{0x27, 0x00 ,0xDF},					//Reg 0x05 // alex
-*/
-{0x3E, 0x00 ,0x0A},					//Reg 0x05 // alex
-
-{0xCB, 0x00 ,0x10},					//Reg 0x05 // alex
-{0xCF, 0x00 ,0x48},					//Reg 0x05 // alex
-
-
-{0x00, 0x00, 0x00}     //End of table
-};
-
-#endif
-
 static const uint8_t	SiS_ACPI_2_init[56][3]={
 {0x00, 0x00, 0xFF},					//Reg 0x00
 {0x01, 0x00, 0xFF},					//Reg 0x01
@@ -440,129 +294,55 @@ static const uint8_t	SiS_ACPI_2_init[56][3]={
 {0x00, 0x00, 0x00}					//End of table
 };
 
-#if 0
-static const uint8_t	SiS_SiS1183_init[60][3]={
-{0x04, 0x00, 0x05},					 
-{0x09, 0x00, 0x05},					 
-{0x2C, 0x00, 0x39},					 
-{0x2D, 0x00, 0x10},					  
-{0x2E, 0x00, 0x83},					 
-{0x2F, 0x00, 0x11},					 
-{0x90, 0x00, 0x40},					 
-{0x91, 0x00, 0x00},	// set mode				 
-{0x50, 0x00, 0xA2},					 
-{0x52, 0x00, 0xA2},					 
-{0x55, 0x00, 0x96},					 
-{0x52, 0x00, 0xA2},					 
-{0x55, 0xF7, 0x00},					 
-{0x56, 0x00, 0xC0},	
-{0x57, 0x00, 0x14},
-{0x67, 0x00, 0x28},					 
-{0x81, 0x00, 0xB3},					 
-{0x82, 0x00, 0x72},					 
-{0x83, 0x00, 0x40},					 
-{0x85, 0x00, 0xB3},					 
-{0x86, 0x00, 0x72},					 
-{0x87, 0x00, 0x40},
-{0x88, 0x00, 0xDE},      // after set mode					 
-{0x89, 0x00, 0xB3},					 
-{0x8A, 0x00, 0x72},					 
-{0x8B, 0x00, 0x40},					 
-{0x8C, 0x00, 0xDE},					 
-{0x8D, 0x00, 0xB3},					 
-{0x8E, 0x00, 0x92},					 
-{0x8F, 0x00, 0x40},					 
-{0x93, 0x00, 0x00},					 
-{0x94, 0x00, 0x80},					 
-{0x95, 0x00, 0x08},					 
-{0x96, 0x00, 0x80},					 
-{0x97, 0x00, 0x08},
-{0x9C, 0x00, 0x80},					 
-{0x9D, 0x00, 0x08},					 
-{0x9E, 0x00, 0x80},					 
-{0x9F, 0x00, 0x08},					 
-{0xA0, 0x00, 0x15},					 
-{0xA1, 0x00, 0x15},					 
-{0xA2, 0x00, 0x15},					 
-{0xA3, 0x00, 0x15},
-
-//{0xD8, 0xFE, 0x01},	// Com reset				
-//{0xC8, 0xFE, 0x01},
-//{0xE8, 0xFE, 0x01},
-//{0xF8, 0xFE, 0x01},
-{0xC4, 0xFF, 0xFF},    // Clear status					 
-{0xC5, 0xFF, 0xFF},
-{0xC6, 0xFF, 0xFF},
-{0xC7, 0xFF, 0xFF},
-{0xD4, 0xFF, 0xFF},
-{0xD5, 0xFF, 0xFF},
-{0xD6, 0xFF, 0xFF},
-{0xD7, 0xFF, 0xFF},
-{0xE4, 0xFF, 0xFF},    // Clear status					 
-{0xE5, 0xFF, 0xFF},
-{0xE6, 0xFF, 0xFF},
-{0xE7, 0xFF, 0xFF},
-{0xF4, 0xFF, 0xFF},
-{0xF5, 0xFF, 0xFF},
-{0xF6, 0xFF, 0xFF},
-{0xF7, 0xFF, 0xFF},
-{0x00, 0x00, 0x00}					//End of table
-};
-
-#else
-
 static const uint8_t	SiS_SiS1183_init[44][3]={
-{0x04, 0x00, 0x05},					 
-{0x09, 0x00, 0x05},					 
-{0x2C, 0x00, 0x39},					 
-{0x2D, 0x00, 0x10},					  
-{0x2E, 0x00, 0x83},					 
-{0x2F, 0x00, 0x11},					 
-{0x90, 0x00, 0x40},					 
-{0x91, 0x00, 0x00},	// set mode				 
-{0x50, 0x00, 0xA2},					 
-{0x52, 0x00, 0xA2},					 
-{0x55, 0x00, 0x96},					 
-{0x52, 0x00, 0xA2},					 
-{0x55, 0xF7, 0x00},					 
-{0x56, 0x00, 0xC0},	
+{0x04, 0x00, 0x05},
+{0x09, 0x00, 0x05},
+{0x2C, 0x00, 0x39},
+{0x2D, 0x00, 0x10},
+{0x2E, 0x00, 0x83},
+{0x2F, 0x00, 0x11},
+{0x90, 0x00, 0x40},
+{0x91, 0x00, 0x00},	// set mode
+{0x50, 0x00, 0xA2},
+{0x52, 0x00, 0xA2},
+{0x55, 0x00, 0x96},
+{0x52, 0x00, 0xA2},
+{0x55, 0xF7, 0x00},
+{0x56, 0x00, 0xC0},
 {0x57, 0x00, 0x14},
-{0x67, 0x00, 0x28},					 
-{0x81, 0x00, 0xB3},					 
-{0x82, 0x00, 0x72},					 
-{0x83, 0x00, 0x40},					 
-{0x85, 0x00, 0xB3},					 
-{0x86, 0x00, 0x72},					 
+{0x67, 0x00, 0x28},
+{0x81, 0x00, 0xB3},
+{0x82, 0x00, 0x72},
+{0x83, 0x00, 0x40},
+{0x85, 0x00, 0xB3},
+{0x86, 0x00, 0x72},
 {0x87, 0x00, 0x40},
-{0x88, 0x00, 0xDE},      // after set mode					 
-{0x89, 0x00, 0xB3},					 
-{0x8A, 0x00, 0x72},					 
-{0x8B, 0x00, 0x40},					 
-{0x8C, 0x00, 0xDE},					 
-{0x8D, 0x00, 0xB3},					 
-{0x8E, 0x00, 0x92},					 
-{0x8F, 0x00, 0x40},					 
-{0x93, 0x00, 0x00},					 
-{0x94, 0x00, 0x80},					 
-{0x95, 0x00, 0x08},					 
-{0x96, 0x00, 0x80},					 
+{0x88, 0x00, 0xDE},      // after set mode
+{0x89, 0x00, 0xB3},
+{0x8A, 0x00, 0x72},
+{0x8B, 0x00, 0x40},
+{0x8C, 0x00, 0xDE},
+{0x8D, 0x00, 0xB3},
+{0x8E, 0x00, 0x92},
+{0x8F, 0x00, 0x40},
+{0x93, 0x00, 0x00},
+{0x94, 0x00, 0x80},
+{0x95, 0x00, 0x08},
+{0x96, 0x00, 0x80},
 {0x97, 0x00, 0x08},
-{0x9C, 0x00, 0x80},					 
-{0x9D, 0x00, 0x08},					 
-{0x9E, 0x00, 0x80},					 
-{0x9F, 0x00, 0x08},					 
-{0xA0, 0x00, 0x15},					 
-{0xA1, 0x00, 0x15},					 
-{0xA2, 0x00, 0x15},					 
+{0x9C, 0x00, 0x80},
+{0x9D, 0x00, 0x08},
+{0x9E, 0x00, 0x80},
+{0x9F, 0x00, 0x08},
+{0xA0, 0x00, 0x15},
+{0xA1, 0x00, 0x15},
+{0xA2, 0x00, 0x15},
 {0xA3, 0x00, 0x15},
-
-
 {0x00, 0x00, 0x00}					//End of table
 };
 
-#endif
 
-/*       In => Share Memory size 
+/*       In => Share Memory size
                             => 00h :    0MBytes
                             => 02h :   32MBytes
                             => 03h :   64MBytes