ODROID-COMMON: mmc/core: Removed HS400

Change-Id: Ic2082a938ff2966f74717796e3d52a4546fef0e6

diff --git a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
index 818a6ee..010d021 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
@@ -321,6 +321,8 @@
 
 &sd_emmc_c {
        status = "okay";
+       mmc-ddr-1_8v;
+       mmc-hs200-1_8v;
        emmc {
                caps = "MMC_CAP_8_BIT_DATA",
                         "MMC_CAP_MMC_HIGHSPEED",
@@ -331,14 +333,10 @@
                         "MMC_CAP_ERASE",
                         "MMC_CAP_CMD23";
                caps2 = "MMC_CAP2_HS200_1_8V_SDR",
-                       "MMC_CAP2_BROKEN_VOLTAGE",
-                       "MMC_CAP2_HS400_ES",
-                       "MMC_CAP2_HS400_1_8V";
+                       "MMC_CAP2_BROKEN_VOLTAGE";
                f_min = <400000>;
-               f_max = <120000000>;
-               card_type = <1>;
-               gpio_dat3 = <&gpio BOOT_3 GPIO_ACTIVE_HIGH>;
-               hw_reset =  <&gpio BOOT_12 GPIO_ACTIVE_HIGH>;
+               f_max = <200000000>;
+               hw_reset = <&gpio BOOT_12 GPIO_ACTIVE_HIGH>;
        };
 };
 

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index fbac7f2..a848930 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1190,17 +1190,17 @@ static int mmc_select_hs400(struct mmc_card *card)
                                mmc_hostname(host));
                }
        }
-       if (raw_driver_strength & (1 << 1)) {
+       if (raw_driver_strength & (1 << 4)) {
                val =
-                       (0x1 << EXT_CSD_DRV_STR_SHIFT)
+                       (0x4 << EXT_CSD_DRV_STR_SHIFT)
                        | EXT_CSD_TIMING_HS400;
-               pr_info("%s: support driver strength type 1\n",
+               pr_info("%s: support driver strength type 4\n",
                                mmc_hostname(host));
-       } else if (raw_driver_strength & (1 << 4)) {
+       } else if (raw_driver_strength & (1 << 1)) {
                val =
-                       (0x4 << EXT_CSD_DRV_STR_SHIFT)
+                       (0x1 << EXT_CSD_DRV_STR_SHIFT)
                        | EXT_CSD_TIMING_HS400;
-               pr_info("%s: support driver strength type 4\n",
+               pr_info("%s: support driver strength type 1\n",
                                mmc_hostname(host));
        } else  {
                val = EXT_CSD_TIMING_HS400;