Remoteproc: DRA7xx: Remove invalid ISS mapping in DSP

[ipc/ipcdev.git] / packages / ti / ipc / remoteproc / rsc_table_vayu_dsp.h

diff --git a/packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h b/packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h
index 328aee1260d3ce13ff0cfac94f5cb15992d9b02f..ea4b7d06505153145d019b2a179febfdb77ecce0 100644 (file)
--- a/packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h
+++ b/packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013, Texas Instruments Incorporated
+ * Copyright (c) 2012-2014, Texas Instruments Incorporated
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@
  */
 
 /*
- *  ======== rsc_table_omap5_dsp.h ========
+ *  ======== rsc_table_vayu_dsp.h ========
  *
  *  Define the resource table entries for all DSP cores. This will be
  *  incorporated into corresponding base images, and used by the remoteproc
@@ -39,8 +39,8 @@
  *
  */
 
-#ifndef _RSC_TABLE_DSP_H_
-#define _RSC_TABLE_DSP_H_
+#ifndef _RSC_TABLE_VAYU_DSP_H_
+#define _RSC_TABLE_VAYU_DSP_H_
 
 #include "rsc_types.h"
 
@@ -65,9 +65,6 @@
 #define L3_PERIPHERAL_DMM       0x4E000000
 #define DSP_PERIPHERAL_DMM      0x4E000000
 
-#define L3_PERIPHERAL_ISS       0x52000000
-#define DSP_PERIPHERAL_ISS      0x52000000
-
 #define L3_TILER_MODE_0_1       0x60000000
 #define DSP_TILER_MODE_0_1      0x60000000
 
@@ -101,14 +98,10 @@
  * Assign fixed RAM addresses to facilitate a fixed MMU table.
  */
 /* See CMA BASE addresses in Linux side: arch/arm/mach-omap2/remoteproc.c */
-#ifdef OMAP5
-#define PHYS_MEM_IPC_VRING      0x95000000
-#elif defined (VAYU_DSP_1)
-#define PHYS_MEM_IPC_VRING      0x95000000
+#if defined (VAYU_DSP_1)
+#define PHYS_MEM_IPC_VRING      0x99000000
 #elif defined (VAYU_DSP_2)
-#define PHYS_MEM_IPC_VRING      0x94800000
-#else
-#define PHYS_MEM_IPC_VRING      0x98800000
+#define PHYS_MEM_IPC_VRING      0x9F000000
 #endif
 
 /* Need to be identical to that of IPU */
@@ -181,9 +174,6 @@ struct my_resource_table {
 
     /* devmem entry */
     struct fw_rsc_devmem devmem10;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem11;
 };
 
 #define TRACEBUFADDR (UInt32)&ti_trace_SysMin_Module_State_0_outbuf__A
@@ -193,7 +183,7 @@ struct my_resource_table {
 
 struct my_resource_table ti_ipc_remoteproc_ResourceTable = {
     1,      /* we're the first version that implements this */
-    18,     /* number of entries in the table */
+    17,     /* number of entries in the table */
     0, 0,   /* reserved, must be zero */
     /* offsets to entries */
     {
@@ -214,7 +204,6 @@ struct my_resource_table ti_ipc_remoteproc_ResourceTable = {
         offsetof(struct my_resource_table, devmem8),
         offsetof(struct my_resource_table, devmem9),
         offsetof(struct my_resource_table, devmem10),
-        offsetof(struct my_resource_table, devmem11),
     },
 
     /* rpmsg vdev entry */
@@ -320,12 +309,6 @@ struct my_resource_table ti_ipc_remoteproc_ResourceTable = {
         DSP_PERIPHERAL_DMM, L3_PERIPHERAL_DMM,
         SZ_1M, 0, 0, "DSP_PERIPHERAL_DMM",
     },
-
-    {
-        TYPE_DEVMEM,
-        DSP_PERIPHERAL_ISS, L3_PERIPHERAL_ISS,
-        SZ_256K, 0, 0, "DSP_PERIPHERAL_ISS",
-    },
 };
 
-#endif /* _RSC_TABLE_DSP_H_ */
+#endif /* _RSC_TABLE_VAYU_DSP_H_ */