MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-13 20:59:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: amd: acp: ACP code generic to support newer platforms

Browse Source 
ADD Generic code to support to newer platforms, add
control threshold, irq control macros ,added structure for register
offset differences.

Signed-off-by: V sujith kumar Reddy <Vsujithkumar.Reddy@amd.com>
Link: https://lore.kernel.org/r/20220707161142.491034-3-Vsujithkumar.Reddy@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
V sujith kumar Reddy 2022-07-07 21:41:41 +05:30 committed by Mark Brown
parent ac2606df8a
commit b24484c18b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
6 changed files with 86 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sound/soc/amd/acp/acp-i2s.c
View File

@ -199,6 +199,7 @@ static int acp_i2s_prepare(struct snd_pcm_substream *substream, struct snd_soc_d
{ {
struct device *dev = dai->component->dev; struct device *dev = dai->component->dev;
struct acp_dev_data *adata = dev_get_drvdata(dev); struct acp_dev_data *adata = dev_get_drvdata(dev);
struct acp_resource *rsrc = adata->rsrc;
struct acp_stream *stream = substream->runtime->private_data; struct acp_stream *stream = substream->runtime->private_data;
u32 reg_dma_size = 0, reg_fifo_size = 0, reg_fifo_addr = 0; u32 reg_dma_size = 0, reg_fifo_size = 0, reg_fifo_addr = 0;
u32 phy_addr = 0, acp_fifo_addr = 0, ext_int_ctrl; u32 phy_addr = 0, acp_fifo_addr = 0, ext_int_ctrl;
@ -208,7 +209,7 @@ static int acp_i2s_prepare(struct snd_pcm_substream *substream, struct snd_soc_d
case I2S_SP_INSTANCE: case I2S_SP_INSTANCE:
if (dir == SNDRV_PCM_STREAM_PLAYBACK) { if (dir == SNDRV_PCM_STREAM_PLAYBACK) {
reg_dma_size = ACP_I2S_TX_DMA_SIZE; reg_dma_size = ACP_I2S_TX_DMA_SIZE;
acp_fifo_addr = ACP_SRAM_PTE_OFFSET + acp_fifo_addr = rsrc->sram_pte_offset +
SP_PB_FIFO_ADDR_OFFSET; SP_PB_FIFO_ADDR_OFFSET;
reg_fifo_addr = ACP_I2S_TX_FIFOADDR; reg_fifo_addr = ACP_I2S_TX_FIFOADDR;
reg_fifo_size = ACP_I2S_TX_FIFOSIZE; reg_fifo_size = ACP_I2S_TX_FIFOSIZE;
@ -217,7 +218,7 @@ static int acp_i2s_prepare(struct snd_pcm_substream *substream, struct snd_soc_d
writel(phy_addr, adata->acp_base + ACP_I2S_TX_RINGBUFADDR); writel(phy_addr, adata->acp_base + ACP_I2S_TX_RINGBUFADDR);
} else { } else {
reg_dma_size = ACP_I2S_RX_DMA_SIZE; reg_dma_size = ACP_I2S_RX_DMA_SIZE;
acp_fifo_addr = ACP_SRAM_PTE_OFFSET + acp_fifo_addr = rsrc->sram_pte_offset +
SP_CAPT_FIFO_ADDR_OFFSET; SP_CAPT_FIFO_ADDR_OFFSET;
reg_fifo_addr = ACP_I2S_RX_FIFOADDR; reg_fifo_addr = ACP_I2S_RX_FIFOADDR;
reg_fifo_size = ACP_I2S_RX_FIFOSIZE; reg_fifo_size = ACP_I2S_RX_FIFOSIZE;
@ -228,7 +229,7 @@ static int acp_i2s_prepare(struct snd_pcm_substream *substream, struct snd_soc_d
case I2S_BT_INSTANCE: case I2S_BT_INSTANCE:
if (dir == SNDRV_PCM_STREAM_PLAYBACK) { if (dir == SNDRV_PCM_STREAM_PLAYBACK) {
reg_dma_size = ACP_BT_TX_DMA_SIZE; reg_dma_size = ACP_BT_TX_DMA_SIZE;
acp_fifo_addr = ACP_SRAM_PTE_OFFSET + acp_fifo_addr = rsrc->sram_pte_offset +
BT_PB_FIFO_ADDR_OFFSET; BT_PB_FIFO_ADDR_OFFSET;
reg_fifo_addr = ACP_BT_TX_FIFOADDR; reg_fifo_addr = ACP_BT_TX_FIFOADDR;
reg_fifo_size = ACP_BT_TX_FIFOSIZE; reg_fifo_size = ACP_BT_TX_FIFOSIZE;
@ -237,7 +238,7 @@ static int acp_i2s_prepare(struct snd_pcm_substream *substream, struct snd_soc_d
writel(phy_addr, adata->acp_base + ACP_BT_TX_RINGBUFADDR); writel(phy_addr, adata->acp_base + ACP_BT_TX_RINGBUFADDR);
} else { } else {
reg_dma_size = ACP_BT_RX_DMA_SIZE; reg_dma_size = ACP_BT_RX_DMA_SIZE;
acp_fifo_addr = ACP_SRAM_PTE_OFFSET + acp_fifo_addr = rsrc->sram_pte_offset +
BT_CAPT_FIFO_ADDR_OFFSET; BT_CAPT_FIFO_ADDR_OFFSET;
reg_fifo_addr = ACP_BT_RX_FIFOADDR; reg_fifo_addr = ACP_BT_RX_FIFOADDR;
reg_fifo_size = ACP_BT_RX_FIFOSIZE; reg_fifo_size = ACP_BT_RX_FIFOSIZE;
@ -255,11 +256,13 @@ static int acp_i2s_prepare(struct snd_pcm_substream *substream, struct snd_soc_d
writel(acp_fifo_addr, adata->acp_base + reg_fifo_addr); writel(acp_fifo_addr, adata->acp_base + reg_fifo_addr);
writel(FIFO_SIZE, adata->acp_base + reg_fifo_size); writel(FIFO_SIZE, adata->acp_base + reg_fifo_size);
ext_int_ctrl = readl(adata->acp_base + ACP_EXTERNAL_INTR_CNTL); ext_int_ctrl = readl(ACP_EXTERNAL_INTR_CNTL(adata, rsrc->irqp_used));
ext_int_ctrl |= BIT(I2S_RX_THRESHOLD) | BIT(BT_RX_THRESHOLD) ext_int_ctrl |= BIT(I2S_RX_THRESHOLD(rsrc->offset)) |
| BIT(I2S_TX_THRESHOLD) | BIT(BT_TX_THRESHOLD); BIT(BT_RX_THRESHOLD(rsrc->offset)) |
BIT(I2S_TX_THRESHOLD(rsrc->offset)) |
BIT(BT_TX_THRESHOLD(rsrc->offset));
writel(ext_int_ctrl, adata->acp_base + ACP_EXTERNAL_INTR_CNTL); writel(ext_int_ctrl, ACP_EXTERNAL_INTR_CNTL(adata, rsrc->irqp_used));
return 0; return 0;
} }
@ -268,28 +271,30 @@ static int acp_i2s_startup(struct snd_pcm_substream *substream, struct snd_soc_d
{ {
struct acp_stream *stream = substream->runtime->private_data; struct acp_stream *stream = substream->runtime->private_data;
struct device *dev = dai->component->dev; struct device *dev = dai->component->dev;
struct acp_dev_data *adata = dev_get_drvdata(dev);
struct acp_resource *rsrc = adata->rsrc;
unsigned int dir = substream->stream; unsigned int dir = substream->stream;
unsigned int irq_bit = 0; unsigned int irq_bit = 0;
switch (dai->driver->id) { switch (dai->driver->id) {
case I2S_SP_INSTANCE: case I2S_SP_INSTANCE:
if (dir == SNDRV_PCM_STREAM_PLAYBACK) { if (dir == SNDRV_PCM_STREAM_PLAYBACK) {
irq_bit = BIT(I2S_TX_THRESHOLD); irq_bit = BIT(I2S_TX_THRESHOLD(rsrc->offset));
stream->pte_offset = ACP_SRAM_SP_PB_PTE_OFFSET; stream->pte_offset = ACP_SRAM_SP_PB_PTE_OFFSET;
stream->fifo_offset = SP_PB_FIFO_ADDR_OFFSET; stream->fifo_offset = SP_PB_FIFO_ADDR_OFFSET;
} else { } else {
irq_bit = BIT(I2S_RX_THRESHOLD); irq_bit = BIT(I2S_RX_THRESHOLD(rsrc->offset));
stream->pte_offset = ACP_SRAM_SP_CP_PTE_OFFSET; stream->pte_offset = ACP_SRAM_SP_CP_PTE_OFFSET;
stream->fifo_offset = SP_CAPT_FIFO_ADDR_OFFSET; stream->fifo_offset = SP_CAPT_FIFO_ADDR_OFFSET;
} }
break; break;
case I2S_BT_INSTANCE: case I2S_BT_INSTANCE:
if (dir == SNDRV_PCM_STREAM_PLAYBACK) { if (dir == SNDRV_PCM_STREAM_PLAYBACK) {
irq_bit = BIT(BT_TX_THRESHOLD); irq_bit = BIT(BT_TX_THRESHOLD(rsrc->offset));
stream->pte_offset = ACP_SRAM_BT_PB_PTE_OFFSET; stream->pte_offset = ACP_SRAM_BT_PB_PTE_OFFSET;
stream->fifo_offset = BT_PB_FIFO_ADDR_OFFSET; stream->fifo_offset = BT_PB_FIFO_ADDR_OFFSET;
} else { } else {
irq_bit = BIT(BT_RX_THRESHOLD); irq_bit = BIT(BT_RX_THRESHOLD(rsrc->offset));
stream->pte_offset = ACP_SRAM_BT_CP_PTE_OFFSET; stream->pte_offset = ACP_SRAM_BT_CP_PTE_OFFSET;
stream->fifo_offset = BT_CAPT_FIFO_ADDR_OFFSET; stream->fifo_offset = BT_CAPT_FIFO_ADDR_OFFSET;
} }
@ -319,6 +324,7 @@ int asoc_acp_i2s_probe(struct snd_soc_dai *dai)
{ {
struct device *dev = dai->component->dev; struct device *dev = dai->component->dev;
struct acp_dev_data *adata = dev_get_drvdata(dev); struct acp_dev_data *adata = dev_get_drvdata(dev);
struct acp_resource *rsrc = adata->rsrc;
unsigned int val; unsigned int val;
if (!adata->acp_base) { if (!adata->acp_base) {
@ -326,8 +332,8 @@ int asoc_acp_i2s_probe(struct snd_soc_dai *dai)
return -EINVAL; return -EINVAL;
} }
val = readl(adata->acp_base + ACP_I2S_PIN_CONFIG); val = readl(adata->acp_base + rsrc->i2s_pin_cfg_offset);
if (val != I2S_MODE) { if (val != rsrc->i2s_mode) {
dev_err(dev, "I2S Mode not supported val %x\n", val); dev_err(dev, "I2S Mode not supported val %x\n", val);
return -EINVAL; return -EINVAL;
} }

8
sound/soc/amd/acp/acp-pdm.c
View File

@ -160,9 +160,9 @@ static int acp_dmic_dai_startup(struct snd_pcm_substream *substream,
stream->reg_offset = ACP_REGION2_OFFSET; stream->reg_offset = ACP_REGION2_OFFSET;
/* Enable DMIC Interrupts */ /* Enable DMIC Interrupts */
ext_int_ctrl = readl(adata->acp_base + ACP_EXTERNAL_INTR_CNTL); ext_int_ctrl = readl(ACP_EXTERNAL_INTR_CNTL(adata, 0));
ext_int_ctrl |= PDM_DMA_INTR_MASK; ext_int_ctrl |= PDM_DMA_INTR_MASK;
writel(ext_int_ctrl, adata->acp_base + ACP_EXTERNAL_INTR_CNTL); writel(ext_int_ctrl, ACP_EXTERNAL_INTR_CNTL(adata, 0));
return 0; return 0;
} }
@ -175,9 +175,9 @@ static void acp_dmic_dai_shutdown(struct snd_pcm_substream *substream,
u32 ext_int_ctrl; u32 ext_int_ctrl;
/* Disable DMIC interrupts */ /* Disable DMIC interrupts */
ext_int_ctrl = readl(adata->acp_base + ACP_EXTERNAL_INTR_CNTL); ext_int_ctrl = readl(ACP_EXTERNAL_INTR_CNTL(adata, 0));
ext_int_ctrl |= ~PDM_DMA_INTR_MASK; ext_int_ctrl |= ~PDM_DMA_INTR_MASK;
writel(ext_int_ctrl, adata->acp_base + ACP_EXTERNAL_INTR_CNTL); writel(ext_int_ctrl, ACP_EXTERNAL_INTR_CNTL(adata, 0));
} }
const struct snd_soc_dai_ops acp_dmic_dai_ops = { const struct snd_soc_dai_ops acp_dmic_dai_ops = {

16
sound/soc/amd/acp/acp-platform.c
View File

@ -91,6 +91,7 @@ EXPORT_SYMBOL_NS_GPL(acp_machine_select, SND_SOC_ACP_COMMON);
static irqreturn_t i2s_irq_handler(int irq, void *data) static irqreturn_t i2s_irq_handler(int irq, void *data)
{ {
struct acp_dev_data *adata = data; struct acp_dev_data *adata = data;
struct acp_resource *rsrc = adata->rsrc;
struct acp_stream *stream; struct acp_stream *stream;
u16 i2s_flag = 0; u16 i2s_flag = 0;
u32 val, i; u32 val, i;
@ -98,12 +99,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *data)
if (!adata) if (!adata)
return IRQ_NONE; return IRQ_NONE;
val = readl(adata->acp_base + ACP_EXTERNAL_INTR_STAT); val = readl(ACP_EXTERNAL_INTR_STAT(adata, rsrc->irqp_used));
for (i = 0; i < ACP_MAX_STREAM; i++) { for (i = 0; i < ACP_MAX_STREAM; i++) {
stream = adata->stream[i]; stream = adata->stream[i];
if (stream && (val & stream->irq_bit)) { if (stream && (val & stream->irq_bit)) {
writel(stream->irq_bit, adata->acp_base + ACP_EXTERNAL_INTR_STAT); writel(stream->irq_bit,
ACP_EXTERNAL_INTR_STAT(adata, rsrc->irqp_used));
snd_pcm_period_elapsed(stream->substream); snd_pcm_period_elapsed(stream->substream);
i2s_flag = 1; i2s_flag = 1;
break; break;
@ -118,6 +120,7 @@ static irqreturn_t i2s_irq_handler(int irq, void *data)
static void config_pte_for_stream(struct acp_dev_data *adata, struct acp_stream *stream) static void config_pte_for_stream(struct acp_dev_data *adata, struct acp_stream *stream)
{ {
struct acp_resource *rsrc = adata->rsrc;
u32 pte_reg, pte_size, reg_val; u32 pte_reg, pte_size, reg_val;
/* Use ATU base Group5 */ /* Use ATU base Group5 */
@ -126,7 +129,7 @@ static void config_pte_for_stream(struct acp_dev_data *adata, struct acp_stream
stream->reg_offset = 0x02000000; stream->reg_offset = 0x02000000;
/* Group Enable */ /* Group Enable */
reg_val = ACP_SRAM_PTE_OFFSET; reg_val = rsrc->sram_pte_offset;
writel(reg_val | BIT(31), adata->acp_base + pte_reg); writel(reg_val | BIT(31), adata->acp_base + pte_reg);
writel(PAGE_SIZE_4K_ENABLE, adata->acp_base + pte_size); writel(PAGE_SIZE_4K_ENABLE, adata->acp_base + pte_size);
} }
@ -135,6 +138,7 @@ static void config_acp_dma(struct acp_dev_data *adata, int cpu_id, int size)
{ {
struct acp_stream *stream = adata->stream[cpu_id]; struct acp_stream *stream = adata->stream[cpu_id];
struct snd_pcm_substream *substream = stream->substream; struct snd_pcm_substream *substream = stream->substream;
struct acp_resource *rsrc = adata->rsrc;
dma_addr_t addr = substream->dma_buffer.addr; dma_addr_t addr = substream->dma_buffer.addr;
int num_pages = (PAGE_ALIGN(size) >> PAGE_SHIFT); int num_pages = (PAGE_ALIGN(size) >> PAGE_SHIFT);
u32 low, high, val; u32 low, high, val;
@ -146,9 +150,9 @@ static void config_acp_dma(struct acp_dev_data *adata, int cpu_id, int size)
/* Load the low address of page int ACP SRAM through SRBM */ /* Load the low address of page int ACP SRAM through SRBM */
low = lower_32_bits(addr); low = lower_32_bits(addr);
high = upper_32_bits(addr); high = upper_32_bits(addr);
writel(low, adata->acp_base + ACP_SCRATCH_REG_0 + val); writel(low, adata->acp_base + rsrc->scratch_reg_offset + val);
high |= BIT(31); high |= BIT(31);
writel(high, adata->acp_base + ACP_SCRATCH_REG_0 + val + 4); writel(high, adata->acp_base + rsrc->scratch_reg_offset + val + 4);
/* Move to next physically contiguous page */ /* Move to next physically contiguous page */
val += 8; val += 8;
@ -187,7 +191,7 @@ static int acp_dma_open(struct snd_soc_component *component, struct snd_pcm_subs
} }
runtime->private_data = stream; runtime->private_data = stream;
writel(1, adata->acp_base + ACP_EXTERNAL_INTR_ENB); writel(1, ACP_EXTERNAL_INTR_ENB(adata));
return ret; return ret;
} }

38
sound/soc/amd/acp/acp-renoir.c
View File

@ -39,6 +39,17 @@
#define ACP_ERROR_MASK 0x20000000 #define ACP_ERROR_MASK 0x20000000
#define ACP_EXT_INTR_STAT_CLEAR_MASK 0xFFFFFFFF #define ACP_EXT_INTR_STAT_CLEAR_MASK 0xFFFFFFFF
static struct acp_resource rsrc = {
.offset = 20,
.no_of_ctrls = 1,
.irqp_used = 0,
.irq_reg_offset = 0x1800,
.i2s_pin_cfg_offset = 0x1400,
.i2s_mode = 0x04,
.scratch_reg_offset = 0x12800,
.sram_pte_offset = 0x02052800,
};
static struct snd_soc_acpi_codecs amp_rt1019 = { static struct snd_soc_acpi_codecs amp_rt1019 = {
.num_codecs = 1, .num_codecs = 1,
.codecs = {"10EC1019"} .codecs = {"10EC1019"}
@ -186,20 +197,24 @@ static int acp3x_reset(void __iomem *base)
return readl_poll_timeout(base + ACP_SOFT_RESET, val, !val, DELAY_US, ACP_TIMEOUT); return readl_poll_timeout(base + ACP_SOFT_RESET, val, !val, DELAY_US, ACP_TIMEOUT);
} }
static void acp3x_enable_interrupts(void __iomem *base) static void acp3x_enable_interrupts(struct acp_dev_data *adata)
{ {
struct acp_resource *rsrc = adata->rsrc;
u32 ext_intr_ctrl; u32 ext_intr_ctrl;
writel(0x01, base + ACP_EXTERNAL_INTR_ENB); writel(0x01, ACP_EXTERNAL_INTR_ENB(adata));
ext_intr_ctrl = readl(base + ACP_EXTERNAL_INTR_CNTL); ext_intr_ctrl = readl(ACP_EXTERNAL_INTR_CNTL(adata, rsrc->irqp_used));
ext_intr_ctrl |= ACP_ERROR_MASK; ext_intr_ctrl |= ACP_ERROR_MASK;
writel(ext_intr_ctrl, base + ACP_EXTERNAL_INTR_CNTL); writel(ext_intr_ctrl, ACP_EXTERNAL_INTR_CNTL(adata, rsrc->irqp_used));
} }
static void acp3x_disable_interrupts(void __iomem *base) static void acp3x_disable_interrupts(struct acp_dev_data *adata)
{ {
writel(ACP_EXT_INTR_STAT_CLEAR_MASK, base + ACP_EXTERNAL_INTR_STAT); struct acp_resource *rsrc = adata->rsrc;
writel(0x00, base + ACP_EXTERNAL_INTR_ENB);
writel(ACP_EXT_INTR_STAT_CLEAR_MASK,
ACP_EXTERNAL_INTR_STAT(adata, rsrc->irqp_used));
writel(0x00, ACP_EXTERNAL_INTR_ENB(adata));
} }
static int rn_acp_init(void __iomem *base) static int rn_acp_init(void __iomem *base)
@ -218,8 +233,6 @@ static int rn_acp_init(void __iomem *base)
if (ret) if (ret)
return ret; return ret;
acp3x_enable_interrupts(base);
return 0; return 0;
} }
@ -227,8 +240,6 @@ static int rn_acp_deinit(void __iomem *base)
{ {
int ret = 0; int ret = 0;
acp3x_disable_interrupts(base);
/* Reset */ /* Reset */
ret = acp3x_reset(base); ret = acp3x_reset(base);
if (ret) if (ret)
@ -290,11 +301,13 @@ static int renoir_audio_probe(struct platform_device *pdev)
adata->dev = dev; adata->dev = dev;
adata->dai_driver = acp_renoir_dai; adata->dai_driver = acp_renoir_dai;
adata->num_dai = ARRAY_SIZE(acp_renoir_dai); adata->num_dai = ARRAY_SIZE(acp_renoir_dai);
adata->rsrc = &rsrc;
adata->machines = snd_soc_acpi_amd_acp_machines; adata->machines = snd_soc_acpi_amd_acp_machines;
acp_machine_select(adata); acp_machine_select(adata);
dev_set_drvdata(dev, adata); dev_set_drvdata(dev, adata);
acp3x_enable_interrupts(adata);
acp_platform_register(dev); acp_platform_register(dev);
return 0; return 0;
@ -303,11 +316,14 @@ static int renoir_audio_probe(struct platform_device *pdev)
static int renoir_audio_remove(struct platform_device *pdev) static int renoir_audio_remove(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct acp_dev_data *adata = dev_get_drvdata(dev);
struct acp_chip_info *chip; struct acp_chip_info *chip;
int ret; int ret;
chip = dev_get_platdata(&pdev->dev); chip = dev_get_platdata(&pdev->dev);
acp3x_disable_interrupts(adata);
ret = rn_acp_deinit(chip->base); ret = rn_acp_deinit(chip->base);
if (ret) if (ret)
dev_err(&pdev->dev, "ACP de-init Failed (%pe)\n", ERR_PTR(ret)); dev_err(&pdev->dev, "ACP de-init Failed (%pe)\n", ERR_PTR(ret));

24
sound/soc/amd/acp/amd.h
View File

@ -32,13 +32,12 @@
#define ACP3x_I2STDM_REG_END 0x1242410 #define ACP3x_I2STDM_REG_END 0x1242410
#define ACP3x_BT_TDM_REG_START 0x1242800 #define ACP3x_BT_TDM_REG_START 0x1242800
#define ACP3x_BT_TDM_REG_END 0x1242810 #define ACP3x_BT_TDM_REG_END 0x1242810
#define I2S_MODE 0x04
#define I2S_RX_THRESHOLD 27
#define I2S_TX_THRESHOLD 28
#define BT_TX_THRESHOLD 26
#define BT_RX_THRESHOLD 25
#define ACP_SRAM_PTE_OFFSET 0x02052800 #define THRESHOLD(bit, base) ((bit) + (base))
#define I2S_RX_THRESHOLD(base) THRESHOLD(7, base)
#define I2S_TX_THRESHOLD(base) THRESHOLD(8, base)
#define BT_TX_THRESHOLD(base) THRESHOLD(6, base)
#define BT_RX_THRESHOLD(base) THRESHOLD(5, base)
#define ACP_SRAM_SP_PB_PTE_OFFSET 0x0 #define ACP_SRAM_SP_PB_PTE_OFFSET 0x0
#define ACP_SRAM_SP_CP_PTE_OFFSET 0x100 #define ACP_SRAM_SP_CP_PTE_OFFSET 0x100
@ -92,6 +91,17 @@ struct acp_stream {
u32 fifo_offset; u32 fifo_offset;
}; };
struct acp_resource {
int offset;
int no_of_ctrls;
int irqp_used;
u32 irq_reg_offset;
u32 i2s_pin_cfg_offset;
int i2s_mode;
u64 scratch_reg_offset;
u64 sram_pte_offset;
};
struct acp_dev_data { struct acp_dev_data {
char *name; char *name;
struct device *dev; struct device *dev;
@ -106,6 +116,8 @@ struct acp_dev_data {
struct snd_soc_acpi_mach *machines; struct snd_soc_acpi_mach *machines;
struct platform_device *mach_dev; struct platform_device *mach_dev;
struct acp_resource *rsrc;
}; };
extern const struct snd_soc_dai_ops asoc_acp_cpu_dai_ops; extern const struct snd_soc_dai_ops asoc_acp_cpu_dai_ops;

12
sound/soc/amd/acp/chip_offset_byte.h
View File

@ -20,11 +20,13 @@
#define ACP_SOFT_RESET 0x1000 #define ACP_SOFT_RESET 0x1000
#define ACP_CONTROL 0x1004 #define ACP_CONTROL 0x1004
#define ACP_EXTERNAL_INTR_ENB 0x1800 #define ACP_EXTERNAL_INTR_REG_ADDR(adata, offset, ctrl) \
#define ACP_EXTERNAL_INTR_CNTL 0x1804 (adata->acp_base + adata->rsrc->irq_reg_offset + offset + (ctrl * 0x04))
#define ACP_EXTERNAL_INTR_STAT 0x1808
#define ACP_I2S_PIN_CONFIG 0x1400 #define ACP_EXTERNAL_INTR_ENB(adata) ACP_EXTERNAL_INTR_REG_ADDR(adata, 0x0, 0x0)
#define ACP_SCRATCH_REG_0 0x12800 #define ACP_EXTERNAL_INTR_CNTL(adata, ctrl) ACP_EXTERNAL_INTR_REG_ADDR(adata, 0x4, ctrl)
#define ACP_EXTERNAL_INTR_STAT(adata, ctrl) ACP_EXTERNAL_INTR_REG_ADDR(adata, \
(0x4 + (adata->rsrc->no_of_ctrls * 0x04)), ctrl)
/* Registers from ACP_AUDIO_BUFFERS block */ /* Registers from ACP_AUDIO_BUFFERS block */