PRSDK-5093: Using board APIs to read headers,interrupt router updates for gpio

3 files changed, 92 insertions, 181 deletions

diff --git a/am65xx/evmAM65xx/A53/template_app/app.c b/am65xx/evmAM65xx/A53/template_app/app.c
index 146e587..209b026 100644
--- a/am65xx/evmAM65xx/A53/template_app/app.c
+++ b/am65xx/evmAM65xx/A53/template_app/app.c
@@ -232,76 +232,34 @@ void spi_test_task(UArg arg0, UArg arg1)
  */
 void i2c_eeprom_read_and_display_task(UArg arg0, UArg arg1)
 {
-    I2C_Params i2cParams;
-    I2C_Handle handle = NULL;
-    I2C_Transaction i2cTransaction;
-    bool status;
-    char txBuf[2] = {0x00, 0x00};
-    char boardName[20];
-    char boardVersion[20];
-    unsigned int *uintPtr, i;
-
-    appPrint("\n i2c_eeprom_read_and_display task started");
-
-    /* Initialize parameters */
-    I2C_Params_init(&i2cParams);
-
-    /* BitRate : 400 Kbps */
-    i2cParams.bitRate = I2C_400kHz;
-
-    /* Open I2C instance */
-    handle = I2C_open(BOARD_I2C_EEPROM_INSTANCE, &i2cParams);
-
-    /* Configure common parameters with I2C transaction */
-    i2cTransaction.slaveAddress = BOARD_I2C_EEPROM_ADDR;
-    i2cTransaction.writeBuf = (uint8_t *)&txBuf[0];
-    i2cTransaction.writeCount = 2;
-
-     /* Get board name */
-     txBuf[0] = (char)(((uint32_t) 0xFF00 & BOARD_EEPROM_BOARD_NAME_ADDR)>>8);
-     txBuf[1] = (char)((uint32_t) 0xFF & BOARD_EEPROM_BOARD_NAME_ADDR);
-     i2cTransaction.readBuf = boardName;
-     i2cTransaction.readCount = BOARD_EEPROM_BOARD_NAME_LENGTH;
-     status = I2C_transfer(handle, &i2cTransaction);
-     if (status == false)
-     {
-         I2C_close(handle);
-         appPrint("\n ERROR: I2C_transfer failed");
-         goto I2C_TEST_EXIT;
-     }
-     ///boardName[BOARD_EEPROM_BOARD_NAME_LENGTH] = '\0';
-     ///appPrint("\n Board Name read: %s", boardName);
-     appPrint("\n Board Name read:");
-     for (i=0; i<BOARD_EEPROM_BOARD_NAME_LENGTH/4; i++)
-     {
-         uintPtr = (unsigned int *)&boardName[i*4];
-         appPrint("\n Hex: 0x%x", *uintPtr);
-     }
+
+    Board_IDInfo_v2 info = {0};
+    Board_STATUS status;
+
+    status = Board_getIDInfo_v2(&info, BOARD_I2C_EEPROM_ADDR);
+
+    if(status != BOARD_SOK)
+    {
+
+        if(status==BOARD_INVALID_PARAM)
+        {
+          appPrint("\n Board info is not supported!");
+          goto i2c_eeprom_read_and_display_task_exit;
+        }
+        else
+        {
+          appPrint("\n Board info read failed!!");
+          goto i2c_eeprom_read_and_display_task_exit;
+        }
+    }
+
+
+    appPrint("\n Board Name read: %s\n",info.boardInfo.boardName);
      /* Get board version */
-     txBuf[0] = (char)(((uint32_t) 0xFF00 & BOARD_EEPROM_VERSION_ADDR)>>8);
-     txBuf[1] = (char)((uint32_t) 0xFF & BOARD_EEPROM_VERSION_ADDR);
-     i2cTransaction.readBuf = boardVersion;
-     i2cTransaction.readCount = BOARD_EEPROM_VERSION_LENGTH;
-     status = I2C_transfer(handle, &i2cTransaction);
-     if (status == false)
-     {
-         I2C_close(handle);
-         appPrint("\n ERROR: I2C_transfer failed");
-         goto I2C_TEST_EXIT;
-     }
-     ///boardVersion[BOARD_EEPROM_VERSION_LENGTH] = '\0';
-     ///appPrint("\n Board version read: %s", boardVersion);
-     appPrint("\n Board version read:");
-     for (i=0; i<BOARD_EEPROM_VERSION_LENGTH/4; i++)
-     {
-         uintPtr = (unsigned int *)&boardVersion[i*4];
-         appPrint("\n Hex: 0x%x", *uintPtr);
-     }
+    appPrint("\n Board version read: %s\n",info.boardInfo.designRev);
 
     Task_sleep(10);
-
-I2C_TEST_EXIT:
-    appPrint("\n i2c_eeprom_read_and_display task ended");
+i2c_eeprom_read_and_display_task_exit:
     Task_exit();
 }
 
diff --git a/am65xx/evmAM65xx/A53/template_app/main.c b/am65xx/evmAM65xx/A53/template_app/main.c
index d253696..d8225ea 100644
--- a/am65xx/evmAM65xx/A53/template_app/main.c
+++ b/am65xx/evmAM65xx/A53/template_app/main.c
@@ -148,10 +148,6 @@ void peripheralInit(void) {
     ///UART_init();
     ///appPrint("\n Uart Init complete");
 
-    /* I2C initialization */
-    I2C_init();
-    appPrint("\n I2C Init complete");
-
     /* GPIO initialization */
     GPIO_init();
     appPrint("\n Gpio Init complete");
@@ -173,116 +169,58 @@ void peripheralInit(void) {
 #define CSL_MAIN2MCU_INTRTR_PLS_GPIOMUX_INT31_DFLT_PLS (0x0000001F)
 void GPIO_configIntRouter(uint32_t portNum, uint32_t pinNum, uint32_t gpioIntRtrOutIntNum, GPIO_v0_HwAttrs *cfg)
 {
-    GPIO_IntCfg       *intCfg;
-    CSL_IntrRouterCfg  intrRouterCfg;
-    uint32_t           gpioIntRtrInIntNum;
-    uint32_t           bankNum;
-    uint32_t           i;
-    intCfg = cfg->intCfg;
-
-#if defined (am65xx_evm)
-    /* no main domain GPIO pins directly connected to LEDs on GP EVM,
-       use WKUP domain GPIO pins which connected to LEDs on base board */
-    cfg->baseAddr = CSL_WKUP_GPIO0_BASE;
-
-    /* Initialize WKUP GPIO Interrupt Router conifg structure */
-    intrRouterCfg.pIntrRouterRegs = (CSL_intr_router_cfgRegs *)(uintptr_t)(CSL_WKUP_GPIOMUX_INTRTR0_CFG_BASE);
-    intrRouterCfg.pIntdRegs       = (CSL_intr_router_intd_cfgRegs *)(uintptr_t)NULL;
-    intrRouterCfg.numInputIntrs   = 64;
-    intrRouterCfg.numOutputIntrs  = 16;
-    for (i = 0; i < intrRouterCfg.numOutputIntrs; i++)
-        CSL_intrRouterCfgMux(&intrRouterCfg, intrRouterCfg.numInputIntrs - 1, i);
-
-    bankNum = pinNum/16; /* Each GPIO bank has 16 pins */
-
-    /* WKUP GPIO int router input interrupt is the GPIO bank interrupt */
-    gpioIntRtrInIntNum = WKUP_GPIO_INTRTR_GPIO0_BANK0_INT + bankNum;
-#if defined (__aarch64__)
-    intCfg[pinNum].intNum = CSL_GIC0_INTR_WKUP_GPIOMUX_INTRTR0_BUS_OUTP_0 + bankNum;
-#else
-    intCfg[pinNum].intNum = CSL_MCU0_INTR_GPIOMUX_INTR0_OUTP_0 + bankNum;
-#endif
-    intCfg[pinNum].eventId = 0;
-    intCfg[pinNum].intcMuxNum = INVALID_INTC_MUX_NUM;
-    intCfg[pinNum].intcMuxInEvent = 0;
-    intCfg[pinNum].intcMuxOutEvent = 0;
-
-    /* Setup interrupt router configuration for gpio port/pin */
-#if defined (__aarch64__)
-    gpioIntRtrOutIntNum = intCfg[pinNum].intNum - CSL_GIC0_INTR_WKUP_GPIOMUX_INTRTR0_BUS_OUTP_0;
-
-    /* Route WKUP GPIO pin interrupt to main GIC */
-    CSL_intrRouterCfgMux(&intrRouterCfg, gpioIntRtrInIntNum, gpioIntRtrOutIntNum);
-#else
-    gpioIntRtrOutIntNum = intCfg[pinNum].intNum - CSL_MCU0_INTR_GPIOMUX_INTR0_OUTP_0;
-
-    /* Route WKUP GPIO pin interrupt to mcu VIM */
-    CSL_intrRouterCfgMux(&intrRouterCfg, gpioIntRtrInIntNum, gpioIntRtrOutIntNum);
-#endif
-
-#else /* defined (am65xx_evm) */
-    /* Use main domain GPIO pins directly connected to IDK EVM */
-
-    /* Initialize Main GPIO Interrupt Router conifg structure */
-    intrRouterCfg.pIntrRouterRegs = (CSL_intr_router_cfgRegs *)(uintptr_t)(CSL_GPIOMUX_INTRTR0_INTR_ROUTER_CFG_BASE);
-    intrRouterCfg.pIntdRegs       = (CSL_intr_router_intd_cfgRegs *)(uintptr_t)NULL;
-    intrRouterCfg.numInputIntrs   = 208;
-    intrRouterCfg.numOutputIntrs  = 32;
-    for (i = 0; i < intrRouterCfg.numOutputIntrs; i++)
-        CSL_intrRouterCfgMux(&intrRouterCfg, intrRouterCfg.numInputIntrs - 1, i);
-
-    bankNum = pinNum/16; /* Each GPIO bank has 16 pins */
-    if (portNum == 0)
-    {
-        /* MAIN GPIO int router input interrupt is the GPIO bank interrupt */
-        gpioIntRtrInIntNum = MAIN_GPIO_INTRTR_GPIO0_BANK0_INT + bankNum;
-#if defined (__aarch64__)
-        intCfg[pinNum].intNum = CSL_GIC0_INTR_MAIN_GPIOMUX_INTROUTER_MAIN_GPIOMUX_INTROUTER_MAIN_0_BUS_OUTP_0 + bankNum;
-#else
-        intCfg[pinNum].intNum = CSL_MCU0_INTR_MAIN2MCU_PULSE_INTR0_OUTP_0 + bankNum;
-#endif
-    }
-    else
-    {
-        gpioIntRtrInIntNum = MAIN_GPIO_INTRTR_GPIO1_BANK0_INT + bankNum;
-#if defined (__aarch64__)
-        intCfg[pinNum].intNum = CSL_GIC0_INTR_MAIN_GPIOMUX_INTROUTER_MAIN_GPIOMUX_INTROUTER_MAIN_0_BUS_OUTP_6 + bankNum;
-#else
-        intCfg[pinNum].intNum = CSL_MCU0_INTR_MAIN2MCU_PULSE_INTR0_OUTP_6 + bankNum;
-#endif
-    }
-    intCfg[pinNum].eventId = 0;
-    intCfg[pinNum].intcMuxNum = INVALID_INTC_MUX_NUM;
-    intCfg[pinNum].intcMuxInEvent = 0;
-    intCfg[pinNum].intcMuxOutEvent = 0;
-
-    /* Setup interrupt router configuration for gpio port/pin */
-#if defined (__aarch64__)
-    /* gpioIntRtrOutIntNum parameter (main gpio int router output int number) is not used in A53 code,
-     * it is derived from the GIC500  interrupt number configured in HwAttr in GPIO_soc.c */
-    gpioIntRtrOutIntNum = intCfg[pinNum].intNum - CSL_GIC0_INTR_MAIN_GPIOMUX_INTROUTER_MAIN_GPIOMUX_INTROUTER_MAIN_0_BUS_OUTP_0;
-
-    /* Route GPIO pin interrupt to main GIC */
-    CSL_intrRouterCfgMux(&intrRouterCfg, gpioIntRtrInIntNum, gpioIntRtrOutIntNum);
-#else
-    /* Route GPIO pin interrupt to MAIN2MCU_INTRTR */
-    CSL_intrRouterCfgMux(&intrRouterCfg, gpioIntRtrInIntNum, gpioIntRtrOutIntNum);
-
-    /* Initialize Main to MCU Interrupt Router conifg structure */
-    intrRouterCfg.pIntrRouterRegs = (CSL_intr_router_cfgRegs *)(uintptr_t)(CSL_MAIN2MCU_PLS_INTRTR0_CFG_BASE);
-    intrRouterCfg.pIntdRegs       = (CSL_intr_router_intd_cfgRegs *)(uintptr_t)NULL;
-    intrRouterCfg.numInputIntrs   = 32;
-    intrRouterCfg.numOutputIntrs  = 48;
-    for (i = 0; i < intrRouterCfg.numOutputIntrs; i++)
-        CSL_intrRouterCfgMux(&intrRouterCfg, intrRouterCfg.numInputIntrs - 1, i);
-
-    /* Route GPIO int router output to MAIN2MCU int router output, MAIN2MCU int router output int number
-     * is derived from the MCU GIC interrupt number configured in HwAttr in GPIO_soc.*/
-    gpioIntRtrInIntNum = gpioIntRtrOutIntNum;
-    gpioIntRtrOutIntNum = intCfg[pinNum].intNum - CSL_MCU0_INTR_MAIN2MCU_PULSE_INTR0_OUTP_0;
-    CSL_intrRouterCfgMux(&intrRouterCfg, gpioIntRtrInIntNum, gpioIntRtrOutIntNum);
-#endif
-#endif /* defined (am65xx_evm) */
+        GPIO_IntCfg       *intCfg;
+        uint32_t           bankNum;
+
+        intCfg = cfg->intCfg;
+
+    #if defined (am65xx_evm) || defined (am65xx_idk)
+
+        /* no main domain GPIO pins directly connected to LEDs on GP EVM,
+           use WKUP domain GPIO pins which connected to LEDs on base board */
+        cfg->baseAddr = CSL_WKUP_GPIO0_BASE;
+
+        bankNum = pinNum/16; /* Each GPIO bank has 16 pins */
+
+        /* WKUP GPIO int router input interrupt is the GPIO bank interrupt */
+    #if defined (__aarch64__)
+        intCfg[pinNum].intNum = CSL_GIC0_INTR_WKUP_GPIOMUX_INTRTR0_BUS_OUTP_0 + bankNum;
+    #else
+        intCfg[pinNum].intNum = CSL_MCU0_INTR_GPIOMUX_INTR0_OUTP_0 + bankNum;
+    #endif
+        intCfg[pinNum].eventId = 0;
+        intCfg[pinNum].intcMuxNum = INVALID_INTC_MUX_NUM;
+        intCfg[pinNum].intcMuxInEvent = 0;
+        intCfg[pinNum].intcMuxOutEvent = 0;
+
+        /* Setup interrupt router configuration for gpio port/pin */
+    #else /* defined (am65xx_evm) */
+        /* Use main domain GPIO pins directly connected to IDK EVM */
+
+        bankNum = pinNum/16; /* Each GPIO bank has 16 pins */
+        if (portNum == 0)
+        {
+            /* MAIN GPIO int router input interrupt is the GPIO bank interrupt */
+    #if defined (__aarch64__)
+            intCfg[pinNum].intNum = CSL_GIC0_INTR_MAIN_GPIOMUX_INTROUTER_MAIN_GPIOMUX_INTROUTER_MAIN_0_BUS_OUTP_0 + bankNum;
+    #else
+            intCfg[pinNum].intNum = CSL_MCU0_INTR_MAIN2MCU_PULSE_INTR0_OUTP_0 + bankNum;
+    #endif
+        }
+        else
+        {
+    #if defined (__aarch64__)
+            intCfg[pinNum].intNum = CSL_GIC0_INTR_MAIN_GPIOMUX_INTROUTER_MAIN_GPIOMUX_INTROUTER_MAIN_0_BUS_OUTP_6 + bankNum;
+    #else
+            intCfg[pinNum].intNum = CSL_MCU0_INTR_MAIN2MCU_PULSE_INTR0_OUTP_6 + bankNum;
+    #endif
+        }
+        intCfg[pinNum].eventId = 0;
+        intCfg[pinNum].intcMuxNum = INVALID_INTC_MUX_NUM;
+        intCfg[pinNum].intcMuxInEvent = 0;
+        intCfg[pinNum].intcMuxOutEvent = 0;
+
+    #endif /* defined (am65xx_evm) */
 }
 
 void Board_initGPIO(void)
@@ -379,6 +317,13 @@ Void InitMmu()
     }
 
     mapIdx++;
+    retVal = Mmu_map(0x030000000, 0x030000000, 0x10000000, &attrs); /* NAVSS used by sciclient  */
+    if(retVal == FALSE)
+    {
+        goto mmu_exit;
+    }
+
+    mapIdx++;
     retVal = Mmu_map(0x00600000, 0x00600000, 0x00002000, &attrs); /* GPIO           */
     if(retVal == FALSE)
     {
diff --git a/am65xx/evmAM65xx/A53/template_app/main.cfg b/am65xx/evmAM65xx/A53/template_app/main.cfg
index d946707..29eb16e 100644
--- a/am65xx/evmAM65xx/A53/template_app/main.cfg
+++ b/am65xx/evmAM65xx/A53/template_app/main.cfg
@@ -174,6 +174,14 @@ I2c.Settings.socType = socType;
 var Uart              = xdc.loadPackage('ti.drv.uart');
 Uart.Settings.socType = socType;
 
+
+var Sciclient = xdc.loadPackage('ti.drv.sciclient');
+Sciclient.Settings.socType = socType;
+
+var Board = xdc.loadPackage('ti.board');
+Board.Settings.boardName = "am65xx_evm";
+
+
 /* Load the gpio package */
 var Gpio = xdc.loadPackage('ti.drv.gpio');
 Gpio.Settings.socType = socType;