From 701dabd0e3fc1a53797531758b5e18cbd4cb6110 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Mon, 24 Dec 2012 21:58:56 -0700
Subject: [PATCH] --- yaml --- r: 355743 b: refs/heads/master c:
 5186bf287aa4393b78c36f548d9b06001046b65e h: refs/heads/master i:   355741:
 6e7d64cce21b85b0b1645f50d81da31a72320ff2   355739:
 8083877dd5754cbd60a91dad3b34ce03209a2770   355735:
 35c542f46eae40f11e4d13282a9c0ecb1bf3bce6   355727:
 cfde4575db514e9267c2598328a2b4f3f229a945   355711:
 885592f97c01761f24061d514ec8d329fbd95ab2 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/arm/boot/dts/bcm2835-rpi-b.dts |  5 +++++
 trunk/arch/arm/boot/dts/bcm2835.dtsi      | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 542bbf0cdb1f..4a95db85ffec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6520700fdb2cc07ed86e893a2e88c491e04d6b75
+refs/heads/master: 5186bf287aa4393b78c36f548d9b06001046b65e
diff --git a/trunk/arch/arm/boot/dts/bcm2835-rpi-b.dts b/trunk/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 6ff26f99cacd..0544ef860623 100644
--- a/trunk/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/trunk/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -24,3 +24,8 @@
 		brcm,function = <7>; /* alt3 */
 	};
 };
+
+&sdhci {
+	status = "okay";
+	bus-width = <4>;
+};
diff --git a/trunk/arch/arm/boot/dts/bcm2835.dtsi b/trunk/arch/arm/boot/dts/bcm2835.dtsi
index 8917550fd1bb..1d7e4f5c0b1e 100644
--- a/trunk/arch/arm/boot/dts/bcm2835.dtsi
+++ b/trunk/arch/arm/boot/dts/bcm2835.dtsi
@@ -63,5 +63,19 @@
 			interrupt-controller;
 			#interrupt-cells = <2>;
 		};
+
+		sdhci: sdhci {
+			compatible = "brcm,bcm2835-sdhci";
+			reg = <0x7e300000 0x100>;
+			interrupts = <2 30>;
+			clocks = <&clk_mmc>;
+			status = "disabled";
+		};
+	};
+
+	clk_mmc: clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <100000000>;
 	};
 };