From patchwork Thu Apr 9 08:23:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 46911 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 921C1218D6 for ; Thu, 9 Apr 2015 08:24:10 +0000 (UTC) Received: by lbcne10 with SMTP id ne10sf24981339lbc.1 for ; Thu, 09 Apr 2015 01:24:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=iORnTr/1hnsCTM/vRhcDZy8H8FtEw006h+JXNRsuCCs=; b=Iy7H0z+jSgbbgZn3mynliv7o+nispsyBpOJGtzQyaOTeNzNa/9c5id7+pbaA+8xp1Q aZzbgA4sULX8/c9vIKxxRY9RH4g7wf2jwz9+fv3WYJa2idmIpdUvfL3MpHlYy3RGjjrM jrogjv8QtesMymKPlzFWNexDOdQ3X3JvyUBq5gdVaMIbusQF1pYtWpHzs+gq6leHENgl oCAU4BAErn+FP6EzG0DKayqcCYQL0u3MgjGiw+SppCUZ28jfHLbdJWs/IvEg2AcQ8Bio uxo70WSJzBNJmh1JDJa4AZcyXSpwiCZGEC5vrEi41HHghv3fZLgkOaMz4aaQhbK6fytt oRqw== X-Gm-Message-State: ALoCoQl46Kq1HkIHKUirybJa7kAj7R52k6AT6+4Ega4ye5ywizp6oK6YIVHGx+yy86/VzLPC2xM0 X-Received: by 10.180.74.197 with SMTP id w5mr362558wiv.5.1428567849561; Thu, 09 Apr 2015 01:24:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.129 with SMTP id m1ls253476laf.76.gmail; Thu, 09 Apr 2015 01:24:09 -0700 (PDT) X-Received: by 10.112.198.225 with SMTP id jf1mr1474199lbc.91.1428567849397; Thu, 09 Apr 2015 01:24:09 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id b8si10867279lae.45.2015.04.09.01.24.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2015 01:24:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by labbd9 with SMTP id bd9so72592922lab.2 for ; Thu, 09 Apr 2015 01:24:09 -0700 (PDT) X-Received: by 10.152.23.70 with SMTP id k6mr3286796laf.76.1428567849089; Thu, 09 Apr 2015 01:24:09 -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.67.65 with SMTP id l1csp328906lbt; Thu, 9 Apr 2015 01:24:08 -0700 (PDT) X-Received: by 10.66.164.98 with SMTP id yp2mr53313857pab.114.1428567846998; Thu, 09 Apr 2015 01:24:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gk9si16882359pbd.150.2015.04.09.01.24.05; Thu, 09 Apr 2015 01:24:06 -0700 (PDT) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754996AbbDIIYA (ORCPT + 5 others); Thu, 9 Apr 2015 04:24:00 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:33869 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754952AbbDIIX4 (ORCPT ); Thu, 9 Apr 2015 04:23:56 -0400 Received: by widjs5 with SMTP id js5so49702838wid.1 for ; Thu, 09 Apr 2015 01:23:54 -0700 (PDT) X-Received: by 10.180.104.66 with SMTP id gc2mr4118508wib.34.1428567834772; Thu, 09 Apr 2015 01:23:54 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-78-145-247-151.as13285.net. [78.145.247.151]) by mx.google.com with ESMTPSA id dr7sm19063108wib.22.2015.04.09.01.23.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Apr 2015 01:23:53 -0700 (PDT) From: Srinivas Kandagatla To: galak@codeaurora.org, linux-arm-msm@vger.kernel.org Cc: bjorn.andersson@sonymobile.com, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Russell King , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, inux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 09/10] ARM: dts: Move i2c1 pinctrl to apq8064.dtsi Date: Thu, 9 Apr 2015 09:23:51 +0100 Message-Id: <1428567831-11105-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428567674-10672-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1428567674-10672-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: srinivas.kandagatla@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.44 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , I2C1 pinctrl is not really specific to a board, moving to SOC dtsi would avoid redefining this in every board. Signed-off-by: Srinivas Kandagatla --- arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 7 ------- arch/arm/boot/dts/qcom-apq8064.dtsi | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts index b76a92b..9bd9dfe 100644 --- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts +++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts @@ -11,13 +11,6 @@ soc { pinctrl@800000 { - i2c1_pins: i2c1 { - mux { - pins = "gpio20", "gpio21"; - function = "gsbi1"; - }; - }; - card_detect: card_detect { mux { pins = "gpio26"; diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index f4b8c3a..2fa979f 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -129,6 +129,13 @@ function = "ps_hold"; }; }; + + i2c1_pins: i2c1 { + mux { + pins = "gpio20", "gpio21"; + function = "gsbi1"; + }; + }; }; intc: interrupt-controller@2000000 {