diff options
-rw-r--r-- | sound/soc/intel/common/sst-dsp-priv.h | 4 | ||||
-rw-r--r-- | sound/soc/intel/skylake/bxt-sst.c | 4 | ||||
-rw-r--r-- | sound/soc/intel/skylake/skl-sst.c | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/intel/common/sst-dsp-priv.h b/sound/soc/intel/common/sst-dsp-priv.h index d13c84364c3c..8734040d64d3 100644 --- a/sound/soc/intel/common/sst-dsp-priv.h +++ b/sound/soc/intel/common/sst-dsp-priv.h | |||
@@ -77,6 +77,10 @@ struct sst_addr { | |||
77 | u32 dram_offset; | 77 | u32 dram_offset; |
78 | u32 dsp_iram_offset; | 78 | u32 dsp_iram_offset; |
79 | u32 dsp_dram_offset; | 79 | u32 dsp_dram_offset; |
80 | u32 sram0_base; | ||
81 | u32 sram1_base; | ||
82 | u32 w0_stat_sz; | ||
83 | u32 w0_up_sz; | ||
80 | void __iomem *lpe; | 84 | void __iomem *lpe; |
81 | void __iomem *shim; | 85 | void __iomem *shim; |
82 | void __iomem *pci_cfg; | 86 | void __iomem *pci_cfg; |
diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index f5e7dbb1ba39..cf11b84888b9 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c | |||
@@ -573,6 +573,10 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, | |||
573 | sst->fw_ops = bxt_fw_ops; | 573 | sst->fw_ops = bxt_fw_ops; |
574 | sst->addr.lpe = mmio_base; | 574 | sst->addr.lpe = mmio_base; |
575 | sst->addr.shim = mmio_base; | 575 | sst->addr.shim = mmio_base; |
576 | sst->addr.sram0_base = BXT_ADSP_SRAM0_BASE; | ||
577 | sst->addr.sram1_base = BXT_ADSP_SRAM1_BASE; | ||
578 | sst->addr.w0_stat_sz = SKL_ADSP_W0_STAT_SZ; | ||
579 | sst->addr.w0_up_sz = SKL_ADSP_W0_UP_SZ; | ||
576 | 580 | ||
577 | sst_dsp_mailbox_init(sst, (BXT_ADSP_SRAM0_BASE + SKL_ADSP_W0_STAT_SZ), | 581 | sst_dsp_mailbox_init(sst, (BXT_ADSP_SRAM0_BASE + SKL_ADSP_W0_STAT_SZ), |
578 | SKL_ADSP_W0_UP_SZ, BXT_ADSP_SRAM1_BASE, SKL_ADSP_W1_SZ); | 582 | SKL_ADSP_W0_UP_SZ, BXT_ADSP_SRAM1_BASE, SKL_ADSP_W1_SZ); |
diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c index 155e456b7a3a..aba9ea11ac74 100644 --- a/sound/soc/intel/skylake/skl-sst.c +++ b/sound/soc/intel/skylake/skl-sst.c | |||
@@ -553,6 +553,11 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, | |||
553 | sst = skl->dsp; | 553 | sst = skl->dsp; |
554 | sst->addr.lpe = mmio_base; | 554 | sst->addr.lpe = mmio_base; |
555 | sst->addr.shim = mmio_base; | 555 | sst->addr.shim = mmio_base; |
556 | sst->addr.sram0_base = SKL_ADSP_SRAM0_BASE; | ||
557 | sst->addr.sram1_base = SKL_ADSP_SRAM1_BASE; | ||
558 | sst->addr.w0_stat_sz = SKL_ADSP_W0_STAT_SZ; | ||
559 | sst->addr.w0_up_sz = SKL_ADSP_W0_UP_SZ; | ||
560 | |||
556 | sst_dsp_mailbox_init(sst, (SKL_ADSP_SRAM0_BASE + SKL_ADSP_W0_STAT_SZ), | 561 | sst_dsp_mailbox_init(sst, (SKL_ADSP_SRAM0_BASE + SKL_ADSP_W0_STAT_SZ), |
557 | SKL_ADSP_W0_UP_SZ, SKL_ADSP_SRAM1_BASE, SKL_ADSP_W1_SZ); | 562 | SKL_ADSP_W0_UP_SZ, SKL_ADSP_SRAM1_BASE, SKL_ADSP_W1_SZ); |
558 | 563 | ||