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: 7215801 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 8BB7D9F372 for ; Fri, 18 Sep 2015 12:34:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B937B208D0 for ; Fri, 18 Sep 2015 12:34:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C65A420721 for ; Fri, 18 Sep 2015 12:34:27 +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 1Zcuq5-0008DB-H3; Fri, 18 Sep 2015 12:32:29 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zcupa-0007NC-LG for linux-arm-kernel@lists.infradead.org; Fri, 18 Sep 2015 12:32:01 +0000 Received: by wiclk2 with SMTP id lk2so29025558wic.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=gyvI90b9Ml0pkweptmFkTnSP9i2vUfzKUugDTQbFjrwGluhmeyNo3uaoxHV2tAag3p 2qghi5yxf1BSmAu+JHLAOGVvjLXwAtnoOX8kGmQm1V/2IERP1/v5arLHdd4Nw1A36Wdd crfx7vUf0asu2xwaAiyCe2nXSXCnV8VxFTI0rPpiVQw948RnNtSaxdE0yGB+LJu5Z6IQ Q7S3izDw9Tn4s6NSf3YRsdTuXAv5bNOYh0TfI4BZ50tXbfaiH/5MlMByDu4lD2LhvDlY 5ieLip1h+VwoID6L6H9QGmRZlIu+104o0oZj4fnYe+Z8Aj4CagCbg/cWNRlOcRFS3Yxp V3ZQ== X-Gm-Message-State: ALoCoQkmvz2zbeSOjMBJVHzTZzScBf4UE4hnJW/gy2xh9MgTP0V8ANuSYODOeN3QR0eP171NoRlG 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150918_053159_303504_8C9B3720 X-CRM114-Status: GOOD ( 14.15 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Ian Campbell , linux-kernel@vger.kernel.org, Rob Herring , srinivas.kandagatla@linaro.org, linux-arm-kernel@lists.infradead.org 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 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";