michaelh/zephyr
1
0
Fork 0
Code Releases Activity

intel_adsp: rename clock registers due to possible conflict

Browse source 
SOF using the same defines and in some cases generating conflicts.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2022-07-27 09:12:29 -04:00
commit 728d8eb2c0
6 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/timer/intel_adsp_timer.c
View file

@ -42,11 +42,11 @@
BUILD_ASSERT(MIN_DELAY < CYC_PER_TICK);
BUILD_ASSERT(COMPARATOR_IDX >= 0 && COMPARATOR_IDX <= 1);
#define WCTCS (SHIM_DSPWCTS)
#define COUNTER_HI (SHIM_DSPWCH)
#define COUNTER_LO (SHIM_DSPWCL)
#define COMPARE_HI (SHIM_COMPARE_HI(COMPARATOR_IDX))
#define COMPARE_LO (SHIM_COMPARE_LO(COMPARATOR_IDX))
#define WCTCS (ADSP_SHIM_DSPWCTS)
#define COUNTER_HI (ADSP_SHIM_DSPWCH)
#define COUNTER_LO (ADSP_SHIM_DSPWCL)
#define COMPARE_HI (ADSP_SHIM_COMPARE_HI(COMPARATOR_IDX))
#define COMPARE_LO (ADSP_SHIM_COMPARE_LO(COMPARATOR_IDX))
static struct k_spinlock lock;
@ -191,7 +191,7 @@ static void irq_init(void)
*/
#ifdef CONFIG_SOC_SERIES_INTEL_ACE1X
MTL_DINT[cpu].ie[MTL_INTL_TTS] |= BIT(COMPARATOR_IDX + 1);
*WCTCS |= SHIM_DSPWCTCS_TTIE(COMPARATOR_IDX);
*WCTCS |= ADSP_SHIM_DSPWCTCS_TTIE(COMPARATOR_IDX);
#else
CAVS_INTCTRL[cpu].l2.clear = CAVS_L2_DWCT0;
#endif