From c4609125bf36314cf77d15d2d7578eca1d4577ee Mon Sep 17 00:00:00 2001 From: Ivy Jian Date: Tue, 18 May 2021 11:10:55 +0800 Subject: [PATCH] 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 Change-Id: I528f90d81a418236e512a1e0840ff44c3a3a983e Reviewed-on: https://review.coreboot.org/c/coreboot/+/54549 Tested-by: build bot (Jenkins) Reviewed-by: Karthik Ramasubramanian --- src/mainboard/google/mancomb/Kconfig | 1 + .../google/mancomb/variants/baseboard/devicetree.cb | 12 ++++++++++++ 2 files changed, 13 insertions(+) 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