From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wi0-f181.google.com ([209.85.212.181]:61358 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752917AbbAOQ3a (ORCPT ); Thu, 15 Jan 2015 11:29:30 -0500 Received: by mail-wi0-f181.google.com with SMTP id hi2so18970839wib.2 for ; Thu, 15 Jan 2015 08:29:28 -0800 (PST) Message-ID: <54B7EAE4.3020107@linaro.org> Date: Thu, 15 Jan 2015 17:29:24 +0100 From: Daniel Lezcano MIME-Version: 1.0 To: Alexandre Belloni , Nicolas Ferre CC: Boris Brezillon , Jean-Christophe Plagniol-Villard , Thomas Gleixner , Samuel Ortiz , Lee Jones , Wim Van Sebroeck , Guenter Roeck , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org Subject: Re: [PATCH v3 8/8] ARM: at91: remove useless include References: <1421077023-30954-1-git-send-email-alexandre.belloni@free-electrons.com> <1421077023-30954-9-git-send-email-alexandre.belloni@free-electrons.com> In-Reply-To: <1421077023-30954-9-git-send-email-alexandre.belloni@free-electrons.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org On 01/12/2015 04:37 PM, Alexandre Belloni wrote: > Both drivers using the system timer are now converted to an MFD. mach= /at91_st.h > is now useless. > > Signed-off-by: Alexandre Belloni > Acked-by: Boris Brezillon Acked-by: Daniel Lezcano > --- > arch/arm/mach-at91/include/mach/at91_st.h | 61 --------------------= ----------- > 1 file changed, 61 deletions(-) > delete mode 100644 arch/arm/mach-at91/include/mach/at91_st.h > > diff --git a/arch/arm/mach-at91/include/mach/at91_st.h b/arch/arm/mac= h-at91/include/mach/at91_st.h > deleted file mode 100644 > index 67fdbd13c3ed..000000000000 > --- a/arch/arm/mach-at91/include/mach/at91_st.h > +++ /dev/null > @@ -1,61 +0,0 @@ > -/* > - * arch/arm/mach-at91/include/mach/at91_st.h > - * > - * Copyright (C) 2005 Ivan Kokshaysky > - * Copyright (C) SAN People > - * > - * System Timer (ST) - System peripherals registers. > - * Based on AT91RM9200 datasheet revision E. > - * > - * This program is free software; you can redistribute it and/or mod= ify > - * it under the terms of the GNU General Public License as published= by > - * the Free Software Foundation; either version 2 of the License, or > - * (at your option) any later version. > - */ > - > -#ifndef AT91_ST_H > -#define AT91_ST_H > - > -#ifndef __ASSEMBLY__ > -extern void __iomem *at91_st_base; > - > -#define at91_st_read(field) \ > - __raw_readl(at91_st_base + field) > - > -#define at91_st_write(field, value) \ > - __raw_writel(value, at91_st_base + field) > -#else > -.extern at91_st_base > -#endif > - > -#define AT91_ST_CR 0x00 /* Control Register */ > -#define AT91_ST_WDRST (1 << 0) /* Watchdog Timer Restart */ > - > -#define AT91_ST_PIMR 0x04 /* Period Interval Mode Register */ > -#define AT91_ST_PIV (0xffff << 0) /* Period Interval Value */ > - > -#define AT91_ST_WDMR 0x08 /* Watchdog Mode Register */ > -#define AT91_ST_WDV (0xffff << 0) /* Watchdog Counter Value */ > -#define AT91_ST_RSTEN (1 << 16) /* Reset Enable */ > -#define AT91_ST_EXTEN (1 << 17) /* External Signal Assertion Enab= le */ > - > -#define AT91_ST_RTMR 0x0c /* Real-time Mode Register */ > -#define AT91_ST_RTPRES (0xffff << 0) /* Real-time Prescalar Valu= e */ > - > -#define AT91_ST_SR 0x10 /* Status Register */ > -#define AT91_ST_PITS (1 << 0) /* Period Interval Timer Status */ > -#define AT91_ST_WDOVF (1 << 1) /* Watchdog Overflow */ > -#define AT91_ST_RTTINC (1 << 2) /* Real-time Timer Increment */ > -#define AT91_ST_ALMS (1 << 3) /* Alarm Status */ > - > -#define AT91_ST_IER 0x14 /* Interrupt Enable Register */ > -#define AT91_ST_IDR 0x18 /* Interrupt Disable Register */ > -#define AT91_ST_IMR 0x1c /* Interrupt Mask Register */ > - > -#define AT91_ST_RTAR 0x20 /* Real-time Alarm Register */ > -#define AT91_ST_ALMV (0xfffff << 0) /* Alarm Value */ > - > -#define AT91_ST_CRTR 0x24 /* Current Real-time Register */ > -#define AT91_ST_CRTV (0xfffff << 0) /* Current Real-Time Value */ > - > -#endif > --=20 Linaro.org =E2=94=82 Open source software fo= r ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-watchdo= g" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html