From 9e9536171a9077584a4101b26e102a5a87a55e22 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Mon, 14 Jan 2013 21:07:20 -0700
Subject: [PATCH] --- yaml --- r: 355745 b: refs/heads/master c:
 9692c191ffffbd5255bec222b8f0f2854932a408 h: refs/heads/master i:   355743:
 701dabd0e3fc1a53797531758b5e18cbd4cb6110 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/arm/boot/dts/bcm2835.dtsi | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 2253c60712a7..7c8e4d102c66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 232fed4825e832c89b1d47a24c7836918063fb3e
+refs/heads/master: 9692c191ffffbd5255bec222b8f0f2854932a408
diff --git a/trunk/arch/arm/boot/dts/bcm2835.dtsi b/trunk/arch/arm/boot/dts/bcm2835.dtsi
index c69a591631b8..4bf2a8774aa7 100644
--- a/trunk/arch/arm/boot/dts/bcm2835.dtsi
+++ b/trunk/arch/arm/boot/dts/bcm2835.dtsi
@@ -89,15 +89,23 @@
 		};
 	};
 
-	clk_i2c: clock {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <150000000>;
-	};
+	clocks {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
 
-	clk_mmc: clock {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <100000000>;
+		clk_mmc: mmc {
+			compatible = "fixed-clock";
+			reg = <0>;
+			#clock-cells = <0>;
+			clock-frequency = <100000000>;
+		};
+
+		clk_i2c: i2c {
+			compatible = "fixed-clock";
+			reg = <1>;
+			#clock-cells = <0>;
+			clock-frequency = <150000000>;
+		};
 	};
 };