Rename TOM to TOM1 and refer to the SSDT value with an External(TOM1)

clause.

An ITE87427 Super I/O does not exist. Use the real name (IT8712F) of
the chip on the DBM690T board.

Use decimal values for KELV, THOT and TCRT on the Pistachio board for
better readability.

Tested by Maggie Li on DBM690T and Pistachio.
Tested by Carl-Daniel Hailfinger on Asus M2A-VM.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>


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

2 files changed, 15 insertions, 14 deletions

diff --git a/src/mainboard/amd/dbm690t/acpi/dsdt.asl b/src/mainboard/amd/dbm690t/acpi/dsdt.asl
index 47ed318945..075814892f 100644
--- a/src/mainboard/amd/dbm690t/acpi/dsdt.asl
+++ b/src/mainboard/amd/dbm690t/acpi/dsdt.asl
@@ -30,8 +30,8 @@ DefinitionBlock (
 	/* Include ("debug.asl") */		/* Include global debug methods if needed */
 
 	/* Data to be patched by the BIOS during POST */
+	/* FIXME the patching is not done yet! */
 	/* Memory related values */
-	Name(TOM, 0x40000000)/* Top of RAM memory below 4GB */
 	Name(TOM2, 0x0)	/* Top of RAM memory above 4GB (>> 16) */
 	Name(LOMH, 0x0)	/* Start of unused memory in C0000-E0000 range */
 	Name(PBAD, 0x0)	/* Address of BIOS area (If TOM2 != 0, Addr >> 16) */
@@ -1171,6 +1171,7 @@ DefinitionBlock (
 		/*  _SB.PCI0 */
 		/* Note: Only need HID on Primary Bus */
 		Device(PCI0) {
+			External (TOM1)
 			Name(_HID, EISAID("PNP0A03"))
 			Name(_ADR, 0x00180000)	/* Dev# = BSP Dev#, Func# = 0 */
 			Method(_BBN, 0) { /* Bus number = 0 */
@@ -1433,7 +1434,7 @@ DefinitionBlock (
 				Name(_ADR, 0x00140006)
 			} /* end Ac97modem */
 
-			/* ITE87427 Support */
+			/* ITE IT8712F Support */
 			OperationRegion (IOID, SystemIO, 0x2E, 0x02)	/* sometimes it is 0x4E */
 				Field (IOID, ByteAcc, NoLock, Preserve)
 				{
@@ -1457,15 +1458,15 @@ DefinitionBlock (
 				APC4,	8	/* APC/PME Control Register 2 */
 			}
 
-			/* Enter the 87427 MB PnP Mode */
+			/* Enter the IT8712F MB PnP Mode */
 			Method (EPNP)
 			{
 				Store(0x87, SIOI)
 				Store(0x01, SIOI)
 				Store(0x55, SIOI)
-				Store(0x55, SIOI) /* 87427 magic number */
+				Store(0x55, SIOI) /* IT8712F magic number */
 			}
-			/* Exit the 87427 MB PnP Mode */
+			/* Exit the IT8712F MB PnP Mode */
 			Method (XPNP)
 			{
 				Store (0x02, SIOI)
@@ -1482,7 +1483,7 @@ DefinitionBlock (
 				If (LLess (Arg0, 0x05))
 				{
 					EPNP()
-					/* DBGO("87427F\n") */
+					/* DBGO("IT8712F\n") */
 
 					Store (0x4, LDN)
 					Store (One, ACTR)  /* Enable EC */
@@ -1593,7 +1594,7 @@ DefinitionBlock (
 				}
 
 				/* Set size of memory from 1MB to TopMem */
-				Subtract(TOM, 0x100000, DMLL)
+				Subtract(TOM1, 0x100000, DMLL)
 
 				/*
 				* If(LNotEqual(TOM2, 0x00000000)){
diff --git a/src/mainboard/amd/pistachio/acpi/dsdt.asl b/src/mainboard/amd/pistachio/acpi/dsdt.asl
index 9bf60cb87d..3fd521621e 100644
--- a/src/mainboard/amd/pistachio/acpi/dsdt.asl
+++ b/src/mainboard/amd/pistachio/acpi/dsdt.asl
@@ -30,8 +30,8 @@ DefinitionBlock (
 	/* Include ("debug.asl") */		/* Include global debug methods if needed */
 
 	/* Data to be patched by the BIOS during POST */
+	/* FIXME the patching is not done yet! */
 	/* Memory related values */
-	Name(TOM, 0x40000000)/* Top of RAM memory below 4GB */
 	Name(TOM2, 0x0)	/* Top of RAM memory above 4GB (>> 16) */
 	Name(LOMH, 0x0)	/* Start of unused memory in C0000-E0000 range */
 	Name(PBAD, 0x0)	/* Address of BIOS area (If TOM2 != 0, Addr >> 16) */
@@ -1170,6 +1170,7 @@ DefinitionBlock (
 		/*  _SB.PCI0 */
 		/* Note: Only need HID on Primary Bus */
 		Device(PCI0) {
+			External (TOM1)
 			Name(_HID, EISAID("PNP0A03"))
 			Name(_ADR, 0x00180000)	/* Dev# = BSP Dev#, Func# = 0 */
 			Method(_BBN, 0) { /* Bus number = 0 */
@@ -1516,7 +1517,7 @@ DefinitionBlock (
 				}
 
 				/* Set size of memory from 1MB to TopMem */
-				Subtract(TOM, 0x100000, DMLL)
+				Subtract(TOM1, 0x100000, DMLL)
 
 				/*
 				* If(LNotEqual(TOM2, 0x00000000)){
@@ -1676,9 +1677,9 @@ DefinitionBlock (
 
 	/* THERMAL */
 	Scope(\_TZ) {
-		Name (KELV, 0x0AAC)
-		Name (THOT, 0x0384)
-		Name (TCRT, 0x03B6)
+		Name (KELV, 2732)
+		Name (THOT, 900)
+		Name (TCRT, 950)
 
 		ThermalZone(TZ00) {
 			Method(_AC0,0) {	/* Active Cooling 0 (0=highest fan speed) */
@@ -1746,7 +1747,7 @@ DefinitionBlock (
 					}
 
 					Subtract (Local1, 0x40, Local1)
-					Multiply (Local1, 0x0A, Local1)
+					Multiply (Local1, 10, Local1)
 					Return (Add (Local1, KELV))
 				}
 				Else {
@@ -1759,4 +1760,3 @@ DefinitionBlock (
 	}
 }
 /* End of ASL file */
-