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: 6195021 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7E9119F2E9 for ; Fri, 10 Apr 2015 12:35:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5F29203EB for ; Fri, 10 Apr 2015 12:35:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2082203C1 for ; Fri, 10 Apr 2015 12:35:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933022AbbDJMfY (ORCPT ); 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ft8BwqNYk2j4yGqQcfhLgSfAe8pE6S6Xg294juPM+y0=; b=KkyDlJ0xBSb8zOq58bujEqGWFCyWS5BsprUKRqMFJGaGCgB2rOIei1+TohD3j9Uswx Sj1zM80MAntfLiQQ+z44MPy7r4JQqaaB7tU6Ubg2SVDdLahH/qS82rbXnHGi4Va1Ef8U kafJL3Qt2c8eoF86v5fSglB7oMWIYbiDKICP+GotHsFHeA/F9qc3yBm9cbI/YUPF+589 1zIEkPs3f26mKGt2Q9tttgCRgJvhJdJcN8vu7o3BDgaqiXhO7jTgd04g+qtjJOq6g5ni bny2QyUuifQo+vMyUqiKxU41cPLD2nQi7Bgbmbt3q0/tf5nvVaWH4NvyAOEgYan0Rch7 Bn8Q== X-Gm-Message-State: ALoCoQlLebeK59K1Ph1/50ELkc25XE0LfIavLag0LUrQwTMeQbUT8oX9rg9vL81ZlRJRZOHaShH+ 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: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 {