aries adapter

Signed-off-by: lzl <sucer_fater@163.com>

sdk_liteos/config/device_info/device_info.hcs

@@ -110,14 +110,22 @@
                     deviceMatchAttr = "hisilicon_hi35xx_spi_1";
                 }
             }
-            device_sdio :: device {
+            device_mmc:: device {
                 device0 :: deviceNode {
-                    policy = 1;
-                    priority = 70;
+                    policy = 2;
+                    priority = 20;
                     permission = 0644;
-                    moduleName = "HDF_PLATFORM_SDIO";
-                    serviceName = "HDF_PLATFORM_SDIO_1";
-                    deviceMatchAttr = "hisilicon_hi35xx_sdio_1";
+                    moduleName = "hi3518_mmc_driver";
+                    serviceName = "HDF_PLATFORM_MMC_0";
+                    deviceMatchAttr = "hi3518_mmc_sd";
+                }
+                device1 :: deviceNode {
+                    policy = 2;
+                    priority = 10;
+                    permission = 0644;
+                    moduleName = "hi3518_mmc_driver";
+                    serviceName = "HDF_PLATFORM_MMC_1";
+                    deviceMatchAttr = "hi3518_mmc_sdio";
                 }
             }
             device_hisi_sdk:: device {

sdk_liteos/config/hdf.hcs

@@ -4,7 +4,7 @@
 #include "uart/uart_config.hcs"
 #include "watchdog/watchdog_config.hcs"
 #include "usb/usb_config.hcs"
-#include "sdio/sdio_config.hcs"
+#include "mmc/mmc_config.hcs"
 #include "rtc/rtc_config.hcs"
 #include "spi/spi_config.hcs"
 #include "wifi/wlan_platform.hcs"

sdk_liteos/config/mmc/mmc_config.hcs

@@ -0,0 +1,47 @@
+root {
+    platform {
+        mmc_config {
+            template mmc_controller {
+                match_attr = "";
+                voltDef = 0;         // 3.3V
+                freqMin = 100000;
+                freqMax = 50000000;
+                freqDef = 400000;
+                maxBlkNum = 2048;
+                maxBlkSize = 512;
+                ocrDef = 0x360000;
+                caps = 0;
+                caps2 = 0;
+                regSize = 0x600;
+                hostId = 0;
+                regBasePhy = 0;
+                irqNum = 0;
+                devType = 0;
+                quirks = 0;
+            }
+
+            controller_0x00 :: mmc_controller {
+                match_attr = "hi3518_mmc_sd";
+                hostId = 0;
+                regBasePhy = 0x10010000;
+                irqNum = 62;
+                devType = 1;      // sd
+                freqMax = 150000000;
+                caps = 0x50000101;
+                caps2 = 0x60;
+                quirks = 0x0C;
+            }
+
+            controller_0x01 :: mmc_controller {
+                match_attr = "hi3518_mmc_sdio";
+                hostId = 1;
+                regBasePhy = 0x10020000;
+                irqNum = 63;
+                devType = 2;     // sdio
+                freqMax = 50000000;
+                caps = 0x10000109;
+                quirks = 0x0D;
+            }
+        }
+    }
+}

sdk_liteos/config/sdio/sdio_config.hcs

@@ -1,16 +0,0 @@
-root {
-    platform {
-        sdio_config {
-            template sdio_controller {
-                match_attr = "";
-                funcNum = 1;
-                vendorId = 0x296;
-                deviceId = 0x5347;
-            }
-
-            controller_0x5347 :: sdio_controller {
-                match_attr = "hisilicon_hi35xx_sdio_1";
-            }
-        }
-    }
-}

sdk_liteos/mpp/module_init/src/system_init.c

@@ -132,12 +132,6 @@ void SystemInit(void)
     DevUrandomRegister();
 #endif
 
-#ifdef LOSCFG_DRIVERS_MMC
-    dprintf("MMC dev init ...");
-    extern int SD_MMC_Host_init(void);
-    SD_MMC_Host_init();
-#endif
-
 #ifdef LOSCFG_DRIVERS_MEM
     dprintf("dev mem init ...\n");
     DevMemRegister();