From patchwork Sat Jul 25 09:22:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 51468 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 562C620323 for ; Sat, 25 Jul 2015 09:24:21 +0000 (UTC) Received: by lbcjj5 with SMTP id jj5sf14154449lbc.1 for ; Sat, 25 Jul 2015 02:24:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:cc:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=BT+CcSLriVhFTG6n/Awd9sAE85V9ZZjKQjGxHCuA9Kc=; b=EXPk9XEX2mlACh4luGwgNpiJqRqWTE9vJefIS+sy58BTvLzLeRl6dcXmA46OJQ7xGZ rKKFqtX4j8QQL2ZFDXdb+SL8qeu9mI3WPjblFGmxwAPMmCBO2tAqYnzl8poS1Icu3G5n lBpQr3LkIJ/veck8a0QzRiaKDNXTABRXC7YiYXUQwr5KEN4kqhSK5l5SSMC5QnCkokJP OQSzy253kaukgGBANRmtr8A6kq+0+4GOxYeadqq3l5l63whBBV2DRZGIfxPLV4HjjgMI j57hHtjgJF5oyA1Zo6tdLJqd85PVv2THc0nwU4myDzW7SYA8/NXMupZhJvca76DdYqKu vtqQ== X-Gm-Message-State: ALoCoQnZM/QeSWC/yRJy+g8kmd5mbwU8/LSy/MTP6RAdISzkeknLdqFJJj+exyDoogYfI14Rmo5z X-Received: by 10.113.11.3 with SMTP id ee3mr8060032lbd.9.1437816259899; Sat, 25 Jul 2015 02:24:19 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.227 with SMTP id t3ls484362laj.72.gmail; Sat, 25 Jul 2015 02:24:19 -0700 (PDT) X-Received: by 10.112.186.35 with SMTP id fh3mr17470622lbc.82.1437816259607; Sat, 25 Jul 2015 02:24:19 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id d7si9840248lag.88.2015.07.25.02.24.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Jul 2015 02:24:19 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by lahh5 with SMTP id h5so25885043lah.2 for ; Sat, 25 Jul 2015 02:24:19 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr17523140lay.72.1437816259461; Sat, 25 Jul 2015 02:24:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp441160lba; Sat, 25 Jul 2015 02:24:18 -0700 (PDT) X-Received: by 10.107.135.193 with SMTP id r62mr31919218ioi.29.1437816257995; Sat, 25 Jul 2015 02:24:17 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id xh9si27429591pac.163.2015.07.25.02.24.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Jul 2015 02:24:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; 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 1ZIvfF-0004rv-Ij; Sat, 25 Jul 2015 09:22:41 +0000 Received: from mail-lb0-f176.google.com ([209.85.217.176]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZIvf6-0004ou-NX for linux-arm-kernel@lists.infradead.org; Sat, 25 Jul 2015 09:22:35 +0000 Received: by lbbyj8 with SMTP id yj8so27760424lbb.0 for ; Sat, 25 Jul 2015 02:22:10 -0700 (PDT) X-Received: by 10.112.56.139 with SMTP id a11mr17640139lbq.90.1437816130267; Sat, 25 Jul 2015 02:22:10 -0700 (PDT) Received: from localhost.localdomain.localdomain (c-297471d5.01-192-6c756e10.cust.bredbandsbolaget.se. [213.113.116.41]) by smtp.gmail.com with ESMTPSA id aj4sm2447719lbd.5.2015.07.25.02.22.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Jul 2015 02:22:08 -0700 (PDT) From: Linus Walleij To: arm@kernel.org Subject: [PATCH] ARM: nomadik: disable UART0 on Nomadik boards Date: Sat, 25 Jul 2015 11:22:03 +0200 Message-Id: <1437816123-7692-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150725_022233_242346_DCCD3763 X-CRM114-Status: GOOD ( 12.49 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.176 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.217.176 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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: Linus Walleij , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The UART0 is not used on these boards, yet active and blocking other use. Fix this by disabling UART0 and setting port aliases to maintain port enumeration to userspace. Signed-off-by: Linus Walleij --- ARM SoC folks: please apply this directly to fixes if you're OK with it. --- arch/arm/boot/dts/ste-nomadik-nhk15.dts | 1 + arch/arm/boot/dts/ste-nomadik-s8815.dts | 4 ++++ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 1 + 3 files changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts index 3d0b8755caee..3d25dba143a5 100644 --- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts +++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts @@ -17,6 +17,7 @@ }; aliases { + serial1 = &uart1; stmpe-i2c0 = &stmpe0; stmpe-i2c1 = &stmpe1; }; diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index 85d3b95dfdba..3c140d05f796 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -15,6 +15,10 @@ bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk"; }; + aliases { + serial1 = &uart1; + }; + src@101e0000 { /* These chrystal drivers are not used on this board */ disable-sxtalo; diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index 6846e3eb027d..8e601d02ca8c 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -763,6 +763,7 @@ clock-names = "uartclk", "apb_pclk"; pinctrl-names = "default"; pinctrl-0 = <&uart0_default_mux>; + status = "disabled"; }; uart1: uart@101fb000 {