From patchwork Mon Apr 20 18:50:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dinguyen@opensource.altera.com X-Patchwork-Id: 6243951 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 ACEDD9F313 for ; Mon, 20 Apr 2015 18:59:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D3CE3203AB for ; Mon, 20 Apr 2015 18:59:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 022D92034B for ; Mon, 20 Apr 2015 18:59:21 +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 1YkGsh-0000b4-UN; Mon, 20 Apr 2015 18:57:19 +0000 Received: from mail-by2on0061.outbound.protection.outlook.com ([207.46.100.61] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YkGrm-0008TL-5v for linux-arm-kernel@lists.infradead.org; Mon, 20 Apr 2015 18:56:22 +0000 Received: from BN3PR0301CA0032.namprd03.prod.outlook.com (0.160.180.170) by CY1PR0301MB0665.namprd03.prod.outlook.com (0.160.158.147) with Microsoft SMTP Server (TLS) id 15.1.136.25; Mon, 20 Apr 2015 18:56:00 +0000 Received: from BL2FFO11FD056.protection.gbl (2a01:111:f400:7c09::100) by BN3PR0301CA0032.outlook.office365.com (2a01:111:e400:4000::42) with Microsoft SMTP Server (TLS) id 15.1.136.25 via Frontend Transport; Mon, 20 Apr 2015 18:56:00 +0000 Authentication-Results: spf=fail (sender IP is 66.35.236.227) smtp.mailfrom=opensource.altera.com; lixom.net; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of opensource.altera.com does not designate 66.35.236.227 as permitted sender) receiver=protection.outlook.com; client-ip=66.35.236.227; helo=sj-itexedge03.altera.priv.altera.com; Received: from sj-itexedge03.altera.priv.altera.com (66.35.236.227) by BL2FFO11FD056.mail.protection.outlook.com (10.173.161.184) with Microsoft SMTP Server (TLS) id 15.1.148.11 via Frontend Transport; Mon, 20 Apr 2015 18:55:59 +0000 Received: from na01-bn1-obe.outbound.protection.outlook.com (207.46.163.186) by webmail.altera.com (66.35.236.227) with Microsoft SMTP Server (TLS) id 14.3.174.1; Mon, 20 Apr 2015 11:54:36 -0700 Received: from BY1PR03MB1370.namprd03.prod.outlook.com (0.162.109.28) by BY1PR03MB1500.namprd03.prod.outlook.com (0.162.210.146) with Microsoft SMTP Server (TLS) id 15.1.136.25; Mon, 20 Apr 2015 18:55:50 +0000 Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; Received: from linux-builds1.altera.com (64.129.157.38) by BY1PR03MB1370.namprd03.prod.outlook.com (0.162.109.28) with Microsoft SMTP Server (TLS) id 15.1.148.15; Mon, 20 Apr 2015 18:55:48 +0000 From: To: , , , , Subject: [PATCHv2 3/4] ARM: socfpga: dts: enable UART1 for the debug uart Date: Mon, 20 Apr 2015 13:50:24 -0500 Message-ID: <1429555825-23560-4-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1429555825-23560-1-git-send-email-dinguyen@opensource.altera.com> References: <1429555825-23560-1-git-send-email-dinguyen@opensource.altera.com> MIME-Version: 1.0 X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BY2PR06CA035.namprd06.prod.outlook.com (10.141.250.153) To BY1PR03MB1370.namprd03.prod.outlook.com (25.162.109.28) X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1370; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1500; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB0665; X-Forefront-Antispam-Report-Untrusted: BMV:1; SFV:NSPM; SFS:(10009020)(6009001)(2201001)(86152002)(33646002)(62966003)(77156002)(50466002)(50226001)(48376002)(87976001)(5001770100001)(19580395003)(19580405001)(40100003)(86362001)(53416004)(46102003)(229853001)(47776003)(92566002)(2950100001)(42186005)(76176999)(50986999)(66066001)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR03MB1370; H:linux-builds1.altera.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:;UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5002010)(5005006); SRVR:BY1PR03MB1370; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1370; BCL:0; PCL:0; RULEID:(601004)(5005006)(5002010); SRVR:CY1PR0301MB0665; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB0665; X-Forefront-PRVS: 05529C6FDB X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1370 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BL2FFO11FD056.protection.gbl X-Forefront-Antispam-Report: CIP:66.35.236.227; CTRY:US; IPV:NLI; EFV:NLI; BMV:1; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(199003)(189002)(86362001)(40100003)(46102003)(19580395003)(66066001)(19580405001)(47776003)(2201001)(50986999)(76176999)(86152002)(5001770100001)(105606002)(122386002)(6806004)(2950100001)(50226001)(53416004)(77156002)(92566002)(62966003)(33646002)(50466002)(81156007)(85426001)(87936001)(48376002)(229853001)(106466001)(7099027)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0665; H:sj-itexedge03.altera.priv.altera.com; FPR:; SPF:Fail; MLV:ovrnspm; A:0; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Forefront-PRVS: 05529C6FDB X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2015 18:55:59.7124 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a; Ip=[66.35.236.227]; Helo=[sj-itexedge03.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0665 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150420_115622_306156_77B06619 X-CRM114-Status: UNSURE ( 6.74 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.0 (+) Cc: devicetree@vger.kernel.org, dinh.linux@gmail.com, arnd@arndb.de, linux-kernel@vger.kernel.org, olof@lixom.net, Dinh Nguyen , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,RCVD_ILLEGAL_IP, RCVD_IN_DNSWL_MED,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 From: Dinh Nguyen Arria10 devkit is using UART1 for the debug uart port. Remove unused aliases. Signed-off-by: Dinh Nguyen --- v2: Add removal of unused aliases --- arch/arm/boot/dts/socfpga_arria10.dtsi | 12 ------------ arch/arm/boot/dts/socfpga_arria10_socdk.dts | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi index d843609..6c3ad92 100644 --- a/arch/arm/boot/dts/socfpga_arria10.dtsi +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi @@ -21,18 +21,6 @@ #address-cells = <1>; #size-cells = <1>; - aliases { - ethernet0 = &gmac0; - ethernet1 = &gmac1; - ethernet2 = &gmac2; - serial0 = &uart0; - serial1 = &uart1; - timer0 = &timer0; - timer1 = &timer1; - timer2 = &timer2; - timer3 = &timer3; - }; - cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk.dts b/arch/arm/boot/dts/socfpga_arria10_socdk.dts index 3015ce8..811a61c 100755 --- a/arch/arm/boot/dts/socfpga_arria10_socdk.dts +++ b/arch/arm/boot/dts/socfpga_arria10_socdk.dts @@ -40,9 +40,9 @@ }; }; }; - - serial0@ffc02000 { - status = "okay"; - }; }; }; + +&uart1 { + status = "okay"; +};