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: 6097991 Return-Path: X-Original-To: patchwork-linux-mmc@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 60063BF90F for ; Thu, 26 Mar 2015 11:46:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 795DF203EC for ; Thu, 26 Mar 2015 11:46:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6573E203AC for ; Thu, 26 Mar 2015 11:46:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751909AbbCZLqL (ORCPT ); Thu, 26 Mar 2015 07:46:11 -0400 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:59319 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752251AbbCZLqJ (ORCPT ); Thu, 26 Mar 2015 07:46:09 -0400 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 Cc: hskinnemoen@gmail.com, egtvedt@samfundet.no, linux@maxim.org.za, nicolas.ferre@atmel.com, linux-arm-kernel@lists.infradead.org, Ben Dooks , Ludovic Desroches , Chris Ball , Ulf Hansson , linux-mmc@vger.kernel.org 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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 --- 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