kunimitsu: Clean up mainboard code to match glados

Clean up the intel/kunimitsu mainboard code to match the code
and cleanups in glados.  Many of these are trivial changes that
do not impact things in a meaningful way but will make it easier
to diff the code and keep the mainboards in sync.

- use relative path for mainboard includes to make porting easier
- fix trivial style issues to match glados so diffs are clean
- pull GPIO configuration into gpio.h and use from there
- remove thermal.h as it is not used on this board
- make info message BIOS_INFO instead of BIOS_ERR
- add support for SPD manufacturer and part number in SMBIOS

BUG=chrome-os-partner:40635
BRANCH=none
TEST=emerge-kunimitsu coreboot

Change-Id: I64a053bcec0e0ff25a57f65659f391ab64d9a11a
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: e47f0fd3e00a665f07098c7ea0018d51b105d1be
Original-Change-Id: Ib787f3ccc63115de48c4d608ca2bd81b58d24b6c
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/297752
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11576
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

3 files changed, 60 insertions, 57 deletions

diff --git a/src/mainboard/intel/kunimitsu/acpi/dptf.asl b/src/mainboard/intel/kunimitsu/acpi/dptf.asl
index a056bf534f..742ba7186f 100644
--- a/src/mainboard/intel/kunimitsu/acpi/dptf.asl
+++ b/src/mainboard/intel/kunimitsu/acpi/dptf.asl
@@ -18,7 +18,6 @@
  * Foundation, Inc.
  */
 
-/* CPU */
 #define DPTF_CPU_PASSIVE        80
 #define DPTF_CPU_CRITICAL       90
 #define DPTF_CPU_ACTIVE_AC0     90
@@ -53,9 +52,6 @@ Name (CHPS, Package () {
 	Package () { 0, 0, 0, 0, 0, 0x000, "mA", 0 },	/* 0.0A */
 })
 
-/* Mainboard specific _PDL is 1GHz */
-Name (MPDL, 8)
-
 Name (DTRT, Package () {
 	/* CPU Throttle Effect on CPU */
 	Package () { \_SB.PCI0.B0D4, \_SB.PCI0.B0D4, 100, 50, 0, 0, 0, 0 },
diff --git a/src/mainboard/intel/kunimitsu/acpi/mainboard.asl b/src/mainboard/intel/kunimitsu/acpi/mainboard.asl
index 4492a19335..dce1371a4d 100644
--- a/src/mainboard/intel/kunimitsu/acpi/mainboard.asl
+++ b/src/mainboard/intel/kunimitsu/acpi/mainboard.asl
@@ -20,20 +20,22 @@
 
 #include "../gpio.h"
 
-#define BOARD_TRACKPAD_IRQ		0x33
-#define BOARD_TOUCHSCREEN_IRQ		0x1f
+#define BOARD_TOUCHPAD_I2C_ADDR			0x15
+#define BOARD_TOUCHPAD_IRQ			TOUCHPAD_INT_L
 
-#define BOARD_TRACKPAD_I2C_ADDR		0x15
-#define BOARD_TOUCHSCREEN_I2C_ADDR	0x10
-#define BOARD_LEFT_SSM4567_I2C_ADDR	0x34
-#define BOARD_RIGHT_SSM4567_I2C_ADDR	0x35
-#define BOARD_AUDIO_CODEC_I2C_ADDR	0x1A
+#define BOARD_TOUCHSCREEN_I2C_ADDR		0x10
+#define BOARD_TOUCHSCREEN_IRQ			TOUCHSCREEN_INT_L
+
+#define BOARD_HP_MIC_CODEC_I2C_ADDR		0x1a
+#define BOARD_HP_MIC_CODEC_IRQ			MIC_INT_L
+#define BOARD_LEFT_SPEAKER_AMP_I2C_ADDR		0x34
+#define BOARD_RIGHT_SPEAKER_AMP_I2C_ADDR	0x35
 
 Scope (\_SB)
 {
 	Device (LID0)
 	{
-		Name (_HID, EisaId("PNP0C0D"))
+		Name (_HID, EisaId ("PNP0C0D"))
 		Method (_LID, 0)
 		{
 			Return (\_SB.PCI0.LPCB.EC0.LIDS)
@@ -44,9 +46,10 @@ Scope (\_SB)
 
 	Device (PWRB)
 	{
-		Name (_HID, EisaId("PNP0C0C"))
+		Name (_HID, EisaId ("PNP0C0C"))
 	}
 }
+
 /*
  * LPC Trusted Platform Module
  */
@@ -57,13 +60,15 @@ Scope (\_SB.PCI0.LPCB)
 
 Scope (\_SB.PCI0.I2C0)
 {
-	Device (ETSA)
+	/* Touchscreen */
+	Device (ELTS)
 	{
 		Name (_HID, "ELAN0001")
-		Name (_DDN, "ELAN Touchscreen")
-		Name (_UID, 5)
-		Name (ISTP, 0) /* TouchScreen */
-		Name (_CRS, ResourceTemplate()
+		Name (_DDN, "Elan Touchscreen")
+		Name (_UID, 1)
+		Name (_S0W, 4)
+
+		Name (_CRS, ResourceTemplate ()
 		{
 			I2cSerialBus (
 				BOARD_TOUCHSCREEN_I2C_ADDR,
@@ -72,11 +77,13 @@ Scope (\_SB.PCI0.I2C0)
 				AddressingMode7Bit,
 				"\\_SB.PCI0.I2C0",
 			)
-			Interrupt (ResourceConsumer, Edge, ActiveLow) {
+			Interrupt (ResourceConsumer, Edge, ActiveLow)
+			{
 				BOARD_TOUCHSCREEN_IRQ
 			}
 		})
-		Method (_STA, 0, NotSerialized)
+
+		Method (_STA)
 		{
 			Return (0xF)
 		}
@@ -85,18 +92,18 @@ Scope (\_SB.PCI0.I2C0)
 
 Scope (\_SB.PCI0.I2C1)
 {
-	Device (ELAN)
+	/* Touchpad */
+	Device (ELTP)
 	{
 		Name (_HID, "ELAN0000")
 		Name (_DDN, "Elan Touchpad")
-		Name (_UID, 3)
-		/* Allow device to power off in S0 */
+		Name (_UID, 1)
 		Name (_S0W, 4)
-		Name (ISTP, 1) /* TouchPad */
-		Name (_CRS, ResourceTemplate()
+
+		Name (_CRS, ResourceTemplate ()
 		{
 			I2cSerialBus (
-				BOARD_TRACKPAD_I2C_ADDR,
+				BOARD_TOUCHPAD_I2C_ADDR,
 				ControllerInitiated,
 				400000,
 				AddressingMode7Bit,
@@ -104,9 +111,10 @@ Scope (\_SB.PCI0.I2C1)
 			)
 			Interrupt (ResourceConsumer, Edge, ActiveLow)
 			{
-				BOARD_TRACKPAD_IRQ
+				BOARD_TOUCHPAD_IRQ
 			}
 		})
+
 		Method (_STA)
 		{
 			Return (0xF)
@@ -116,43 +124,45 @@ Scope (\_SB.PCI0.I2C1)
 
 Scope (\_SB.PCI0.I2C4)
 {
-	// LEFT SSM4567 I2c ADDR 0x34
-	Device (LSPK)
+	/* Headphone Codec */
+	Device (HPMC)
 	{
-		Name (_HID, "INT343B")
-		Name (_CID, "INT343B")
-		Name (_DDN, "Intel(R) Smart Sound Technology Audio Codec")
+		Name (_HID, "10508825")
+		Name (_DDN, "NAU88L25 Codec")
 		Name (_UID, 1)
 
 		Name (_CRS, ResourceTemplate()
 		{
 			I2cSerialBus (
-				BOARD_LEFT_SSM4567_I2C_ADDR,
+				BOARD_HP_MIC_CODEC_I2C_ADDR,
 				ControllerInitiated,
 				400000,
 				AddressingMode7Bit,
 				"\\_SB.PCI0.I2C4",
 			)
+			Interrupt (ResourceConsumer, Edge, ActiveLow)
+			{
+				BOARD_HP_MIC_CODEC_IRQ
+			}
 		})
 
-		Method (_STA, 0, NotSerialized)
+		Method (_STA)
 		{
-			Return (0xF) // I2S Codec ADI LEFT SSM4567 Enabled
+			Return (0xF)
 		}
-	} // Device (LSPK)
+	}
 
-	// RIGHT SSM4567 I2C ADDR 0x35
-	Device (RSPK)
+	/* Left Speaker Amp */
+	Device (SPKL)
 	{
 		Name (_HID, "INT343B")
-		Name (_CID, "INT343B")
-		Name (_DDN, "Intel(R) Smart Sound Technology Audio Codec")
-		Name (_UID, 2)
+		Name (_DDN, "SSM4567 Speaker Amp")
+		Name (_UID, 0)
 
 		Name (_CRS, ResourceTemplate()
 		{
 			I2cSerialBus (
-				BOARD_RIGHT_SSM4567_I2C_ADDR,
+				BOARD_LEFT_SPEAKER_AMP_I2C_ADDR,
 				ControllerInitiated,
 				400000,
 				AddressingMode7Bit,
@@ -160,24 +170,23 @@ Scope (\_SB.PCI0.I2C4)
 			)
 		})
 
-		Method (_STA, 0, NotSerialized)
+		Method (_STA)
 		{
-			Return (0xF) // I2S Codec ADI RIGHT SSM4567 Enabled
+			Return (0xF)
 		}
-	} // Device (RSPK)
+	}
 
-	// Nuvoton NAU88L25 (I2SC = 2)
-	Device (HDAC)
+	/* Right Speaker Amp */
+	Device (SPKR)
 	{
-		Name (_HID, "10508825")
-		Name (_CID, "10508825")
-		Name (_DDN, "Intel(R) Smart Sound Technology Audio Codec")
+		Name (_HID, "INT343B")
+		Name (_DDN, "SSM4567 Speaker Amp")
 		Name (_UID, 1)
 
 		Name (_CRS, ResourceTemplate()
 		{
 			I2cSerialBus (
-				BOARD_AUDIO_CODEC_I2C_ADDR,
+				BOARD_RIGHT_SPEAKER_AMP_I2C_ADDR,
 				ControllerInitiated,
 				400000,
 				AddressingMode7Bit,
@@ -185,11 +194,9 @@ Scope (\_SB.PCI0.I2C4)
 			)
 		})
 
-		Method (_STA, 0, NotSerialized)
+		Method (_STA)
 		{
-			Return (0xF) // I2S Codec  Enabled
+			Return (0xF)
 		}
-	} // Device (HDAC)
+	}
 }
-
-
diff --git a/src/mainboard/intel/kunimitsu/acpi/superio.asl b/src/mainboard/intel/kunimitsu/acpi/superio.asl
index 747991e7f5..822821e9df 100644
--- a/src/mainboard/intel/kunimitsu/acpi/superio.asl
+++ b/src/mainboard/intel/kunimitsu/acpi/superio.asl
@@ -18,7 +18,7 @@
  */
 
 /* mainboard configuration */
-#include <mainboard/intel/kunimitsu/ec.h>
+#include "../ec.h"
 
 #define SIO_EC_MEMMAP_ENABLE     // EC Memory Map Resources
 #define SIO_EC_HOST_ENABLE       // EC Host Interface Resources