PRSDK-7885: Board: Removed unused RMII pinmux for J721E EVM QSMII mode

 - RMII mode is not used when CPSW is configured for QSGMII operation, so removed the
   RMII pinmux configuration.

 - Code optimization/cleanup for Ethernet PHY reset functions

Signed-off-by: M V Pratap Reddy <x0257344@ti.com>

diff --git a/packages/ti/board/src/j721e_evm/J721E_pinmux_data_gesi_cpsw9g.c b/packages/ti/board/src/j721e_evm/J721E_pinmux_data_gesi_cpsw9g.c
index d90a22315e85eb4f1c504ac87be489e1e6fb8c5b..4745d2b8d4e4d010ac0d453b83bdecd342db9b5d 100755 (executable)
--- a/packages/ti/board/src/j721e_evm/J721E_pinmux_data_gesi_cpsw9g.c
+++ b/packages/ti/board/src/j721e_evm/J721E_pinmux_data_gesi_cpsw9g.c
@@ -584,7 +584,6 @@ pinmuxBoardCfg_t gJ721E_MainPinmuxDataGesiCpsw9gQsgmii[] =
     {1, gGpioPinCfg},\r
     {2, gMdioPinCfg},\r
     {3, gQsgmiiPinCfg},\r
-    {4, gRmiiPinCfg},\r
     {PINMUX_END}\r
 };\r
 pinmuxBoardCfg_t gJ721E_WkupPinmuxDataGesiCpsw9g[] =\r

diff --git a/packages/ti/board/src/j721e_evm/board_ethernet_config.c b/packages/ti/board/src/j721e_evm/board_ethernet_config.c
index 2be6a7ca497562d7d8500fd43d70cf49e1329396..2ffebce8f47261faf8b11a3b38f256a5702dbbc5 100755 (executable)
--- a/packages/ti/board/src/j721e_evm/board_ethernet_config.c
+++ b/packages/ti/board/src/j721e_evm/board_ethernet_config.c
@@ -237,35 +237,27 @@ Board_STATUS Board_cpsw9gEnetExpPhyReset(bool enableFlag)
     Board_IoExpCfg_t ioExpCfg;\r
     Board_STATUS status = BOARD_SOK;\r
 \r
+    ioExpCfg.i2cInst     = BOARD_I2C_IOEXP_DEVICE2_INSTANCE;\r
+    ioExpCfg.socDomain   = BOARD_SOC_DOMAIN_MAIN;\r
+    ioExpCfg.slaveAddr   = BOARD_I2C_IOEXP_DEVICE2_ADDR;\r
+    ioExpCfg.enableIntr  = false;\r
+    ioExpCfg.ioExpType   = THREE_PORT_IOEXP;\r
+    ioExpCfg.portNum     = PORTNUM_2;\r
+    ioExpCfg.pinNum      = PIN_NUM_1;\r
+\r
     if (1U == enableFlag)\r
     {\r
         /* EXP_ENET_RSTz - set to 0 for PHY reset */\r
-        ioExpCfg.i2cInst     = BOARD_I2C_IOEXP_DEVICE2_INSTANCE;\r
-        ioExpCfg.socDomain   = BOARD_SOC_DOMAIN_MAIN;\r
-        ioExpCfg.slaveAddr   = BOARD_I2C_IOEXP_DEVICE2_ADDR;\r
-        ioExpCfg.enableIntr  = false;\r
-        ioExpCfg.ioExpType   = THREE_PORT_IOEXP;\r
-        ioExpCfg.portNum     = PORTNUM_2;\r
-        ioExpCfg.pinNum      = PIN_NUM_1;\r
         ioExpCfg.signalLevel = GPIO_SIGNAL_LEVEL_LOW;\r
-\r
-        status = Board_control(BOARD_CTRL_CMD_SET_IO_EXP_PIN_OUT, &ioExpCfg);\r
     }\r
     else\r
     {\r
         /* EXP_ENET_RSTz - set to 1 to take PHY out of reset (normal operation)*/\r
-        ioExpCfg.i2cInst     = BOARD_I2C_IOEXP_DEVICE2_INSTANCE;\r
-        ioExpCfg.socDomain   = BOARD_SOC_DOMAIN_MAIN;\r
-        ioExpCfg.slaveAddr   = BOARD_I2C_IOEXP_DEVICE2_ADDR;\r
-        ioExpCfg.enableIntr  = false;\r
-        ioExpCfg.ioExpType   = THREE_PORT_IOEXP;\r
-        ioExpCfg.portNum     = PORTNUM_2;\r
-        ioExpCfg.pinNum      = PIN_NUM_1;\r
         ioExpCfg.signalLevel = GPIO_SIGNAL_LEVEL_HIGH;\r
-\r
-        status = Board_control(BOARD_CTRL_CMD_SET_IO_EXP_PIN_OUT, &ioExpCfg);\r
     }\r
 \r
+    status = Board_control(BOARD_CTRL_CMD_SET_IO_EXP_PIN_OUT, &ioExpCfg);\r
+\r
     return status;\r
 }\r
 \r
@@ -281,34 +273,26 @@ Board_STATUS Board_cpsw9gEnetExpComaModeCfg(bool enableFlag)
 \r
     if (Board_detectBoard(BOARD_ID_ENET) == TRUE)\r
     {\r
+        ioExpCfg.i2cInst     = BOARD_I2C_IOEXP_DEVICE2_INSTANCE;\r
+        ioExpCfg.socDomain   = BOARD_SOC_DOMAIN_MAIN;\r
+        ioExpCfg.slaveAddr   = BOARD_I2C_IOEXP_DEVICE2_ADDR;\r
+        ioExpCfg.enableIntr  = false;\r
+        ioExpCfg.ioExpType   = THREE_PORT_IOEXP;\r
+        ioExpCfg.portNum     = PORTNUM_2;\r
+        ioExpCfg.pinNum      = PIN_NUM_0;\r
+\r
         if (1U == enableFlag)\r
         {\r
             /* ENET_EXP_PWRDN - set to 1 for device power down */\r
-            ioExpCfg.i2cInst     = BOARD_I2C_IOEXP_DEVICE2_INSTANCE;\r
-            ioExpCfg.socDomain   = BOARD_SOC_DOMAIN_MAIN;\r
-            ioExpCfg.slaveAddr   = BOARD_I2C_IOEXP_DEVICE2_ADDR;\r
-            ioExpCfg.enableIntr  = false;\r
-            ioExpCfg.ioExpType   = THREE_PORT_IOEXP;\r
-            ioExpCfg.portNum     = PORTNUM_2;\r
-            ioExpCfg.pinNum      = PIN_NUM_0;\r
             ioExpCfg.signalLevel = GPIO_SIGNAL_LEVEL_HIGH;\r
-\r
-            status = Board_control(BOARD_CTRL_CMD_SET_IO_EXP_PIN_OUT, &ioExpCfg);\r
         }\r
         else\r
         {\r
             /* ENET_EXP_PWRDN - set to 0 for normal operation */\r
-            ioExpCfg.i2cInst     = BOARD_I2C_IOEXP_DEVICE2_INSTANCE;\r
-            ioExpCfg.socDomain   = BOARD_SOC_DOMAIN_MAIN;\r
-            ioExpCfg.slaveAddr   = BOARD_I2C_IOEXP_DEVICE2_ADDR;\r
-            ioExpCfg.enableIntr  = false;\r
-            ioExpCfg.ioExpType   = THREE_PORT_IOEXP;\r
-            ioExpCfg.portNum     = PORTNUM_2;\r
-            ioExpCfg.pinNum      = PIN_NUM_0;\r
             ioExpCfg.signalLevel = GPIO_SIGNAL_LEVEL_LOW;\r
-\r
-            status = Board_control(BOARD_CTRL_CMD_SET_IO_EXP_PIN_OUT, &ioExpCfg);\r
         }\r
+\r
+        status = Board_control(BOARD_CTRL_CMD_SET_IO_EXP_PIN_OUT, &ioExpCfg);\r
     }\r
 \r
     return status;\r