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: 6195261 Return-Path: X-Original-To: patchwork-linux-arm@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 8C2419F1C4 for ; Fri, 10 Apr 2015 12:46:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB77C203EC for ; Fri, 10 Apr 2015 12:46:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C9ACB203C1 for ; Fri, 10 Apr 2015 12:46:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YgYH4-0005AT-7w; Fri, 10 Apr 2015 12:43:06 +0000 Received: from mail-wg0-f54.google.com ([74.125.82.54]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YgY9v-00074U-LI for linux-arm-kernel@lists.infradead.org; Fri, 10 Apr 2015 12:35:44 +0000 Received: by wgyo15 with SMTP id o15so16287852wgy.2 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=agwrFxRvYv2+oaMnE/sLYkcZqXvjEmrWtCAS2j3HpT1pleZDY1bQyws76yfYsZ6j2G LzVkuAYYDJDG1C4i4EDor9Q6lquzNot9Pkzz/S8mf3AZwK0y18jzkgvsv2Tm0kiuolMM 5KFsK3PHmXHzEOkYvSAvBz0hdiDcxZQ4E+K8iArCUk+jSSPY/hSctaTUBAx0D1Vn9c9Y lRaOB+A7voOMGcznXpv+zxHq4/q/m7oQRvoiRCiPm3uEtQsUvn1EgCPmwWBtVovibFHU 54KtsERrWxVu9K18iwQGIUq1tWIqezJUHt0RlmDjbgWOiytH1+vwOo9tyuYEFCHp8i1D Bd1A== X-Gm-Message-State: ALoCoQlMgq5wdku0e+ZmvWrhwGTxQePAw6VV5nhOzazIHbxfl8kNo3W+b7lqmmeU73TpGEIKKZwj 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150410_053543_896230_629ABCF1 X-CRM114-Status: UNSURE ( 9.50 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Ian Campbell , linux-kernel@vger.kernel.org, Rob Herring , Srinivas Kandagatla , bjorn.andersson@sonymobile.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 {