diff options
| author | Karthikeyan Ramasubramanian <kramasub@google.com> | 2021-04-23 11:42:19 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2021-04-29 15:10:48 +0000 |
| commit | 4520aa2891263736791861c1fa12dd8f0c34a19e (patch) | |
| tree | 0abf7f1fd9feaee03558177ca2631ee76037e8a6 /src/mainboard | |
| parent | e5b85c3377901e2bdf2ecd21ea0f4b637e5a7c62 (diff) | |
| download | coreboot-4520aa2891263736791861c1fa12dd8f0c34a19e.tar.xz | |
soc/amd/common/acp: Move Audio Co-processor driver to common
Audio Co-processor driver is similar for both Picasso and Cezanne SoCs.
Hence move it to the common location.
BUG=None.
TEST=Builds Dalboz, Trembyle, Vilboz, Mandolin and Bilby mainboards.
Change-Id: I91470ff68d1c183df9a2927d71b03371b535186a
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52643
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'src/mainboard')
7 files changed, 21 insertions, 12 deletions
diff --git a/src/mainboard/amd/bilby/devicetree.cb b/src/mainboard/amd/bilby/devicetree.cb index c07415e94c..5429234d6c 100644 --- a/src/mainboard/amd/bilby/devicetree.cb +++ b/src/mainboard/amd/bilby/devicetree.cb @@ -1,7 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only chip soc/amd/picasso - register "acp_pin_cfg" = "I2S_PINS_MAX_HDA" + # ACP Configuration + register "common_config.acp_config.acp_pin_cfg" = "I2S_PINS_MAX_HDA" # Set FADT Configuration register "common_config.fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" diff --git a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb index addb328ba4..c02cb8a448 100644 --- a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb @@ -1,7 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only chip soc/amd/picasso - register "acp_pin_cfg" = "I2S_PINS_MAX_HDA" + # ACP Configuration + register "common_config.acp_config.acp_pin_cfg" = "I2S_PINS_MAX_HDA" # Set FADT Configuration register "common_config.fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" diff --git a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb index f4f178a3d3..1a86ab7ce9 100644 --- a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb @@ -1,7 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only chip soc/amd/picasso - register "acp_pin_cfg" = "I2S_PINS_MAX_HDA" + # ACP Configuration + register "common_config.acp_config.acp_pin_cfg" = "I2S_PINS_MAX_HDA" # Set FADT Configuration register "common_config.fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb index 3f4c4047e9..f0fcf37c26 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb @@ -13,9 +13,12 @@ chip soc/amd/picasso # See table 5-34 ACPI 6.3 spec register "common_config.fadt_flags" = "ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_SEALED_CASE" - register "acp_pin_cfg" = "I2S_PINS_I2S_TDM" - register "acp_i2s_wake_enable" = "0" - register "acp_pme_enable" = "0" + # ACP Configuration + register "common_config.acp_config" = "{ + .acp_pin_cfg = I2S_PINS_I2S_TDM, + .acp_i2s_wake_enable = 0, + .acp_pme_enable = 0, + }" # Start : OPN Performance Configuration # (Configuratin that is common for all variants) diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb index 3270b6f954..ececa3e050 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb @@ -6,9 +6,12 @@ chip soc/amd/picasso # See table 5-34 ACPI 6.3 spec register "common_config.fadt_flags" = "ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_SEALED_CASE" - register "acp_pin_cfg" = "I2S_PINS_I2S_TDM" - register "acp_i2s_wake_enable" = "0" - register "acp_pme_enable" = "0" + # ACP Configuration + register "common_config.acp_config" = "{ + .acp_pin_cfg = I2S_PINS_I2S_TDM, + .acp_i2s_wake_enable = 0, + .acp_pme_enable = 0, + }" # Start : OPN Performance Configuration # (Configuratin that is common for all variants) diff --git a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c index a9414b92e0..f7b8ed4253 100644 --- a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c +++ b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c @@ -70,8 +70,8 @@ static void update_hp_int_odl(void) * need to be set to trigger I2S_WAKE event for headphone jack. */ soc_cfg = config_of_soc(); - soc_cfg->acp_i2s_wake_enable = 1; - soc_cfg->acp_pme_enable = 1; + soc_cfg->common_config.acp_config.acp_i2s_wake_enable = 1; + soc_cfg->common_config.acp_config.acp_pme_enable = 1; } static void update_dmic_gpio(void) diff --git a/src/mainboard/google/zork/variants/vilboz/variant.c b/src/mainboard/google/zork/variants/vilboz/variant.c index 43ca0e51df..df82698b66 100644 --- a/src/mainboard/google/zork/variants/vilboz/variant.c +++ b/src/mainboard/google/zork/variants/vilboz/variant.c @@ -45,7 +45,7 @@ void variant_devtree_update(void) /* b:/174121847 Use external OSC to mitigate noise for WWAN sku. */ if (variant_has_wwan()) { - soc_cfg->acp_i2s_use_external_48mhz_osc = 1; + soc_cfg->common_config.acp_config.acp_i2s_use_external_48mhz_osc = 1; /* eDP phy tuning settings */ soc_cfg->edp_phy_override = ENABLE_EDP_TUNINGSET; |