summaryrefslogtreecommitdiff
path: root/src/soc/amd
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@google.com>2021-04-29 16:50:51 -0600
committerFelix Held <felix-coreboot@felixheld.de>2021-04-30 23:14:30 +0000
commit39b7afa118d44943ac83595a88b049ddfa8823c2 (patch)
tree58289a86f74ac88b6e7ad6ff06ea6f204b7e073c /src/soc/amd
parent2713da3614127ae4fe7b49ef4c57ce4d87ba3007 (diff)
downloadcoreboot-39b7afa118d44943ac83595a88b049ddfa8823c2.tar.xz
soc/amd/common: Move external oscillator config away from common
The usage of external oscillator has got nothing to do with Audio Co-processor (ACP). Hence move it out of common config and put it into the SoC config where it is being used. BUG=None TEST=Build Dalboz and Vilboz mainboards. Change-Id: I8c5d98addfba750f9ddb87a846599541b4a8340a Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/52771 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'src/soc/amd')
-rw-r--r--src/soc/amd/common/block/include/amdblocks/acp.h3
-rw-r--r--src/soc/amd/picasso/chip.h2
-rw-r--r--src/soc/amd/picasso/fch.c6
3 files changed, 5 insertions, 6 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/acp.h b/src/soc/amd/common/block/include/amdblocks/acp.h
index f091c0540f..36edfa1bdb 100644
--- a/src/soc/amd/common/block/include/amdblocks/acp.h
+++ b/src/soc/amd/common/block/include/amdblocks/acp.h
@@ -17,9 +17,6 @@ struct acp_config {
u8 acp_i2s_wake_enable;
/* Enable ACP PME (0 = disable, 1 = enable) */
u8 acp_pme_enable;
-
- /* If using an external 48MHz OSC for codec, will disable internal X48M_OSC */
- bool acp_i2s_use_external_48mhz_osc;
};
#endif /* AMD_COMMON_ACP_H */
diff --git a/src/soc/amd/picasso/chip.h b/src/soc/amd/picasso/chip.h
index d59a4c8207..d2ce1bcfdc 100644
--- a/src/soc/amd/picasso/chip.h
+++ b/src/soc/amd/picasso/chip.h
@@ -257,6 +257,8 @@ struct soc_amd_picasso_config {
/* The array index is the general purpose PCIe clock output number. */
enum gpp_clk_req_setting gpp_clk_config[GPP_CLK_OUTPUT_COUNT];
+ /* If using an external 48MHz OSC for codec, will disable internal X48M_OSC */
+ bool acp_i2s_use_external_48mhz_osc;
/* eDP phy tuning settings */
uint16_t edp_phy_override;
diff --git a/src/soc/amd/picasso/fch.c b/src/soc/amd/picasso/fch.c
index a871ccf9cb..e1c0eba9b5 100644
--- a/src/soc/amd/picasso/fch.c
+++ b/src/soc/amd/picasso/fch.c
@@ -90,12 +90,12 @@ const struct irq_idx_name *sb_get_apic_reg_association(size_t *size)
void sb_clk_output_48Mhz(void)
{
u32 ctrl;
- const struct soc_amd_common_config *cfg = soc_get_common_config();
+ const struct soc_amd_picasso_config *cfg = config_of_soc();
ctrl = misc_read32(MISC_CLK_CNTL1);
/* If used external clock source for I2S, disable the internal clock output */
- if (cfg->acp_config.acp_i2s_use_external_48mhz_osc &&
- cfg->acp_config.acp_pin_cfg == I2S_PINS_I2S_TDM)
+ if (cfg->acp_i2s_use_external_48mhz_osc &&
+ cfg->common_config.acp_config.acp_pin_cfg == I2S_PINS_I2S_TDM)
ctrl &= ~BP_X48M0_OUTPUT_EN;
else
ctrl |= BP_X48M0_OUTPUT_EN;