mb/google/kahlee: Fix audio ACPI inclusion
Not all kahlee variants use the RT5682 audio codec, so split the
baseboard audio ACPI into two parts and only include the asl for
the codec(s) actually needed for a given variant.
TEST=build/boot aleena, liara variants and verify no ACPI present
for RT5682 codec (which is not present on the boards).
Change-Id: Icb7df4f8e51495ad3cb40113cd00810fd27dcd00
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68583
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
diff --git a/src/mainboard/google/kahlee/variants/aleena/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/aleena/include/variant/acpi/mainboard.asl
index 7aefe2c..c4b5018 100644
--- a/src/mainboard/google/kahlee/variants/aleena/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/aleena/include/variant/acpi/mainboard.asl
@@ -1,3 +1,3 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <baseboard/acpi/audio.asl>
+#include <baseboard/acpi/audio_da7219.asl>
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl
deleted file mode 100644
index bb92243..0000000
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl
+++ /dev/null
@@ -1,56 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <amdblocks/acpimmio_map.h>
-
-/* Grunt specific I2S machine driver */
-Device (I2S0)
-{
- Name (_HID, "AMD7219")
- Name (_CID, "AMD7219")
-
- /* Device-Specific Data */
- Name (_DSD, Package ()
- {
- ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
- Package ()
- {
- Package () { "bt-pad-enable", 1 },
- }
- })
-
- Method (_CRS, 0x0, Serialized) {
- Name (RBUF, ResourceTemplate () {
- // Memory resource is for MISC FCH register set.
- // It is needed for enabling the clock.
- Memory32Fixed(ReadWrite, ACPIMMIO_MISC_BASE, 0x100)
- })
-
- Return (RBUF)
- }
-}
-
-Device (I2S1)
-{
- Name (_HID, "AMDI5682")
- Name (_CID, "AMDI5682")
-
- /* Device-Specific Data */
- Name (_DSD, Package ()
- {
- ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
- Package ()
- {
- Package () { "bt-pad-enable", 1 },
- }
- })
-
- Method (_CRS, 0x0, Serialized) {
- Name (RBUF, ResourceTemplate () {
- // Memory resource is for MISC FCH register set.
- // It is needed for enabling the clock.
- Memory32Fixed(ReadWrite, ACPIMMIO_MISC_BASE, 0x100)
- })
-
- Return (RBUF)
- }
-}
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_da7219.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_da7219.asl
new file mode 100644
index 0000000..1a08343
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_da7219.asl
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <amdblocks/acpimmio_map.h>
+
+/* Grunt specific I2S machine driver */
+Device (I2S0)
+{
+ Name (_HID, "AMD7219")
+ Name (_CID, "AMD7219")
+
+ /* Device-Specific Data */
+ Name (_DSD, Package ()
+ {
+ ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+ Package ()
+ {
+ Package () { "bt-pad-enable", 1 },
+ }
+ })
+
+ Method (_CRS, 0x0, Serialized) {
+ Name (RBUF, ResourceTemplate () {
+ // Memory resource is for MISC FCH register set.
+ // It is needed for enabling the clock.
+ Memory32Fixed(ReadWrite, ACPIMMIO_MISC_BASE, 0x100)
+ })
+
+ Return (RBUF)
+ }
+}
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_rt5682.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_rt5682.asl
new file mode 100644
index 0000000..9e3ae05
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_rt5682.asl
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <amdblocks/acpimmio_map.h>
+
+/* Grunt specific I2S machine driver */
+Device (I2S1)
+{
+ Name (_HID, "AMDI5682")
+ Name (_CID, "AMDI5682")
+
+ /* Device-Specific Data */
+ Name (_DSD, Package ()
+ {
+ ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+ Package ()
+ {
+ Package () { "bt-pad-enable", 1 },
+ }
+ })
+
+ Method (_CRS, 0x0, Serialized) {
+ Name (RBUF, ResourceTemplate () {
+ // Memory resource is for MISC FCH register set.
+ // It is needed for enabling the clock.
+ Memory32Fixed(ReadWrite, ACPIMMIO_MISC_BASE, 0x100)
+ })
+
+ Return (RBUF)
+ }
+}
diff --git a/src/mainboard/google/kahlee/variants/careena/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/careena/include/variant/acpi/mainboard.asl
index 7aefe2c..86e4053 100644
--- a/src/mainboard/google/kahlee/variants/careena/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/careena/include/variant/acpi/mainboard.asl
@@ -1,3 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <baseboard/acpi/audio.asl>
+#include <baseboard/acpi/audio_da7219.asl>
+#include <baseboard/acpi/audio_rt5682.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
index 7aefe2c..c4b5018 100644
--- a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
@@ -1,3 +1,3 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <baseboard/acpi/audio.asl>
+#include <baseboard/acpi/audio_da7219.asl>
diff --git a/src/mainboard/google/kahlee/variants/liara/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/liara/include/variant/acpi/mainboard.asl
index 7aefe2c..c4b5018 100644
--- a/src/mainboard/google/kahlee/variants/liara/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/liara/include/variant/acpi/mainboard.asl
@@ -1,3 +1,3 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <baseboard/acpi/audio.asl>
+#include <baseboard/acpi/audio_da7219.asl>
diff --git a/src/mainboard/google/kahlee/variants/nuwani/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/nuwani/include/variant/acpi/mainboard.asl
index 7aefe2c..c4b5018 100644
--- a/src/mainboard/google/kahlee/variants/nuwani/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/nuwani/include/variant/acpi/mainboard.asl
@@ -1,3 +1,3 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <baseboard/acpi/audio.asl>
+#include <baseboard/acpi/audio_da7219.asl>
diff --git a/src/mainboard/google/kahlee/variants/treeya/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/treeya/include/variant/acpi/mainboard.asl
index 7aefe2c..86e4053 100644
--- a/src/mainboard/google/kahlee/variants/treeya/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/treeya/include/variant/acpi/mainboard.asl
@@ -1,3 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <baseboard/acpi/audio.asl>
+#include <baseboard/acpi/audio_da7219.asl>
+#include <baseboard/acpi/audio_rt5682.asl>