diff options
| -rw-r--r-- | sound/soc/amd/acp/acp-legacy-common.c | 43 | ||||
| -rw-r--r-- | sound/soc/amd/acp/amd.h | 42 | 
2 files changed, 47 insertions, 38 deletions
| diff --git a/sound/soc/amd/acp/acp-legacy-common.c b/sound/soc/amd/acp/acp-legacy-common.c index 255f90ca956a..5fad6c4a8d86 100644 --- a/sound/soc/amd/acp/acp-legacy-common.c +++ b/sound/soc/amd/acp/acp-legacy-common.c @@ -24,6 +24,49 @@  #define ACP63_PDM_ADDR		0x02  #define ACP70_PDM_ADDR		0x02 +struct acp_resource rn_rsrc = { +	.offset = 20, +	.no_of_ctrls = 1, +	.irqp_used = 0, +	.irq_reg_offset = 0x1800, +	.scratch_reg_offset = 0x12800, +	.sram_pte_offset = 0x02052800, +}; +EXPORT_SYMBOL_NS_GPL(rn_rsrc, "SND_SOC_ACP_COMMON"); + +struct acp_resource rmb_rsrc = { +	.offset = 0, +	.no_of_ctrls = 2, +	.irqp_used = 1, +	.soc_mclk = true, +	.irq_reg_offset = 0x1a00, +	.scratch_reg_offset = 0x12800, +	.sram_pte_offset = 0x03802800, +}; +EXPORT_SYMBOL_NS_GPL(rmb_rsrc, "SND_SOC_ACP_COMMON"); + +struct acp_resource acp63_rsrc = { +	.offset = 0, +	.no_of_ctrls = 2, +	.irqp_used = 1, +	.soc_mclk = true, +	.irq_reg_offset = 0x1a00, +	.scratch_reg_offset = 0x12800, +	.sram_pte_offset = 0x03802800, +}; +EXPORT_SYMBOL_NS_GPL(acp63_rsrc, "SND_SOC_ACP_COMMON"); + +struct acp_resource acp70_rsrc = { +	.offset = 0, +	.no_of_ctrls = 2, +	.irqp_used = 1, +	.soc_mclk = true, +	.irq_reg_offset = 0x1a00, +	.scratch_reg_offset = 0x10000, +	.sram_pte_offset = 0x03800000, +}; +EXPORT_SYMBOL_NS_GPL(acp70_rsrc, "SND_SOC_ACP_COMMON"); +  const struct snd_acp_hw_ops acp_common_hw_ops = {  	/* ACP hardware initilizations */  	.acp_init = acp_init, diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h index 928aa60ab386..863e74fcee43 100644 --- a/sound/soc/amd/acp/amd.h +++ b/sound/soc/amd/acp/amd.h @@ -238,44 +238,10 @@ enum acp_config {  	ACP_CONFIG_20,  }; -struct acp_resource rn_rsrc = { -	.offset = 20, -	.no_of_ctrls = 1, -	.irqp_used = 0, -	.irq_reg_offset = 0x1800, -	.scratch_reg_offset = 0x12800, -	.sram_pte_offset = 0x02052800, -}; - -struct acp_resource rmb_rsrc = { -	.offset = 0, -	.no_of_ctrls = 2, -	.irqp_used = 1, -	.soc_mclk = true, -	.irq_reg_offset = 0x1a00, -	.scratch_reg_offset = 0x12800, -	.sram_pte_offset = 0x03802800, -}; - -struct acp_resource acp63_rsrc = { -	.offset = 0, -	.no_of_ctrls = 2, -	.irqp_used = 1, -	.soc_mclk = true, -	.irq_reg_offset = 0x1a00, -	.scratch_reg_offset = 0x12800, -	.sram_pte_offset = 0x03802800, -}; - -struct acp_resource acp70_rsrc = { -	.offset = 0, -	.no_of_ctrls = 2, -	.irqp_used = 1, -	.soc_mclk = true, -	.irq_reg_offset = 0x1a00, -	.scratch_reg_offset = 0x10000, -	.sram_pte_offset = 0x03800000, -}; +extern struct acp_resource rn_rsrc; +extern struct acp_resource rmb_rsrc; +extern struct acp_resource acp63_rsrc; +extern struct acp_resource acp70_rsrc;  extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines;  extern struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_acp_machines; | 
