Skip to content

Commit 57e8577

Browse files
saba-kareembroonie
authored andcommitted
ASoC: amd: acp: add platform and flag data to acp data structure
add name of the platform and flag data in private data structure. name of the platform will be used to differentiate platforms where as flag will be used to know what kind of endpoint configuration is selected where its legacy(I2S + PDM) or only ACP PDM. Signed-off-by: Syed Saba Kareem <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 3a94c8a commit 57e8577

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

sound/soc/amd/acp/acp-rembrandt.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include <linux/pm_runtime.h>
2424

2525
#include "amd.h"
26+
#include "../mach-config.h"
27+
#include "acp-mach.h"
2628

2729
#define DRV_NAME "acp_asoc_rembrandt"
2830

@@ -226,7 +228,8 @@ static int rembrandt_audio_probe(struct platform_device *pdev)
226228
adata->dai_driver = acp_rmb_dai;
227229
adata->num_dai = ARRAY_SIZE(acp_rmb_dai);
228230
adata->rsrc = &rsrc;
229-
231+
adata->platform = REMBRANDT;
232+
adata->flag = chip->flag;
230233
adata->machines = snd_soc_acpi_amd_rmb_acp_machines;
231234
acp_machine_select(adata);
232235

sound/soc/amd/acp/acp-renoir.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <linux/dma-mapping.h>
2323

2424
#include "amd.h"
25+
#include "acp-mach.h"
2526

2627
#define DRV_NAME "acp_asoc_renoir"
2728

@@ -185,6 +186,8 @@ static int renoir_audio_probe(struct platform_device *pdev)
185186
adata->dai_driver = acp_renoir_dai;
186187
adata->num_dai = ARRAY_SIZE(acp_renoir_dai);
187188
adata->rsrc = &rsrc;
189+
adata->platform = RENOIR;
190+
adata->flag = chip->flag;
188191

189192
adata->machines = snd_soc_acpi_amd_acp_machines;
190193
acp_machine_select(adata);

sound/soc/amd/acp/acp63.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include <linux/pm_runtime.h>
2222
#include <linux/pci.h>
2323
#include "amd.h"
24+
#include "acp-mach.h"
25+
#include "../mach-config.h"
2426

2527
#define DRV_NAME "acp_asoc_acp63"
2628

@@ -237,6 +239,8 @@ static int acp63_audio_probe(struct platform_device *pdev)
237239
adata->dai_driver = acp63_dai;
238240
adata->num_dai = ARRAY_SIZE(acp63_dai);
239241
adata->rsrc = &rsrc;
242+
adata->platform = ACP63;
243+
adata->flag = chip->flag;
240244
adata->machines = snd_soc_acpi_amd_acp63_acp_machines;
241245
acp_machine_select(adata);
242246
dev_set_drvdata(dev, adata);

sound/soc/amd/acp/amd.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ struct acp_dev_data {
187187
u32 tdm_rx_fmt[3];
188188
u32 xfer_tx_resolution[3];
189189
u32 xfer_rx_resolution[3];
190+
unsigned int flag;
191+
unsigned int platform;
190192
};
191193

192194
enum acp_config {

0 commit comments

Comments
 (0)