From patchwork Fri Apr 10 20:44:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 47074 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EB79C218D9 for ; Fri, 10 Apr 2015 20:45:09 +0000 (UTC) Received: by lbdc7 with SMTP id c7sf4877750lbd.2 for ; Fri, 10 Apr 2015 13:45:08 -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=lk3ba/wseRwL3adaPyrXqaO/C3oW6lTjWtGByfEYUVo=; b=TwptuwpgMQDCYOLC+j03E1T6TgmBF2lIuSiVRDq8eQYwAttsnUp2w6PgMoC7QgNScZ he7bMDYEkPmWf27hPjG9/bE4TzVFDbAaZHFDIFOJvjHzTY6EHoqJbaf9aTKIub6RJDQD Ixjz8BCdsm7Vo2mj9DbYq3q/Q4MSka96aAEv/AWRn1WKBll4+f7TjrBL9OPuqG5d9x75 rUwoEa5M4P5R8KNfDFQjxKnoJOqFPGf00IjP1Zh8KzzVI5QV6jkPQELRt84FiB/KtTKN b5fdQIo1OuNq+Yym3vBJGPQYLrkNr1fcT1Jkg5ldnoybvk4r841xn2jgvriI07guyX4s 6vQg== X-Gm-Message-State: ALoCoQnp/gqtoZDkgMoNCu+fAFKgEboN6JNVSvKNMfUcl7Ltbgmq3WgZp3WeWdij2q+DeIqWboE6 X-Received: by 10.152.37.101 with SMTP id x5mr619663laj.5.1428698708914; Fri, 10 Apr 2015 13:45:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.115.240 with SMTP id jr16ls512045lab.69.gmail; Fri, 10 Apr 2015 13:45:08 -0700 (PDT) X-Received: by 10.152.43.110 with SMTP id v14mr3005177lal.4.1428698708745; Fri, 10 Apr 2015 13:45:08 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id yq7si2312356lab.133.2015.04.10.13.45.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2015 13:45:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by labbd9 with SMTP id bd9so21428639lab.2 for ; Fri, 10 Apr 2015 13:45:08 -0700 (PDT) X-Received: by 10.112.125.167 with SMTP id mr7mr3019908lbb.106.1428698708612; Fri, 10 Apr 2015 13:45:08 -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 l1csp1326997lbt; Fri, 10 Apr 2015 13:45:07 -0700 (PDT) X-Received: by 10.66.145.2 with SMTP id sq2mr5786609pab.124.1428698706812; Fri, 10 Apr 2015 13:45:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id td9si4427489pac.213.2015.04.10.13.45.05; Fri, 10 Apr 2015 13:45:06 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S933190AbbDJUpB (ORCPT + 27 others); Fri, 10 Apr 2015 16:45:01 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:34275 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932929AbbDJUop (ORCPT ); Fri, 10 Apr 2015 16:44:45 -0400 Received: by wgso17 with SMTP id o17so28821628wgs.1 for ; Fri, 10 Apr 2015 13:44:44 -0700 (PDT) X-Received: by 10.194.210.103 with SMTP id mt7mr6273536wjc.103.1428698684372; Fri, 10 Apr 2015 13:44:44 -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 ju2sm1146188wid.12.2015.04.10.13.44.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Apr 2015 13:44:43 -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 v3 10/11] ARM: dts: apq8064: Move i2c1 pinctrl to apq8064.dtsi Date: Fri, 10 Apr 2015 21:44:40 +0100 Message-Id: <1428698680-12324-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428698491-11881-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1428698491-11881-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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.46 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 528cb31..f97339a 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 93de48a..345ea08 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -113,6 +113,13 @@ function = "ps_hold"; }; }; + + i2c1_pins: i2c1 { + mux { + pins = "gpio20", "gpio21"; + function = "gsbi1"; + }; + }; }; intc: interrupt-controller@2000000 {