From 17e843e746936d5b043c7438d1578c70a201898c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 21 Dec 2012 15:49:08 +0100
Subject: [PATCH] --- yaml --- r: 359928 b: refs/heads/master c:
 b6150c710658faed9ebe80f989f622175eaf0e14 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/arm/boot/dts/armada-370-db.dts | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8a76cd37c734..2dfc0297c7d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d64c129b44d90fd7075dc7cf4b0f30ef70c316f7
+refs/heads/master: b6150c710658faed9ebe80f989f622175eaf0e14
diff --git a/trunk/arch/arm/boot/dts/armada-370-db.dts b/trunk/arch/arm/boot/dts/armada-370-db.dts
index 9b82facb2561..8e66a7c00e18 100644
--- a/trunk/arch/arm/boot/dts/armada-370-db.dts
+++ b/trunk/arch/arm/boot/dts/armada-370-db.dts
@@ -59,5 +59,20 @@
 			phy = <&phy1>;
 			phy-mode = "rgmii-id";
 		};
+
+		mvsdio@d00d4000 {
+			pinctrl-0 = <&sdio_pins1>;
+			pinctrl-names = "default";
+			/*
+			 * This device is disabled by default, because
+			 * using the SD card connector requires
+			 * changing the default CON40 connector
+			 * "DB-88F6710_MPP_2xRGMII_DEVICE_Jumper" to a
+			 * different connector
+			 * "DB-88F6710_MPP_RGMII_SD_Jumper".
+			 */
+			status = "disabled";
+			/* No CD or WP GPIOs */
+		};
 	};
 };