From patchwork Wed May 11 22:56:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 9075571 Return-Path: X-Original-To: patchwork-linux-arm@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 2B7CBBF29F for ; Wed, 11 May 2016 22:58:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47C872017D for ; Wed, 11 May 2016 22:58:18 +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 605B520114 for ; Wed, 11 May 2016 22:58:17 +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 1b0d3j-0008Ez-Na; Wed, 11 May 2016 22:56:51 +0000 Received: from mail-pf0-x22c.google.com ([2607:f8b0:400e:c00::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b0d3g-0008DY-4Y for linux-arm-kernel@lists.infradead.org; Wed, 11 May 2016 22:56:48 +0000 Received: by mail-pf0-x22c.google.com with SMTP id 77so23193942pfv.2 for ; Wed, 11 May 2016 15:56:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=jrM1DDUMrrOEBz+bKS49nkZGxb6ltzXkzSH6mizZCEc=; b=BuGDvbErSp73iiPDddGHl68IBfwNnUbgImAQa3CcDlkOdpWY38vvAzxGoF16p+ryA3 P6wMRIMbo7A+RQ/rxfjFF7uFtBkqh1fyNjeQmMpS/Vq3Oz71G9gYmS0wF8JesVBVxawa /p1raj0DQfl2Pmk6R1i/4fWLbwPEVz5m6eQ/g= 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; bh=jrM1DDUMrrOEBz+bKS49nkZGxb6ltzXkzSH6mizZCEc=; b=eq9yww2Yv66ydEHxU4kS7NfYAp7ICJJBGM1iDNaoe9QRvBaL7WZ3RjKteZBXLHy8VJ Yaj8C25Wqt719Ki+6TELGl3UvrdrHylkqSjtJ39mb/HhnTutr6ezpQA93LWzuCR7Q1mN Q6FOZH7wqhScsolrF8rYGcOrcrJmhRCD6eiWEYBWBERp7CFiKNt7nJY4ZwAAzR/PB1iJ YLb7v2AsLvvQe+JE6ZJUfqV3FErwntqBsn39wctkrwjmB/472BORKvl1ZwHfcQA3Fg9z dKOtnqAGXrVn1qFgyEzkNJM5YFw+vBRuJOkXbV3C/d3aLBSed3NiqrigpwRou6sXXlqT bqbw== X-Gm-Message-State: AOPr4FWvpEbj67GXv6ViyAxex3ALgaalpXhVW417ZrizS2Yp3eAtc5qNb3zv6Vh3rdL7VAhs X-Received: by 10.98.29.137 with SMTP id d131mr8854741pfd.2.1463007386823; Wed, 11 May 2016 15:56:26 -0700 (PDT) Received: from venom.rtp.broadcom.com ([216.31.219.19]) by smtp.gmail.com with ESMTPSA id ey12sm14683095pac.26.2016.05.11.15.56.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 May 2016 15:56:26 -0700 (PDT) From: Jon Mason X-Google-Original-From: Jon Mason To: Florian Fainelli , Ray Jui , Scott Branden , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Catalin Marinas , Will Deacon Subject: [PATCH 1/2] arm64: dts: NS2: Add all of the UARTs Date: Wed, 11 May 2016 18:56:08 -0400 Message-Id: <1463007369-13071-1-git-send-email-jonmason@broadcom.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160511_155648_215365_64544ED5 X-CRM114-Status: GOOD ( 11.85 ) X-Spam-Score: -2.7 (--) 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: devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.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=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Add all of the UARTs present on NS2 and enable them in the SVK device tree file. Also, do some magic to make sure that uart3 is discovered as ttyS0 (as that is the console UART). Signed-off-by: Jon Mason --- arch/arm64/boot/dts/broadcom/ns2-svk.dts | 16 ++++++++++++++++ arch/arm64/boot/dts/broadcom/ns2.dtsi | 30 ++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/arch/arm64/boot/dts/broadcom/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/ns2-svk.dts index 7cd3640..b062a44 100644 --- a/arch/arm64/boot/dts/broadcom/ns2-svk.dts +++ b/arch/arm64/boot/dts/broadcom/ns2-svk.dts @@ -40,10 +40,14 @@ aliases { serial0 = &uart3; + serial1 = &uart0; + serial2 = &uart1; + serial3 = &uart2; }; chosen { stdout-path = "serial0:115200n8"; + bootargs = "earlycon=uart8250,mmio32,0x66130000"; }; memory { @@ -68,6 +72,18 @@ status = "ok"; }; +&uart0 { + status = "ok"; +}; + +&uart1 { + status = "ok"; +}; + +&uart2 { + status = "ok"; +}; + &uart3 { status = "ok"; }; diff --git a/arch/arm64/boot/dts/broadcom/ns2.dtsi b/arch/arm64/boot/dts/broadcom/ns2.dtsi index 788ed8f..c77a9e8 100644 --- a/arch/arm64/boot/dts/broadcom/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/ns2.dtsi @@ -357,6 +357,36 @@ status = "disabled"; }; + uart0: serial@66100000 { + compatible = "snps,dw-apb-uart"; + reg = <0x66100000 0x100>; + interrupts = ; + clocks = <&iprocslow>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart1: serial@66110000 { + compatible = "snps,dw-apb-uart"; + reg = <0x66110000 0x100>; + interrupts = ; + clocks = <&iprocslow>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + + uart2: serial@66120000 { + compatible = "snps,dw-apb-uart"; + reg = <0x66120000 0x100>; + interrupts = ; + clocks = <&iprocslow>; + reg-shift = <2>; + reg-io-width = <4>; + status = "disabled"; + }; + uart3: serial@66130000 { compatible = "snps,dw-apb-uart"; reg = <0x66130000 0x100>;