From patchwork Tue Apr 9 20:12:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2417021 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id A05BEDF25A for ; Tue, 9 Apr 2013 20:29:30 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UPf9N-0001ck-4G; Tue, 09 Apr 2013 20:28:18 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UPf8o-0003pL-JP; Tue, 09 Apr 2013 20:27:42 +0000 Received: from mail-ia0-x249.google.com ([2607:f8b0:4001:c02::249]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UPf8C-0003mM-Ol for linux-arm-kernel@lists.infradead.org; Tue, 09 Apr 2013 20:27:07 +0000 Received: by mail-ia0-f201.google.com with SMTP id k25so757185iah.0 for ; Tue, 09 Apr 2013 13:27:03 -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=v5H7xzVL1JsqT163zu+apC6tLLG2FjzvVPti0flHqWI=; b=km/p/tFPR0EOTK0xlpz2P/og2eI9nppnTxPwsytgAyAoMsuwrSznGVti3+tvy8bHxQ G8/BiepbYaQGSRNvBLqYQLgPPnNkfBCcRCQAHU1gAkKtod2HKlClx5vd4/NK4QujUmFT D+xSW1NqLHWeAlonp517ZtAKBVBIE9qBQrzRBZUwu//IlPklKDibWm3gwX4IP0S35gr/ DlLZyYEivrmmykgJj1RldRNDDp9sMVZO4tJnRQ9hGHxhhpVzpPnLoZsE8mfwHRpknkVI oXrE8LY723M03vuRQje6rPZAhSG5F9BDAZxGcB9Jhu1IMMKF82wnvQSIOzpteIDhBpr9 EApQ== X-Received: by 10.43.113.131 with SMTP id ew3mr20752489icc.24.1365539222014; Tue, 09 Apr 2013 13:27:02 -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 iw8si2312464igc.1.2013.04.09.13.27.00 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 09 Apr 2013 13:27:02 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.34]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 6D50C5A42A5; Tue, 9 Apr 2013 13:27:00 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 0840180866; Tue, 9 Apr 2013 13:26:59 -0700 (PDT) From: Doug Anderson To: Wolfram Sang , Kukjin Kim Subject: [PATCH v5 2/3] ARM: dts: Add i2c-arbitrator bus for exynos5250-snow Date: Tue, 9 Apr 2013 13:12:40 -0700 Message-Id: <1365538361-2763-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1365538361-2763-1-git-send-email-dianders@chromium.org> References: <1363192583-26363-1-git-send-email-dianders@chromium.org> <1365538361-2763-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQm/dYn3mpR+rBafO+MgY87R5n9qBgwbGLzm9v5mkvs74+sC9pkQa84vWE/3DHV26Q+rgYdQfNfWLOMu7E/08cjg9XCfKSZ984FkJFbnsKNVWvVaTEXOYbHtPI56jARAUQ0/ig0IMJKGTjtQNpfdRwFGMEZwnXeq74aUcSdwsf4FWZhcHpW85UTXQGaGsAY0BtWZBAD2zyvMBI6AoyOqaCf4zyvvfg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130409_162704_932091_AC67AF69 X-CRM114-Status: GOOD ( 13.82 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.7 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -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: Daniel Kurtz , linux-kernel@vger.kernel.org, Grant Likely , Russell King , Jingoo Han , Ben Dooks , Thomas Abraham , u.kleine-koenig@pengutronix.de, Guenter Roeck , Stephen Warren , 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.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 --- Changes in v5: - Adjust bindings as per Wolfram Sang. 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..fa85f58 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-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.