---

yaml --- r: 355743 b: refs/heads/master c: 5186bf2 h: refs/heads/master i: 355741: 6e7d64c 355739: 8083877 355735: 35c542f 355727: cfde457 355711: 885592f v: v3
git-mirror · Jan 15, 2013 · 701dabd · 701dabd
1 parent 7b9d9a3
commit 701dabd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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>;
 	};
 };