From patchwork Fri Oct 31 20:45:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 39980 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6F8D92405B for ; Fri, 31 Oct 2014 20:48:35 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id mc6sf4577846lab.7 for ; Fri, 31 Oct 2014 13:48:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=2BykpYCVRKRTRJr+DJ46GF25zAkfplpAGVpk+5QuN+c=; b=IlrkYvnhyPYWlVmP5J+qWsS6So4OO1Ca2wkSjkq614wU+N+ZW5sjm5e2rmIARYA0U6 PyNhXJNd2xMfa1Dq/kJiBrrBH6sww9DjnA6vhPi2rw1ysy42TD0IZtlXOU9cjoprr2g4 PbkF1yDWc1npQbZrgwCCf2j0onoiPXt9Rp4+0sjvO0qmoH8lixybGIu35nUPdcMs/o55 pd4GuCU3xrzfSYycc5w7C+Fk8egSrZudHJQCA6tcYgPCNm10WQ070F/jyfDZ9j4i5j78 7IA4DAm/8vpsOOWC76i8K/cpSceJIkCsWo+LCR7YCrn8QMnts8gJaZPAwvF0dQMispP1 TiAg== X-Gm-Message-State: ALoCoQk3+krgIeHA/6Om/iPAzgU0y6CREsPomjf5IJjjvEKYWVZZCtdLacUHNF6XsI9P5e0FYAHy X-Received: by 10.181.8.194 with SMTP id dm2mr1002677wid.2.1414788514376; Fri, 31 Oct 2014 13:48:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.30.40 with SMTP id p8ls431473lah.106.gmail; Fri, 31 Oct 2014 13:48:34 -0700 (PDT) X-Received: by 10.152.36.33 with SMTP id n1mr6409906laj.95.1414788514105; Fri, 31 Oct 2014 13:48:34 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id ai4si18676523lbc.67.2014.10.31.13.48.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 13:48:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id pn19so1528047lab.18 for ; Fri, 31 Oct 2014 13:48:34 -0700 (PDT) X-Received: by 10.113.6.1 with SMTP id cq1mr7807977lbd.32.1414788513939; Fri, 31 Oct 2014 13:48:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp258711lbz; Fri, 31 Oct 2014 13:48:33 -0700 (PDT) X-Received: by 10.66.191.8 with SMTP id gu8mr27155285pac.126.1414788511311; Fri, 31 Oct 2014 13:48:31 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id id2si1233702pbb.224.2014.10.31.13.48.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Oct 2014 13:48:31 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XkJ5g-0000QX-NE; Fri, 31 Oct 2014 20:46:36 +0000 Received: from mail-lb0-f173.google.com ([209.85.217.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XkJ5Y-0000LG-F9 for linux-arm-kernel@lists.infradead.org; Fri, 31 Oct 2014 20:46:29 +0000 Received: by mail-lb0-f173.google.com with SMTP id p9so1072011lbv.4 for ; Fri, 31 Oct 2014 13:46:05 -0700 (PDT) X-Received: by 10.152.19.133 with SMTP id f5mr28615204lae.87.1414788365713; Fri, 31 Oct 2014 13:46:05 -0700 (PDT) Received: from localhost.localdomain (c83-254-157-117.bredband.comhem.se. [83.254.157.117]) by mx.google.com with ESMTPSA id 8sm3087368lav.15.2014.10.31.13.46.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Oct 2014 13:46:04 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/6] ARM: nomadik: move GPIO I2C to S8815 board file Date: Fri, 31 Oct 2014 21:45:32 +0100 Message-Id: <1414788335-28334-3-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1414788335-28334-1-git-send-email-linus.walleij@linaro.org> References: <1414788335-28334-1-git-send-email-linus.walleij@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141031_134628_726123_8D880FB0 X-CRM114-Status: GOOD ( 14.45 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.173 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.217.173 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Linus Walleij X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The idea to use two GPIO pins for bit-banged I2C is an S8815 pecularity, so move this over to the board-specific file and out of the SoC core DTSI file. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-nomadik-s8815.dts | 25 +++++++++++++++++++++++++ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index c795ee8a356a..33caad8df276 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -47,6 +47,14 @@ }; }; }; + gpioi2c { + gpioi2c_default_mode: gpioi2c_default { + gpioi2c_default_cfg { + ste,pins = "GPIO73_C21", "GPIO74_C20"; + ste,input = <0>; + }; + }; + }; user-led { user_led_default_mode: user_led_default { user_led_default_cfg { @@ -65,6 +73,23 @@ }; }; + /* GPIO I2C connected to the USB portions of the STw4811 only */ + gpio-i2c { + compatible = "i2c-gpio"; + gpios = <&gpio2 10 0>, /* sda */ + <&gpio2 9 0>; /* scl */ + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&gpioi2c_default_mode>; + + stw4811@2d { + compatible = "st,stw4811-usb"; + reg = <0x2d>; + }; + }; + + /* Configure card detect for the uSD slot */ amba { mmcsd: sdi@101f6000 { diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index 1ee9372191df..49b17c7dfb1b 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -169,14 +169,6 @@ }; }; }; - i2c2 { - i2c2_default_mode: i2c2_default { - i2c2_default_cfg { - ste,pins = "GPIO73_C21", "GPIO74_C20"; - ste,input = <0>; - }; - }; - }; }; src: src@101e0000 { @@ -747,22 +739,6 @@ }; }; - /* I2C2 connected to the USB portions of the STw4811 only */ - i2c2 { - compatible = "i2c-gpio"; - gpios = <&gpio2 10 0>, /* sda */ - <&gpio2 9 0>; /* scl */ - #address-cells = <1>; - #size-cells = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_default_mode>; - - stw4811@2d { - compatible = "st,stw4811-usb"; - reg = <0x2d>; - }; - }; - amba { compatible = "arm,amba-bus"; #address-cells = <1>;