diff options
| -rw-r--r-- | sound/soc/amd/acp/acp-pci.c | 1 | ||||
| -rw-r--r-- | sound/soc/amd/acp/acp63.c | 13 | ||||
| -rw-r--r-- | sound/soc/amd/acp/amd.h | 10 | 
3 files changed, 12 insertions, 12 deletions
| diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c index 6728eee29993..3df665ca1b0b 100644 --- a/sound/soc/amd/acp/acp-pci.c +++ b/sound/soc/amd/acp/acp-pci.c @@ -145,6 +145,7 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id  		break;  	case 0x63:  		chip->name = "acp_asoc_acp63"; +		chip->rsrc = &acp63_rsrc;  		chip->acp_hw_ops_init = acp63_hw_ops_init;  		chip->machines = snd_soc_acpi_amd_acp63_acp_machines;  		break; diff --git a/sound/soc/amd/acp/acp63.c b/sound/soc/amd/acp/acp63.c index 49786e1a214f..53c013a64854 100644 --- a/sound/soc/amd/acp/acp63.c +++ b/sound/soc/amd/acp/acp63.c @@ -52,16 +52,6 @@ union clk_pll_req_no {  	u32 clk_pll_req_no_reg;  }; -static struct acp_resource 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, -}; -  static struct snd_soc_dai_driver acp63_dai[] = {  {  	.name = "acp-i2s-sp", @@ -222,11 +212,10 @@ static int acp63_audio_probe(struct platform_device *pdev)  	}  	chip->dev = dev; -	chip->rsrc = &rsrc;  	chip->dai_driver = acp63_dai;  	chip->num_dai = ARRAY_SIZE(acp63_dai); -	if (chip->is_i2s_config && rsrc.soc_mclk) { +	if (chip->is_i2s_config && chip->rsrc->soc_mclk) {  		ret = acp63_i2s_master_clock_generate(chip);  		if (ret)  			return ret; diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h index 979d8b8801a3..075659fb3314 100644 --- a/sound/soc/amd/acp/amd.h +++ b/sound/soc/amd/acp/amd.h @@ -238,6 +238,16 @@ enum acp_config {  	ACP_CONFIG_20,  }; +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, | 
