From patchwork Thu Mar 26 11:45:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 6097981 Return-Path: X-Original-To: patchwork-linux-spi@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 47B60BF90F for ; Thu, 26 Mar 2015 11:46:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 672D6203F1 for ; Thu, 26 Mar 2015 11:46:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51D7A203EC for ; Thu, 26 Mar 2015 11:46:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752138AbbCZLqC (ORCPT ); Thu, 26 Mar 2015 07:46:02 -0400 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:59239 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751567AbbCZLqB (ORCPT ); Thu, 26 Mar 2015 07:46:01 -0400 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id 83E18460B7E; Thu, 26 Mar 2015 11:46:00 +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 h2nC6bZN0R3v; Thu, 26 Mar 2015 11:45:59 +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 F06EE4609ED; 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-0005Xg-Ow; Thu, 26 Mar 2015 11:45:58 +0000 From: Ben Dooks To: linux-kernel@lists.codethink.co.uk Cc: hskinnemoen@gmail.com, egtvedt@samfundet.no, linux@maxim.org.za, nicolas.ferre@atmel.com, linux-arm-kernel@lists.infradead.org, Ben Dooks , Mark Brown , linux-spi@vger.kernel.org (open list:SPI SUBSYSTEM) Subject: [RFC 4/6] spi: atmel: use atmel_io.h to provide on-chip IO Date: Thu, 26 Mar 2015 11:45:52 +0000 Message-Id: <1427370354-21247-5-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> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Use to provide IO accessors which work on both AVR32 and ARM for on-chip peripherals. Signed-off-by: Ben Dooks Acked-by: Hans-Christian Egtvedt Acked-by: Mark Brown --- CC: Nicolas Ferre (supporter:ATMEL SPI DRIVER) CC: Mark Brown (maintainer:SPI SUBSYSTEM) CC: linux-spi@vger.kernel.org (open list:SPI SUBSYSTEM) CC: linux-arm-kernel@lists.infradead.org --- drivers/spi/spi-atmel.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index a2f40b1..f10cc75 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -180,17 +181,11 @@ | SPI_BF(name, value)) /* Register access macros */ -#ifdef CONFIG_AVR32 #define spi_readl(port, reg) \ - __raw_readl((port)->regs + SPI_##reg) + atmel_oc_readl((port)->regs + SPI_##reg) #define spi_writel(port, reg, value) \ - __raw_writel((value), (port)->regs + SPI_##reg) -#else -#define spi_readl(port, reg) \ - readl_relaxed((port)->regs + SPI_##reg) -#define spi_writel(port, reg, value) \ - writel_relaxed((value), (port)->regs + SPI_##reg) -#endif + atmel_oc_writel((value), (port)->regs + SPI_##reg) + /* use PIO for small transfers, avoiding DMA setup/teardown overhead and * cache operations; better heuristics consider wordsize and bitrate. */