From 61414d218823580143a5e7914965779f6292cdc3 Mon Sep 17 00:00:00 2001
From: Dinh Nguyen <dinguyen@opensource.altera.com>
Date: Fri, 13 Mar 2015 14:34:47 -0500
Subject: FogBugz #270904-96: put sd into 4-bit mode

Turns out, in order for 4-bit mode SD to work, we also need to configure
the SD_DAT[4-7] to be SDMMC as well.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
---
 arch/arm/dts/socfpga_arria10.dts | 16 ++++++++--------
 drivers/mmc/mmc.c                |  2 --
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/arch/arm/dts/socfpga_arria10.dts b/arch/arm/dts/socfpga_arria10.dts
index 7f628b0301..a6c826bea4 100644
--- a/arch/arm/dts/socfpga_arria10.dts
+++ b/arch/arm/dts/socfpga_arria10.dts
@@ -100,10 +100,10 @@
 				<0x00000020 0x00000008>,
 				<0x00000024 0x00000008>,
 				<0x00000028 0x0000000f>,
-				<0x0000002c 0x0000000f>,
-				<0x00000030 0x0000000f>,
-				<0x00000034 0x0000000f>,
-				<0x00000038 0x0000000f>,
+				<0x0000002c 0x00000008>,
+				<0x00000030 0x00000008>,
+				<0x00000034 0x00000008>,
+				<0x00000038 0x00000008>,
 				<0x0000003c 0x0000000f>,
 				<0x00000040 0x0000000f>;
 
@@ -125,10 +125,10 @@
 				<0x00000124 0x000a0304>,
 				<0x00000128 0x00090304>,
 				<0x0000012c 0x000d0008>,
-				<0x00000130 0x000d0008>,
-				<0x00000134 0x000d0008>,
-				<0x00000138 0x000d0008>,
-				<0x0000013c 0x000d0008>,
+				<0x00000130 0x000b0304>,
+				<0x00000134 0x000b0304>,
+				<0x00000138 0x000b0304>,
+				<0x0000013c 0x000b0304>,
 				<0x00000140 0x000d0008>,
 				<0x00000144 0x000d0008>;
 
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 894dc56457..ce56d42b70 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -706,10 +706,8 @@ retry_scr:
 			mmc->version = SD_VERSION_1_0;
 			break;
 	}
-#if 0
 	if (mmc->scr[0] & SD_DATA_4BIT)
 		mmc->card_caps |= MMC_MODE_4BIT;
-#endif
 
 	/* Version 1.0 doesn't support switching */
 	if (mmc->version == SD_VERSION_1_0)
-- 
cgit v1.2.1