s32: s32z: patch rtd 2.0.0 to work with zephyr

Remove 'u' suffix from macros so that they can be used
with LISTIFY.

Netc shim driver uses 'Netc_Eth_Ip_MSIX_Rx' function. Need
to remove 'static inline' keywords from this function so
that it can be used as an extern function outside of the
file declaration.

Set the number of UART LINFlexD instances configured that
bases on the number of devicetree UART nodes enabled.

Set the number of SPI instances configured that bases on
the number of devicetree SPI nodes enabled.

Enable SPI slave support bases on CONFIG_SPI_SLAVE.

Wrap the defined macros of each MRU instance base on
devicetree MRU node so that it is built when node enabled.

Signed-off-by: Ha Duong Quang <[email protected]>

Author: haduongquang

s32/drivers/s32ze/BaseNXP/header/S32Z2_CANXL_SIC.h

@@ -91,7 +91,7 @@ typedef struct {
 } CANXL_SIC_Type, *CANXL_SIC_MemMapPtr;
 
 /** Number of instances of the CANXL_SIC module. */
-#define CANXL_SIC_INSTANCE_COUNT                 (2u)
+#define CANXL_SIC_INSTANCE_COUNT                 (2)
 
 /* CANXL_SIC - Peripheral instance base addresses */
 /** Peripheral CANXL_0__SIC base address */

s32/drivers/s32ze/BaseNXP/header/S32Z2_LINFLEXD.h

@@ -95,7 +95,7 @@ typedef struct {
 } LINFLEXD_Type, *LINFLEXD_MemMapPtr;
 
 /** Number of instances of the LINFLEXD module. */
-#define LINFLEXD_INSTANCE_COUNT                  (13u)
+#define LINFLEXD_INSTANCE_COUNT                  (13)
 
 /* LINFLEXD - Peripheral instance base addresses */
 /** Peripheral LINFLEX_0 base address */

s32/drivers/s32ze/BaseNXP/header/S32Z2_NETC_F1.h

@@ -88,7 +88,7 @@ typedef struct {
 } NETC_F1_Type, *NETC_F1_MemMapPtr;
 
 /** Number of instances of the NETC_F1 module. */
-#define NETC_F1_INSTANCE_COUNT                   (1u)
+#define NETC_F1_INSTANCE_COUNT                   (1)
 
 /* NETC_F1 - Peripheral instance base addresses */
 /** Peripheral NETC__EMDIO_BASE base address */

s32/drivers/s32ze/BaseNXP/header/S32Z2_RTU_MRU.h

@@ -135,7 +135,7 @@ typedef struct {
 } RTU_MRU_Type, *RTU_MRU_MemMapPtr;
 
 /** Number of instances of the RTU_MRU module. */
-#define RTU_MRU_INSTANCE_COUNT                   (8u)
+#define RTU_MRU_INSTANCE_COUNT                   (8)
 
 /* RTU_MRU - Peripheral instance base addresses */
 /** Peripheral RTU0__MRU_0 base address */

s32/drivers/s32ze/BaseNXP/header/S32Z2_SPI.h

@@ -106,7 +106,7 @@ typedef struct {
 } SPI_Type, *SPI_MemMapPtr;
 
 /** Number of instances of the SPI module. */
-#define SPI_INSTANCE_COUNT                       (10u)
+#define SPI_INSTANCE_COUNT                       (10)
 
 /* SPI - Peripheral instance base addresses */
 /** Peripheral SPI_0 base address */

s32/drivers/s32ze/EthSwt_NETC/include/Netc_EthSwt_Ip_Types.h

@@ -93,7 +93,7 @@ extern "C"{
 ==================================================================================================*/
 
 #define NETC_ETHSWT_IP_NUMBER_OF_PSEUDO_PORT (1U)  /*!< number of pseudoport */
-#define NETC_ETHSWT_IP_NUMBER_OF_PORTS       (3U)  /*!< number of ports */
+#define NETC_ETHSWT_IP_NUMBER_OF_PORTS       3  /*!< number of ports */
 #define NETC_ETHSWT_IP_NUMBER_OF_MAC_PORTS   (2U)  /*!< number of mac ports*/
 #define NETC_ETHSWT_IP_NUMBER_OF_VID_PER_PORT (255U)   /*!< 3 number of vid per port */
 

s32/drivers/s32ze/Eth_NETC/src/Netc_Eth_Ip_Irq.c

@@ -114,7 +114,7 @@ static inline void Netc_Eth_Ip_MSIX_Tx_CheckAllRings(const uint32 TxRingIntStatu
  *
  * @param CtrlIndex
  */
-static inline void Netc_Eth_Ip_MSIX_Rx(uint8 CtrlIndex);
+void Netc_Eth_Ip_MSIX_Rx(uint8 CtrlIndex);
 
 /**
  * @brief Local function used to process PSI Message Receive event
@@ -227,7 +227,7 @@ static inline void Netc_Eth_Ip_MSIX_Tx(uint8 CtrlIndex)
 /***************************************************************************
  * implements     Netc_Eth_Ip_MSIX_Rx_Activity
  ***************************************************************************/
-static inline void Netc_Eth_Ip_MSIX_Rx(uint8 CtrlIndex)
+void Netc_Eth_Ip_MSIX_Rx(uint8 CtrlIndex)
 {
     uint8  RingIndex;
     uint32 interruptStatus = netcSIsBase[CtrlIndex]->SIRXIDR0;

s32/soc/s32z270/include/Linflexd_Uart_Ip_Defines.h

@@ -25,6 +25,7 @@ extern "C"{
 * 3) internal and external interfaces from this unit
 * 4) user callback header files
 ==================================================================================================*/
+#include <zephyr/devicetree.h>
 #include "S32Z2_LINFLEXD.h"
 #include "Mcal.h"
 /*==================================================================================================
@@ -65,7 +66,7 @@ extern "C"{
 #define LINFLEXD_UART_IP_DEV_ERROR_DETECT       (STD_OFF)
 
 /* @brief Total number of channels configured */
-#define LINFLEXD_UART_IP_NUMBER_OF_INSTANCES    (2U)
+#define LINFLEXD_UART_IP_NUMBER_OF_INSTANCES    (DT_NUM_INST_STATUS_OKAY(nxp_s32_linflexd))
 
 /* @brief Uart Osif source counter. This parameter is used to select between different OsIf counter implementation */
 #define LINFLEXD_UART_IP_TIMEOUT_TYPE           (OSIF_COUNTER_DUMMY)

s32/soc/s32z270/include/Mru_Ip_Cfg.h

@@ -30,6 +30,7 @@ extern "C"{
 * 3) internal and external interfaces from this unit
 * 4) user callback header files
 ==================================================================================================*/
+#include <zephyr/devicetree.h>
 #include "Mcal.h"
 #include "OsIf.h"
 #include "Mru_Ip_CfgDefines.h"
@@ -88,23 +89,10 @@ extern "C"{
  *                                     DEFINES AND MACROS
 ==================================================================================================*/
 
-#define MRU_IP_CONFIG_EXT  \
-    extern const Mru_Ip_ConfigType Mru_Ip_HWUnitConfig_RTU0_MRU0; \
-    extern const Mru_Ip_ConfigType Mru_Ip_HWUnitConfig_RTU0_MRU1; \
-    extern const Mru_Ip_ConfigType Mru_Ip_HWUnitConfig_RTU0_MRU2; \
-    extern const Mru_Ip_ConfigType Mru_Ip_HWUnitConfig_RTU0_MRU3; \
-    extern const Mru_Ip_ConfigType Mru_Ip_HWUnitConfig_RTU1_MRU4; \
-    extern const Mru_Ip_ConfigType Mru_Ip_HWUnitConfig_RTU1_MRU5; \
-    extern const Mru_Ip_ConfigType Mru_Ip_HWUnitConfig_RTU1_MRU6; \
-    extern const Mru_Ip_ConfigType Mru_Ip_HWUnitConfig_RTU1_MRU7; \
-    extern const Mru_Ip_ReceiveChannelType Mru_Ip_ReceiveChCfg_PlatformMruReceivingChannel_0; \
-    extern const Mru_Ip_ReceiveChannelType Mru_Ip_ReceiveChCfg_PlatformMruReceivingChannel_1; \
-    extern const Mru_Ip_ReceiveChannelType Mru_Ip_ReceiveChCfg_PlatformMruReceivingChannel_2; \
-    extern const Mru_Ip_ReceiveChannelType Mru_Ip_ReceiveChCfg_PlatformMruReceivingChannel_3; \
-    extern const Mru_Ip_ReceiveChannelType Mru_Ip_ReceiveChCfg_PlatformMruReceivingChannel_4; \
-    extern const Mru_Ip_ReceiveChannelType Mru_Ip_ReceiveChCfg_PlatformMruReceivingChannel_5; \
-    extern const Mru_Ip_ReceiveChannelType Mru_Ip_ReceiveChCfg_PlatformMruReceivingChannel_6; \
-    extern const Mru_Ip_ReceiveChannelType Mru_Ip_ReceiveChCfg_PlatformMruReceivingChannel_7;
+/* Not used by Zephyr integration but required to build the drivers */
+#define MRU_IP_CONFIG_EXT
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(mru0), okay)
 /**
 * @brief RTU0_MRU0 is enabled and used.
 */
@@ -117,6 +105,8 @@ extern "C"{
 * @brief Instance ID for RTU0_MRU0.
 */
 #define MRU_IP_RTU0_MRU0_ID                (0U)
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(mru1), okay)
 /**
 * @brief RTU0_MRU1 is enabled and used.
 */
@@ -129,6 +119,8 @@ extern "C"{
 * @brief Instance ID for RTU0_MRU1.
 */
 #define MRU_IP_RTU0_MRU1_ID                (1U)
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(mru2), okay)
 /**
 * @brief RTU0_MRU2 is enabled and used.
 */
@@ -141,6 +133,8 @@ extern "C"{
 * @brief Instance ID for RTU0_MRU2.
 */
 #define MRU_IP_RTU0_MRU2_ID                (2U)
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(mru3), okay)
 /**
 * @brief RTU0_MRU3 is enabled and used.
 */
@@ -153,6 +147,8 @@ extern "C"{
 * @brief Instance ID for RTU0_MRU3.
 */
 #define MRU_IP_RTU0_MRU3_ID                (3U)
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(mru4), okay)
 /**
 * @brief RTU1_MRU4 is enabled and used.
 */
@@ -165,6 +161,8 @@ extern "C"{
 * @brief Instance ID for RTU1_MRU4.
 */
 #define MRU_IP_RTU1_MRU4_ID                (4U)
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(mru5), okay)
 /**
 * @brief RTU1_MRU5 is enabled and used.
 */
@@ -177,6 +175,8 @@ extern "C"{
 * @brief Instance ID for RTU1_MRU5.
 */
 #define MRU_IP_RTU1_MRU5_ID                (5U)
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(mru6), okay)
 /**
 * @brief RTU1_MRU6 is enabled and used.
 */
@@ -189,6 +189,8 @@ extern "C"{
 * @brief Instance ID for RTU1_MRU6.
 */
 #define MRU_IP_RTU1_MRU6_ID                (6U)
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(mru7), okay)
 /**
 * @brief RTU1_MRU7 is enabled and used.
 */
@@ -201,6 +203,8 @@ extern "C"{
 * @brief Instance ID for RTU1_MRU7.
 */
 #define MRU_IP_RTU1_MRU7_ID                (7U)
+#endif
+
 /**
 * @brief Number of instance is used by the driver.
 */
@@ -209,38 +213,12 @@ extern "C"{
 /**
 * @brief ID for interrupt group 0.
 */
-#define MRU_IP_INT_GROUP_0  0u
+#define MRU_IP_INT_GROUP_0  0
 /**
 * @brief ID for interrupt group 1.
 */
-#define MRU_IP_INT_GROUP_1  1u
-/**
-* @brief Skip the Platform default interrupt handler.
-*/
-#define MRU_IP_SKIP_RTU0_MRU0_INT1_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU0_INT2_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU0_INT3_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU1_INT1_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU1_INT2_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU1_INT3_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU2_INT1_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU2_INT2_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU2_INT3_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU3_INT1_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU3_INT2_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU0_MRU3_INT3_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU4_INT1_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU4_INT2_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU4_INT3_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU5_INT1_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU5_INT2_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU5_INT3_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU6_INT1_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU6_INT2_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU6_INT3_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU7_INT1_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU7_INT2_HANDLER  (STD_ON)
-#define MRU_IP_SKIP_RTU1_MRU7_INT3_HANDLER  (STD_ON)
+#define MRU_IP_INT_GROUP_1  1
+
 /*==================================================================================================
 *                                            ENUMS
 ==================================================================================================*/
@@ -270,5 +248,3 @@ extern RTU_MRU_Type* const Mru_Ip_apxRTU_Bases[RTU_MRU_INSTANCE_COUNT];
 #endif
 
 /** @} */
-
-

s32/soc/s32z270/include/Netc_Eth_Ip_Features.h

@@ -49,13 +49,13 @@ extern "C"
 *                                       DEFINES AND MACROS
 ==================================================================================================*/
 /** @brief Total number of virtual ethernet controllers supported on NETC(VSIs). */
-#define FEATURE_NETC_ETH_NUM_OF_VIRTUAL_CTRLS       (7U)
+#define FEATURE_NETC_ETH_NUM_OF_VIRTUAL_CTRLS       7
 
 /** @brief Total number of physical ethernet controllers supported on NETC(PSIs). */
 #define NETC_ETH_IP_NUM_OF_PHYSICAL_CTRLS           (1U)
 
 /** @brief Total number of ethernet controllers supported on NETC(VSI + PSI). */
-#define FEATURE_NETC_ETH_NUMBER_OF_CTRLS            (8U)
+#define FEATURE_NETC_ETH_NUMBER_OF_CTRLS            (8)
 
 #define FEATURE_NETC_NUMBER_OF_FUNC            (4U)