From 3b648baf03a97689528a18c16f498bd9c4eb1e21 Mon Sep 17 00:00:00 2001 From: Eric Lai Date: Fri, 18 Dec 2020 10:51:46 +0800 Subject: soc/amd/picasso: move sb_clk_output_48Mhz from acp to fch Move sb_clk_output_48Mhz out of acp. It should be called unconditionally. We may have another device need this clock e.g. superio chip. BUG=b:174121847 BRANCH=zork TEST= build passed Signed-off-by: Eric Lai Change-Id: I30ad6c60066f17cc83e7feb40675610f4853a022 Reviewed-on: https://review.coreboot.org/c/coreboot/+/48722 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Felix Held --- src/soc/amd/picasso/acp.c | 3 --- src/soc/amd/picasso/fch.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/soc/amd/picasso/acp.c b/src/soc/amd/picasso/acp.c index 9ee29551d4..69982f5dc6 100644 --- a/src/soc/amd/picasso/acp.c +++ b/src/soc/amd/picasso/acp.c @@ -46,9 +46,6 @@ static void init(struct device *dev) /* Enable ACP_PME_EN and ACP_I2S_WAKE_EN for I2S_WAKE event */ acp_update32(bar, ACP_I2S_WAKE_EN, WAKE_EN_MASK, !!cfg->acp_i2s_wake_enable); acp_update32(bar, ACP_PME_EN, PME_EN_MASK, !!cfg->acp_pme_enable); - - if (cfg->acp_pin_cfg == I2S_PINS_I2S_TDM) - sb_clk_output_48Mhz(); /* Internal connection to I2S */ } static const char *acp_acpi_name(const struct device *dev) diff --git a/src/soc/amd/picasso/fch.c b/src/soc/amd/picasso/fch.c index 0fe176b21a..d5278cbd0f 100644 --- a/src/soc/amd/picasso/fch.c +++ b/src/soc/amd/picasso/fch.c @@ -237,6 +237,8 @@ void southbridge_init(void *chip_info) al2ahb_clock_gate(); gpp_clk_setup(); + + sb_clk_output_48Mhz(); } void southbridge_final(void *chip_info) -- cgit v1.2.3