From 9d4a62403e5bf33a88a13e5a57919a507f200005 Mon Sep 17 00:00:00 2001
From: Doug Anderson <dianders@chromium.org>
Date: Tue, 16 Apr 2013 16:29:01 +0000
Subject: [PATCH] --- yaml --- r: 374135 b: refs/heads/master c:
 97a4a1ba0eb0c8fd20cabf8a3ca857de9658ee21 h: refs/heads/master i:   374133:
 c403989ca377b0182f7d4710f7f3649a8bc87f2e   374131:
 88ceb0fa84531df9d8675c6051e5529cfcdaac90   374127:
 c557aa8b73c258dc62c033f436f213ca407e0f3b v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/arm/boot/dts/cros5250-common.dtsi |  3 ++-
 trunk/arch/arm/boot/dts/exynos5250-snow.dts  | 25 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 80b3db91030a..a5f637200230 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cae0fafe33254c52f19dbf90854cbf22b82fc96
+refs/heads/master: 97a4a1ba0eb0c8fd20cabf8a3ca857de9658ee21
diff --git a/trunk/arch/arm/boot/dts/cros5250-common.dtsi b/trunk/arch/arm/boot/dts/cros5250-common.dtsi
index 8a5b3a6cdc58..0a61bbb9102f 100644
--- a/trunk/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/trunk/arch/arm/boot/dts/cros5250-common.dtsi
@@ -193,7 +193,8 @@
 	};
 
 	i2c@12CA0000 {
-		status = "disabled";
+		samsung,i2c-sda-delay = <100>;
+		samsung,i2c-max-bus-freq = <66000>;
 	};
 
 	i2c@12CB0000 {
diff --git a/trunk/arch/arm/boot/dts/exynos5250-snow.dts b/trunk/arch/arm/boot/dts/exynos5250-snow.dts
index 581ffae27e13..fa85f58553f5 100644
--- a/trunk/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/trunk/arch/arm/boot/dts/exynos5250-snow.dts
@@ -16,6 +16,10 @@
 	model = "Google Snow";
 	compatible = "google,snow", "samsung,exynos5250";
 
+	aliases {
+		i2c104 = &i2c_104;
+	};
+
 	pinctrl@11400000 {
 		sd3_clk: sd3-clk {
 			samsung,pin-drv = <0>;
@@ -44,6 +48,27 @@
 		};
 	};
 
+	i2c-arbitrator {
+		compatible = "i2c-arb-gpio-challenge";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		i2c-parent = <&{/i2c@12CA0000}>;
+
+		our-claim-gpio = <&gpf0 3 1>;
+		their-claim-gpios = <&gpe0 4 1>;
+		slew-delay-us = <10>;
+		wait-retry-us = <3000>;
+		wait-free-us = <50000>;
+
+		/* Use ID 104 as a hint that we're on physical bus 4 */
+		i2c_104: i2c@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
+
 	/*
 	 * On Snow we've got SIP WiFi and so can keep drive strengths low to
 	 * reduce EMI.