进行代码精简

bsp/imx6ull-artpi-smart/.config

@@ -475,6 +475,7 @@ CONFIG_LWP_TID_MAX_NR=64
 # CONFIG_PKG_USING_TOUCHGFX2RTT is not set
 # CONFIG_PKG_USING_NUEMWIN is not set
 # CONFIG_PKG_USING_MP3PLAYER is not set
+# CONFIG_PKG_USING_TINYJPEG is not set
 
 #
 # tools packages
@@ -751,9 +752,10 @@ CONFIG_BSP_LCD_WIDTH=1024
 CONFIG_BSP_LCD_HEIGHT=600
 
 #
-# Select SD Card Driver
+# Select SDHC Driver
 #
-CONFIG_BSP_USING_SDHC=y
+CONFIG_RT_USING_SDIO1=y
+# CONFIG_RT_USING_SDIO2 is not set
 
 #
 # Select RTC Driver

bsp/imx6ull-artpi-smart/drivers/Kconfig

@@ -111,12 +111,16 @@ config BSP_USING_LCD
     endif
 endmenu
 
-menu "Select SD Card Driver"
+menu "Select SDHC Driver"
     if RT_USING_SDIO
-        config BSP_USING_SDHC
-            bool "Enable SDHC"
+        config RT_USING_SDIO1
+            bool "Enable SDHC1"
             default n
+        config RT_USING_SDIO2
+            bool "Enable SDHC2"
+           	default n
     endif
+    
 endmenu
 
 menu "Select RTC Driver"

bsp/imx6ull-artpi-smart/drivers/drv_sdhc.c

@@ -1,322 +0,0 @@
-/*
- * Copyright (c) 2006-2021, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2021-04-23     Lyons        first version
- */
-
-#include <rtconfig.h>
-
-#ifdef BSP_USING_SDHC
-
-#include "board.h"
-#include "drv_pin.h"
-#include "drv_sdhc.h"
-
-#define DBG_TAG "drv.sdhc"
-#define DBG_LVL DBG_LOG
-#include <rtdbg.h>
-
-#define SDCARD_SHOW_CARD_INFO 0
-
-/*
- * There are 512M Bytes reserved for boot image.
- * Modify these parameter manually.
- */
-#define SDCARD_PART1_START_SECTOR 8192 //no fs!
-#define SDCARD_PART2_START_SECTOR 1056768 //use fs.
-
-_internal_rw struct imx_sddev _s_sdcard_device = {
-    .name = "sd0",
-    .periph.paddr = BOARD_SD_HOST_BASEADDR,
-    .irqno = RT_NULL, //not use irq yet!
-    .gpio = {
-        {IOMUXC_SD1_CLK_USDHC1_CLK,         0U, 0x17049},
-        {IOMUXC_SD1_CMD_USDHC1_CMD,         0U, 0x17089},
-
-        {IOMUXC_SD1_DATA0_USDHC1_DATA0,     0U, 0x17089},
-        {IOMUXC_SD1_DATA1_USDHC1_DATA1,     0U, 0x17089},
-        {IOMUXC_SD1_DATA2_USDHC1_DATA2,     0U, 0x17089},
-        {IOMUXC_SD1_DATA3_USDHC1_DATA3,     0U, 0x17089},
-    },
-    .flag = 0,
-};
-
-_internal_rw sd_card_t _s_sd;
-
-#if defined(SDCARD_SHOW_CARD_INFO) && (SDCARD_SHOW_CARD_INFO)
-static void _sdcard_show_info( sd_card_t *card )
-{
-    LOG_RAW("------------------------------\n");
-    LOG_RAW("sd card infomation\n");
-    LOG_RAW("------------------------------\n");
-
-    LOG_RAW("Version:\n");
-    LOG_RAW("  version: %d\n", card->version);
-
-    LOG_RAW("Bus frequency:\n");
-    LOG_RAW("  freq: %d Hz\n", card->busClock_Hz);
-
-    LOG_RAW("Capacity information:\n");
-
-    LOG_RAW("  sector size:  %d Bytes\n", card->blockSize);
-    LOG_RAW("  sector count: %d\n", card->blockCount);
-    LOG_RAW("  block size:   %d\n", card->csd.eraseSectorSize);
-
-    LOG_RAW("Working condition:\n");
-
-    LOG_RAW("  voltage: ");
-    if (card->operationVoltage == kCARD_OperationVoltage330V) {
-        LOG_RAW("3.3V");
-    } else if (card->operationVoltage == kCARD_OperationVoltage180V) {
-        LOG_RAW("1.8V");
-    }
-    LOG_RAW("\n");
-
-    LOG_RAW("  timing mode: ");
-    if (card->currentTiming == kSD_TimingSDR12DefaultMode)
-    {
-        if (card->operationVoltage == kCARD_OperationVoltage330V) {
-            LOG_RAW("Default");
-        } else if (card->operationVoltage == kCARD_OperationVoltage180V) {
-            LOG_RAW("SDR12");
-        }
-    } else if (card->currentTiming == kSD_TimingSDR25HighSpeedMode) {
-        if (card->operationVoltage == kCARD_OperationVoltage180V) {
-            LOG_RAW("SDR25");
-        } else {
-            LOG_RAW("High Speed");
-        }
-    } else if (card->currentTiming == kSD_TimingSDR50Mode) {
-        LOG_RAW("SDR50");
-    } else if (card->currentTiming == kSD_TimingSDR104Mode) {
-        LOG_RAW("SDR104");
-    } else if (card->currentTiming == kSD_TimingDDR50Mode) {
-        LOG_RAW("DDR50");
-    }
-    LOG_RAW("\n");
-}
-#endif //#if defined(SDCARD_SHOW_CARD_INFO) && (SDCARD_SHOW_CARD_INFO)
-
-static rt_err_t sdcard_init_clock( struct imx_sddev *sddev )
-{
-    RT_ASSERT(RT_NULL != sddev);
-
-    if (IMX6ULL_USDHC1_BASE == sddev->periph.paddr)
-    {
-        CLOCK_SetDiv(kCLOCK_Usdhc1Div, 0U);
-        CLOCK_EnableClock(kCLOCK_Usdhc1);
-    } else if (IMX6ULL_USDHC2_BASE == sddev->periph.paddr) {
-        CLOCK_SetDiv(kCLOCK_Usdhc2Div, 0U);
-        CLOCK_EnableClock(kCLOCK_Usdhc2);
-    }
-
-    return RT_EOK;
-}
-
-static void _sdcard_gpio_init( struct imx_sddev *sddev )
-{
-    RT_ASSERT(RT_NULL != sddev);
-
-    for (int i=0; i<SDCARD_CONTROL_PIN_NUM; i++)
-    {
-        imx6ull_gpio_init(&sddev->gpio[i]);
-    }
-}
-
-static rt_err_t _sdcard_device_init( struct imx_sddev *sddev )
-{
-    sd_card_t *card = RT_NULL;
-
-    RT_ASSERT(RT_NULL != sddev);
-    RT_ASSERT(0 != sddev->periph.vaddr);
-
-    sdcard_init_clock(sddev);
-
-    card = &_s_sd;
-
-    card->host.base = (USDHC_Type*)(sddev->periph.vaddr);
-    if (IMX6ULL_USDHC1_BASE == sddev->periph.paddr)
-    {
-        card->host.sourceClock_Hz = BOARD_USDHC1_CLK_FREQ;
-    } else if (IMX6ULL_USDHC2_BASE == sddev->periph.paddr) {
-        card->host.sourceClock_Hz = BOARD_USDHC2_CLK_FREQ;
-    }
-
-    if (kStatus_Success != SD_Init(card))
-    {
-        SD_Deinit(card);
-        rt_memset(card, 0U, sizeof(_s_sd));
-
-        LOG_W("sd card init failed.");
-        return -RT_ERROR;
-    }
-
-    sddev->flag = 1;
-
-    LOG_D("sd card init finished.");
-    LOG_D("sd card has %d sector, sector size %d Bytes.", card->blockCount, card->blockSize);
-
-#if defined(SDCARD_SHOW_CARD_INFO) && (SDCARD_SHOW_CARD_INFO)
-    _sdcard_show_info(card);
-#endif
-
-    return RT_EOK;
-}
-
-static rt_err_t _sdcard_ops_init( rt_device_t dev )
-{
-    return RT_EOK;
-}
-
-static rt_err_t _sdcard_ops_open( rt_device_t dev,
-                                  rt_uint16_t oflag )
-{
-    RT_ASSERT(RT_NULL != dev);
-
-    if (!(dev->flag & RT_DEVICE_FLAG_RDWR))
-    {
-        LOG_W("only support rd/wr option!");
-        return -RT_ERROR;
-    }
-
-    dev->ref_count++;
-
-    return RT_EOK;
-}
-
-static rt_err_t _sdcard_ops_close( rt_device_t dev )
-{
-    RT_ASSERT(RT_NULL != dev);
-
-    dev->ref_count = (0 == dev->ref_count) ? 0 : (dev->ref_count - 1);
-
-    return RT_EOK;
-}
-
-static rt_size_t _sdcard_ops_read( rt_device_t dev,
-                                   rt_off_t pos,
-                                   void *buffer,
-                                   rt_size_t size )
-{
-    RT_ASSERT(RT_NULL != dev);
-
-    if (0 == dev->ref_count)
-    {
-        return 0;
-    }
-
-    if (kStatus_Success != SD_ReadBlocks(&_s_sd, buffer, SDCARD_PART2_START_SECTOR+pos, size))
-    {
-        return 0;
-    }
-
-    return size;
-}
-
-static rt_size_t _sdcard_ops_write( rt_device_t dev,
-                                    rt_off_t pos,
-                                    const void *buffer,
-                                    rt_size_t size )
-{
-    RT_ASSERT(RT_NULL != dev);
-
-    if (0 == dev->ref_count)
-    {
-        return 0;
-    }
-
-    if (kStatus_Success != SD_WriteBlocks(&_s_sd, buffer, SDCARD_PART2_START_SECTOR+pos, size))
-    {
-        return 0;
-    }
-
-    return size;
-}
-
-static rt_err_t _sdcard_ops_control( rt_device_t dev,
-                                     int cmd,
-                                     void *args )
-{
-    struct rt_device_blk_geometry *pgeometry = RT_NULL;
-    rt_err_t result;
-
-    switch (cmd)
-    {
-        case RT_DEVICE_CTRL_BLK_GETGEOME:
-            if (args)
-            {
-                pgeometry = (struct rt_device_blk_geometry*)args;
-
-                pgeometry->sector_count = _s_sd.blockCount;
-                pgeometry->bytes_per_sector = _s_sd.blockSize;
-                pgeometry->block_size = _s_sd.csd.eraseSectorSize;
-
-                result = RT_EOK;
-            }
-            else
-            {
-                result = -RT_EINVAL;
-            }
-            break;
-
-        case RT_DEVICE_CTRL_BLK_SYNC:
-            result = RT_EOK;
-            break;
-
-        default :
-            result = -RT_EINVAL;
-            break;
-    }
-
-    return result;
-}
-
-#ifdef RT_USING_DEVICE_OPS
-_internal_ro struct rt_device_ops _k_sdcard_ops =
-{
-    _sdcard_ops_init,       /* init */
-    _sdcard_ops_open,       /* open */
-    _sdcard_ops_close,      /* close */
-    _sdcard_ops_read,       /* read */
-    _sdcard_ops_write,      /* write */
-    _sdcard_ops_control,    /* control */
-};
-#endif
-
-int rt_hw_sdcard_init(void)
-{
-    struct rt_device *device = RT_NULL;
-
-    device = &_s_sdcard_device.parent;
-
-    device->type    = RT_Device_Class_Block;
-#ifdef RT_USING_DEVICE_OPS
-    device->ops     = &_k_sdcard_ops;
-#else
-    device->init    = _sdcard_ops_init;
-    device->open    = _sdcard_ops_open;
-    device->close   = _sdcard_ops_close;
-    device->read    = _sdcard_ops_read;
-    device->write   = _sdcard_ops_write;
-    device->control = _sdcard_ops_control;
-#endif
-    device->user_data = RT_NULL;
-
-    rt_device_register(device, _s_sdcard_device.name, RT_DEVICE_FLAG_RDWR);
-
-    _s_sdcard_device.periph.vaddr = platform_get_periph_vaddr(_s_sdcard_device.periph.paddr);
-
-    _s_sdcard_device.flag = 0; //wait for sdhc init!
-
-    _sdcard_gpio_init(&_s_sdcard_device);
-    _sdcard_device_init(&_s_sdcard_device);
-
-    return RT_EOK;
-}
-//INIT_DEVICE_EXPORT(rt_hw_sdcard_init);
-
-#endif //#ifdef BSP_USING_SDHC

bsp/imx6ull-artpi-smart/drivers/drv_sdhc.h

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2021, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2021-04-23     Lyons        first version
- */
-
-#ifndef __DRV_SDHC_H__
-#define __DRV_SDHC_H__
-
-#include "board.h"
-#include "drv_common.h"
-
-#ifdef BSP_USING_SDHC
-
-/* Fixed value, not edit! */
-#define SDCARD_CONTROL_PIN_NUM      (6)
-
-struct imx_periph
-{
-    rt_uint32_t                 paddr;
-    rt_uint32_t                 vaddr;
-};
-
-struct imx_sddev
-{
-    struct rt_device                parent;
-
-    const char                      *name;
-    struct imx_periph               periph;
-    rt_uint32_t                     irqno;
-
-    struct imx6ull_iomuxc           gpio[SDCARD_CONTROL_PIN_NUM];
-
-    rt_uint32_t                     flag;
-};
-
-#endif //#ifdef BSP_USING_SDHC
-#endif //#ifndef __DRV_SDHC_H__

bsp/imx6ull-artpi-smart/drivers/drv_sdio.c

@@ -6,6 +6,7 @@
  * Change Logs:
  * Date           Author       Notes
  * 2017-10-10     Tanek        first version
+ * 2021-07-07     linzhenxing  add sd card drivers in mmu
  */
 
 #include <rtthread.h>
@@ -18,27 +19,15 @@
 #include <fsl_gpio.h>
 #include <fsl_iomuxc.h>
 
-#include <finsh.h>
-
-#define RT_USING_SDIO1
-//#define RT_USING_SDIO2
-
-//#define DEBUG
-
-#ifdef DEBUG
-static int enable_log = 1;
+#include <ioremap.h>
 
-#define MMCSD_DGB(fmt, ...)                 \
-    do                                      \
-    {                                       \
-        if (enable_log)                     \
-        {                                   \
-            rt_kprintf(fmt, ##__VA_ARGS__); \
-        }                                   \
-    } while (0)
+#define DBG_TAG               "drv_sdio"
+#ifdef RT_SDIO_DEBUG
+#define DBG_LVL               DBG_LOG
 #else
-#define MMCSD_DGB(fmt, ...)
-#endif
+#define DBG_LVL               DBG_INFO
+#endif /* RT_SDIO_DEBUG */
+#include <rtdbg.h>
 
 #define CACHE_LINESIZE              (32)
 
@@ -86,8 +75,6 @@ struct imxrt_mmcsd
     uint32_t *usdhc_adma2_table;
 };
 
-extern void *rt_ioremap(void *paddr, size_t size);
-
 /*! @name Configuration */
 /*@{*/
 
@@ -157,29 +144,11 @@ static inline void _IOMUXC_SetPinConfig(uint32_t muxRegister,
     }
 }
 
-void rt_hw_usdhc1_isr(int irqno, void *param)
-{
-    struct rt_mmcsd_host *host = (struct rt_mmcsd_host *)param;
-    struct imxrt_mmcsd *mmcsd = host->private_data;
-    rt_uint32_t intstatus = mmcsd->usdhc_host.base->INT_STATUS;
-
-    rt_interrupt_enter();
-    mmcsd->usdhc_host.base->INT_STATUS = intstatus;
-    if (intstatus & kUSDHC_CardDetectFlag)
-    {
-        host_change();
-    }
-    else
-    {
-
-    }
-    rt_interrupt_leave();
-}
-
 static void _mmcsd_gpio_init(struct imxrt_mmcsd *mmcsd)
 {
 
     CLOCK_EnableClock(kCLOCK_Iomuxc);          /* iomuxc clock (iomuxc_clk_enable): 0x03u */
+#ifdef RT_USING_SDIO1
     /* uSDHC1 pins start*/
     _IOMUXC_SetPinMux(IOMUXC_UART1_RTS_B_USDHC1_CD_B, 0U);
     _IOMUXC_SetPinConfig(IOMUXC_UART1_RTS_B_USDHC1_CD_B,
@@ -248,7 +217,9 @@ static void _mmcsd_gpio_init(struct imxrt_mmcsd *mmcsd)
                         IOMUXC_SW_PAD_CTL_PAD_HYS_MASK);
 
     /* uSDHC1 pins end*/
+#endif
 
+#ifdef RT_USING_SDIO2
     /* uSDHC2 pins start*/
     _IOMUXC_SetPinMux(IOMUXC_NAND_WE_B_USDHC2_CMD, 0U);
     _IOMUXC_SetPinConfig(IOMUXC_NAND_WE_B_USDHC2_CMD,
@@ -261,7 +232,7 @@ static void _mmcsd_gpio_init(struct imxrt_mmcsd *mmcsd)
                         IOMUXC_SW_PAD_CTL_PAD_HYS_MASK);
     _IOMUXC_SetPinMux(IOMUXC_NAND_RE_B_USDHC2_CLK, 0U);
 
-_IOMUXC_SetPinConfig(IOMUXC_NAND_RE_B_USDHC2_CLK,
+    _IOMUXC_SetPinConfig(IOMUXC_NAND_RE_B_USDHC2_CLK,
                         IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
                         IOMUXC_SW_PAD_CTL_PAD_DSE(1U) |
                         IOMUXC_SW_PAD_CTL_PAD_SPEED(2U) |
@@ -352,6 +323,7 @@ _IOMUXC_SetPinConfig(IOMUXC_NAND_RE_B_USDHC2_CLK,
                         IOMUXC_SW_PAD_CTL_PAD_HYS_MASK);
 
     /* uSDHC2 pins end*/
+#endif
 }
 static void SDMMCHOST_ErrorRecovery(USDHC_Type *base)
 {
@@ -393,11 +365,6 @@ static void _mmcsd_clk_init(struct imxrt_mmcsd *mmcsd)
     CLOCK_SetDiv(mmcsd->usdhc_div, 5U);
 }
 
-static void _mmcsd_isr_init(struct imxrt_mmcsd *mmcsd)
-{
-    //NVIC_SetPriority(USDHC1_IRQn, 5U);
-}
-
 static void _mmc_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *req)
 {
     struct imxrt_mmcsd *mmcsd;
@@ -421,7 +388,7 @@ static void _mmc_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *req)
     cmd = req->cmd;
     RT_ASSERT(cmd != RT_NULL);
 
-    MMCSD_DGB("\tcmd->cmd_code: %02d, cmd->arg: %08x, cmd->flags: %08x --> ", cmd->cmd_code, cmd->arg, cmd->flags);
+    LOG_D("\tcmd->cmd_code: %02d, cmd->arg: %08x, cmd->flags: %08x --> ", cmd->cmd_code, cmd->arg, cmd->flags);
 
     data = cmd->data;
 
@@ -489,7 +456,7 @@ static void _mmc_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *req)
         fsl_data.blockSize = data->blksize;
         fsl_data.blockCount = data->blks;
 
-        MMCSD_DGB(" blksize:%d, blks:%d ", fsl_data.blockSize, fsl_data.blockCount);
+        LOG_D(" blksize:%d, blks:%d ", fsl_data.blockSize, fsl_data.blockCount);
 
         if (((rt_uint32_t)data->buf & (CACHE_LINESIZE - 1)) ||         // align cache(32byte)
                 ((rt_uint32_t)data->buf >  0x00000000 && (rt_uint32_t)data->buf < 0x00080000) /*||  // ITCM
@@ -499,7 +466,7 @@ static void _mmc_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *req)
             buf = rt_malloc_align(fsl_data.blockSize * fsl_data.blockCount, CACHE_LINESIZE);
             RT_ASSERT(buf != RT_NULL);
 
-            MMCSD_DGB(" malloc buf: %p, data->buf:%p, %d ", buf, data->buf, fsl_data.blockSize * fsl_data.blockCount);
+            LOG_D(" malloc buf: %p, data->buf:%p, %d ", buf, data->buf, fsl_data.blockSize * fsl_data.blockCount);
         }
 
 
@@ -507,7 +474,7 @@ static void _mmc_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *req)
         {
             if (buf)
             {
-                MMCSD_DGB(" write(data->buf to buf) ");
+                LOG_D(" write(data->buf to buf) ");
                 rt_memcpy(buf, data->buf, fsl_data.blockSize * fsl_data.blockCount);
                 fsl_data.txData = (uint32_t const *)buf;
             }
@@ -543,7 +510,7 @@ static void _mmc_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *req)
     if (error == kStatus_Fail)
     {
         SDMMCHOST_ErrorRecovery(mmcsd->usdhc_host.base);
-        MMCSD_DGB(" ***USDHC_TransferBlocking error: %d*** --> \n", error);
+        LOG_D(" ***USDHC_TransferBlocking error: %d*** --> \n", error);
         cmd->err = -RT_ERROR;
     }
 
@@ -551,7 +518,7 @@ static void _mmc_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *req)
     {
         if (fsl_data.rxData)
         {
-            MMCSD_DGB("read copy buf to data->buf ");
+            LOG_D("read copy buf to data->buf ");
             rt_memcpy(data->buf, buf, fsl_data.blockSize * fsl_data.blockCount);
         }
 
@@ -564,13 +531,13 @@ static void _mmc_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *req)
         cmd->resp[2] = fsl_command.response[1];
         cmd->resp[1] = fsl_command.response[2];
         cmd->resp[0] = fsl_command.response[3];
-        MMCSD_DGB(" resp 0x%08X 0x%08X 0x%08X 0x%08X\n",
+        LOG_D(" resp 0x%08X 0x%08X 0x%08X 0x%08X\n",
                   cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
     }
     else
     {
         cmd->resp[0] = fsl_command.response[0];
-        MMCSD_DGB(" resp 0x%08X\n", cmd->resp[0]);
+        LOG_D(" resp 0x%08X\n", cmd->resp[0]);
     }
 
     mmcsd_req_complete(host);
@@ -600,7 +567,7 @@ static void _mmc_set_iocfg(struct rt_mmcsd_host *host, struct rt_mmcsd_io_cfg *i
         usdhc_clk = IMXRT_MAX_FREQ;
     src_clk = (CLOCK_GetSysPfdFreq(kCLOCK_Pfd2) / (CLOCK_GetDiv(mmcsd->usdhc_div) + 1U));
 
-    MMCSD_DGB("\tsrc_clk: %d, usdhc_clk: %d, bus_width: %d\n", src_clk, usdhc_clk, bus_width);
+    LOG_D("\tsrc_clk: %d, usdhc_clk: %d, bus_width: %d\n", src_clk, usdhc_clk, bus_width);
     if (usdhc_clk)
     {
         USDHC_SetSdClock(mmcsd->usdhc_host.base, src_clk, usdhc_clk);
@@ -617,14 +584,6 @@ static void _mmc_set_iocfg(struct rt_mmcsd_host *host, struct rt_mmcsd_io_cfg *i
     }
 }
 
-#ifdef DEBUG
-static void log_toggle(int en)
-{
-    enable_log = en;
-}
-FINSH_FUNCTION_EXPORT(log_toggle, toglle log dumple);
-#endif
-
 static const struct rt_mmcsd_host_ops ops =
 {
     _mmc_request,
@@ -633,11 +592,11 @@ static const struct rt_mmcsd_host_ops ops =
     RT_NULL,//_mmc_enable_sdio_irq,
 };
 
-rt_int32_t _imxrt_mci_init(void)
+rt_int32_t imxrt_mci_init(void)
 {
-    struct imxrt_mmcsd *mmcsd1;
-    //struct imxrt_mmcsd *mmcsd2;
 #ifdef RT_USING_SDIO1
+    struct imxrt_mmcsd *mmcsd1;
+
     host1 = mmcsd_alloc_host();
     if (!host1)
     {
@@ -669,7 +628,6 @@ rt_int32_t _imxrt_mci_init(void)
 
     mmcsd1->host = host1;
     _mmcsd_clk_init(mmcsd1);
-    _mmcsd_isr_init(mmcsd1);
     _mmcsd_gpio_init(mmcsd1);
     _mmcsd_host_init(mmcsd1);
 
@@ -679,6 +637,7 @@ rt_int32_t _imxrt_mci_init(void)
 #endif
 
 #ifdef RT_USING_SDIO2
+    struct imxrt_mmcsd *mmcsd2;
     host2 = mmcsd_alloc_host();
     if (!host2)
     {
@@ -710,7 +669,6 @@ rt_int32_t _imxrt_mci_init(void)
 
     mmcsd2->host = host2;
     _mmcsd_clk_init(mmcsd2);
-    _mmcsd_isr_init(mmcsd2);
     _mmcsd_gpio_init(mmcsd2);
     _mmcsd_host_init(mmcsd2);
 
@@ -727,26 +685,14 @@ rt_int32_t _imxrt_mci_init(void)
     return 0;
 
 err:
+#ifdef RT_USING_SDIO1
     mmcsd_free_host(host1);
+#endif
+#ifdef RT_USING_SDIO2
     mmcsd_free_host(host2);
-
+#endif
     return -RT_ENOMEM;
 }
 
-int imxrt_mci_init(void)
-{
-    /* initilize sd card */
-    _imxrt_mci_init();
-
-    return 0;
-}
 INIT_DEVICE_EXPORT(imxrt_mci_init);
 
-
-void host_change(void)
-{
-    mmcsd_change(host1);
-
-}
-MSH_CMD_EXPORT(host_change, host_change);
-

bsp/imx6ull-artpi-smart/rtconfig.h

@@ -310,9 +310,9 @@
 #define BSP_LCD_WIDTH 1024
 #define BSP_LCD_HEIGHT 600
 
-/* Select SD Card Driver */
+/* Select SDHC Driver */
 
-#define BSP_USING_SDHC
+#define RT_USING_SDIO1
 
 /* Select RTC Driver */