From patchwork Wed Mar 13 16:36:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Anderson X-Patchwork-Id: 2263891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 1A567DF215 for ; Wed, 13 Mar 2013 16:40:32 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFog2-0001Hw-8w; Wed, 13 Mar 2013 16:37:18 +0000 Received: from mail-gg0-x249.google.com ([2607:f8b0:4002:c02::249]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFofs-0001Gj-6O for linux-arm-kernel@lists.infradead.org; Wed, 13 Mar 2013 16:37:10 +0000 Received: by mail-gg0-f201.google.com with SMTP id l2so118772ggn.4 for ; Wed, 13 Mar 2013 09:37:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=Sz9kRtonKFCAwKk2AG0dht6PBQ/z8kE2qGOBT/vi8q0=; b=g+nQmqu4JoqLbZUjlIXwP4Eom4qoG7AnMtZ1kznpgf/H2KSFtvwdMxXxamR3pBAX1N eiksiJzOjSbIxGwHAFCRdBvEC6xG6/89jZZEip9U0ysjFnYMXSa3LtkDveKAlveMPhdJ odB2y4QW/7kcbJapoY/KaZyBzYZP+T/iOej8H26eCR+5H2TMSkW04GsV8gz2TpKs4QXS nrjNyMMmk9NEl00Z5YTleDzxnFF2Wzv8URtDHBCA2SuM+3zMWuzTsXIuFhtbP81lyEq7 S7nB8mgnXxUUKbDjIf5ccXM2pq7ejTrPvq1J9BUPq5OaGlU/2hayPcwQAKoL4VVpn1A9 rSxQ== X-Received: by 10.236.146.144 with SMTP id r16mr13127650yhj.2.1363192627121; Wed, 13 Mar 2013 09:37:07 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id f64si1642627yhj.7.2013.03.13.09.37.07 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Wed, 13 Mar 2013 09:37:07 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.73.80]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id C8BD05A4251; Wed, 13 Mar 2013 09:37:06 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 5B18480354; Wed, 13 Mar 2013 09:37:06 -0700 (PDT) From: Doug Anderson To: Wolfram Sang , Kukjin Kim Subject: [PATCH v4 2/3] ARM: dts: Add i2c-arbitrator bus for exynos5250-snow Date: Wed, 13 Mar 2013 09:36:22 -0700 Message-Id: <1363192583-26363-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1363192583-26363-1-git-send-email-dianders@chromium.org> References: <1360957573-864-1-git-send-email-dianders@chromium.org> <1363192583-26363-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQlqzGyqDmDSP2FqDqLWTOfOOhxhLgNSie8SjG+MfVw9VxtycPpx87FJh4PelVQZTGXtuI+q50j6TNqP0wkaGLp8o6BGm5W1XFmfvw3J7/gOGQ+Xnubd4gVmlGSAac4I1a0e/4en1kdQBbo1camUfczUaYEqs3HuHdgXYzPc55OSEJEyRGqzQ/ddkhsMfPgZY/996zmP1rzsz1yiUA0Eb5Iylm5yiA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130313_123708_316490_1DA6FF4E X-CRM114-Status: GOOD ( 13.64 ) X-Spam-Score: -4.3 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -2.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: sreekumar.c@samsung.com, Jingoo Han , Russell King , Grant Grundler , Prashanth G , Simon Glass , Mark Brown , Doug Anderson , Daniel Kurtz , linux-kernel@vger.kernel.org, Grant Likely , Olof Johansson , Ben Dooks , Yuvaraj Kumar , u.kleine-koenig@pengutronix.de, Girish Shivananjappa , Thomas Abraham , bhushan.r@samsung.com, Naveen Krishna Chatradhi , linux-arm-kernel@lists.infradead.org, Rahul Sharma X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org We need to use the i2c-arbitrator to talk to any of the devices on i2c bus 4 on exynos5250-snow so that we don't confuse the embedded controller (EC). Add the i2c-arbitrator to the device tree. As we add future devices (keyboard, sbs, tps65090) we'll add them on top of this. The arbitrated bus is numbered 104 simply as a convenience to make it easier for people poking around to guess that it might have something to do with the physical bus 4. The addition is split between the cros5250-common and the snow device tree file since not all cros5250-class devices use arbitration. Signed-off-by: Doug Anderson Tested-by: Naveen Krishna Chatradhi --- Changes in v4: - Changed mux gpio syntax to work atop Thomas's "ARM: dts: add pin state information in client nodes for Exynos5 platforms"; avoid adding gpios property to i2c@12CA0000 for the same reason. Changes in v3: None Changes in v2: - Use new device tree property names / compatible string. - Include that the GPIOs for arbitration are active low. arch/arm/boot/dts/cros5250-common.dtsi | 3 ++- arch/arm/boot/dts/exynos5250-snow.dts | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index 8a5b3a6..0a61bbb 100644 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ b/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/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index 581ffae..bf16353 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/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-arbitrator-cros-ec"; + #address-cells = <1>; + #size-cells = <0>; + + i2c-parent = <&{/i2c@12CA0000}>; + + ap-claim-gpio = <&gpf0 3 1>; + ec-claim-gpio = <&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.