3 files changed, 220 insertions, 4 deletions
diff --git a/src/mainboard/apple/macbook21/acpi/ec.asl b/src/mainboard/apple/macbook21/acpi/ec.asl
index e69de29bb2..01bfb0c6a0 100644
--- a/src/mainboard/apple/macbook21/acpi/ec.asl
+++ b/src/mainboard/apple/macbook21/acpi/ec.asl
@@ -0,0 +1,218 @@
+Device(EC)
+{
+	Name(_HID, EISAID("PNP0C09"))
+	Name(_UID, 0)
+
+	Name(_GPE, 0x17)
+	Mutex(ECLK, 0)
+
+	OperationRegion(ERAM, EmbeddedControl, 0x00, 0x100)
+	Field(ERAM, ByteAcc, NoLock, Preserve)
+	{
+		Offset(0x01),
+				LIDS, 1,        /* Lid status */
+				HPAC, 1,
+		Offset(0x02),
+				WKLD, 1,        /* Lid wake */
+
+		Offset(0x20),
+				SPTR,   8,
+				SSTS,   8,
+				SADR,   8,
+				SCMD,   8,
+				SBFR,   256,
+	}
+        Field(ERAM, ByteAcc, Lock, Preserve)
+        {
+		Offset(0x24),
+				SBDW,   16,
+	}
+
+	Method(SBPC, 0, NotSerialized)
+	{
+		Store(1000, Local0)
+		While(Local0)
+		{
+			If(LEqual(SPTR, 0x00))
+			{
+				Return()
+			}
+
+			Sleep(1)
+			Decrement(Local0)
+		}
+	}
+
+	Method(SBRW, 2, NotSerialized)
+	{
+		Acquire(ECLK, 0xFFFF)
+		Store(ShiftLeft(Arg0, 0x01), SADR)
+		Store(Arg1, SCMD)
+		Store(0x09, SPTR)
+		SBPC()
+		Store(SBDW, Local0)
+		Release(ECLK)
+		Return(Local0)
+	}
+
+	Method(SBRB, 2, NotSerialized)
+	{
+		Acquire(ECLK, 0xFFFF)
+		Store(ShiftLeft(Arg0, 0x01), SADR)
+		Store(Arg1, SCMD)
+		Store(0x0B, SPTR)
+		SBPC()
+		Store(SBFR, Local0)
+		Release(ECLK)
+		Return(Local0)
+	}
+
+	/* LID status change. */
+	Method(_Q20, 0, NotSerialized)
+	{
+		Notify(LID, 0x80)
+	}
+
+	/* AC status change. */
+	Method(_Q21, 0, NotSerialized)
+	{
+		Notify(AC, 0x80)
+	}
+
+	Method(_CRS, 0)
+	{
+		Name(ECMD, ResourceTemplate()
+		{
+			IO(Decode16, 0x62, 0x62, 1, 1)
+			IO(Decode16, 0x66, 0x66, 1, 1)
+		})
+		Return(ECMD)
+	}
+
+	Method(_INI, 0, NotSerialized)
+	{
+	}
+
+	Device(LID)
+	{
+		Name(_HID, "PNP0C0D")
+
+		Method(_LID, 0, NotSerialized)
+		{
+			return(LIDS)
+		}
+	}
+
+	Device(AC)
+	{
+		Name(_HID, "ACPI0003")
+		Name(_UID, 0x00)
+		Name(_PCL, Package() { \_SB } )
+
+		Method(_PSR, 0, NotSerialized)
+		{
+			return(HPAC)
+		}
+
+		Method(_STA, 0, NotSerialized)
+		{
+			Return(0x0f)
+		}
+	}
+
+	Device(BAT0)
+	{
+		Name(_HID, EisaId("PNP0C0A"))
+		Name(_UID, 0x00)
+		Name(_PCL, Package() { \_SB })
+
+		Name(BATS, Package()
+		{
+			0x00,			// 0: PowerUnit: Report in mWh
+			0xFFFFFFFF,		// 1: Design cap
+			0xFFFFFFFF,		// 2: Last full charge cap
+			0x01,			// 3: Battery Technology
+			10800,			// 4: Design Voltage(mV)
+			0x00,			// 5: Warning design capacity
+			200,			// 6: Low design capacity
+			10,			// 7: granularity1
+			10,			// 8: granularity2
+			"",			// 9: Model number
+			"",			// A: Serial number
+			"",			// B: Battery Type
+			""			// C: OEM information
+		})
+
+		Name(BATI, Package()
+		{
+			0,			// Battery State
+						// Bit 0 - discharge
+						// Bit 1 - charge
+						// Bit 2 - critical state
+			0,			// Battery present Rate
+			0,			// Battery remaining capacity
+			0			// Battery present voltage
+		})
+
+		Method(_BIF, 0, NotSerialized)
+		{
+			Multiply(^^SBRW(0x0B, 0x18), 10, Index(BATS, 0x01))
+			Multiply(^^SBRW(0x0B, 0x10), 10, Index(BATS, 0x02))
+			Store(^^SBRW(0x0B, 0x19), Index(BATS, 0x04))
+			Store(^^SBRB(0x0B, 0x21), Index(BATS, 0x09))
+			Store(^^SBRB(0x0B, 0x22), Index(BATS, 0x0B))
+			Store(^^SBRB(0x0B, 0x20), Index(BATS, 0x0C))
+
+			Return(BATS)
+		}
+
+		Method(_STA, 0, NotSerialized)
+		{
+			If(And(^^SBRW(0x0A, 0x01), 0x01)) {
+				Return(0x1f)
+			} else {
+				Return(0x0f)
+			}
+		}
+
+		Method(_BST, 0, NotSerialized)
+		{
+			/* Check for battery presence.  */
+			If(LNot(And(^^SBRW(0x0A, 0x01), 0x01))) {
+				Return(Package(4) {
+				       0,
+				       0xFFFFFFFF,
+				       0xFFFFFFFF,
+				       0xFFFFFFFF
+				})
+			}
+			Store(^^SBRW(0x0B, 0x09), Local1)
+			Store(Local1, Index(BATI, 0x03))
+			Store(^^SBRW(0x0B, 0x0A), Local0)
+			/* Sign-extend Local0.  */
+			If(And(Local0, 0x8000))
+			{
+				Not(Local0, Local0)
+				And(Increment(Local0), 0xFFFF, Local0)
+			}
+
+			Multiply(Local0, Local1, Local0)
+			Divide(Local0, 1000, , Index(BATI, 1))
+			Multiply(^^SBRW(0x0B, 0x0F), 10, Index(BATI, 2))
+			If(HPAC)
+			{
+				If(LNot(And(^^SBRW(0x0B, 0x16), 0x40))) {
+					Store(2, Index(BATI, 0))
+				} Else {
+					Store(0, Index(BATI, 0))
+				}
+			}
+			Else
+			{
+				Store(0x01, Index(BATI, 0))
+			}
+
+			Return(BATI)
+		}
+	}
+}
diff --git a/src/mainboard/apple/macbook21/devicetree.cb b/src/mainboard/apple/macbook21/devicetree.cb
index 6b1e7fff35..258a329c8c 100644
--- a/src/mainboard/apple/macbook21/devicetree.cb
+++ b/src/mainboard/apple/macbook21/devicetree.cb
@@ -57,9 +57,8 @@ chip northbridge/intel/i945
 			#  0 No effect (default)
 			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
 			#  2 SCI (if corresponding GPIO_EN bit is also set)
-			register "gpi13_routing" = "2"
-			register "gpi12_routing" = "1"
-			register "gpi8_routing" = "2"
+			register "gpi1_routing" = "2"
+			register "gpi7_routing" = "2"
 
 			register "sata_ahci" = "0x1"
 			register "sata_ports_implemented" = "0x04"
diff --git a/src/mainboard/apple/macbook21/dsdt.asl b/src/mainboard/apple/macbook21/dsdt.asl
index e654d202dd..5ba7b09cc8 100644
--- a/src/mainboard/apple/macbook21/dsdt.asl
+++ b/src/mainboard/apple/macbook21/dsdt.asl
@@ -19,7 +19,6 @@
  * MA 02110-1301 USA
  */
 
-#define THINKPAD_EC_GPE 28
 #define BRIGHTNESS_UP \DSPC.BRTU
 #define BRIGHTNESS_DOWN \DSPC.BRTD
 #define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0