dra7xx: u-boot: Revert the fix for MMC instability

Change-Id: I88daa7df388c12eed2b53f3db2c8821814c2e88e
Signed-off-by: Karthik Ramanan <a0393906@ti.com>

diff --git a/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/0001-mmc-disable-the-mmc-clock-during-power-off.patch b/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/0001-mmc-disable-the-mmc-clock-during-power-off.patch
deleted file mode 100644 (file)
index 3be8dc7..0000000
--- a/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/0001-mmc-disable-the-mmc-clock-during-power-off.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 96d42df4e7cb700bde4bdf5106cfd2753749c4e7 Mon Sep 17 00:00:00 2001
-From: Kishon Vijay Abraham I <kishon@ti.com>
-Date: Fri, 11 Nov 2016 19:59:22 +0530
-Subject: [PATCH] mmc: disable the mmc clock during power off
-
-There is no point in having the mmc clock enabled during
-power off. Disable the mmc clock. This is similar to how it's
-programmed in Linux Kernel.
-
-Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
----
- drivers/mmc/mmc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
-index c929a1e..84515a7 100644
---- a/drivers/mmc/mmc.c
-+++ b/drivers/mmc/mmc.c
-@@ -2058,6 +2058,7 @@ static void mmc_power_off(struct mmc *mmc)
- {
-       mmc_set_signal_voltage(mmc, 0);
-       mmc_set_vdd(mmc, false);
-+      mmc_set_clock(mmc, 1, true);
- }
- 
- static void mmc_power_cycle(struct mmc *mmc)
--- 
-1.9.1
-

diff --git a/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend b/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend
index 8f4402b..2630fab 100644 (file)
--- a/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend
+++ b/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend
@@ -7,7 +7,6 @@ SRC_URI = "git://git.omapzoom.org/repo/u-boot.git;protocol=git;branch=${BRANCH}"
 # This applies to the JACINTO 6 vayu board ... essentially it is dra7_evm.
 SRC_URI_vayu     += "file://fix_builderror_gcc5.patch"
 SRC_URI += " file://${UBOOT_ENV_BINARY}"
-SRC_URI += " file://0001-mmc-disable-the-mmc-clock-during-power-off.patch"
 
 UBOOT_ENV = "uEnv"