From patchwork Thu Mar 26 11:45:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 6098051 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 3A323BF90F for ; Thu, 26 Mar 2015 11:51:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 30FB0203EC for ; Thu, 26 Mar 2015 11:51:13 +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 C18C1203B7 for ; Thu, 26 Mar 2015 11:51:11 +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 1Yb6Gk-0007cG-H6; Thu, 26 Mar 2015 11:48:14 +0000 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yb6Ew-0006f4-CD for linux-arm-kernel@lists.infradead.org; Thu, 26 Mar 2015 11:46:25 +0000 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id 339874609ED; Thu, 26 Mar 2015 11:46:02 +0000 (GMT) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oVRK1mrxUxHx; Thu, 26 Mar 2015 11:46:00 +0000 (GMT) Received: from rainbowdash.ducie.codethink.co.uk (rainbowdash.dyn.ducie.codethink.co.uk [10.24.2.193]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPS id E9AF3460793; Thu, 26 Mar 2015 11:45:58 +0000 (GMT) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.84) (envelope-from ) id 1Yb6EY-0005XX-Nc; Thu, 26 Mar 2015 11:45:58 +0000 From: Ben Dooks To: linux-kernel@lists.codethink.co.uk Subject: [RFC 2/6] tty: serial: atmel: use atmel_io.h to provide on-chip IO Date: Thu, 26 Mar 2015 11:45:50 +0000 Message-Id: <1427370354-21247-3-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427370354-21247-1-git-send-email-ben.dooks@codethink.co.uk> References: <1427370354-21247-1-git-send-email-ben.dooks@codethink.co.uk> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150326_044622_782965_83F7EF4E X-CRM114-Status: UNSURE ( 9.06 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Greg Kroah-Hartman , nicolas.ferre@atmel.com, Ben Dooks , linux-serial@vger.kernel.org, hskinnemoen@gmail.com, Jiri Slaby , linux@maxim.org.za, linux-arm-kernel@lists.infradead.org, egtvedt@samfundet.no 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: , 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 Use to provide IO accessors which work on both AVR32 and ARM for on-chip peripherals. Signed-off-by: Ben Dooks --- CC: Nicolas Ferre CC: Greg Kroah-Hartman CC: Jiri Slaby CC: linux-serial@vger.kernel.org CC: Linux ARM Kernel --- drivers/tty/serial/atmel_serial.c | 63 +++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 40ef95f..eed0700 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -88,44 +89,36 @@ static void atmel_stop_rx(struct uart_port *port); #define ATMEL_ISR_PASS_LIMIT 256 -#ifdef CONFIG_AVR32 -#define __atserial_writel __raw_writel -#define __atserial_readl __raw_readl -#else -#define __atserial_writel writel_relaxed -#define __atserial_readl readl_relaxed -#endif - /* UART registers. CR is write-only, hence no GET macro */ -#define UART_PUT_CR(port,v) __atserial_writel(v, (port)->membase + ATMEL_US_CR) -#define UART_GET_MR(port) __atserial_readl((port)->membase + ATMEL_US_MR) -#define UART_PUT_MR(port,v) __atserial_writel(v, (port)->membase + ATMEL_US_MR) -#define UART_PUT_IER(port,v) __atserial_writel(v, (port)->membase + ATMEL_US_IER) -#define UART_PUT_IDR(port,v) __atserial_writel(v, (port)->membase + ATMEL_US_IDR) -#define UART_GET_IMR(port) __atserial_readl((port)->membase + ATMEL_US_IMR) -#define UART_GET_CSR(port) __atserial_readl((port)->membase + ATMEL_US_CSR) -#define UART_GET_CHAR(port) __atserial_readl((port)->membase + ATMEL_US_RHR) -#define UART_PUT_CHAR(port,v) __atserial_writel(v, (port)->membase + ATMEL_US_THR) -#define UART_GET_BRGR(port) __atserial_readl((port)->membase + ATMEL_US_BRGR) -#define UART_PUT_BRGR(port,v) __atserial_writel(v, (port)->membase + ATMEL_US_BRGR) -#define UART_PUT_RTOR(port,v) __atserial_writel(v, (port)->membase + ATMEL_US_RTOR) -#define UART_PUT_TTGR(port, v) __atserial_writel(v, (port)->membase + ATMEL_US_TTGR) -#define UART_GET_IP_NAME(port) __atserial_readl((port)->membase + ATMEL_US_NAME) -#define UART_GET_IP_VERSION(port) __atserial_readl((port)->membase + ATMEL_US_VERSION) +#define UART_PUT_CR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_US_CR) +#define UART_GET_MR(port) atmel_oc_readl((port)->membase + ATMEL_US_MR) +#define UART_PUT_MR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_US_MR) +#define UART_PUT_IER(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_US_IER) +#define UART_PUT_IDR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_US_IDR) +#define UART_GET_IMR(port) atmel_oc_readl((port)->membase + ATMEL_US_IMR) +#define UART_GET_CSR(port) atmel_oc_readl((port)->membase + ATMEL_US_CSR) +#define UART_GET_CHAR(port) atmel_oc_readl((port)->membase + ATMEL_US_RHR) +#define UART_PUT_CHAR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_US_THR) +#define UART_GET_BRGR(port) atmel_oc_readl((port)->membase + ATMEL_US_BRGR) +#define UART_PUT_BRGR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_US_BRGR) +#define UART_PUT_RTOR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_US_RTOR) +#define UART_PUT_TTGR(port, v) atmel_oc_writel(v, (port)->membase + ATMEL_US_TTGR) +#define UART_GET_IP_NAME(port) atmel_oc_readl((port)->membase + ATMEL_US_NAME) +#define UART_GET_IP_VERSION(port) atmel_oc_readl((port)->membase + ATMEL_US_VERSION) /* PDC registers */ -#define UART_PUT_PTCR(port,v) __atserial_writel(v, (port)->membase + ATMEL_PDC_PTCR) -#define UART_GET_PTSR(port) __atserial_readl((port)->membase + ATMEL_PDC_PTSR) - -#define UART_PUT_RPR(port,v) __atserial_writel(v, (port)->membase + ATMEL_PDC_RPR) -#define UART_GET_RPR(port) __atserial_readl((port)->membase + ATMEL_PDC_RPR) -#define UART_PUT_RCR(port,v) __atserial_writel(v, (port)->membase + ATMEL_PDC_RCR) -#define UART_PUT_RNPR(port,v) __atserial_writel(v, (port)->membase + ATMEL_PDC_RNPR) -#define UART_PUT_RNCR(port,v) __atserial_writel(v, (port)->membase + ATMEL_PDC_RNCR) - -#define UART_PUT_TPR(port,v) __atserial_writel(v, (port)->membase + ATMEL_PDC_TPR) -#define UART_PUT_TCR(port,v) __atserial_writel(v, (port)->membase + ATMEL_PDC_TCR) -#define UART_GET_TCR(port) __atserial_readl((port)->membase + ATMEL_PDC_TCR) +#define UART_PUT_PTCR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_PDC_PTCR) +#define UART_GET_PTSR(port) atmel_oc_readl((port)->membase + ATMEL_PDC_PTSR) + +#define UART_PUT_RPR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_PDC_RPR) +#define UART_GET_RPR(port) atmel_oc_readl((port)->membase + ATMEL_PDC_RPR) +#define UART_PUT_RCR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_PDC_RCR) +#define UART_PUT_RNPR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_PDC_RNPR) +#define UART_PUT_RNCR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_PDC_RNCR) + +#define UART_PUT_TPR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_PDC_TPR) +#define UART_PUT_TCR(port,v) atmel_oc_writel(v, (port)->membase + ATMEL_PDC_TCR) +#define UART_GET_TCR(port) atmel_oc_readl((port)->membase + ATMEL_PDC_TCR) struct atmel_dma_buffer { unsigned char *buf;