From 6dc946b0fa5857a50336e0c8a91cfbeacc5d90b2 Mon Sep 17 00:00:00 2001
From: EricB-ADI <eric.busch@analogdevices.com>
Date: Wed, 21 Aug 2024 16:07:54 -0500
Subject: [PATCH] Revert "feat(PeriphDrivers): Allow Skipping Clock and GPIO
 Initialization (#932)"

This reverts commit e75ecd7791a4622cdcf5976b6b845c17b5b6f754.
---
 Libraries/PeriphDrivers/Include/MAX32650/i2c.h  | 4 ----
 Libraries/PeriphDrivers/Include/MAX32650/spi.h  | 5 -----
 Libraries/PeriphDrivers/Include/MAX32650/uart.h | 5 -----
 Libraries/PeriphDrivers/Include/MAX32660/i2c.h  | 4 ----
 Libraries/PeriphDrivers/Include/MAX32660/spi.h  | 5 -----
 Libraries/PeriphDrivers/Include/MAX32662/i2c.h  | 4 ----
 Libraries/PeriphDrivers/Include/MAX32662/spi.h  | 5 -----
 Libraries/PeriphDrivers/Include/MAX32662/uart.h | 5 -----
 Libraries/PeriphDrivers/Include/MAX32672/i2c.h  | 4 ----
 Libraries/PeriphDrivers/Include/MAX32672/spi.h  | 5 -----
 Libraries/PeriphDrivers/Include/MAX32672/uart.h | 5 -----
 Libraries/PeriphDrivers/Include/MAX32675/i2c.h  | 4 ----
 Libraries/PeriphDrivers/Include/MAX32675/spi.h  | 5 -----
 Libraries/PeriphDrivers/Include/MAX32675/uart.h | 5 -----
 Libraries/PeriphDrivers/Include/MAX32680/i2c.h  | 4 ----
 Libraries/PeriphDrivers/Include/MAX32680/spi.h  | 5 -----
 Libraries/PeriphDrivers/Include/MAX32680/uart.h | 5 -----
 Libraries/PeriphDrivers/Source/I2C/i2c_me10.c   | 5 ++---
 Libraries/PeriphDrivers/Source/I2C/i2c_me11.c   | 2 --
 Libraries/PeriphDrivers/Source/I2C/i2c_me12.c   | 2 --
 Libraries/PeriphDrivers/Source/I2C/i2c_me21.c   | 2 --
 Libraries/PeriphDrivers/Source/SPI/spi_me10.c   | 2 --
 Libraries/PeriphDrivers/Source/SPI/spi_me11.c   | 2 --
 Libraries/PeriphDrivers/Source/SPI/spi_me12.c   | 4 ----
 Libraries/PeriphDrivers/Source/SPI/spi_me16.c   | 2 --
 Libraries/PeriphDrivers/Source/SPI/spi_me21.c   | 2 --
 Libraries/PeriphDrivers/Source/UART/uart_me12.c | 4 ----
 Libraries/PeriphDrivers/Source/UART/uart_me16.c | 2 --
 Libraries/PeriphDrivers/Source/UART/uart_me21.c | 2 --
 29 files changed, 2 insertions(+), 108 deletions(-)

diff --git a/Libraries/PeriphDrivers/Include/MAX32650/i2c.h b/Libraries/PeriphDrivers/Include/MAX32650/i2c.h
index 3c1c7a56342..841f6d5c158 100644
--- a/Libraries/PeriphDrivers/Include/MAX32650/i2c.h
+++ b/Libraries/PeriphDrivers/Include/MAX32650/i2c.h
@@ -169,10 +169,6 @@ typedef int (*mxc_i2c_slave_handler_t)(mxc_i2c_regs_t *i2c, mxc_i2c_slave_event_
 /**
  * @brief   Initialize and enable I2C peripheral.
  *
- * @note    On default this function enables I2C peripheral clock and i2c gpio pins.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
  *
  * @param   i2c         Pointer to I2C registers (selects the I2C block used.)
  * @param   masterMode  Whether to put the device in master or slave mode. Use
diff --git a/Libraries/PeriphDrivers/Include/MAX32650/spi.h b/Libraries/PeriphDrivers/Include/MAX32650/spi.h
index 7fa2e3e34e7..b9245c98806 100644
--- a/Libraries/PeriphDrivers/Include/MAX32650/spi.h
+++ b/Libraries/PeriphDrivers/Include/MAX32650/spi.h
@@ -146,11 +146,6 @@ struct _mxc_spi_req_t {
  *
  * These parameters can be modified after initialization using low level functions
  *
- * @note    On default this function enables SPI peripheral clock and spi gpio pins.
- * if you wish to manage clock and gpio related things in upper level instead of here.
- * Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- * By this flag this function will remove clock and gpio related codes from file.
- * 
  * @param   spi             Pointer to SPI registers (selects the SPI block used.)
  * @param   masterMode      Whether to put the device in master or slave mode. Use
  *                          non-zero for master mode, and zero for slave mode.
diff --git a/Libraries/PeriphDrivers/Include/MAX32650/uart.h b/Libraries/PeriphDrivers/Include/MAX32650/uart.h
index 78270431457..4e79ae4d746 100644
--- a/Libraries/PeriphDrivers/Include/MAX32650/uart.h
+++ b/Libraries/PeriphDrivers/Include/MAX32650/uart.h
@@ -139,11 +139,6 @@ struct _mxc_uart_req_t {
  *
  * These parameters can be modified after initialization using low level functions
  *
- * @note    On default this function enables UART peripheral clock.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
- * 
  * @param   uart            Pointer to UART registers (selects the UART block used.)
  * @param   baud            The requested clock frequency. The actual clock frequency
  *                          will be returned by the function if successful.
diff --git a/Libraries/PeriphDrivers/Include/MAX32660/i2c.h b/Libraries/PeriphDrivers/Include/MAX32660/i2c.h
index 5e327d14c3d..aa302f80134 100644
--- a/Libraries/PeriphDrivers/Include/MAX32660/i2c.h
+++ b/Libraries/PeriphDrivers/Include/MAX32660/i2c.h
@@ -173,10 +173,6 @@ typedef int (*mxc_i2c_slave_handler_t)(mxc_i2c_regs_t *i2c, mxc_i2c_slave_event_
 /**
  * @brief   Initialize and enable I2C peripheral.
  *
- * @note    On default this function enables I2C peripheral clock and i2c gpio pins.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
  *
  * @param   i2c         Pointer to I2C registers (selects the I2C block used.)
  * @param   masterMode  Whether to put the device in master or slave mode. Use
diff --git a/Libraries/PeriphDrivers/Include/MAX32660/spi.h b/Libraries/PeriphDrivers/Include/MAX32660/spi.h
index 40fc6fbb0b1..b3556c703e2 100644
--- a/Libraries/PeriphDrivers/Include/MAX32660/spi.h
+++ b/Libraries/PeriphDrivers/Include/MAX32660/spi.h
@@ -142,11 +142,6 @@ struct _mxc_spi_req_t {
  *
  * These parameters can be modified after initialization using low level functions
  *
- * @note    On default this function enables I2C peripheral clock and i2c gpio pins.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
- *
  * @param   spi             Pointer to SPI registers (selects the SPI block used.)
  * @param   masterMode      Whether to put the device in master or slave mode. Use
  *                          non-zero for master mode, and zero for slave mode.
diff --git a/Libraries/PeriphDrivers/Include/MAX32662/i2c.h b/Libraries/PeriphDrivers/Include/MAX32662/i2c.h
index d9399eb6851..9898a903f91 100644
--- a/Libraries/PeriphDrivers/Include/MAX32662/i2c.h
+++ b/Libraries/PeriphDrivers/Include/MAX32662/i2c.h
@@ -172,10 +172,6 @@ typedef int (*mxc_i2c_slave_handler_t)(mxc_i2c_regs_t *i2c, mxc_i2c_slave_event_
 /**
  * @brief   Initialize and enable I2C peripheral.
  *
- * @note    On default this function enables I2C peripheral clock and i2c gpio pins.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
  *
  * @param   i2c         Pointer to I2C registers (selects the I2C block used.)
  * @param   masterMode  Whether to put the device in master or slave mode. Use
diff --git a/Libraries/PeriphDrivers/Include/MAX32662/spi.h b/Libraries/PeriphDrivers/Include/MAX32662/spi.h
index 4c43bc27c17..cad067942ef 100644
--- a/Libraries/PeriphDrivers/Include/MAX32662/spi.h
+++ b/Libraries/PeriphDrivers/Include/MAX32662/spi.h
@@ -164,11 +164,6 @@ struct _mxc_spi_req_t {
  *
  * These parameters can be modified after initialization using low level functions
  *
- * @note    On default this function enables SPI peripheral clock and spi gpio pins.
- * if you wish to manage clock and gpio related things in upper level instead of here.
- * Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- * By this flag this function will remove clock and gpio related codes from file.
- *
  * @param   spi             Pointer to SPI registers (selects the SPI block used.)
  * @param   masterMode      Whether to put the device in master or slave mode. Use
  *                          non-zero for master mode, and zero for slave mode.
diff --git a/Libraries/PeriphDrivers/Include/MAX32662/uart.h b/Libraries/PeriphDrivers/Include/MAX32662/uart.h
index 12a5d1621b5..0b025bacfd2 100644
--- a/Libraries/PeriphDrivers/Include/MAX32662/uart.h
+++ b/Libraries/PeriphDrivers/Include/MAX32662/uart.h
@@ -145,11 +145,6 @@ struct _mxc_uart_req_t {
  * 
  * These parameters can be modified after initialization using low level functions
  * 
- * @note    On default this function enables UART peripheral clock.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
- * 
  * @param   uart         Pointer to UART registers (selects the UART block used.)
  * @param   baud         The requested clock frequency. The actual clock frequency
  *                       will be returned by the function if successful.
diff --git a/Libraries/PeriphDrivers/Include/MAX32672/i2c.h b/Libraries/PeriphDrivers/Include/MAX32672/i2c.h
index 79668653fa0..629d6763a17 100644
--- a/Libraries/PeriphDrivers/Include/MAX32672/i2c.h
+++ b/Libraries/PeriphDrivers/Include/MAX32672/i2c.h
@@ -173,10 +173,6 @@ typedef int (*mxc_i2c_slave_handler_t)(mxc_i2c_regs_t *i2c, mxc_i2c_slave_event_
 /**
  * @brief   Initialize and enable I2C peripheral.
  *
- * @note    On default this function enables I2C peripheral clock and i2c gpio pins.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
  *
  * @param   i2c         Pointer to I2C registers (selects the I2C block used.)
  * @param   masterMode  Whether to put the device in master or slave mode. Use
diff --git a/Libraries/PeriphDrivers/Include/MAX32672/spi.h b/Libraries/PeriphDrivers/Include/MAX32672/spi.h
index b1214d58e71..0a69c12735f 100644
--- a/Libraries/PeriphDrivers/Include/MAX32672/spi.h
+++ b/Libraries/PeriphDrivers/Include/MAX32672/spi.h
@@ -141,11 +141,6 @@ struct _mxc_spi_req_t {
  *
  * These parameters can be modified after initialization using low level functions
  *
- * @note    On default this function enables SPI peripheral clock and spi gpio pins.
- * if you wish to manage clock and gpio related things in upper level instead of here.
- * Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- * By this flag this function will remove clock and gpio related codes from file.
- *
  * @param   spi             Pointer to SPI registers (selects the SPI block used.)
  * @param   masterMode      Whether to put the device in master or slave mode. Use
  *                          non-zero for master mode, and zero for slave mode.
diff --git a/Libraries/PeriphDrivers/Include/MAX32672/uart.h b/Libraries/PeriphDrivers/Include/MAX32672/uart.h
index bb49c6e16dc..ada484fb501 100644
--- a/Libraries/PeriphDrivers/Include/MAX32672/uart.h
+++ b/Libraries/PeriphDrivers/Include/MAX32672/uart.h
@@ -164,11 +164,6 @@ sys_map_t MXC_UART_GetPinMapping(mxc_uart_regs_t *uart);
  * 
  * These parameters can be modified after initialization using low level functions
  * 
- * @note    On default this function enables UART peripheral clock.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
- * 
  * @param   uart         Pointer to UART registers (selects the UART block used.)
  * @param   baud         The requested clock frequency. The actual clock frequency
  *                       will be returned by the function if successful.
diff --git a/Libraries/PeriphDrivers/Include/MAX32675/i2c.h b/Libraries/PeriphDrivers/Include/MAX32675/i2c.h
index f7adc223014..46c65e63911 100644
--- a/Libraries/PeriphDrivers/Include/MAX32675/i2c.h
+++ b/Libraries/PeriphDrivers/Include/MAX32675/i2c.h
@@ -173,10 +173,6 @@ typedef int (*mxc_i2c_slave_handler_t)(mxc_i2c_regs_t *i2c, mxc_i2c_slave_event_
 /**
  * @brief   Initialize and enable I2C peripheral.
  *
- * @note    On default this function enables I2C peripheral clock and i2c gpio pins.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
  *
  * @param   i2c         Pointer to I2C registers (selects the I2C block used.)
  * @param   masterMode  Whether to put the device in master or slave mode. Use
diff --git a/Libraries/PeriphDrivers/Include/MAX32675/spi.h b/Libraries/PeriphDrivers/Include/MAX32675/spi.h
index 5d4e113f9f8..b1c2112f19d 100644
--- a/Libraries/PeriphDrivers/Include/MAX32675/spi.h
+++ b/Libraries/PeriphDrivers/Include/MAX32675/spi.h
@@ -139,11 +139,6 @@ struct _mxc_spi_req_t {
  * SPI Mode - 0
  * SPI Width - SPI_WIDTH_STANDARD (even if quadModeUsed is set)
  *
- * @note    On default this function enables SPI peripheral clock and spi gpio pins.
- * if you wish to manage clock and gpio related things in upper level instead of here.
- * Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- * By this flag this function will remove clock and gpio related codes from file.
- *
  * These parameters can be modified after initialization using low level functions
  *
  * @param   spi             Pointer to SPI registers (selects the SPI block used.)
diff --git a/Libraries/PeriphDrivers/Include/MAX32675/uart.h b/Libraries/PeriphDrivers/Include/MAX32675/uart.h
index 6018d7cfbca..856579f5130 100644
--- a/Libraries/PeriphDrivers/Include/MAX32675/uart.h
+++ b/Libraries/PeriphDrivers/Include/MAX32675/uart.h
@@ -147,11 +147,6 @@ struct _mxc_uart_req_t {
  * 
  * These parameters can be modified after initialization using low level functions
  * 
- * @note    On default this function enables UART peripheral clock.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
- * 
  * @param   uart         Pointer to UART registers (selects the UART block used.)
  * @param   baud         The requested clock frequency. The actual clock frequency
  *                       will be returned by the function if successful.
diff --git a/Libraries/PeriphDrivers/Include/MAX32680/i2c.h b/Libraries/PeriphDrivers/Include/MAX32680/i2c.h
index 0c7db262ed3..eff82db7183 100644
--- a/Libraries/PeriphDrivers/Include/MAX32680/i2c.h
+++ b/Libraries/PeriphDrivers/Include/MAX32680/i2c.h
@@ -172,10 +172,6 @@ typedef int (*mxc_i2c_slave_handler_t)(mxc_i2c_regs_t *i2c, mxc_i2c_slave_event_
 /**
  * @brief   Initialize and enable I2C peripheral.
  *
- * @note    On default this function enables I2C peripheral clock and i2c gpio pins.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
  *
  * @param   i2c         Pointer to I2C registers (selects the I2C block used.)
  * @param   masterMode  Whether to put the device in master or slave mode. Use
diff --git a/Libraries/PeriphDrivers/Include/MAX32680/spi.h b/Libraries/PeriphDrivers/Include/MAX32680/spi.h
index 76706972531..13733bda35b 100644
--- a/Libraries/PeriphDrivers/Include/MAX32680/spi.h
+++ b/Libraries/PeriphDrivers/Include/MAX32680/spi.h
@@ -162,11 +162,6 @@ struct _mxc_spi_req_t {
  *
  * These parameters can be modified after initialization using low level functions
  *
- * @note    On default this function enables SPI peripheral clock and spi gpio pins.
- * if you wish to manage clock and gpio related things in upper level instead of here.
- * Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- * By this flag this function will remove clock and gpio related codes from file.
- *
  * @param   spi             Pointer to SPI registers (selects the SPI block used.)
  * @param   masterMode      Whether to put the device in master or slave mode. Use
  *                          non-zero for master mode, and zero for slave mode.
diff --git a/Libraries/PeriphDrivers/Include/MAX32680/uart.h b/Libraries/PeriphDrivers/Include/MAX32680/uart.h
index 539c1640740..fa400f11cb2 100644
--- a/Libraries/PeriphDrivers/Include/MAX32680/uart.h
+++ b/Libraries/PeriphDrivers/Include/MAX32680/uart.h
@@ -150,11 +150,6 @@ struct _mxc_uart_req_t {
  * 
  * These parameters can be modified after initialization using low level functions
  * 
- * @note    On default this function enables UART peripheral clock.
- *          if you wish to manage clock and gpio related things in upper level instead of here.
- *          Define MSDK_NO_GPIO_CLK_INIT flag in project.mk file. 
- *          By this flag this function will remove clock and gpio related codes from file.
- * 
  * @param   uart         Pointer to UART registers (selects the UART block used.)
  * @param   baud         The requested clock frequency. The actual clock frequency
  *                       will be returned by the function if successful.
diff --git a/Libraries/PeriphDrivers/Source/I2C/i2c_me10.c b/Libraries/PeriphDrivers/Source/I2C/i2c_me10.c
index 3fe35988c27..7e5be7bebdf 100644
--- a/Libraries/PeriphDrivers/Source/I2C/i2c_me10.c
+++ b/Libraries/PeriphDrivers/Source/I2C/i2c_me10.c
@@ -51,9 +51,9 @@
 int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
 {
     int err;
+    int idx = MXC_I2C_GET_IDX(i2c);
 
-#ifndef MSDK_NO_GPIO_CLK_INIT
-    switch (MXC_I2C_GET_IDX(i2c)) {
+    switch (idx) {
     case 0:
         MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_I2C0);
         MXC_GPIO_Config(&gpio_cfg_i2c0);
@@ -65,7 +65,6 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
     default:
         return E_BAD_PARAM;
     }
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     if ((err = MXC_I2C_RevA_Init((mxc_i2c_reva_regs_t *)i2c, masterMode, slaveAddr)) !=
         E_NO_ERROR) {
diff --git a/Libraries/PeriphDrivers/Source/I2C/i2c_me11.c b/Libraries/PeriphDrivers/Source/I2C/i2c_me11.c
index a841eec4fe3..eabda670e94 100644
--- a/Libraries/PeriphDrivers/Source/I2C/i2c_me11.c
+++ b/Libraries/PeriphDrivers/Source/I2C/i2c_me11.c
@@ -50,7 +50,6 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
         return E_NULL_PTR;
     }
 
-#ifndef MSDK_NO_GPIO_CLK_INIT
     MXC_I2C_Shutdown(i2c); // Clear everything out
 
     if (i2c == MXC_I2C0) {
@@ -62,7 +61,6 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
     } else {
         return E_NO_DEVICE;
     }
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     return MXC_I2C_RevA_Init((mxc_i2c_reva_regs_t *)i2c, masterMode, slaveAddr);
 }
diff --git a/Libraries/PeriphDrivers/Source/I2C/i2c_me12.c b/Libraries/PeriphDrivers/Source/I2C/i2c_me12.c
index 8f07eaa0f7c..b0a549be487 100644
--- a/Libraries/PeriphDrivers/Source/I2C/i2c_me12.c
+++ b/Libraries/PeriphDrivers/Source/I2C/i2c_me12.c
@@ -53,7 +53,6 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
         return E_NULL_PTR;
     }
 
-#ifndef MSDK_NO_GPIO_CLK_INIT
     MXC_I2C_Shutdown(i2c); // Clear everything out
 
     if (i2c == MXC_I2C0) {
@@ -65,7 +64,6 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
     } else {
         return E_NO_DEVICE;
     }
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     return MXC_I2C_RevA_Init((mxc_i2c_reva_regs_t *)i2c, masterMode, slaveAddr);
 }
diff --git a/Libraries/PeriphDrivers/Source/I2C/i2c_me21.c b/Libraries/PeriphDrivers/Source/I2C/i2c_me21.c
index 1614154a83e..4f85991503a 100644
--- a/Libraries/PeriphDrivers/Source/I2C/i2c_me21.c
+++ b/Libraries/PeriphDrivers/Source/I2C/i2c_me21.c
@@ -69,7 +69,6 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
         return E_NULL_PTR;
     }
 
-#ifndef MSDK_NO_GPIO_CLK_INIT
     MXC_I2C_Shutdown(i2c); // Clear everything out
 
     if (i2c == MXC_I2C0) {
@@ -84,7 +83,6 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
     } else {
         return E_NO_DEVICE;
     }
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     return MXC_I2C_RevA_Init((mxc_i2c_reva_regs_t *)i2c, masterMode, slaveAddr);
 }
diff --git a/Libraries/PeriphDrivers/Source/SPI/spi_me10.c b/Libraries/PeriphDrivers/Source/SPI/spi_me10.c
index 57f1720c510..b6cc961fca1 100644
--- a/Libraries/PeriphDrivers/Source/SPI/spi_me10.c
+++ b/Libraries/PeriphDrivers/Source/SPI/spi_me10.c
@@ -53,7 +53,6 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS
         return E_BAD_PARAM;
     }
 
-#ifndef MSDK_NO_GPIO_CLK_INIT
     switch (MXC_SPI_GET_IDX(spi)) {
     case 0:
         MXC_SYS_Reset_Periph(MXC_SYS_RESET_SPI0);
@@ -79,7 +78,6 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS
     default:
         return E_BAD_PARAM;
     }
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     return MXC_SPI_RevA1_Init((mxc_spi_reva_regs_t *)spi, masterMode, quadModeUsed, numSlaves,
                               ssPolarity, hz);
diff --git a/Libraries/PeriphDrivers/Source/SPI/spi_me11.c b/Libraries/PeriphDrivers/Source/SPI/spi_me11.c
index 5523c7da8ab..6dafc8e8d3e 100644
--- a/Libraries/PeriphDrivers/Source/SPI/spi_me11.c
+++ b/Libraries/PeriphDrivers/Source/SPI/spi_me11.c
@@ -48,7 +48,6 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS
         return E_BAD_PARAM;
     }
 
-#ifndef MSDK_NO_GPIO_CLK_INIT
     // Configure GPIO for spi
     if (spi == MXC_SPI0) {
         MXC_GCR->rst0 |= MXC_F_GCR_RST0_SPI0;
@@ -58,7 +57,6 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS
     } else {
         return E_NO_DEVICE;
     }
-#endif
 
     return MXC_SPI_RevA1_Init((mxc_spi_reva_regs_t *)spi, masterMode, quadModeUsed, numSlaves,
                               ssPolarity, hz);
diff --git a/Libraries/PeriphDrivers/Source/SPI/spi_me12.c b/Libraries/PeriphDrivers/Source/SPI/spi_me12.c
index 5e79eed26e7..5da2b573b7b 100644
--- a/Libraries/PeriphDrivers/Source/SPI/spi_me12.c
+++ b/Libraries/PeriphDrivers/Source/SPI/spi_me12.c
@@ -56,7 +56,6 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS
         return E_BAD_PARAM;
     }
 
-#ifndef MSDK_NO_GPIO_CLK_INIT
     mxc_gpio_cfg_t gpio_cfg_spi;
     gpio_cfg_spi.pad = MXC_GPIO_PAD_NONE;
     gpio_cfg_spi.port = MXC_GPIO0;
@@ -141,9 +140,6 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS
     }
 
     MXC_GPIO_Config(&gpio_cfg_spi);
-#else
-    (void)pins;
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     return MXC_SPI_RevA1_Init((mxc_spi_reva_regs_t *)spi, masterMode, quadModeUsed, numSlaves,
                               ssPolarity, hz);
diff --git a/Libraries/PeriphDrivers/Source/SPI/spi_me16.c b/Libraries/PeriphDrivers/Source/SPI/spi_me16.c
index 17d53d1ee43..eac01f4da7b 100644
--- a/Libraries/PeriphDrivers/Source/SPI/spi_me16.c
+++ b/Libraries/PeriphDrivers/Source/SPI/spi_me16.c
@@ -49,7 +49,6 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS
         return E_BAD_PARAM;
     }
 
-#ifndef MSDK_NO_GPIO_CLK_INIT
     // Configure GPIO for spi
     if (spi == MXC_SPI0) {
         MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_SPI0);
@@ -66,7 +65,6 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS
     } else {
         return E_NO_DEVICE;
     }
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     return MXC_SPI_RevA1_Init(spi, masterMode, quadModeUsed, numSlaves, ssPolarity, hz);
 }
diff --git a/Libraries/PeriphDrivers/Source/SPI/spi_me21.c b/Libraries/PeriphDrivers/Source/SPI/spi_me21.c
index f2854d42db9..6358572d825 100644
--- a/Libraries/PeriphDrivers/Source/SPI/spi_me21.c
+++ b/Libraries/PeriphDrivers/Source/SPI/spi_me21.c
@@ -48,7 +48,6 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS
         return E_BAD_PARAM;
     }
 
-#ifndef MSDK_NO_GPIO_CLK_INIT
     // Configure GPIO for spi
     if (spi == MXC_SPI0) {
         MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_SPI0);
@@ -85,7 +84,6 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS
     } else {
         return E_NO_DEVICE;
     }
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     return MXC_SPI_RevA1_Init((mxc_spi_reva_regs_t *)spi, masterMode, quadModeUsed, numSlaves,
                               ssPolarity, hz);
diff --git a/Libraries/PeriphDrivers/Source/UART/uart_me12.c b/Libraries/PeriphDrivers/Source/UART/uart_me12.c
index 87f3ab1dc22..5bba1638c6b 100644
--- a/Libraries/PeriphDrivers/Source/UART/uart_me12.c
+++ b/Libraries/PeriphDrivers/Source/UART/uart_me12.c
@@ -44,7 +44,6 @@ int MXC_UART_AsyncStop(mxc_uart_regs_t *uart)
 
 int MXC_UART_Init(mxc_uart_regs_t *uart, unsigned int baud, mxc_uart_clock_t clock, sys_map_t map)
 {
-#ifndef MSDK_NO_GPIO_CLK_INIT
     int retval;
 
     retval = MXC_UART_Shutdown(uart);
@@ -65,9 +64,6 @@ int MXC_UART_Init(mxc_uart_regs_t *uart, unsigned int baud, mxc_uart_clock_t clo
     } else {
         return E_BAD_PARAM;
     }
-#else
-    (void)map;
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     retval = MXC_UART_SetClockSource(uart, clock);
     if (retval != E_NO_ERROR) {
diff --git a/Libraries/PeriphDrivers/Source/UART/uart_me16.c b/Libraries/PeriphDrivers/Source/UART/uart_me16.c
index 9f6ad898d41..27f73da4b20 100644
--- a/Libraries/PeriphDrivers/Source/UART/uart_me16.c
+++ b/Libraries/PeriphDrivers/Source/UART/uart_me16.c
@@ -48,7 +48,6 @@ int MXC_UART_AsyncStop(mxc_uart_regs_t *uart)
 
 int MXC_UART_Init(mxc_uart_regs_t *uart, unsigned int baud, mxc_uart_clock_t clock)
 {
-#ifndef MSDK_NO_GPIO_CLK_INIT
     int retval, error;
 
     retval = MXC_UART_Shutdown(uart);
@@ -96,7 +95,6 @@ int MXC_UART_Init(mxc_uart_regs_t *uart, unsigned int baud, mxc_uart_clock_t clo
     default:
         return E_NOT_SUPPORTED;
     }
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     return MXC_UART_RevB_Init((mxc_uart_revb_regs_t *)uart, baud, (mxc_uart_revb_clock_t)clock);
 }
diff --git a/Libraries/PeriphDrivers/Source/UART/uart_me21.c b/Libraries/PeriphDrivers/Source/UART/uart_me21.c
index b3e03781476..3a6dc3d486b 100644
--- a/Libraries/PeriphDrivers/Source/UART/uart_me21.c
+++ b/Libraries/PeriphDrivers/Source/UART/uart_me21.c
@@ -69,7 +69,6 @@ int MXC_UART_AsyncStop(mxc_uart_regs_t *uart)
 
 int MXC_UART_Init(mxc_uart_regs_t *uart, unsigned int baud, mxc_uart_clock_t clock)
 {
-#ifndef MSDK_NO_GPIO_CLK_INIT
     int retval;
     sys_map_t current_pin_mapping = MXC_UART_GetPinMapping(uart);
 
@@ -146,7 +145,6 @@ int MXC_UART_Init(mxc_uart_regs_t *uart, unsigned int baud, mxc_uart_clock_t clo
         MXC_MCR->lppioctrl |= (MXC_F_MCR_LPPIOCTRL_LPUART0_RX | MXC_F_MCR_LPPIOCTRL_LPUART0_TX);
         break;
     }
-#endif // MSDK_NO_GPIO_CLK_INIT
 
     return MXC_UART_RevB_Init((mxc_uart_revb_regs_t *)uart, baud, clock);
 }