Merge pull request #63 in PROCESSOR-SDK/pruss-lld from PRSDK-4321 to masterDEV.PRUSS_LLD.01.00.00.14A

* commit '3e430031565b9d81ee6d77ac96014856604f6c6b':
  PRSDK-4321: Correction for J7 SoC object count
  PRSDK-4321: Updated AM335x object initialization to align with new PRU instance Max count
  PRSDK-4321: Updated PRU instance support for AM335x
  PRSDK-4321: Added PRUICSS instace 3 support for AM65xx

7 files changed, 111 insertions, 77 deletions

diff --git a/pruicss.h b/pruicss.h
index 44fef2d..8c80500 100644
--- a/pruicss.h
+++ b/pruicss.h
@@ -82,6 +82,7 @@ extern "C" {
 
 #include <stdint.h>
 #include <stddef.h>
+#include <ti/drv/pruss/soc/pruicss_soc.h>
 
 #define PRUICSS_NUM_PRU_HOSTS        (10U)
 #define PRUICSS_NUM_PRU_CHANNELS     (10U)
@@ -103,15 +104,7 @@ extern "C" {
 
 /**< Invalid Intc Mux number, intc Mux not used if assigned PRUSS_INVALID_INTC_MUX_NUM */
 #define PRUSS_INVALID_INTC_MUX_NUM      ((uint32_t)0xffff)
-/*!
- *  @brief    PRUICSS Instance IDs
- */
-typedef enum PRUICSS_MaxInstances_s
-{
-   PRUICCSS_INSTANCE_ONE=1,
-   PRUICCSS_INSTANCE_TWO=2,
-   PRUICCSS_INSTANCE_MAX=3
-}PRUICSS_MaxInstances;
+
 /** \brief Interrupt handler   */
 typedef void (*PRUICSSDRV_IRQ_HANDLER)(void* buf);
 typedef struct  PRUICSS_Config_s          *PRUICSS_Handle;
diff --git a/soc/am335x/pruicss_soc.c b/soc/am335x/pruicss_soc.c
index b7cb374..baee0fb 100644
--- a/soc/am335x/pruicss_soc.c
+++ b/soc/am335x/pruicss_soc.c
@@ -86,11 +86,7 @@ PRUICSS_Config pruss_config[PRUICCSS_INSTANCE_MAX] = {
         &prussInitCfg
     },
 
-    {NULL, NULL},
-
     {NULL, NULL}
-
-
 };
 
 
diff --git a/soc/am65xx/pruicss_soc.c b/soc/am65xx/pruicss_soc.c
index 71f3997..6a3207d 100644
--- a/soc/am65xx/pruicss_soc.c
+++ b/soc/am65xx/pruicss_soc.c
@@ -138,10 +138,10 @@ PRUICSS_HwAttrs prussInitCfg[3] =
 };
 
 /* PRUICSS objects */
-PRUICSS_V1_Object prussObjects[PRUICCSS_INSTANCE_MAX];
+PRUICSS_V1_Object prussObjects[PRUICCSS_INSTANCE_MAX-1];
 
 /* PRUICSS configuration structure */
-PRUICSS_Config pruss_config[PRUICCSS_INSTANCE_MAX] = {
+PRUICSS_Config pruss_config[PRUICCSS_INSTANCE_MAX-1] = {
     {
         &prussObjects[0],
         &prussInitCfg[0]
diff --git a/soc/j721e/pruicss_soc.c b/soc/j721e/pruicss_soc.c
index 5ab799e..fb357bd 100644
--- a/soc/j721e/pruicss_soc.c
+++ b/soc/j721e/pruicss_soc.c
@@ -111,10 +111,10 @@ PRUICSS_HwAttrs prussInitCfg[PRUICCSS_INSTANCE_TWO] =
 };
 
 /* PRUICSS objects */
-PRUICSS_V1_Object prussObjects[PRUICCSS_INSTANCE_MAX];
+PRUICSS_V1_Object prussObjects[PRUICCSS_INSTANCE_MAX-1];
 
 /* PRUICSS configuration structure */
-PRUICSS_Config pruss_config[PRUICCSS_INSTANCE_MAX] = {
+PRUICSS_Config pruss_config[PRUICCSS_INSTANCE_MAX-1] = {
     {
         &prussObjects[0],
         &prussInitCfg[0]
@@ -122,10 +122,6 @@ PRUICSS_Config pruss_config[PRUICCSS_INSTANCE_MAX] = {
     {
         &prussObjects[1],
         &prussInitCfg[1]
-    },
-    {
-        &prussObjects[2],
-        &prussInitCfg[2]
     }
 };
 
diff --git a/soc/pruicss_soc.h b/soc/pruicss_soc.h
new file mode 100644
index 0000000..de4da8e
--- /dev/null
+++ b/soc/pruicss_soc.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2019, Texas Instruments Incorporated
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * *  Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * *  Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * *  Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** ============================================================================
+ *  @file       pruicss_soc.h
+ *
+ *  @brief      pruicss soc specific data structures
+ *
+ *  ============================================================================
+ */
+
+#ifndef _PRUICSS_SOC_H_
+#define _PRUICSS_SOC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stddef.h>
+
+#if defined(SOC_AM335x)
+/*!
+ *  @brief    PRUICSS Instance IDs
+ */
+typedef enum PRUICSS_MaxInstances_s
+{
+   PRUICCSS_INSTANCE_ONE=1,
+   PRUICCSS_INSTANCE_MAX=2
+}PRUICSS_MaxInstances;
+#elif defined(SOC_AM65XX)
+/*!
+ *  @brief    PRUICSS Instance IDs
+ */
+typedef enum PRUICSS_MaxInstances_s
+{
+   PRUICCSS_INSTANCE_ONE=1,
+   PRUICCSS_INSTANCE_TWO=2,
+   PRUICCSS_INSTANCE_THREE=3,
+   PRUICCSS_INSTANCE_MAX=4
+}PRUICSS_MaxInstances;
+#else
+/*!
+ *  @brief    PRUICSS Instance IDs
+ */
+typedef enum PRUICSS_MaxInstances_s
+{
+   PRUICCSS_INSTANCE_ONE=1,
+   PRUICCSS_INSTANCE_TWO=2,
+   PRUICCSS_INSTANCE_MAX=3
+}PRUICSS_MaxInstances;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _PRUICSS_SOC_H_ */
diff --git a/src/pruicss_drv.c b/src/pruicss_drv.c
index ceeba87..7a079b9 100644
--- a/src/pruicss_drv.c
+++ b/src/pruicss_drv.c
@@ -70,7 +70,7 @@ static uintptr_t pruicss_get_ctrl_addr (PRUICSS_HwAttrs const *hwAttrs,
 {
     uintptr_t baseaddr = 0;
 
-    if ((instance >= PRUICCSS_INSTANCE_ONE) && (instance <= PRUICCSS_INSTANCE_MAX))
+    if ((instance >= PRUICCSS_INSTANCE_ONE) && (instance < PRUICCSS_INSTANCE_MAX))
     {
         switch (pruNum) {
         case PRUICCSS_PRU0: baseaddr = hwAttrs->prussPru0CtrlRegBase;
@@ -476,11 +476,8 @@ int32_t PRUICSS_pruSendEvent(PRUICSS_Handle handle,uint32_t eventnum)
     object = (PRUICSS_V1_Object *)handle->object;
     hwAttrs = (PRUICSS_HwAttrs const *)handle->hwAttrs;
 
-    if(object->instance == PRUICCSS_INSTANCE_ONE) 
-    {
-        baseaddr = hwAttrs->prussIntcRegBase;
-    }
-    else if(object->instance == PRUICCSS_INSTANCE_TWO)
+    if ((object->instance >= PRUICCSS_INSTANCE_ONE) &&
+        (object->instance < PRUICCSS_INSTANCE_MAX))
     {
         baseaddr = hwAttrs->prussIntcRegBase;
     }
@@ -526,11 +523,8 @@ int32_t PRUICSS_pruClearEvent(PRUICSS_Handle handle,uint32_t eventnum)
     hwAttrs = (PRUICSS_HwAttrs const *)handle->hwAttrs;
     
     baseaddr = hwAttrs->baseAddr;
-    if(object->instance == PRUICCSS_INSTANCE_ONE) 
-    {
-        baseaddr = hwAttrs->prussIntcRegBase;
-    }
-    else if(object->instance == PRUICCSS_INSTANCE_TWO)
+    if ((object->instance >= PRUICCSS_INSTANCE_ONE) &&
+        (object->instance < PRUICCSS_INSTANCE_MAX))
     {
         baseaddr = hwAttrs->prussIntcRegBase;
     }
@@ -639,7 +633,9 @@ int32_t PRUICSS_mapPruMem(PRUICSS_Handle handle,uint32_t pru_ram_id, void **addr
     object = (PRUICSS_V1_Object *)handle->object;
     hwAttrs = (PRUICSS_HwAttrs const *)handle->hwAttrs;
 
-    if(object->instance == PRUICCSS_INSTANCE_ONE) {
+    if ((object->instance >= PRUICCSS_INSTANCE_ONE) &&
+        (object->instance < PRUICCSS_INSTANCE_MAX))
+    {
         switch (per_id)
         {
             case PRUICSS_CFG:
@@ -666,34 +662,6 @@ int32_t PRUICSS_mapPruMem(PRUICSS_Handle handle,uint32_t pru_ram_id, void **addr
                 break;
         }
     }
-    else if(object->instance == PRUICCSS_INSTANCE_TWO)
-    {
-        switch (per_id)
-         {
-            case PRUICSS_CFG:
-                *address = (void*)(hwAttrs->prussCfgRegBase);
-                break;
-            case PRUICSS_UART:
-               *address = (void*)(hwAttrs->prussUartRegBase);
-                break;
-            case PRUICSS_IEP:
-                *address = (void*)(hwAttrs->prussIepRegBase);
-                break;
-            case PRUICSS_ECAP:
-                *address = (void*)(hwAttrs->prussEcapRegBase);
-                break;
-            case PRUICSS_MII_RT:
-                *address = (void*)( hwAttrs->prussMiiRtCfgRegBase);
-                break;
-            case PRUICSS_MDIO:
-                *address = (void*)(hwAttrs->prussMiiMdioRegBase);
-                break;
-            default:
-                *address = 0;
-                ret_val = PRUICSS_RETURN_FAILURE;
-                break;
-        }
-    }
     else 
     {
          ret_val = PRUICSS_RETURN_FAILURE;
@@ -710,14 +678,12 @@ void PRUICSS_enableOCPMasterAccess(PRUICSS_Handle handle )
     object = (PRUICSS_V1_Object *)handle->object;
     hwAttrs = (PRUICSS_HwAttrs const *)handle->hwAttrs;
 
-    if(object->instance == PRUICCSS_INSTANCE_ONE)
-    {
-        baseaddr = hwAttrs->prussCfgRegBase;
-    }
-    if(object->instance == PRUICCSS_INSTANCE_TWO)
+    if ((object->instance >= PRUICCSS_INSTANCE_ONE) &&
+        (object->instance < PRUICCSS_INSTANCE_MAX))
     {
         baseaddr = hwAttrs->prussCfgRegBase;
     }
+
     HW_WR_FIELD32((baseaddr + CSL_ICSSCFG_SYSCFG),CSL_ICSSCFG_SYSCFG_STANDBY_INIT, 0);
 }
 
@@ -823,14 +789,12 @@ void PRUICSS_pinMuxConfig(PRUICSS_Handle handle, uint64_t regVal)
     object = (PRUICSS_V1_Object *)handle->object;
     hwAttrs = (PRUICSS_HwAttrs const *)handle->hwAttrs;
     
-    if(object->instance == PRUICCSS_INSTANCE_ONE)
-    {
-        baseaddr = hwAttrs->prussCfgRegBase;
-    }
-    if(object->instance == PRUICCSS_INSTANCE_TWO)
+    if ((object->instance >= PRUICCSS_INSTANCE_ONE) &&
+        (object->instance < PRUICCSS_INSTANCE_MAX))
     {
         baseaddr = hwAttrs->prussCfgRegBase;
     }
+
     HW_WR_FIELD32((baseaddr + CSL_ICSSCFG_PIN_MX),CSL_ICSSCFG_PIN_MX_PIN_MUX_SEL, regVal);
 }
 
diff --git a/src/pruicss_intc.c b/src/pruicss_intc.c
index d681dd4..cc43410 100644
--- a/src/pruicss_intc.c
+++ b/src/pruicss_intc.c
@@ -137,11 +137,8 @@ int32_t PRUICSS_pruIntcInit(PRUICSS_Handle handle, const PRUICSS_IntcInitData *
     hwAttrs = (PRUICSS_HwAttrs const *)handle->hwAttrs;
     baseaddr = hwAttrs->baseAddr;
 
-    if(object->instance == PRUICCSS_INSTANCE_ONE) 
-    {
-        baseaddr = hwAttrs->prussIntcRegBase;
-    }
-    else if(object->instance == PRUICCSS_INSTANCE_TWO ) 
+    if ((object->instance >= PRUICCSS_INSTANCE_ONE) &&
+        (object->instance < PRUICCSS_INSTANCE_MAX))
     {
         baseaddr = hwAttrs->prussIntcRegBase;
     }
@@ -508,7 +505,8 @@ int32_t PRUICSS_pruIntcClear(PRUICSS_Handle handle)
         hwAttrs = (PRUICSS_HwAttrs const *)handle->hwAttrs;
 
         /* verify the instance */
-        if ((object->instance == PRUICCSS_INSTANCE_ONE) || (object->instance == PRUICCSS_INSTANCE_TWO))
+        if ((object->instance >= PRUICCSS_INSTANCE_ONE) &&
+            (object->instance < PRUICCSS_INSTANCE_MAX))
         {
             baseaddr = hwAttrs->prussIntcRegBase;
         }