summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvy Jian <ivy_jian@compal.corp-partner.google.com>2021-05-18 11:10:55 +0800
committerPatrick Georgi <pgeorgi@google.com>2021-05-20 07:58:20 +0000
commitc4609125bf36314cf77d15d2d7578eca1d4577ee (patch)
tree8c7701e42f23dd0daf1e2c3b11ae821e8997e01d
parent4cedb8c3a9075a7137dd04614cda2feba68fb1a7 (diff)
downloadcoreboot-c4609125bf36314cf77d15d2d7578eca1d4577ee.tar.xz
mb/google/mancomb: Enable AMD I2S Machine Driver
Enable AMD I2S machine driver and configure the devicetree with HID information so that the machine driver ACPI objects can be passed to the kernel. Also configure Audio Co-processor(ACP) to operate in I2S TDM mode. BUG=b:187860242 TEST=Build and boot to OS in Guybrush. Ensure that the ACPD device is enabled in the appropriate scope in SSDT. Signed-off-by: Ivy Jian <ivy_jian@compal.corp-partner.google.com> Change-Id: I528f90d81a418236e512a1e0840ff44c3a3a983e Reviewed-on: https://review.coreboot.org/c/coreboot/+/54549 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
-rw-r--r--src/mainboard/google/mancomb/Kconfig1
-rw-r--r--src/mainboard/google/mancomb/variants/baseboard/devicetree.cb12
2 files changed, 13 insertions, 0 deletions
diff --git a/src/mainboard/google/mancomb/Kconfig b/src/mainboard/google/mancomb/Kconfig
index 938382e874..3d798efe4c 100644
--- a/src/mainboard/google/mancomb/Kconfig
+++ b/src/mainboard/google/mancomb/Kconfig
@@ -11,6 +11,7 @@ config BOARD_SPECIFIC_OPTIONS
select BOARD_ROMSIZE_KB_16384
select DISABLE_KEYBOARD_RESET_PIN
select DISABLE_SPI_FLASH_ROM_SHARING
+ select DRIVERS_AMD_I2S_MACHINE_DEV
select DRIVERS_I2C_GENERIC
select DRIVERS_I2C_HID
select DRIVERS_UART_ACPI
diff --git a/src/mainboard/google/mancomb/variants/baseboard/devicetree.cb b/src/mainboard/google/mancomb/variants/baseboard/devicetree.cb
index 0ba1f6da63..f1d15a7713 100644
--- a/src/mainboard/google/mancomb/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/mancomb/variants/baseboard/devicetree.cb
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip soc/amd/cezanne
+ register "common_config.acp_config" = "{
+ .acp_pin_cfg = I2S_PINS_I2S_TDM,
+ .acp_i2s_wake_enable = 0,
+ .acp_pme_enable = 0,
+ }"
+
register "system_configuration" = "3"
# eSPI Configuration
@@ -115,6 +121,12 @@ chip soc/amd/cezanne
end
end
end
+ device ref acp on
+ chip drivers/amd/i2s_machine_dev
+ register "hid" = ""AMDI5682""
+ device generic 0.0 on end
+ end
+ end # Audio
end
device ref lpc_bridge on
chip ec/google/chromeec