From: Robert Tivy <rtivy@ti.com>
Date: Tue, 26 Aug 2014 17:04:49 +0000 (-0700)
Subject: vayu: add new rprocList[] setting for Linux v3.14
X-Git-Tag: 3.30.00.06_eng~5
X-Git-Url: https://git.ti.com/gitweb?p=ipc%2Fipcdev.git;a=commitdiff_plain;h=b983f660a3e15ce817d8eb15bd3d091c032e7ec6

vayu: add new rprocList[] setting for Linux v3.14

The rproc order for vayu remote cores has changed in Linux kernel v3.14,
as part of the conversion to completely DT-based configuration.
---

diff --git a/linux/src/daemon/MultiProcCfg_dra7xx.c b/linux/src/daemon/MultiProcCfg_dra7xx.c
index 10c88cc..4e98715 100644
--- a/linux/src/daemon/MultiProcCfg_dra7xx.c
+++ b/linux/src/daemon/MultiProcCfg_dra7xx.c
@@ -40,6 +40,8 @@
 /* For Backplane IPC startup/shutdown stuff: */
 #include <_MultiProc.h>
 
+#include <linux/version.h>
+
 /* This must match BIOS side MultiProc configuration for given platform!: */
 MultiProc_Config _MultiProc_cfg =  {
    .numProcessors = 5,
@@ -49,9 +51,16 @@ MultiProc_Config _MultiProc_cfg =  {
    .nameList[3] = "DSP2",
    .nameList[4] = "DSP1",
    .rprocList[0] = -1,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0)
    .rprocList[1] = 1,
    .rprocList[2] = 3,
    .rprocList[3] = 2,
    .rprocList[4] = 0,
+#else
+   .rprocList[1] = 1,
+   .rprocList[2] = 0,
+   .rprocList[3] = 3,
+   .rprocList[4] = 2,
+#endif /* LINUX_VERSION_CODE */
    .id = 0,                 /* The host is always zero */
 };