diff options
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/common/block/acp/Kconfig | 4 | ||||
| -rw-r--r-- | src/soc/amd/common/block/acp/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/common/block/acp/acp.c (renamed from src/soc/amd/picasso/acp.c) | 29 | ||||
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/acp.h | 25 | ||||
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/chip.h | 4 | ||||
| -rw-r--r-- | src/soc/amd/picasso/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/amd/picasso/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/picasso/chip.h | 15 | ||||
| -rw-r--r-- | src/soc/amd/picasso/fch.c | 6 | ||||
| -rw-r--r-- | src/soc/amd/picasso/include/soc/acp.h | 14 |
10 files changed, 54 insertions, 46 deletions
diff --git a/src/soc/amd/common/block/acp/Kconfig b/src/soc/amd/common/block/acp/Kconfig new file mode 100644 index 0000000000..ca733cd5de --- /dev/null +++ b/src/soc/amd/common/block/acp/Kconfig @@ -0,0 +1,4 @@ +config SOC_AMD_COMMON_BLOCK_ACP + bool + help + Select this option to perform Audio Co-Processor(ACP) configuration. diff --git a/src/soc/amd/common/block/acp/Makefile.inc b/src/soc/amd/common/block/acp/Makefile.inc new file mode 100644 index 0000000000..cdff5bdb76 --- /dev/null +++ b/src/soc/amd/common/block/acp/Makefile.inc @@ -0,0 +1 @@ +ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACP) += acp.c diff --git a/src/soc/amd/picasso/acp.c b/src/soc/amd/common/block/acp/acp.c index d1ae21cec4..3cb7c453c8 100644 --- a/src/soc/amd/picasso/acp.c +++ b/src/soc/amd/common/block/acp/acp.c @@ -2,20 +2,25 @@ #include <acpi/acpi_device.h> #include <acpi/acpigen.h> +#include <amdblocks/acp.h> +#include <amdblocks/acpimmio.h> +#include <amdblocks/chip.h> #include <console/console.h> #include <device/device.h> #include <device/mmio.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> -#include "chip.h" -#include <soc/acp.h> -#include <soc/acpi.h> -#include <soc/pci_devs.h> -#include <soc/southbridge.h> -#include <amdblocks/acpimmio.h> #include <commonlib/helpers.h> +/* ACP registers and associated fields */ +#define ACP_I2S_PIN_CONFIG 0x1400 /* HDA, Soundwire, I2S */ +#define PIN_CONFIG_MASK (7 << 0) +#define ACP_I2S_WAKE_EN 0x1414 +#define WAKE_EN_MASK (1 << 0) +#define ACP_PME_EN 0x1418 +#define PME_EN_MASK (1 << 0) + static void acp_update32(uintptr_t bar, uint32_t reg, uint32_t clear, uint32_t set) { clrsetbits32((void *)(bar + reg), clear, set); @@ -23,25 +28,23 @@ static void acp_update32(uintptr_t bar, uint32_t reg, uint32_t clear, uint32_t s static void init(struct device *dev) { - const struct soc_amd_picasso_config *cfg; + const struct soc_amd_common_config *cfg = soc_get_common_config(); struct resource *res; uintptr_t bar; - /* Set the proper I2S_PIN_CONFIG state */ - cfg = config_of_soc(); - res = dev->resource_list; if (!res || !res->base) { printk(BIOS_ERR, "Error, unable to configure pin in %s\n", __func__); return; } + /* Set the proper I2S_PIN_CONFIG state */ bar = (uintptr_t)res->base; - acp_update32(bar, ACP_I2S_PIN_CONFIG, PIN_CONFIG_MASK, cfg->acp_pin_cfg); + acp_update32(bar, ACP_I2S_PIN_CONFIG, PIN_CONFIG_MASK, cfg->acp_config.acp_pin_cfg); /* 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); + acp_update32(bar, ACP_I2S_WAKE_EN, WAKE_EN_MASK, !!cfg->acp_config.acp_i2s_wake_enable); + acp_update32(bar, ACP_PME_EN, PME_EN_MASK, !!cfg->acp_config.acp_pme_enable); } static const char *acp_acpi_name(const struct device *dev) diff --git a/src/soc/amd/common/block/include/amdblocks/acp.h b/src/soc/amd/common/block/include/amdblocks/acp.h new file mode 100644 index 0000000000..f091c0540f --- /dev/null +++ b/src/soc/amd/common/block/include/amdblocks/acp.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef AMD_COMMON_ACP_H +#define AMD_COMMON_ACP_H + +struct acp_config { + enum { + I2S_PINS_MAX_HDA = 0, /* HDA w/reset 3xSDI, SW w/Data0 */ + I2S_PINS_MAX_MHDA = 1, /* HDA no reset 3xSDI, SW w/Data0-1 */ + I2S_PINS_MIN_HDA = 2, /* HDA w/reset 1xSDI, SW w/Data0-2 */ + I2S_PINS_MIN_MHDA = 3, /* HDA no reset 1xSDI, SW w/Data0-3 */ + I2S_PINS_I2S_TDM = 4, + I2S_PINS_UNCONF = 7, /* All pads will be input mode */ + } acp_pin_cfg; + + /* Enable ACP I2S wake feature (0 = disable, 1 = enable) */ + 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/common/block/include/amdblocks/chip.h b/src/soc/amd/common/block/include/amdblocks/chip.h index b06ff85d11..c80a6746e0 100644 --- a/src/soc/amd/common/block/include/amdblocks/chip.h +++ b/src/soc/amd/common/block/include/amdblocks/chip.h @@ -5,6 +5,7 @@ #include <amdblocks/espi.h> #include <amdblocks/spi.h> +#include <amdblocks/acp.h> #include <stdint.h> struct soc_amd_common_config { @@ -36,6 +37,9 @@ struct soc_amd_common_config { /* See MP_IRQ_* from mpspec.h */ uint8_t flags; } irq_override[16]; + + /* Audio Co-processor (ACP) configuration */ + struct acp_config acp_config; }; /* diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index 0c494d9c1c..2f36f2e4ab 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -25,6 +25,7 @@ config CPU_SPECIFIC_OPTIONS select HAVE_ACPI_TABLES select HAVE_EM100_SUPPORT select SOC_AMD_COMMON + select SOC_AMD_COMMON_BLOCK_ACP select SOC_AMD_COMMON_BLOCK_ACPI select SOC_AMD_COMMON_BLOCK_ACPIMMIO select SOC_AMD_COMMON_BLOCK_ACPI_GPIO diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 081a65fac2..b5154a40f5 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -43,7 +43,6 @@ ramstage-$(CONFIG_HAVE_ACPI_TABLES) += agesa_acpi.c ramstage-y += gpio.c ramstage-y += fch.c ramstage-y += reset.c -ramstage-y += acp.c ramstage-y += sata.c ramstage-y += uart.c ramstage-y += soc_util.c diff --git a/src/soc/amd/picasso/chip.h b/src/soc/amd/picasso/chip.h index e84db3561e..d59a4c8207 100644 --- a/src/soc/amd/picasso/chip.h +++ b/src/soc/amd/picasso/chip.h @@ -105,19 +105,6 @@ struct soc_amd_picasso_config { */ u8 i2c_scl_reset; struct dw_i2c_bus_config i2c[I2C_CTRLR_COUNT]; - enum { - I2S_PINS_MAX_HDA = 0, /* HDA w/reset 3xSDI, SW w/Data0 */ - I2S_PINS_MAX_MHDA = 1, /* HDA no reset 3xSDI, SW w/Data0-1 */ - I2S_PINS_MIN_HDA = 2, /* HDA w/reset 1xSDI, SW w/Data0-2 */ - I2S_PINS_MIN_MHDA = 3, /* HDA no reset 1xSDI, SW w/Data0-3 */ - I2S_PINS_I2S_TDM = 4, - I2S_PINS_UNCONF = 7, /* All pads will be input mode */ - } acp_pin_cfg; - - /* Enable ACP I2S wake feature (0 = disable, 1 = enable) */ - u8 acp_i2s_wake_enable; - /* Enable ACP PME (0 = disable, 1 = enable) */ - u8 acp_pme_enable; /* System config index */ uint8_t system_config; @@ -270,8 +257,6 @@ 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 b65bc6fbe1..a871ccf9cb 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_picasso_config *cfg; - cfg = config_of_soc(); + const struct soc_amd_common_config *cfg = soc_get_common_config(); ctrl = misc_read32(MISC_CLK_CNTL1); /* If used external clock source for I2S, disable the internal clock output */ - if (cfg->acp_i2s_use_external_48mhz_osc && cfg->acp_pin_cfg == I2S_PINS_I2S_TDM) + if (cfg->acp_config.acp_i2s_use_external_48mhz_osc && + cfg->acp_config.acp_pin_cfg == I2S_PINS_I2S_TDM) ctrl &= ~BP_X48M0_OUTPUT_EN; else ctrl |= BP_X48M0_OUTPUT_EN; diff --git a/src/soc/amd/picasso/include/soc/acp.h b/src/soc/amd/picasso/include/soc/acp.h deleted file mode 100644 index f812b32a98..0000000000 --- a/src/soc/amd/picasso/include/soc/acp.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef AMD_PICASSO_ACP_H -#define AMD_PICASSO_ACP_H - -/* Bus A D0F5 - Audio Processor */ -#define ACP_I2S_PIN_CONFIG 0x1400 /* HDA, Soundwire, I2S */ -#define PIN_CONFIG_MASK (7 << 0) -#define ACP_I2S_WAKE_EN 0x1414 -#define WAKE_EN_MASK (1 << 0) -#define ACP_PME_EN 0x1418 -#define PME_EN_MASK (1 << 0) - -#endif /* AMD_PICASSO_ACP_H */ |