From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752173AbbASTkb (ORCPT ); Mon, 19 Jan 2015 14:40:31 -0500 Received: from cpsmtpb-ews10.kpnxchange.com ([213.75.39.15]:63308 "EHLO cpsmtpb-ews10.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752121AbbASTk2 (ORCPT ); Mon, 19 Jan 2015 14:40:28 -0500 Message-ID: <1421696425.9655.65.camel@x220> Subject: [PATCH] [linux-next] ARM: mvebu: make DTS comments reflect DEBUG_LL changes From: Paul Bolle To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King Cc: Valentin Rothberg , Maxime Ripard , Jason Cooper , Gregory CLEMENT , Andrew Lunn , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Date: Mon, 19 Jan 2015 20:40:25 +0100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4 (3.10.4-4.fc20) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 19 Jan 2015 19:40:25.0375 (UTC) FILETIME=[C55F92F0:01D0341F] X-RcptDomain: vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Kconfig symbol DEBUG_MVEBU_UART_ALTERNATE was renamed to DEBUG_MVEBU_UART0_ALTERNATE. And the symbol DEBUG_MVEBU_UART1_ALTERNATE was added to allow UART1 as a DEBUG_LL target. Make the comment at the top of this DTS reflect those changes. Since we're touching this DTS add comments to show which blocks describe UART0 and UART1. Signed-off-by: Paul Bolle --- Created on top of next-20150119. Untested! Note that I know nothing about this board or about DT source files, so all changes are nothing more than guesses. arch/arm/boot/dts/armada-xp-axpwifiap.dts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index ca0200e20751..28174ab019f9 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -3,8 +3,8 @@ * * Note: this board is shipped with a new generation boot loader that * remaps internal registers at 0xf1000000. Therefore, if earlyprintk - * is used, the CONFIG_DEBUG_MVEBU_UART_ALTERNATE option should be - * used. + * is used, the CONFIG_DEBUG_MVEBU_UART0_ALTERNATE option or the + * CONFIG_DEBUG_MVEBU_UART1_ALTERNATE option should be used. * * Copyright (C) 2013 Marvell * @@ -60,10 +60,12 @@ }; internal-regs { + /* UART0 */ serial@12000 { status = "okay"; }; + /* UART1 */ serial@12100 { status = "okay"; }; -- 1.9.3