From 3bc0121f13ee0b83dda9d615e9cb5ebe68a8d25d Mon Sep 17 00:00:00 2001 From: Kevin Kim Date: Thu, 11 Oct 2018 16:49:40 +0900 Subject: [PATCH] ODROID-COMMON: Support for emmc HS400 mode. Change-Id: I4dfcb28e9c93ba09214436190b82c025d3527f31 --- .../boot/dts/amlogic/mesong12_odroid_common.dtsi | 13 +++++++++---- drivers/amlogic/mmc/aml_sd_emmc_v3.c | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi index 1df79c1db6d2..7b7dfdebd055 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi @@ -319,14 +319,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 97a585bf7943..1e6c53ad5476 100644 --- a/drivers/amlogic/mmc/aml_sd_emmc_v3.c +++ b/drivers/amlogic/mmc/aml_sd_emmc_v3.c @@ -821,7 +821,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; }