From patchwork Fri Apr 10 12:35:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 47036 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 91FE721416 for ; Fri, 10 Apr 2015 12:35:28 +0000 (UTC) Received: by pdbqb6 with SMTP id qb6sf26422127pdb.3 for ; Fri, 10 Apr 2015 05:35:28 -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=cNQ1fpsgniHDLfKTaK4j7zmb5ERPo4Ct38PQ18H5Pa0=; b=lnOcCsgnyb/1Kq45ic0yNcfSudWdbNqzrQ7n5L96P12j/Z8FgVd9VyIporZ7zKnD8I 9o5jw1Gh6X3IFwmb6ZD9gpgEbM7cCZuFXsXyO+IJ37eCC/aMMGAPaAx3tL6HwTJLoQBi sZ1kVNMaFoNnbE73QdCXbfz4nbNDf8dR1g72R02mpz+f+CcPWygzDnGoke2khBzXIBqR Ig8DDlvpVPTsJnG5RheG0xD2cFGa4i4Rw/oKvtlkbjcoIAEnNd8S80rNkGQIpoHXxWPx 66bftnsaSekTvg6WNPRQRR7zvu10bBhuk0ixNEojvxeS2YKYYJXQKwjFrTIYIZOmygmB VQig== X-Gm-Message-State: ALoCoQmF5iXfxOQYbYHK0nUygJ0S/OMFJq+4sXJBESJ7kdsJDJ2rZ++IV+cYj3JaHdbHxeCXZY9z X-Received: by 10.70.138.73 with SMTP id qo9mr1535933pdb.8.1428669328014; Fri, 10 Apr 2015 05:35:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.131 with SMTP id g3ls1721866qge.28.gmail; Fri, 10 Apr 2015 05:35:27 -0700 (PDT) X-Received: by 10.55.20.207 with SMTP id 76mr2278653qku.46.1428669327819; Fri, 10 Apr 2015 05:35:27 -0700 (PDT) Received: from mail-qg0-f50.google.com (mail-qg0-f50.google.com. [209.85.192.50]) by mx.google.com with ESMTPS id w99si1651846qge.15.2015.04.10.05.35.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2015 05:35:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.192.50 as permitted sender) client-ip=209.85.192.50; Received: by qgdy78 with SMTP id y78so395432qgd.0 for ; Fri, 10 Apr 2015 05:35:27 -0700 (PDT) X-Received: by 10.140.145.81 with SMTP id 78mr1443391qhr.45.1428669327716; Fri, 10 Apr 2015 05:35:27 -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.96.155.231 with SMTP id vz7csp984752qdb; Fri, 10 Apr 2015 05:35:26 -0700 (PDT) X-Received: by 10.68.233.71 with SMTP id tu7mr2299686pbc.106.1428669326407; Fri, 10 Apr 2015 05:35:26 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t2si2764387pdh.156.2015.04.10.05.35.25; Fri, 10 Apr 2015 05:35:26 -0700 (PDT) Received-SPF: none (google.com: linux-arm-msm-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 S933022AbbDJMfY (ORCPT + 5 others); Fri, 10 Apr 2015 08:35:24 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:35160 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933068AbbDJMfU (ORCPT ); Fri, 10 Apr 2015 08:35:20 -0400 Received: by widdi4 with SMTP id di4so126347947wid.0 for ; Fri, 10 Apr 2015 05:35:19 -0700 (PDT) X-Received: by 10.180.215.101 with SMTP id oh5mr4726991wic.6.1428669319218; Fri, 10 Apr 2015 05:35:19 -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 kc4sm2803982wjc.2.2015.04.10.05.35.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Apr 2015 05:35:18 -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, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v2 11/12] ARM: dts: apq8064: Move i2c1 pinctrl to apq8064.dtsi Date: Fri, 10 Apr 2015 13:35:15 +0100 Message-Id: <1428669315-11249-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428669187-10775-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1428669187-10775-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-arm-msm@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.192.50 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 f319721..8f955d8 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 d7f70d7..c87f92a 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -128,6 +128,13 @@ function = "ps_hold"; }; }; + + i2c1_pins: i2c1 { + mux { + pins = "gpio20", "gpio21"; + function = "gsbi1"; + }; + }; }; intc: interrupt-controller@2000000 {