summaryrefslogtreecommitdiff
path: root/src/mainboard/google/zork
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google/zork')
-rw-r--r--src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb9
-rw-r--r--src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb9
-rw-r--r--src/mainboard/google/zork/variants/baseboard/ramstage_common.c4
-rw-r--r--src/mainboard/google/zork/variants/vilboz/variant.c2
4 files changed, 15 insertions, 9 deletions
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;