From patchwork Fri Sep 18 12:31:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 7215771 X-Patchwork-Delegate: agross@codeaurora.org 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 E2D459F372 for ; Fri, 18 Sep 2015 12:34:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0843A208D2 for ; Fri, 18 Sep 2015 12:34:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 21CF2208D0 for ; Fri, 18 Sep 2015 12:34:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753912AbbIRMbk (ORCPT ); Fri, 18 Sep 2015 08:31:40 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:38186 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753907AbbIRMbh (ORCPT ); Fri, 18 Sep 2015 08:31:37 -0400 Received: by wiclk2 with SMTP id lk2so29025561wic.1 for ; Fri, 18 Sep 2015 05:31:36 -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=ZJGz7QdecND6d/dVDVe8sVoOqoVR6owoNGH2SxE7Czo=; b=R25cRc+QFWgavf0vCjVFSDK2OztDndyQ2mqrzgMtSSo8wkkdyGTuz/SbbjibfSXQt3 YPniM+aAn1RE0SQX76kB8XdgNsd0WqrxGJLvo+HzUgoUWQS190O1xLDji19t6z0wlLgm VIG2eLM5J2q3uHvx8NzGvuLuiqZd7ejC3OJsxRGBB+xnYFinuUrcEU8/Ebfl13lbf3B4 aM4qTkraNTpYhH8ml9YXFyOPDvh4e1Bs9b3PgeH1U0jioHjjjQDWOkzt/YOUcz3m+e1z 344TjA9NqYMB+t7UonYbKFf4CEjLRLXCVsCDwRhF60mC3z/5qYF8TqmQIQGBkWS1hrsg YB2w== X-Gm-Message-State: ALoCoQlmHuGs6O+UarPg6tbYBk7ldclqqdnlC2m2fyGpEqE+FYbTDVlZaqV7ajYF2ACmR9hcLWCY X-Received: by 10.194.143.102 with SMTP id sd6mr7579282wjb.15.1442579496753; Fri, 18 Sep 2015 05:31:36 -0700 (PDT) Received: from localhost.localdomain (host-92-13-246-184.as43234.net. [92.13.246.184]) by smtp.gmail.com with ESMTPSA id gk9sm15381681wib.9.2015.09.18.05.31.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Sep 2015 05:31:36 -0700 (PDT) From: Srinivas Kandagatla To: agross@codeaurora.org, 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@linaro.org Subject: [PATCH 07/14] ARM: dts: apq8064: Prefix the gsbi6 uart pins correctly Date: Fri, 18 Sep 2015 13:31:34 +0100 Message-Id: <1442579494-20229-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442579371-19822-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1442579371-19822-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 Usage of generic names like "uart_pins" is confusing to the reader, given the fact that there could be more than one uart on APQ8064. This patch adds gsbi prefix to uart pinctrl nodes so as to avoid such confusion. Signed-off-by: Srinivas Kandagatla --- arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 2 +- arch/arm/boot/dts/qcom-apq8064.dtsi | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts index 2ad2ab8..56eaf5a 100644 --- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts +++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts @@ -145,7 +145,7 @@ serial@16540000 { status = "ok"; pinctrl-names = "default"; - pinctrl-0 = <&uart_pins>; + pinctrl-0 = <&gsbi6_uart_4pins>; }; }; diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index 4a2f159..eb629c7 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -127,7 +127,14 @@ }; }; - uart_pins: uart_pins { + gsbi6_uart_2pins: gsbi6_uart_2pins { + mux { + pins = "gpio14", "gpio15"; + function = "gsbi6"; + }; + }; + + gsbi6_uart_4pins: gsbi6_uart_4pins { mux { pins = "gpio14", "gpio15", "gpio16", "gpio17"; function = "gsbi6";