From patchwork Mon Feb 23 07:56:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 44899 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8D54521570 for ; Mon, 23 Feb 2015 07:56:38 +0000 (UTC) Received: by eeke53 with SMTP id e53sf9835570eek.3 for ; Sun, 22 Feb 2015 23:56:37 -0800 (PST) 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=AXPLbPP4CcK60bktMELrSfQw9rdfrBOKHkkMcWyPLcc=; b=bhD3UjAcyvPsulIZBJR7e4XvGKhlSPbBky41ZD9Z1XVGIT+tL8iPKcySzbNtfw9PTn vLCY19MQetQC98WG30no2CsQ38vmT56jzqf7r3usAoDy0apXqO/hnQxqhd1P+uT/Vz8W x0/Jy6x5VhTpX6J20CLdmZF1BMIc9M9wMGE8LTZ/uu+v1DdB1f/LkIUxniKmnKdrUFs9 XxxvsBvEonhcTn+YLEDby7zxTNKttJy8BK/I87jSswl858ovcxcYI4yCsvPHl8G11OQR RYgFYF9isNz+T4h4V7gnFs+j7d3Ey9IMKwNOE0PozopxjVE1ZGvNVuHfeMtiuO1mjOed UN7A== X-Gm-Message-State: ALoCoQkmp3GckTWOTjQ/rYjiVRZe3FM94ty2zuEyjGh2H1j/TJNKVUXXahBMBKiSCQi3omR2vF3D X-Received: by 10.194.221.65 with SMTP id qc1mr1079660wjc.7.1424678197786; Sun, 22 Feb 2015 23:56:37 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.178 with SMTP id p18ls425881lal.97.gmail; Sun, 22 Feb 2015 23:56:37 -0800 (PST) X-Received: by 10.152.120.225 with SMTP id lf1mr8695497lab.20.1424678197599; Sun, 22 Feb 2015 23:56:37 -0800 (PST) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id yh1si23124187lab.112.2015.02.22.23.56.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Feb 2015 23:56:37 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by labgq15 with SMTP id gq15so16816748lab.6 for ; Sun, 22 Feb 2015 23:56:37 -0800 (PST) X-Received: by 10.152.87.3 with SMTP id t3mr8663950laz.19.1424678197530; Sun, 22 Feb 2015 23:56:37 -0800 (PST) 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.35.133 with SMTP id h5csp1104184lbj; Sun, 22 Feb 2015 23:56:36 -0800 (PST) X-Received: by 10.67.8.73 with SMTP id di9mr16627322pad.107.1424678195840; Sun, 22 Feb 2015 23:56:35 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cf1si9560101pdb.224.2015.02.22.23.56.34; Sun, 22 Feb 2015 23:56:35 -0800 (PST) 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 S1752755AbbBWH4Z (ORCPT + 28 others); Mon, 23 Feb 2015 02:56:25 -0500 Received: from mail-we0-f172.google.com ([74.125.82.172]:38982 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752605AbbBWH4W (ORCPT ); Mon, 23 Feb 2015 02:56:22 -0500 Received: by wesx3 with SMTP id x3so16294281wes.6 for ; Sun, 22 Feb 2015 23:56:21 -0800 (PST) X-Received: by 10.194.80.40 with SMTP id o8mr19268249wjx.34.1424678181151; Sun, 22 Feb 2015 23:56:21 -0800 (PST) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-2-96-88-56.as13285.net. [2.96.88.56]) by mx.google.com with ESMTPSA id ka1sm54380680wjc.2.2015.02.22.23.56.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Feb 2015 23:56:20 -0800 (PST) From: Srinivas Kandagatla To: Kumar Gala , linux-arm-msm@vger.kernel.org Cc: 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 11/12] ARM: dts: Move i2c1 pinctrl to apq8064.dtsi Date: Mon, 23 Feb 2015 07:56:17 +0000 Message-Id: <1424678177-13392-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <424678035-12862-1-git-send-email-srinivas.kandagatla@linaro.org> References: <424678035-12862-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.42 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 7a6a076..ab7aee2 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 ba44f30..09077a0 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -115,6 +115,13 @@ function = "ps_hold"; }; }; + + i2c1_pins: i2c1 { + mux { + pins = "gpio20", "gpio21"; + function = "gsbi1"; + }; + }; }; intc: interrupt-controller@2000000 {