From e284bff9cff2b7965a8db53bac320e3ae0ca5651 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 2 Jul 2020 16:03:06 -0700 Subject: mb/google/zork: Use SSDT generator for Chrome EC audio codec device This change drops the inclusion of codec.asl in DSDT for `GOOG0013` device and instead uses the newly added Chrome EC audio codec driver for filling in the device node in SSDT. TEST=Verified that following node gets generated: Scope (\_SB.PCI0.LPCB.EC0.CREC) { Device (ECA0) { Name (_HID, "GOOG0013") // _HID: Hardware ID Name (_UID, One) // _UID: Unique ID Name (_DDN, "Cros EC audio codec") // _DDN: DOS Device Name Method (_STA, 0, NotSerialized) // _STA: Status { Return (0x0F) } } } Change-Id: I3e626ce01a3735ac2c966c0e95310be4c828b241 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/43042 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/mainboard/google/zork/Kconfig | 1 + src/mainboard/google/zork/dsdt.asl | 2 -- src/mainboard/google/zork/variants/baseboard/devicetree.cb | 4 ++++ .../google/zork/variants/baseboard/include/baseboard/acpi/audio.asl | 5 ----- .../google/zork/variants/berknip/include/variant/acpi/audio.asl | 3 --- .../google/zork/variants/dalboz/include/variant/acpi/audio.asl | 3 --- .../google/zork/variants/ezkinil/include/variant/acpi/audio.asl | 3 --- .../google/zork/variants/morphius/include/variant/acpi/audio.asl | 3 --- .../google/zork/variants/trembyle/include/variant/acpi/audio.asl | 3 --- .../google/zork/variants/vilboz/include/variant/acpi/audio.asl | 3 --- 10 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl delete mode 100644 src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl delete mode 100644 src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl delete mode 100644 src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl delete mode 100644 src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl delete mode 100644 src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl delete mode 100644 src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl (limited to 'src/mainboard') diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 3e7756b50c..e24f78a48a 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_AUDIO_CODEC select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_ESPI select EC_GOOGLE_CHROMEEC_I2C_TUNNEL diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl index f561de3a71..8b42102a4a 100644 --- a/src/mainboard/google/zork/dsdt.asl +++ b/src/mainboard/google/zork/dsdt.asl @@ -60,8 +60,6 @@ DefinitionBlock ( #include /* ACPI code for EC functions */ #include - /* ACPI code for EC I2C Audio Tunnel */ - #include } } /* End of ASL file */ diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree.cb b/src/mainboard/google/zork/variants/baseboard/devicetree.cb index 85ce4e6795..159665f8b7 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree.cb @@ -163,6 +163,10 @@ chip soc/amd/picasso register "remote_bus" = "9" device generic 1.0 on end end + chip ec/google/chromeec/audio_codec + register "uid" = "1" + device generic 0 on end + end end end end diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl b/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl deleted file mode 100644 index b892570a7f..0000000000 --- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl +++ /dev/null @@ -1,5 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -Scope (EC0.CREC) { - #include -} diff --git a/src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f277..0000000000 --- a/src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include diff --git a/src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f277..0000000000 --- a/src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include diff --git a/src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f277..0000000000 --- a/src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include diff --git a/src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f277..0000000000 --- a/src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include diff --git a/src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f277..0000000000 --- a/src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include diff --git a/src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f277..0000000000 --- a/src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include -- cgit v1.2.3