From patchwork Thu Mar 26 11:45:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 6098111 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 F1FB89F2A9 for ; Thu, 26 Mar 2015 11:52:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19769203B7 for ; Thu, 26 Mar 2015 11:52:49 +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 2745C203A5 for ; Thu, 26 Mar 2015 11:52:48 +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 1Yb6IG-00007D-UQ; Thu, 26 Mar 2015 11:49:48 +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 1Yb6FG-0006oh-6t for linux-arm-kernel@lists.infradead.org; Thu, 26 Mar 2015 11:46:43 +0000 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id 1EA2C46070A; Thu, 26 Mar 2015 11:46:08 +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 EsNA5kKVLYUw; Thu, 26 Mar 2015 11:46:06 +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 07551460A7F; Thu, 26 Mar 2015 11:45:59 +0000 (GMT) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.84) (envelope-from ) id 1Yb6EY-0005Xr-QJ; Thu, 26 Mar 2015 11:45:58 +0000 From: Ben Dooks To: linux-kernel@lists.codethink.co.uk Subject: [RFC 6/6] mmc: atmel-mci: use atmel_io.h to provide on-chip IO Date: Thu, 26 Mar 2015 11:45:54 +0000 Message-Id: <1427370354-21247-7-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_044642_448853_226E9D61 X-CRM114-Status: UNSURE ( 9.57 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Ulf Hansson , Ludovic Desroches , linux-mmc@vger.kernel.org, nicolas.ferre@atmel.com, Chris Ball , Ben Dooks , hskinnemoen@gmail.com, 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: Ludovic Desroches CC: Chris Ball CC: Ulf Hansson CC: linux-mmc@vger.kernel.org --- drivers/mmc/host/atmel-mci-regs.h | 11 ++--------- drivers/mmc/host/atmel-mci.c | 1 + 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/atmel-mci-regs.h b/drivers/mmc/host/atmel-mci-regs.h index 711bb53..2293f2c 100644 --- a/drivers/mmc/host/atmel-mci-regs.h +++ b/drivers/mmc/host/atmel-mci-regs.h @@ -135,17 +135,10 @@ #define ATMCI_REGS_SIZE 0x100 /* Register access macros */ -#ifdef CONFIG_AVR32 #define atmci_readl(port,reg) \ - __raw_readl((port)->regs + reg) + atmel_oc_readl((port)->regs + reg) #define atmci_writel(port,reg,value) \ - __raw_writel((value), (port)->regs + reg) -#else -#define atmci_readl(port,reg) \ - readl_relaxed((port)->regs + reg) -#define atmci_writel(port,reg,value) \ - writel_relaxed((value), (port)->regs + reg) -#endif + atmel_oc_writel((value), (port)->regs + reg) /* On AVR chips the Peripheral DMA Controller is not connected to MCI. */ #ifdef CONFIG_AVR32 diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 03d7c75..49de0d7 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -37,6 +37,7 @@ #include #include +#include #include #include #include