google/kahlee/grunt: Move ASL to variants

Move the apci/ to the baseboard and move mainboard.asl to
each variant.

BUG=b:71873651
TEST=build
BRANCH=none

Change-Id: I8a829f2946e4b280cd78574eb8dbda6c2a9a1028
Signed-off-by: Marc Jones <marcj303@gmail.com>
Reviewed-on: https://review.coreboot.org/23229
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>

16 files changed, 188 insertions, 14 deletions

diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl
index ff3bb7371cd7..2237876081d4 100644
--- a/src/mainboard/google/kahlee/dsdt.asl
+++ b/src/mainboard/google/kahlee/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock (
 	#include <globalnvs.asl>
 
 	/* Globals for the platform */
-	#include "acpi/mainboard.asl"
+	#include <variant/acpi/mainboard.asl>
 
 	/* PCI IRQ mapping for the Southbridge */
 	#include <pcie.asl>
@@ -43,7 +43,7 @@ DefinitionBlock (
 	#include <sleepstates.asl>
 
 	/* Contains the Sleep methods (WAK, PTS, GTS, etc.) */
-	#include "acpi/sleep.asl"
+	#include <variant/acpi/sleep.asl>
 
 	/* System Bus */
 	Scope(\_SB) { /* Start \_SB scope */
@@ -51,7 +51,7 @@ DefinitionBlock (
 		#include <arch/x86/acpi/globutil.asl>
 
 		/* IRQ Routing mapping for this platform (in \_SB scope) */
-		#include "acpi/routing.asl"
+		#include <variant/acpi/routing.asl>
 
 		Device(PWRB) {
 			Name(_HID, EISAID("PNP0C0C"))
@@ -64,7 +64,7 @@ DefinitionBlock (
 	} /* End \_SB scope */
 
 	/* Thermal handler */
-	#include "acpi/thermal.asl"
+	#include <variant/acpi/thermal.asl>
 
 	/* Chrome OS specific */
 	#include <vendorcode/google/chromeos/acpi/chromeos.asl>
@@ -82,6 +82,6 @@ DefinitionBlock (
 	#include <smbus.asl>
 
 	/* Define the General Purpose Events for the platform */
-	#include "acpi/gpe.asl"
+	#include <variant/acpi/gpe.asl>
 }
 /* End of ASL file */
diff --git a/src/mainboard/google/kahlee/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl
index 9dbbde557c91..9dbbde557c91 100644
--- a/src/mainboard/google/kahlee/acpi/gpe.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl
diff --git a/src/mainboard/google/kahlee/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
index 30b7adeffc36..ddf1211eee44 100644
--- a/src/mainboard/google/kahlee/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
@@ -56,20 +56,20 @@ Device (ETPA)
 	Name (_S0W, 3)
 }
 
-/* Realtek Audio Codec */
-Device (RTEK)   /* Audio Codec driver I2CS*/
+/* DA7219 codec */
+Device (DIAL)  /* audio codec*/
 {
 	Name (_ADR, 0)
-	Name (_HID, "10EC5650")
-	Name (_CID, "10EC5650")
-	Name (_DDN, "RTEK Codec Controller ")
+	Name (_HID, "DLGS7219")
+	Name (_CID, "DLGS7219")
+	Name (_DDN, "DA7219 Codec Controller ")
 	Name (_UID, 1)
 
 	Device (I2S) /* I2S machine driver for RT5650 */
 	{
 		Name (_ADR, 1)
-		Name (_HID, "AMDI1002")
-		Name (_CID, "AMDI1002")
+		Name (_HID, "AMDI7219")
+		Name (_CID, "AMDI7219")
 	}
 
 	Method (_CRS, 0x0, Serialized)
@@ -84,9 +84,9 @@ Device (RTEK)   /* Audio Codec driver I2CS*/
 			"\\_SB.I2CA",           /* ResourceSource: I2C bus controller name */
 			)
 
-			/* Jack Detect AGPIO90 */
+			/* Jack Detect AGPIO14 */
 			GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
-				"\\_SB.GPIO") { 90 }
+				"\\_SB.GPIO") { 14 }
 		})
 		Return (SBUF)
 	}
@@ -96,3 +96,17 @@ Device (RTEK)   /* Audio Codec driver I2CS*/
 		Return (0xF)
 	}
 }
+
+/* MAX98357 codec */
+Device (MAXA)
+{
+	Name (_ADR, 0)
+	Name (_HID, "MX98357A")
+	Name (_CID, "MX98357A")
+	Name (_DDN, "MX98357A Codec Controller ")
+	Name (_UID, 1)
+
+	Method (_STA, 0x0, NotSerialized) {
+			Return (0x0F)
+	}
+}
diff --git a/src/mainboard/google/kahlee/acpi/routing.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
index c61bc4bb6c48..c61bc4bb6c48 100644
--- a/src/mainboard/google/kahlee/acpi/routing.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
diff --git a/src/mainboard/google/kahlee/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
index 1e3a617ad5dc..1e3a617ad5dc 100644
--- a/src/mainboard/google/kahlee/acpi/sleep.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
diff --git a/src/mainboard/google/kahlee/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
index 86f8758892d9..86f8758892d9 100644
--- a/src/mainboard/google/kahlee/acpi/thermal.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/gpe.asl
new file mode 100644
index 000000000000..0a087742067c
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/gpe.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/gpe.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
new file mode 100644
index 000000000000..7e7c158d88d0
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/mainboard.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/routing.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/routing.asl
new file mode 100644
index 000000000000..233494f51eff
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/routing.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/routing.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/sleep.asl
new file mode 100644
index 000000000000..c5a155796203
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/sleep.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/sleep.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/thermal.asl
new file mode 100644
index 000000000000..77137bb90324
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/thermal.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/thermal.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/gpe.asl
new file mode 100644
index 000000000000..0a087742067c
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/gpe.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/gpe.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl
new file mode 100644
index 000000000000..7e7c158d88d0
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/mainboard.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/routing.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/routing.asl
new file mode 100644
index 000000000000..233494f51eff
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/routing.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/routing.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/sleep.asl
new file mode 100644
index 000000000000..c5a155796203
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/sleep.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/sleep.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/thermal.asl
new file mode 100644
index 000000000000..77137bb90324
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/thermal.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/thermal.asl>