From patchwork Thu Mar 26 11:45:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 6098071 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 28D8E9F2A9 for ; Thu, 26 Mar 2015 11:51:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50EDA203EC for ; Thu, 26 Mar 2015 11:51:37 +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 48BE9203B7 for ; Thu, 26 Mar 2015 11:51:36 +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 1Yb6H5-0007lT-0J; Thu, 26 Mar 2015 11:48:35 +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 1Yb6F1-0006gE-68 for linux-arm-kernel@lists.infradead.org; Thu, 26 Mar 2015 11:46:28 +0000 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id B3E3A460B92; Thu, 26 Mar 2015 11:46:05 +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 KBcOqybY5K7e; 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 EDBDA460928; 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-0005Xc-OL; Thu, 26 Mar 2015 11:45:58 +0000 From: Ben Dooks To: linux-kernel@lists.codethink.co.uk Subject: [RFC 3/6] clocksource: tcb_clksrc: use atmel_io.h to provide on-chip IO Date: Thu, 26 Mar 2015 11:45:51 +0000 Message-Id: <1427370354-21247-4-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_044627_458058_2A7CFD35 X-CRM114-Status: UNSURE ( 9.07 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Daniel Lezcano , nicolas.ferre@atmel.com, Linux Kernel , Ben Dooks , Thomas Gleixner , hskinnemoen@gmail.com, Jean-Christophe Plagniol-Villard , 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 Acked-by: Hans-Christian Egtvedt --- CC: Daniel Lezcano CC: Thomas Gleixner CC: Linux Kernel CC: Linux ARM Kernel CC: Andrew Victor CC: Nicolas Ferre CC: Jean-Christophe Plagniol-Villard --- drivers/clocksource/tcb_clksrc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c index 0f819dd3..b25416d 100644 --- a/drivers/clocksource/tcb_clksrc.c +++ b/drivers/clocksource/tcb_clksrc.c @@ -9,6 +9,7 @@ #include #include #include +#include #include @@ -41,13 +42,8 @@ static void __iomem *tcaddr; -#ifdef CONFIG_AVR32 -#define tcb_readl __raw_readl -#define tcb_writel __raw_writel -#else -#define tcb_readl readl_relaxed -#define tcb_writel writel_relaxed -#endif +#define tcb_readl atmel_oc_readl +#define tcb_writel atmel_oc_writel static cycle_t tc_get_cycles(struct clocksource *cs) {