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: 5863221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3E5B1BF440 for ; Mon, 23 Feb 2015 08:02:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 76F912062B for ; Mon, 23 Feb 2015 08:02:37 +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 A734A2061F for ; Mon, 23 Feb 2015 08:02:36 +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 1YPnvO-0004ir-2n; Mon, 23 Feb 2015 07:59:30 +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 1YPnsi-0002Mg-ON for linux-arm-kernel@lists.infradead.org; Mon, 23 Feb 2015 07:56:45 +0000 Received: by mail-wg0-f54.google.com with SMTP id y19so23828547wgg.13 for ; Sun, 22 Feb 2015 23:56:21 -0800 (PST) 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=KQdu4feYuj0UvAhOoLHY7hD+WaADqDYZu8tpQd41BGc=; b=AFw9vcI7Ww8q6ln5NBqP9jRNLt3Ct4Bu7Lgx3Ita1392Z7h1SSzLab+hjhp3HCuARL aT36yYlEquLOKB/WgO4bDLu5VVozZGrI0Fc+xmdW4wboaganbK1WIH9ZEALIcL+L6uG3 xXqpDJoESCFiTnTg2VUh/JbzSeJiOdEpyLTtC+1ciHeBWKmmsqKwwtyzxAAZr7u1fAvC +LjMIs1yzPnLh0ipXZCNyFb+5dGfRg1BC18XNeDpp0Rh4vR3Nsdhkhmt6y7InVacorN+ 7GHihF/0BmFHFCgTzR/0SQ9i3eaAH6sUX28HsxmppKoN8K+TbM0FVCxchJqevW6wcdw6 jVbw== X-Gm-Message-State: ALoCoQlfmszUs/Rn6Od0PYbFRrSkxmUF+5q1qiR0f5Fn0v5ZoK5oXa0ye/McY1SjVQk2e82/3u76 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150222_235644_993963_4F164D17 X-CRM114-Status: UNSURE ( 9.12 ) 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 , 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 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 {