From patchwork Tue Nov 17 09:40:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 56737 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1826898lbb; Tue, 17 Nov 2015 01:47:37 -0800 (PST) X-Received: by 10.140.255.139 with SMTP id a133mr42865324qhd.103.1447753657573; Tue, 17 Nov 2015 01:47:37 -0800 (PST) Return-Path: Received: from lists.xen.org (lists.xenproject.org. [50.57.142.19]) by mx.google.com with ESMTPS id v91si29199672qgv.39.2015.11.17.01.47.37 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Nov 2015 01:47:37 -0800 (PST) Received-SPF: neutral (google.com: 50.57.142.19 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=50.57.142.19; Authentication-Results: mx.google.com; spf=neutral (google.com: 50.57.142.19 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZycqH-0005rc-6D; Tue, 17 Nov 2015 09:46:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZycqF-0005oy-5B for xen-devel@lists.xen.org; Tue, 17 Nov 2015 09:46:23 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 99/42-10715-E67FA465; Tue, 17 Nov 2015 09:46:22 +0000 X-Env-Sender: shannon.zhao@linaro.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1447753581!3767173!1 X-Originating-IP: [74.125.82.48] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.19.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36673 invoked from network); 17 Nov 2015 09:46:21 -0000 Received: from mail-wm0-f48.google.com (HELO mail-wm0-f48.google.com) (74.125.82.48) by server-6.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 17 Nov 2015 09:46:21 -0000 Received: by wmvv187 with SMTP id v187so217887223wmv.1 for ; Tue, 17 Nov 2015 01:46:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DTDs+AR1jWiQByZKMbdZfcmVAGGzHsYeDts99ofkk9w=; b=vkvI9Ve/i+Wh8BRghfYZNiLVg02/QrVwAcBbSwthcZXu/TGbBHnpM2i587jBQ0ihnW jeLQDcre6jdVVYTtemew9XU6Hyb8iiwFRyXUmnM0yvRwXGO1mk3AC5yhWMwHpFZmDisC cJSTv6BlMURTn5ZacDGN6Uz4Y+QQcPELLqbw4qeQ43xaNB/A3OKSDKP0tNBhEE7m3XZt wsK5cybJ+hUSnkcJbTHPxwkpfjk0zgX2XKeNw8Caf7PIT8AnXJVSHJACHAZX6keBnTNk m8b2dekgfg5jkau9rIGhCU09tTbJL07LcBlhpsxoGEgpYIH3uC8CD23fdi3oD2ksY46f 9D1A== 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=DTDs+AR1jWiQByZKMbdZfcmVAGGzHsYeDts99ofkk9w=; b=iLv+2EGUz9B9zvF7Z6W4f3QO5n9QLtcj0F+01J7+Jc7LAYRVdCh7Z69ViFFe7dJBL5 KhuUVxDlL50cvlFGo7wQF/e/esoAACA5Xg6QpKfm157YKjfJidIYb3xXMyOcCueuTrGh W3EIVH/YYatuW9u+VhmuQ/7uVBIoa/RNFZsAq495zDmVxykY5q3iUT0vwKDfKpPjXNl2 KkwoR82zfQ7hPoQ5+DC596oxYPU0cWfngTX6gNnHz4FdPnv1iHFI/MwIFPDaGChlxeXx n7Y6Zv6HvDOAx7Q1zD0nBcUc6d52u/IdpPhHn32VPY8KpEVWC9mp1XppgpcEfsI/PO00 biuA== X-Gm-Message-State: ALoCoQmRFimBndhE0S8unAyZwye0DIDPuuVmM8770Wa5MfxV+Wwz5Qja2DmNRk00aoF5E1toYlYV X-Received: by 10.28.217.6 with SMTP id q6mr1584257wmg.5.1447753581352; Tue, 17 Nov 2015 01:46:21 -0800 (PST) Received: from localhost ([78.129.251.54]) by smtp.gmail.com with ESMTPSA id z13sm33341758wjr.47.2015.11.17.01.46.18 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Nov 2015 01:46:20 -0800 (PST) From: shannon.zhao@linaro.org To: ian.campbell@citrix.com, stefano.stabellini@citrix.com, keir@xen.org, jbeulich@suse.com, andrew.cooper3@citrix.com, julien.grall@citrix.com, xen-devel@lists.xen.org Date: Tue, 17 Nov 2015 17:40:34 +0800 Message-Id: <1447753261-7552-36-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1447753261-7552-1-git-send-email-shannon.zhao@linaro.org> References: <1447753261-7552-1-git-send-email-shannon.zhao@linaro.org> Cc: mark.rutland@arm.com, hangaohuai@huawei.com, ard.biesheuvel@linaro.org, shannon.zhao@linaro.org, christoffer.dall@linaro.org, peter.huangpeng@huawei.com, david.vrabel@citrix.com, zhaoshenglong@huawei.com, linux-arm-kernel@lists.infradead.org, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v3 35/62] serial: Rename SERHND_DTUART to SERHND_UART X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org From: Shannon Zhao Rename SERHND_DTUART to SERHND_UART in order to reuse it when booting with ACPI. Signed-off-by: Shannon Zhao --- xen/arch/arm/vuart.c | 2 +- xen/drivers/char/cadence-uart.c | 2 +- xen/drivers/char/exynos4210-uart.c | 2 +- xen/drivers/char/omap-uart.c | 2 +- xen/drivers/char/pl011.c | 2 +- xen/drivers/char/scif-uart.c | 2 +- xen/drivers/char/serial.c | 2 +- xen/include/xen/serial.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -- 2.1.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c index b5c9288..6619b33 100644 --- a/xen/arch/arm/vuart.c +++ b/xen/arch/arm/vuart.c @@ -59,7 +59,7 @@ int domain_vuart_init(struct domain *d) { ASSERT( is_hardware_domain(d) ); - d->arch.vuart.info = serial_vuart_info(SERHND_DTUART); + d->arch.vuart.info = serial_vuart_info(SERHND_UART); if ( !d->arch.vuart.info ) return 0; diff --git a/xen/drivers/char/cadence-uart.c b/xen/drivers/char/cadence-uart.c index 933672f..ed65004 100644 --- a/xen/drivers/char/cadence-uart.c +++ b/xen/drivers/char/cadence-uart.c @@ -196,7 +196,7 @@ static int __init cuart_init(struct dt_device_node *dev, const void *data) uart->vuart.status = UART_SR_INTR_TEMPTY; /* Register with generic serial driver. */ - serial_register_uart(SERHND_DTUART, &cuart_driver, uart); + serial_register_uart(SERHND_UART, &cuart_driver, uart); dt_device_set_used_by(dev, DOMID_XEN); diff --git a/xen/drivers/char/exynos4210-uart.c b/xen/drivers/char/exynos4210-uart.c index bac1c2b..43f5313 100644 --- a/xen/drivers/char/exynos4210-uart.c +++ b/xen/drivers/char/exynos4210-uart.c @@ -345,7 +345,7 @@ static int __init exynos4210_uart_init(struct dt_device_node *dev, uart->vuart.status = UTRSTAT_TXE | UTRSTAT_TXFE; /* Register with generic serial driver. */ - serial_register_uart(SERHND_DTUART, &exynos4210_uart_driver, uart); + serial_register_uart(SERHND_UART, &exynos4210_uart_driver, uart); dt_device_set_used_by(dev, DOMID_XEN); diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c index d8f64ea..98c3892 100644 --- a/xen/drivers/char/omap-uart.c +++ b/xen/drivers/char/omap-uart.c @@ -343,7 +343,7 @@ static int __init omap_uart_init(struct dt_device_node *dev, uart->vuart.status = UART_LSR_THRE; /* Register with generic serial driver */ - serial_register_uart(SERHND_DTUART, &omap_uart_driver, uart); + serial_register_uart(SERHND_UART, &omap_uart_driver, uart); dt_device_set_used_by(dev, DOMID_XEN); diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 16abaa5..1efb1cf 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -252,7 +252,7 @@ static int __init pl011_uart_init(int irq, u64 addr, u64 size) uart->vuart.status = 0; /* Register with generic serial driver. */ - serial_register_uart(SERHND_DTUART, &pl011_driver, uart); + serial_register_uart(SERHND_UART, &pl011_driver, uart); return 0; } diff --git a/xen/drivers/char/scif-uart.c b/xen/drivers/char/scif-uart.c index 51a2233..739317c 100644 --- a/xen/drivers/char/scif-uart.c +++ b/xen/drivers/char/scif-uart.c @@ -339,7 +339,7 @@ static int __init scif_uart_init(struct dt_device_node *dev, uart->vuart.status = SCFSR_TDFE; /* Register with generic serial driver */ - serial_register_uart(SERHND_DTUART, &scif_uart_driver, uart); + serial_register_uart(SERHND_UART, &scif_uart_driver, uart); dt_device_set_used_by(dev, DOMID_XEN); diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index c583a48..659e10d 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -312,7 +312,7 @@ int __init serial_parse_handle(char *conf) if ( !strncmp(conf, "dtuart", 5) ) { - handle = SERHND_DTUART; + handle = SERHND_UART; goto common; } diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 5e1a536..a6e7c22 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -94,7 +94,7 @@ struct uart_driver { # define SERHND_COM1 (0<<0) # define SERHND_COM2 (1<<0) # define SERHND_DBGP (2<<0) -# define SERHND_DTUART (0<<0) /* Steal SERHND_COM1 value */ +# define SERHND_UART (0<<0) /* Steal SERHND_COM1 value */ #define SERHND_HI (1<<2) /* Mux/demux each transferred char by MSB. */ #define SERHND_LO (1<<3) /* Ditto, except that the MSB is cleared. */ #define SERHND_COOKED (1<<4) /* Newline/carriage-return translation? */