diff options
author | Matt DeVillier <matt.devillier@gmail.com> | 2022-10-19 11:55:57 -0500 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2022-10-22 01:53:11 +0000 |
commit | f0f73bdb1d203350f259da2b195c2e1ff99c0915 (patch) | |
tree | 92653ee8516a06578a658d1d9a0d20b24404e2d1 /src/mainboard | |
parent | 16ae1cf23384a76217c86b73c70046643c79875c (diff) | |
download | coreboot-f0f73bdb1d203350f259da2b195c2e1ff99c0915.tar.gz coreboot-f0f73bdb1d203350f259da2b195c2e1ff99c0915.tar.bz2 coreboot-f0f73bdb1d203350f259da2b195c2e1ff99c0915.zip |
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>
Diffstat (limited to 'src/mainboard')
-rw-r--r-- | src/mainboard/google/kahlee/variants/aleena/include/variant/acpi/mainboard.asl | 2 | ||||
-rw-r--r-- | src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_da7219.asl | 30 | ||||
-rw-r--r-- | src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_rt5682.asl (renamed from src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl) | 26 | ||||
-rw-r--r-- | src/mainboard/google/kahlee/variants/careena/include/variant/acpi/mainboard.asl | 3 | ||||
-rw-r--r-- | src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl | 2 | ||||
-rw-r--r-- | src/mainboard/google/kahlee/variants/liara/include/variant/acpi/mainboard.asl | 2 | ||||
-rw-r--r-- | src/mainboard/google/kahlee/variants/nuwani/include/variant/acpi/mainboard.asl | 2 | ||||
-rw-r--r-- | src/mainboard/google/kahlee/variants/treeya/include/variant/acpi/mainboard.asl | 3 |
8 files changed, 38 insertions, 32 deletions
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 7aefe2cae6fb..c4b5018931ad 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_da7219.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_da7219.asl new file mode 100644 index 000000000000..1a083435d60b --- /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.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_rt5682.asl index bb922435834a..9e3ae05f4c8f 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio_rt5682.asl @@ -3,32 +3,6 @@ #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") 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 7aefe2cae6fb..86e40538c453 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 7aefe2cae6fb..c4b5018931ad 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 7aefe2cae6fb..c4b5018931ad 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 7aefe2cae6fb..c4b5018931ad 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 7aefe2cae6fb..86e40538c453 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> |