diff --git a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi index e4fcba5505e3..bdbe9263eec5 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi @@ -324,14 +324,19 @@ "MMC_CAP_MMC_HIGHSPEED", "MMC_CAP_SD_HIGHSPEED", "MMC_CAP_NONREMOVABLE", - /* "MMC_CAP_1_8V_DDR", */ + "MMC_CAP_1_8V_DDR", "MMC_CAP_HW_RESET", "MMC_CAP_ERASE", "MMC_CAP_CMD23"; - caps2 = "MMC_CAP2_HS200"; - /* "MMC_CAP2_HS400";*/ + caps2 = "MMC_CAP2_HS200_1_8V_SDR", + "MMC_CAP2_BROKEN_VOLTAGE", + "MMC_CAP2_HS400_ES", + "MMC_CAP2_HS400_1_8V"; f_min = <400000>; - f_max = <200000000>; + f_max = <120000000>; + card_type = <1>; + gpio_dat3 = <&gpio BOOT_3 GPIO_ACTIVE_HIGH>; + hw_reset = <&gpio BOOT_12 GPIO_ACTIVE_HIGH>; }; }; diff --git a/drivers/amlogic/mmc/aml_sd_emmc_v3.c b/drivers/amlogic/mmc/aml_sd_emmc_v3.c index a6511939f36f..8aa8e6824a7e 100644 --- a/drivers/amlogic/mmc/aml_sd_emmc_v3.c +++ b/drivers/amlogic/mmc/aml_sd_emmc_v3.c @@ -720,7 +720,7 @@ RETRY: eyetest_log = readl(host->base + SD_EMMC_EYETEST_LOG); if (!(geyetest_log->eyetest_done & 0x1)) { - pr_warn("testing eyetest times:0x%x,out:0x%x,0x%x,line:%d\n", + pr_debug("testing eyetest times:0x%x,out:0x%x,0x%x,line:%d\n", readl(host->base + SD_EMMC_EYETEST_LOG), eyetest_out0, eyetest_out1, line_x); gintf3->eyetest_on = 0; @@ -728,7 +728,7 @@ RETRY: pdata->intf3 = intf3; retry--; if (retry == 0) { - pr_warn("[%s][%d] retry eyetest failed-line:%d\n", + pr_debug("[%s][%d] retry eyetest failed-line:%d\n", __func__, __LINE__, line_x); return 1; }