summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/zork/Kconfig1
-rw-r--r--src/mainboard/google/zork/dsdt.asl2
-rw-r--r--src/mainboard/google/zork/variants/baseboard/devicetree.cb4
-rw-r--r--src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl5
-rw-r--r--src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl3
-rw-r--r--src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl3
-rw-r--r--src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl3
-rw-r--r--src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl3
-rw-r--r--src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl3
-rw-r--r--src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl3
10 files changed, 5 insertions, 25 deletions
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 <ec/google/chromeec/acpi/superio.asl>
/* ACPI code for EC functions */
#include <ec/google/chromeec/acpi/ec.asl>
- /* ACPI code for EC I2C Audio Tunnel */
- #include <variant/acpi/audio.asl>
}
}
/* 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 <ec/google/chromeec/acpi/codec.asl>
-}
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 <baseboard/acpi/audio.asl>
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 <baseboard/acpi/audio.asl>
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 <baseboard/acpi/audio.asl>
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 <baseboard/acpi/audio.asl>
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 <baseboard/acpi/audio.asl>
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 <baseboard/acpi/audio.asl>