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: 5863021 Return-Path: X-Original-To: patchwork-linux-arm-msm@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 DA5CCBF440 for ; Mon, 23 Feb 2015 07:56:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D75C2062D for ; Mon, 23 Feb 2015 07:56:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A20E02062C for ; Mon, 23 Feb 2015 07:56:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752716AbbBWH4Y (ORCPT ); Mon, 23 Feb 2015 02:56:24 -0500 Received: from mail-we0-f179.google.com ([74.125.82.179]:34134 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752713AbbBWH4W (ORCPT ); Mon, 23 Feb 2015 02:56:22 -0500 Received: by wesq59 with SMTP id q59so16362528wes.1 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=LcRX2b60dhhii4Yt7cecXuAvnGBH66Y/n81I9Z/jQnxYxNQ7aiAgBfDbmbLIaMP6x7 kA2EOMcBasWsMJ1w1vigfC4eoWmipGGpNuzJH83DFOf3GgROIgzLm5Sl1904W+Vr8C3b 0obL2OuDgp3YEPU/DEQSQaPYVyGPf5+M6tHHh7ZzyED6CqUh8qNn7GdoXlXfMfVZ4G8Y bM7MWQPRBx8NRvdYTOku0nqxwAvx7pQaRQIO5+/PieAQFX67q/6XR08bzNvfU1pCZvIn YeN6SGjyVyvzx5TRYNnJaqhRKF2apxwq13L72dEWuTvmy+dFsERsxZRIaVQgZv0NTwQI ilJA== X-Gm-Message-State: ALoCoQmkHdZLfVWC8RHz7MwSvl1JZ4y7/1tgYJoEbbrNv4DeF0XBXzbi/caeBs5bDzfyw+Y/7whX 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-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 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 {