From patchwork Thu Apr 9 08:23:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 6184111 Return-Path: X-Original-To: patchwork-linux-arm-msm@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 A91E39F2E9 for ; Thu, 9 Apr 2015 08:24:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3ACC203ED for ; Thu, 9 Apr 2015 08:24:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A646203EB for ; Thu, 9 Apr 2015 08:24:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754994AbbDIIYA (ORCPT ); Thu, 9 Apr 2015 04:24:00 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:33080 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754912AbbDIIX4 (ORCPT ); Thu, 9 Apr 2015 04:23:56 -0400 Received: by wgin8 with SMTP id n8so112161662wgi.0 for ; Thu, 09 Apr 2015 01:23:54 -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=G1QmgRcOmZbNZRmGKLCe+jBQW24XhME1PRxVjN/1B7o=; b=WCgG8TBs+PsQOT2vAOrB/J8kbpkow15sXybIYgwi6Sfw4E+4CYiQV614uKlLEyk328 78qB8S/yfWapfZZb+4ZXS+K2A4epYauelwX1QjTqoVx34lHqm/Tbif0m2k3RXlEmPdaK idaTqyNA7BqVwfP/tMkCMeT6RqPwU18fEIc42zc6DlILADVYquY6IXLnqWERoJiD9yRu Zherbscy6ibVyr5uFl9WWfS0OW7ne6TKgk1Hfillw6U5uac39dmo1lD2kubCimj3dS7t GNC10J7zBxJITFXl+3k5T2dntMtVSgGuci3kOXfX8DA+YT4ELgXXi6Uj8O4nvppq5rlx J/GA== X-Gm-Message-State: ALoCoQkSh/yXnTf1SuwcWslpYhJ7b9Sl7mLP/dQClqxrr3KlHtJBhhPRH0MG09XrwakpYIx+xzoh X-Received: by 10.180.104.66 with SMTP id gc2mr4118508wib.34.1428567834772; Thu, 09 Apr 2015 01:23:54 -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 dr7sm19063108wib.22.2015.04.09.01.23.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Apr 2015 01:23:53 -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, inux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 09/10] ARM: dts: Move i2c1 pinctrl to apq8064.dtsi Date: Thu, 9 Apr 2015 09:23:51 +0100 Message-Id: <1428567831-11105-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428567674-10672-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1428567674-10672-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=ham 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 b76a92b..9bd9dfe 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 f4b8c3a..2fa979f 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -129,6 +129,13 @@ function = "ps_hold"; }; }; + + i2c1_pins: i2c1 { + mux { + pins = "gpio20", "gpio21"; + function = "gsbi1"; + }; + }; }; intc: interrupt-controller@2000000 {