analogdevicesinc · Jake-Carter · Sep 21, 2023 · Aug 1, 2023 · Aug 1, 2023 · Aug 1, 2023
diff --git a/Examples/MAX32572/SDHC_FAT/main.c b/Examples/MAX32572/SDHC_FAT/main.c
@@ -131,7 +131,9 @@ int formatSDHC()
 
     printf("FORMATTING DRIVE\n");
 
-    if ((err = f_mkfs("", FM_ANY, 0, work, sizeof(work))) !=
+    MKFS_PARM format_options = { .fmt = FM_ANY };
+
+    if ((err = f_mkfs("", &format_options, work, sizeof(work))) !=
         FR_OK) { //Format the default drive to FAT32
         printf("Error formatting SD card: %s\n", FF_ERRORS[err]);
     } else {
@@ -565,15 +567,6 @@ int main(void)
         printf("Card type: MMC/eMMC\n");
     }
 
-    /* Configure for fastest possible clock, must not exceed 52 MHz for eMMC */
-    if (SystemCoreClock > 96000000) {
-        printf("SD clock ratio (at card) 4:1\n");
-        MXC_SDHC_Set_Clock_Config(1);
-    } else {
-        printf("SD clock ratio (at card) 2:1\n");
-        MXC_SDHC_Set_Clock_Config(0);
-    }
-
     while (run) {
         f_getcwd(cwd, sizeof(cwd));
 

diff --git a/Examples/MAX32650/SDHC_FAT/main.c b/Examples/MAX32650/SDHC_FAT/main.c
@@ -132,7 +132,9 @@ int formatSDHC()
 
     printf("FORMATTING DRIVE\n");
 
-    if ((err = f_mkfs("", FM_ANY, 0, work, sizeof(work))) !=
+    MKFS_PARM format_options = { .fmt = FM_ANY };
+
+    if ((err = f_mkfs("", &format_options, work, sizeof(work))) !=
         FR_OK) { //Format the default drive to FAT32
         printf("Error formatting SD card: %s\n", FF_ERRORS[err]);
     } else {
@@ -542,15 +544,6 @@ int main(void)
         printf("Card type: MMC/eMMC\n");
     }
 
-    /* Configure for fastest possible clock, must not exceed 52 MHz for eMMC */
-    if (SystemCoreClock > 96000000) {
-        printf("SD clock ratio (at card) 4:1\n");
-        MXC_SDHC_Set_Clock_Config(1);
-    } else {
-        printf("SD clock ratio (at card) 2:1\n");
-        MXC_SDHC_Set_Clock_Config(0);
-    }
-
     while (run) {
         f_getcwd(cwd, sizeof(cwd));
 

diff --git a/Examples/MAX32665/SDHC_FAT/main.c b/Examples/MAX32665/SDHC_FAT/main.c
@@ -138,7 +138,9 @@ int formatSDHC()
 
     printf("FORMATTING DRIVE\n");
 
-    if ((err = f_mkfs("", FM_ANY, 0, work, sizeof(work))) !=
+    MKFS_PARM format_options = { .fmt = FM_ANY };
+
+    if ((err = f_mkfs("", &format_options, work, sizeof(work))) !=
         FR_OK) { //Format the default drive to FAT32
         printf("Error formatting SD card: %s\n", FF_ERRORS[err]);
     } else {
@@ -488,6 +490,7 @@ int example()
 /******************************************************************************/
 int main(void)
 {
+    MXC_Delay(MXC_DELAY_SEC(2));
     mxc_sdhc_cfg_t cfg;
 
     FF_ERRORS[0] = "FR_OK";
@@ -555,15 +558,6 @@ int main(void)
         printf("Card type: MMC/eMMC\n");
     }
 
-    /* Configure for fastest possible clock, must not exceed 52 MHz for eMMC */
-    if (SystemCoreClock > 96000000) {
-        printf("SD clock ratio (at card) 4:1\n");
-        MXC_SDHC_Set_Clock_Config(1);
-    } else {
-        printf("SD clock ratio (at card) 2:1\n");
-        MXC_SDHC_Set_Clock_Config(0);
-    }
-
     while (run) {
         f_getcwd(cwd, sizeof(cwd));
 

diff --git a/Examples/MAX78000/CNN/faceid_evkit/db_single/.gitignore b/Examples/MAX78000/CNN/faceid_evkit/db_single/.gitignore
@@ -0,0 +1 @@
+**/
diff --git a/Examples/MAX78000/CNN/facial_recognition/SDHC_weights/main.c b/Examples/MAX78000/CNN/facial_recognition/SDHC_weights/main.c
@@ -138,7 +138,9 @@ int formatSDHC()
 
     printf("FORMATTING DRIVE\n");
 
-    if ((err = f_mkfs("", FM_ANY, 0, work, sizeof(work))) !=
+    MKFS_PARM format_options = { .fmt = FM_ANY };
+
+    if ((err = f_mkfs("", &format_options, work, sizeof(work))) !=
         FR_OK) { //Format the default drive to FAT32
         printf("Error formatting SD card: %s\n", FF_ERRORS[err]);
     } else {

diff --git a/Examples/MAX78000/CNN/facial_recognition/src/sd.c b/Examples/MAX78000/CNN/facial_recognition/src/sd.c
@@ -127,7 +127,9 @@ int formatSDHC()
 
     printf("FORMATTING DRIVE\n");
 
-    if ((err = f_mkfs("", FM_ANY, 0, work, sizeof(work))) !=
+    MKFS_PARM format_options = { .fmt = FM_ANY };
+
+    if ((err = f_mkfs("", &format_options, work, sizeof(work))) !=
         FR_OK) { //Format the default drive to FAT32
         printf("Error formatting SD card: %s\n", FF_ERRORS[err]);
     } else {

diff --git a/Examples/MAX78000/CNN/kws20_demo/sd_util.c b/Examples/MAX78000/CNN/kws20_demo/sd_util.c
@@ -137,7 +137,9 @@ int formatSDHC()
 
     printf("FORMATTING DRIVE\n");
 
-    if ((err = f_mkfs("", FM_ANY, 0, work, sizeof(work))) !=
+    MKFS_PARM format_options = { .fmt = FM_ANY };
+
+    if ((err = f_mkfs("", &format_options, work, sizeof(work))) !=
         FR_OK) { //Format the default drive to FAT32
         printf("Error formatting SD card: %s\n", FF_ERRORS[err]);
     } else {

diff --git a/Examples/MAX78000/SDHC_FTHR/.vscode/settings.json b/Examples/MAX78000/SDHC_FTHR/.vscode/settings.json
@@ -53,7 +53,7 @@
         "${config:MAXIM_PATH}/Libraries/MiscDrivers/PushButton",
         "${config:MAXIM_PATH}/Libraries/MiscDrivers/Touchscreen",
         "${config:MAXIM_PATH}/Libraries/SDHC/Include",
-        "${config:MAXIM_PATH}/Libraries/SDHC/ff14/Source"
+        "${config:MAXIM_PATH}/Libraries/SDHC/ff15/Source"
     ],
     "C_Cpp.default.browse.path": [
         "${workspaceFolder}",
@@ -66,7 +66,7 @@
         "${config:MAXIM_PATH}/Libraries/MiscDrivers/PushButton",
         "${config:MAXIM_PATH}/Libraries/MiscDrivers/Touchscreen",
         "${config:MAXIM_PATH}/Libraries/MiscDrivers",
-        "${config:MAXIM_PATH}/Libraries/SDHC/ff14/Source"
+        "${config:MAXIM_PATH}/Libraries/SDHC/ff15/Source"
     ],
     "C_Cpp.default.defines": [
 

diff --git a/Examples/MAX78000/SDHC_FTHR/main.c b/Examples/MAX78000/SDHC_FTHR/main.c
@@ -135,7 +135,9 @@ int formatSDHC()
 
     printf("FORMATTING DRIVE\n");
 
-    if ((err = f_mkfs("", FM_ANY, 0, work, sizeof(work))) !=
+    MKFS_PARM format_options = { .fmt = FM_ANY };
+
+    if ((err = f_mkfs("", &format_options, work, sizeof(work))) !=
         FR_OK) { //Format the default drive to FAT32
         printf("Error formatting SD card: %s\n", FF_ERRORS[err]);
     } else {

diff --git a/Examples/MAX78002/SDHC_FAT/main.c b/Examples/MAX78002/SDHC_FAT/main.c
@@ -135,7 +135,9 @@ int formatSDHC()
 
     printf("FORMATTING DRIVE\n");
 
-    if ((err = f_mkfs("", FM_ANY, 0, work, sizeof(work))) !=
+    MKFS_PARM format_options = { .fmt = FM_ANY };
+
+    if ((err = f_mkfs("", &format_options, work, sizeof(work))) !=
         FR_OK) { //Format the default drive to FAT32
         printf("Error formatting SD card: %s\n", FF_ERRORS[err]);
     } else {
@@ -545,15 +547,6 @@ int main(void)
         printf("Card type: MMC/eMMC\n");
     }
 
-    /* Configure for fastest possible clock, must not exceed 52 MHz for eMMC */
-    if (SystemCoreClock > 96000000) {
-        printf("SD clock ratio (at card) 4:1\n");
-        MXC_SDHC_Set_Clock_Config(1);
-    } else {
-        printf("SD clock ratio (at card) 2:1\n");
-        MXC_SDHC_Set_Clock_Config(0);
-    }
-
     while (run) {
         f_getcwd(cwd, sizeof(cwd));
 

diff --git a/Libraries/CMSIS/Device/Maxim/GCC/temp.mk b/Libraries/CMSIS/Device/Maxim/GCC/temp.mk
@@ -0,0 +1,7 @@
+ifeq "$(_OS)" "windows"
+
+else
+ifeq "1" "$(shell expr `$(CC) -dumpversion` \>= 12)"
+LDFLAGS += -Xlinker --no-warn-rwx-segments
+endif
+endif
diff --git a/Libraries/PeriphDrivers/Include/MAX32570/sdhc.h b/Libraries/PeriphDrivers/Include/MAX32570/sdhc.h
@@ -142,21 +142,21 @@ int MXC_SDHC_Shutdown(void);
 /**
  * @brief      Set clock divider
  * @param      clk_div    Divider setting
- * s
- * @returns    #E_NO_ERROR upon success, @ref MXC_Error_Codes "error" if
- *             unsuccessful.
  */
 void MXC_SDHC_Set_Clock_Config(unsigned int clk_div);
 
 /**
  * @brief      Get clock divider
  * @return     Clock divider setting
- * s
- * @returns    #E_NO_ERROR SDHC shutdown successfully, @ref MXC_Error_Codes "error" if
- *             unsuccessful.
  */
 unsigned int MXC_SDHC_Get_Clock_Config(void);
 
+/**
+ * @brief      Get the input clock frequency for the SDHC peripheral.
+ * @return     Input clock frequency in Hz
+ */
+unsigned int MXC_SDHC_Get_Input_Clock_Freq(void);
+
 /**
  * @brief      Send Command, <em>blocking</em>.
  *

diff --git a/Libraries/PeriphDrivers/Include/MAX32650/sdhc.h b/Libraries/PeriphDrivers/Include/MAX32650/sdhc.h
@@ -151,12 +151,15 @@ void MXC_SDHC_Set_Clock_Config(unsigned int clk_div);
 /**
  * @brief   Get clock divider
  * @return  Clock divider setting
- * s
- * @returns #E_NO_ERROR SDHC shutdown successfully, @ref MXC_Error_Codes "error" if
- *             unsuccessful.
  */
 unsigned int MXC_SDHC_Get_Clock_Config(void);
 
+/**
+ * @brief      Get the input clock frequency for the SDHC peripheral.
+ * @return     Input clock frequency in Hz
+ */
+unsigned int MXC_SDHC_Get_Input_Clock_Freq(void);
+
 /**
  * @brief      Send Command, <em>blocking</em>.
  *

diff --git a/Libraries/PeriphDrivers/Include/MAX32665/sdhc.h b/Libraries/PeriphDrivers/Include/MAX32665/sdhc.h
@@ -154,6 +154,12 @@ void MXC_SDHC_Set_Clock_Config(unsigned int clk_div);
  */
 unsigned int MXC_SDHC_Get_Clock_Config(void);
 
+/**
+ * @brief      Get the input clock frequency for the SDHC peripheral.
+ * @return     Input clock frequency in Hz
+ */
+unsigned int MXC_SDHC_Get_Input_Clock_Freq(void);
+
 /**
  * @brief      Send Command, <em>blocking</em>.
  *

diff --git a/Libraries/PeriphDrivers/Include/MAX78002/sdhc.h b/Libraries/PeriphDrivers/Include/MAX78002/sdhc.h
@@ -154,6 +154,12 @@ void MXC_SDHC_Set_Clock_Config(unsigned int clk_div);
  */
 unsigned int MXC_SDHC_Get_Clock_Config(void);
 
+/**
+ * @brief      Get the input clock frequency for the SDHC peripheral.
+ * @return     Input clock frequency in Hz
+ */
+unsigned int MXC_SDHC_Get_Input_Clock_Freq(void);
+
 /**
  * @brief      Send Command, <em>blocking</em>.
  *

diff --git a/Libraries/PeriphDrivers/Source/SDHC/sdhc_ai87.c b/Libraries/PeriphDrivers/Source/SDHC/sdhc_ai87.c
@@ -78,6 +78,22 @@ int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
     return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
 }
 
+unsigned int MXC_SDHC_Get_Input_Clock_Freq(void)
+{
+    // Figure 4-1 of the preliminary AI85 UG (04/01/2022) shows the SDHC hardware block
+    // connected directly to the SYS_CLK node.  This is most likely inaccurate, but the
+    // register description for MXC_GCR->pclkdiv marks the usual SDHC divider as reserved.
+    // We will follow figure 4-1 for now.
+
+    // if (MXC_GCR->pclkdiv & MXC_F_GCR_PCLKDIV_SDHC) {
+    //     return SystemCoreClock >> 2; // Div by 4
+    // } else {
+    //     return SystemCoreClock >> 1; // Div by 2
+    // }
+
+    return SystemCoreClock;
+}
+
 /* ************************************************************************** */
 void MXC_SDHC_PowerUp(void)
 {

diff --git a/Libraries/PeriphDrivers/Source/SDHC/sdhc_me10.c b/Libraries/PeriphDrivers/Source/SDHC/sdhc_me10.c
@@ -95,6 +95,15 @@ unsigned int MXC_SDHC_Get_Clock_Config(void)
     return MXC_SDHC_RevA_Get_Clock_Config((mxc_sdhc_reva_regs_t *)MXC_SDHC);
 }
 
+unsigned int MXC_SDHC_Get_Input_Clock_Freq(void)
+{
+    if (MXC_GCR->pclk_div & MXC_F_GCR_PCLK_DIV_SDHCFRQ) {
+        return SystemCoreClock >> 1; // Div by 2
+    } else {
+        return 50000000; // UG specifies a hard-coded 50Mhz value in this case
+    }
+}
+
 /* ************************************************************************** */
 int MXC_SDHC_SendCommand(mxc_sdhc_cmd_cfg_t *sd_cmd_cfg)
 {

diff --git a/Libraries/PeriphDrivers/Source/SDHC/sdhc_me13.c b/Libraries/PeriphDrivers/Source/SDHC/sdhc_me13.c
@@ -80,6 +80,16 @@ int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
     return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
 }
 
+unsigned int MXC_SDHC_Get_Input_Clock_Freq(void)
+{
+    // TODO(JC): Confirm this is the scheme used by ME13
+    if (MXC_GCR->pclkdiv & MXC_F_GCR_PCLKDIV_SDHCFRQ) {
+        return SystemCoreClock >> 2; // Div by 4
+    } else {
+        return SystemCoreClock >> 1; // Div by 2
+    }
+}
+
 /* ************************************************************************** */
 void MXC_SDHC_PowerUp(void)
 {

diff --git a/Libraries/PeriphDrivers/Source/SDHC/sdhc_me14.c b/Libraries/PeriphDrivers/Source/SDHC/sdhc_me14.c
@@ -78,6 +78,15 @@ int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
     return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
 }
 
+unsigned int MXC_SDHC_Get_Input_Clock_Freq(void)
+{
+    if (MXC_GCR->pckdiv & MXC_F_GCR_PCKDIV_SDHCFRQ) {
+        return SystemCoreClock >> 2; // Div by 4
+    } else {
+        return SystemCoreClock >> 1; // Div by 2
+    }
+}
+
 /* ************************************************************************** */
 void MXC_SDHC_PowerUp(void)
 {

diff --git a/Libraries/SDHC/Include/sdhc_lib.h b/Libraries/SDHC/Include/sdhc_lib.h
@@ -52,6 +52,15 @@
 #include "sdhc.h"
 #include "sdhc_resp_regs.h"
 
+/**
+ * @brief SDHC target clock frequency.
+ * @details Max freq. is limited by GCR register to be @ref SystemCoreClock / 2 or @ref SystemCoreClock / 4.
+ * This field is used as a target for the SDHC peripheral's internal clock divider.
+ * R/W reliability issues can sometimes be eliminated by reducing the clock frequency, which is a good first step for troubleshooting.
+ */
+#define SDHC_CLK_FREQ 40000000
+
+
 /**
  * @ingroup sdhc
  * @{