Skip to content

Commit

Permalink
ASoC: amd: acp: Refactor acp63 platform resource structure
Browse files Browse the repository at this point in the history
Refactor acp63 platform resource private structure to amd.h
header file.

Signed-off-by: Venkata Prasad Potturu <venkataprasad.potturu@amd.com>
Link: https://patch.msgid.link/20250310183201.11979-12-venkataprasad.potturu@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Venkata Prasad Potturu authored and Mark Brown committed Mar 11, 2025
1 parent f8b4f3f commit d08220b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
1 change: 1 addition & 0 deletions sound/soc/amd/acp/acp-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 1 addition & 12 deletions sound/soc/amd/acp/acp63.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions sound/soc/amd/acp/amd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d08220b

Please sign in to comment.