Skip to content

Commit bffc080

Browse files
zhuyingjiangplbossart
authored andcommitted
ASoC:SOF remove duplicated defines
there are duplicated defines HDA_DSP_ADSPIS_CL_DMA HDA_DSP_ADSPIC_CL_DMA the defines HDA_SKL_ADSP_FW_STATUS and HDA_DSP_SRAM_REG_ROM_STATUS_SKL are the same Signed-off-by: Zhu Yingjiang <yingjiang.zhu@linux.intel.com>
1 parent 03cadf8 commit bffc080

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

sound/soc/sof/intel/hda-loader-skl.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@
3131
#define HDA_SKL_WAIT_TIMEOUT 500 /* 500 msec */
3232
#define HDA_SKL_CLDMA_MAX_BUFFER_SIZE (32 * PAGE_SIZE)
3333

34-
/* Intel HD Audio SRAM Window 0*/
35-
#define HDA_SKL_ADSP_SRAM0_BASE 0x8000
36-
37-
/* Firmware status window */
38-
#define HDA_SKL_ADSP_FW_STATUS HDA_SKL_ADSP_SRAM0_BASE
39-
4034
/* Stream Reset */
4135
#define HDA_CL_SD_CTL_SRST_SHIFT 0
4236
#define HDA_CL_SD_CTL_SRST(x) (((x) & 0x1) << \
@@ -532,7 +526,7 @@ static int cl_copy_fw_skl(struct snd_sof_dev *sdev)
532526
}
533527

534528
ret = snd_sof_dsp_register_poll(sdev, HDA_DSP_BAR,
535-
HDA_SKL_ADSP_FW_STATUS,
529+
HDA_DSP_SRAM_REG_ROM_STATUS_SKL,
536530
HDA_DSP_ROM_STS_MASK,
537531
HDA_DSP_ROM_FW_FW_LOADED,
538532
HDA_DSP_BASEFW_TIMEOUT);

sound/soc/sof/intel/hda.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,6 @@
268268
#define HDA_DSP_ADSPCS_CPA_SHIFT 24
269269
#define HDA_DSP_ADSPCS_CPA_MASK(cm) ((cm) << HDA_DSP_ADSPCS_CPA_SHIFT)
270270

271-
#define HDA_DSP_ADSPIC_CL_DMA 0x2
272-
#define HDA_DSP_ADSPIS_CL_DMA 0x2
273-
274271
/* Mask for a given core index, c = 0.. number of supported cores - 1 */
275272
#define HDA_DSP_CORE_MASK(c) BIT(c)
276273

0 commit comments

Comments
 (0)