[Sound-open-firmware] [PATCH 2/2] interrupt: cannonlake: fix the software interrupt macro num gap

[Keyon Jie]

We add SOFTWARE1 and remove SOFTWARE10 to fix the gap, and change
the corresponding calling.

Signed-off-by: Keyon Jie <yang.jie at linux.intel.com>
---
 src/platform/cannonlake/include/platform/interrupt.h | 18 +++++++++---------
 src/platform/cannonlake/include/platform/platform.h  |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/platform/cannonlake/include/platform/interrupt.h b/src/platform/cannonlake/include/platform/interrupt.h
index 4735ddc..0db0d99 100644
--- a/src/platform/cannonlake/include/platform/interrupt.h
+++ b/src/platform/cannonlake/include/platform/interrupt.h
@@ -42,23 +42,23 @@
 #define IRQ_NUM_SOFTWARE0	0	/* level 1 */
 #define IRQ_NUM_TIMER1		1	/* level 1 */
 #define IRQ_NUM_EXT_LEVEL1	2	/* level 1 */
-#define IRQ_NUM_SOFTWARE2	3	/* level 1 */
-#define IRQ_NUM_SOFTWARE3	4	/* level 2 */
+#define IRQ_NUM_SOFTWARE1	3	/* level 1 */
+#define IRQ_NUM_SOFTWARE2	4	/* level 2 */
 #define IRQ_NUM_TIMER2		5	/* level 2 */
 #define IRQ_NUM_EXT_LEVEL2	6	/* level 2 */
-#define IRQ_NUM_SOFTWARE4	7	/* level 2 */
-#define IRQ_NUM_SOFTWARE5	8	/* level 3 */
+#define IRQ_NUM_SOFTWARE3	7	/* level 2 */
+#define IRQ_NUM_SOFTWARE4	8	/* level 3 */
 #define IRQ_NUM_TIMER3		9	/* level 3 */
 #define IRQ_NUM_EXT_LEVEL3	10	/* level 3 */
-#define IRQ_NUM_SOFTWARE6	11	/* level 3 */
-#define IRQ_NUM_SOFTWARE7	12	/* level 4 */
+#define IRQ_NUM_SOFTWARE5	11	/* level 3 */
+#define IRQ_NUM_SOFTWARE6	12	/* level 4 */
 #define IRQ_NUM_EXT_LEVEL4	13	/* level 4 */
-#define IRQ_NUM_SOFTWARE8	14	/* level 4 */
-#define IRQ_NUM_SOFTWARE9	15	/* level 5 */
+#define IRQ_NUM_SOFTWARE7	14	/* level 4 */
+#define IRQ_NUM_SOFTWARE8	15	/* level 5 */
 #define IRQ_NUM_EXT_LEVEL5	16	/* level 5 */
 #define IRQ_NUM_EXT_LEVEL6	17	/* level 5 */
 #define IRQ_NUM_EXT_LEVEL7	18	/* level 5 */
-#define IRQ_NUM_SOFTWARE10	19	/* level 5 */
+#define IRQ_NUM_SOFTWARE9	19	/* level 5 */
 #define IRQ_NUM_NMI		20	/* level 7 */
 
 /* IRQ Level 2 bits */
diff --git a/src/platform/cannonlake/include/platform/platform.h b/src/platform/cannonlake/include/platform/platform.h
index 06a5599..0d68bcb 100644
--- a/src/platform/cannonlake/include/platform/platform.h
+++ b/src/platform/cannonlake/include/platform/platform.h
@@ -50,11 +50,11 @@ struct reef;
 #define PLATFORM_IPC_INTERUPT	IRQ_EXT_IPC_LVL2(0)
 
 /* pipeline IRQ */
-#define PLATFORM_SCHEDULE_IRQ	IRQ_NUM_SOFTWARE5
+#define PLATFORM_SCHEDULE_IRQ	IRQ_NUM_SOFTWARE4
 
-#define PLATFORM_IRQ_TASK_HIGH	IRQ_NUM_SOFTWARE4
-#define PLATFORM_IRQ_TASK_MED	IRQ_NUM_SOFTWARE3
-#define PLATFORM_IRQ_TASK_LOW	IRQ_NUM_SOFTWARE2
+#define PLATFORM_IRQ_TASK_HIGH	IRQ_NUM_SOFTWARE3
+#define PLATFORM_IRQ_TASK_MED	IRQ_NUM_SOFTWARE2
+#define PLATFORM_IRQ_TASK_LOW	IRQ_NUM_SOFTWARE1
 
 #define PLATFORM_SCHEDULE_COST	200
 
-- 
2.14.1