From patchwork Fri Feb 15 00:21:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2143961 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id E955B3FCF6 for ; Fri, 15 Feb 2013 00:25:08 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U694B-0004O7-Uc; Fri, 15 Feb 2013 00:22:15 +0000 Received: from mail-gg0-x249.google.com ([2607:f8b0:4002:c02::249]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U6940-0004N5-Av for linux-arm-kernel@lists.infradead.org; Fri, 15 Feb 2013 00:22:05 +0000 Received: by mail-gg0-f201.google.com with SMTP id l2so18819ggn.4 for ; Thu, 14 Feb 2013 16:22:01 -0800 (PST) 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=AxVKgAKhJ2FjLw+hxT84uPrnryu50BV82gI3aoGnnuE=; b=JMkyHhxzGFReTWL8F/6yoGVFmm446PExhG4Co14LmKEN45HiXsXnLt4JRL4ohQheaq mdVGhw/+echZnXm4C87jA2KvqC3xKfplxCAGaj8MDLCmufuld6v/pE0JF970C3tF2Tlo 9v50vIdGsa4a5teEmW2qVrGFZZijNMkyX66Tqx5HjI5ftLHebIkMCHXUXJk3dP+10V5H 3yy+BgSQeStfZ94PknnPLrh+3+VxRTM8yH7s2tNwDc8NcPTwOprqgNbXu1bL9SjnDrHm +fhMH2EDJ3ziWtgMMsljZX5mgbQchNIfzMjGI3wx6czdF759sktbzIuOdZ9bvKixYKuC NXCw== X-Received: by 10.236.85.211 with SMTP id u59mr312753yhe.38.1360887720588; Thu, 14 Feb 2013 16:22:00 -0800 (PST) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id e7si2191167yhk.3.2013.02.14.16.22.00 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Thu, 14 Feb 2013 16:22:00 -0800 (PST) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.73.80]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 5E53D31C18E; Thu, 14 Feb 2013 16:22:00 -0800 (PST) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 0BED780522; Thu, 14 Feb 2013 16:21:59 -0800 (PST) From: Doug Anderson To: Wolfram Sang Subject: [PATCH v2 2/3] ARM: dts: Add i2c-arbitrator bus for exynos5250-snow Date: Thu, 14 Feb 2013 16:21:16 -0800 Message-Id: <1360887677-20758-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1360887677-20758-1-git-send-email-dianders@chromium.org> References: <1360887677-20758-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQkQOfi82QDSMGxJOiBQV583+nZZm/IexFd3ntJY1SpSn+iClTVswPZ6o0TLU6MB+Rfa2uhcdubBsmr2ohHxXB5Pj81RnvkI9NSmC3+99t24EiZj31jpTves3K+etp98oNF8ppi1SdZeP03rmFp4Mrr1afI5MXYDF1jq9zFnp63wpW/EGJnxro8IfBNU8u+J2WR/Y1InDKg3guKVEbwLuEeu+kVrUg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130214_192204_432304_1A56278B X-CRM114-Status: GOOD ( 14.75 ) X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.7 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: Linus Walleij , Daniel Kurtz , linux-kernel@vger.kernel.org, Grant Likely , Kukjin Kim , Russell King , Ben Dooks , Thomas Abraham , u.kleine-koenig@pengutronix.de, Guenter Roeck , Grant Grundler , Girish Shivananjappa , bhushan.r@samsung.com, Naveen Krishna Chatradhi , linux-arm-kernel@lists.infradead.org, Rahul Sharma , sreekumar.c@samsung.com, Simon Glass , Mark Brown , Doug Anderson , Yuvaraj Kumar , Olof Johansson , Prashanth G X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org 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 --- 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 | 5 ++++- arch/arm/boot/dts/exynos5250-snow.dts | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index 46c0980..f451375 100644 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ b/arch/arm/boot/dts/cros5250-common.dtsi @@ -58,7 +58,10 @@ }; i2c@12CA0000 { - status = "disabled"; + samsung,i2c-sda-delay = <100>; + samsung,i2c-max-bus-freq = <66000>; + gpios = <&gpa2 0 3 3 0>, + <&gpa2 1 3 3 0>; }; i2c@12CB0000 { diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index 17dd951..d2d4b48 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; + }; + gpio-keys { compatible = "gpio-keys"; @@ -29,6 +33,27 @@ }; }; + i2c-arbitrator { + compatible = "i2c-arbitrator-cros-ec"; + #address-cells = <1>; + #size-cells = <0>; + + i2c-parent = <&{/i2c@12CA0000}>; + + ap-claim-gpio = <&gpf0 3 1 0x10000 0>; + ec-claim-gpio = <&gpe0 4 0 0x10003 0>; + 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.