diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-07-03 08:54:25 -0400 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-25 10:27:52 -0400 |
| commit | f55df0d654e10ad49e0e7edaeef02fa00e084d94 (patch) | |
| tree | 484db0ba66469eb702282452cc940c9c18cf3f37 | |
| parent | 351a4ffea259a11deebe0eb169c46ccbfc3abd36 (diff) | |
ARM: at91: Remove rstc and shdwc headers
These headers used to provide an "API" to access the rstc and shdwc registers.
Now that no-one uses this API anymore, we can safely remove those.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| -rw-r--r-- | arch/arm/mach-at91/at91_rstc.h | 53 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91_shdwc.h | 50 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9rl.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board-sam9260ek.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board-sam9261ek.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board-sam9263ek.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board-sam9m10g45ek.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board-sam9rlek.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 1 |
12 files changed, 0 insertions, 113 deletions
diff --git a/arch/arm/mach-at91/at91_rstc.h b/arch/arm/mach-at91/at91_rstc.h deleted file mode 100644 index a600e6992920..000000000000 --- a/arch/arm/mach-at91/at91_rstc.h +++ /dev/null | |||
| @@ -1,53 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-at91/include/mach/at91_rstc.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2007 Andrew Victor | ||
| 5 | * Copyright (C) 2007 Atmel Corporation. | ||
| 6 | * | ||
| 7 | * Reset Controller (RSTC) - System peripherals regsters. | ||
| 8 | * Based on AT91SAM9261 datasheet revision D. | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License as published by | ||
| 12 | * the Free Software Foundation; either version 2 of the License, or | ||
| 13 | * (at your option) any later version. | ||
| 14 | */ | ||
| 15 | |||
| 16 | #ifndef AT91_RSTC_H | ||
| 17 | #define AT91_RSTC_H | ||
| 18 | |||
| 19 | #ifndef __ASSEMBLY__ | ||
| 20 | extern void __iomem *at91_rstc_base; | ||
| 21 | |||
| 22 | #define at91_rstc_read(field) \ | ||
| 23 | __raw_readl(at91_rstc_base + field) | ||
| 24 | |||
| 25 | #define at91_rstc_write(field, value) \ | ||
| 26 | __raw_writel(value, at91_rstc_base + field) | ||
| 27 | #else | ||
| 28 | .extern at91_rstc_base | ||
| 29 | #endif | ||
| 30 | |||
| 31 | #define AT91_RSTC_CR 0x00 /* Reset Controller Control Register */ | ||
| 32 | #define AT91_RSTC_PROCRST (1 << 0) /* Processor Reset */ | ||
| 33 | #define AT91_RSTC_PERRST (1 << 2) /* Peripheral Reset */ | ||
| 34 | #define AT91_RSTC_EXTRST (1 << 3) /* External Reset */ | ||
| 35 | #define AT91_RSTC_KEY (0xa5 << 24) /* KEY Password */ | ||
| 36 | |||
| 37 | #define AT91_RSTC_SR 0x04 /* Reset Controller Status Register */ | ||
| 38 | #define AT91_RSTC_URSTS (1 << 0) /* User Reset Status */ | ||
| 39 | #define AT91_RSTC_RSTTYP (7 << 8) /* Reset Type */ | ||
| 40 | #define AT91_RSTC_RSTTYP_GENERAL (0 << 8) | ||
| 41 | #define AT91_RSTC_RSTTYP_WAKEUP (1 << 8) | ||
| 42 | #define AT91_RSTC_RSTTYP_WATCHDOG (2 << 8) | ||
| 43 | #define AT91_RSTC_RSTTYP_SOFTWARE (3 << 8) | ||
| 44 | #define AT91_RSTC_RSTTYP_USER (4 << 8) | ||
| 45 | #define AT91_RSTC_NRSTL (1 << 16) /* NRST Pin Level */ | ||
| 46 | #define AT91_RSTC_SRCMP (1 << 17) /* Software Reset Command in Progress */ | ||
| 47 | |||
| 48 | #define AT91_RSTC_MR 0x08 /* Reset Controller Mode Register */ | ||
| 49 | #define AT91_RSTC_URSTEN (1 << 0) /* User Reset Enable */ | ||
| 50 | #define AT91_RSTC_URSTIEN (1 << 4) /* User Reset Interrupt Enable */ | ||
| 51 | #define AT91_RSTC_ERSTL (0xf << 8) /* External Reset Length */ | ||
| 52 | |||
| 53 | #endif | ||
diff --git a/arch/arm/mach-at91/at91_shdwc.h b/arch/arm/mach-at91/at91_shdwc.h deleted file mode 100644 index 9e29f31ec9a6..000000000000 --- a/arch/arm/mach-at91/at91_shdwc.h +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-at91/include/mach/at91_shdwc.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2007 Andrew Victor | ||
| 5 | * Copyright (C) 2007 Atmel Corporation. | ||
| 6 | * | ||
| 7 | * Shutdown Controller (SHDWC) - System peripherals regsters. | ||
| 8 | * Based on AT91SAM9261 datasheet revision D. | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License as published by | ||
| 12 | * the Free Software Foundation; either version 2 of the License, or | ||
| 13 | * (at your option) any later version. | ||
| 14 | */ | ||
| 15 | |||
| 16 | #ifndef AT91_SHDWC_H | ||
| 17 | #define AT91_SHDWC_H | ||
| 18 | |||
| 19 | #ifndef __ASSEMBLY__ | ||
| 20 | extern void __iomem *at91_shdwc_base; | ||
| 21 | |||
| 22 | #define at91_shdwc_read(field) \ | ||
| 23 | __raw_readl(at91_shdwc_base + field) | ||
| 24 | |||
| 25 | #define at91_shdwc_write(field, value) \ | ||
| 26 | __raw_writel(value, at91_shdwc_base + field) | ||
| 27 | #endif | ||
| 28 | |||
| 29 | #define AT91_SHDW_CR 0x00 /* Shut Down Control Register */ | ||
| 30 | #define AT91_SHDW_SHDW (1 << 0) /* Shut Down command */ | ||
| 31 | #define AT91_SHDW_KEY (0xa5 << 24) /* KEY Password */ | ||
| 32 | |||
| 33 | #define AT91_SHDW_MR 0x04 /* Shut Down Mode Register */ | ||
| 34 | #define AT91_SHDW_WKMODE0 (3 << 0) /* Wake-up 0 Mode Selection */ | ||
| 35 | #define AT91_SHDW_WKMODE0_NONE 0 | ||
| 36 | #define AT91_SHDW_WKMODE0_HIGH 1 | ||
| 37 | #define AT91_SHDW_WKMODE0_LOW 2 | ||
| 38 | #define AT91_SHDW_WKMODE0_ANYLEVEL 3 | ||
| 39 | #define AT91_SHDW_CPTWK0_MAX 0xf /* Maximum Counter On Wake Up 0 */ | ||
| 40 | #define AT91_SHDW_CPTWK0 (AT91_SHDW_CPTWK0_MAX << 4) /* Counter On Wake Up 0 */ | ||
| 41 | #define AT91_SHDW_CPTWK0_(x) ((x) << 4) | ||
| 42 | #define AT91_SHDW_RTTWKEN (1 << 16) /* Real Time Timer Wake-up Enable */ | ||
| 43 | #define AT91_SHDW_RTCWKEN (1 << 17) /* Real Time Clock Wake-up Enable */ | ||
| 44 | |||
| 45 | #define AT91_SHDW_SR 0x08 /* Shut Down Status Register */ | ||
| 46 | #define AT91_SHDW_WAKEUP0 (1 << 0) /* Wake-up 0 Status */ | ||
| 47 | #define AT91_SHDW_RTTWK (1 << 16) /* Real-time Timer Wake-up */ | ||
| 48 | #define AT91_SHDW_RTCWK (1 << 17) /* Real-time Clock Wake-up [SAM9RL] */ | ||
| 49 | |||
| 50 | #endif | ||
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index dbb069f4a0a6..b6948d677ca9 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
| 26 | 26 | ||
| 27 | #include "at91_aic.h" | 27 | #include "at91_aic.h" |
| 28 | #include "at91_rstc.h" | ||
| 29 | #include "soc.h" | 28 | #include "soc.h" |
| 30 | #include "generic.h" | 29 | #include "generic.h" |
| 31 | #include "sam9_smc.h" | 30 | #include "sam9_smc.h" |
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 80cae8728316..c07339e370ee 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 25 | 25 | ||
| 26 | #include "at91_aic.h" | 26 | #include "at91_aic.h" |
| 27 | #include "at91_rstc.h" | ||
| 28 | #include "soc.h" | 27 | #include "soc.h" |
| 29 | #include "generic.h" | 28 | #include "generic.h" |
| 30 | #include "sam9_smc.h" | 29 | #include "sam9_smc.h" |
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index 37bb02ce8b62..33ab06ec5365 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 24 | 24 | ||
| 25 | #include "at91_aic.h" | 25 | #include "at91_aic.h" |
| 26 | #include "at91_rstc.h" | ||
| 27 | #include "soc.h" | 26 | #include "soc.h" |
| 28 | #include "generic.h" | 27 | #include "generic.h" |
| 29 | #include "sam9_smc.h" | 28 | #include "sam9_smc.h" |
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c index 1644aa250eba..264999f33594 100644 --- a/arch/arm/mach-at91/at91sam9rl.c +++ b/arch/arm/mach-at91/at91sam9rl.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 25 | 25 | ||
| 26 | #include "at91_aic.h" | 26 | #include "at91_aic.h" |
| 27 | #include "at91_rstc.h" | ||
| 28 | #include "soc.h" | 27 | #include "soc.h" |
| 29 | #include "generic.h" | 28 | #include "generic.h" |
| 30 | #include "sam9_smc.h" | 29 | #include "sam9_smc.h" |
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index da9c5f1f2c49..18f49c93f3f3 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <mach/system_rev.h> | 45 | #include <mach/system_rev.h> |
| 46 | 46 | ||
| 47 | #include "at91_aic.h" | 47 | #include "at91_aic.h" |
| 48 | #include "at91_shdwc.h" | ||
| 49 | #include "board.h" | 48 | #include "board.h" |
| 50 | #include "sam9_smc.h" | 49 | #include "sam9_smc.h" |
| 51 | #include "generic.h" | 50 | #include "generic.h" |
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index d1be10b09ab3..5a23e7211203 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #include <mach/system_rev.h> | 49 | #include <mach/system_rev.h> |
| 50 | 50 | ||
| 51 | #include "at91_aic.h" | 51 | #include "at91_aic.h" |
| 52 | #include "at91_shdwc.h" | ||
| 53 | #include "board.h" | 52 | #include "board.h" |
| 54 | #include "sam9_smc.h" | 53 | #include "sam9_smc.h" |
| 55 | #include "generic.h" | 54 | #include "generic.h" |
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c index 7ccaf3be6e80..e8685652a73e 100644 --- a/arch/arm/mach-at91/board-sam9263ek.c +++ b/arch/arm/mach-at91/board-sam9263ek.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | #include <mach/system_rev.h> | 50 | #include <mach/system_rev.h> |
| 51 | 51 | ||
| 52 | #include "at91_aic.h" | 52 | #include "at91_aic.h" |
| 53 | #include "at91_shdwc.h" | ||
| 54 | #include "board.h" | 53 | #include "board.h" |
| 55 | #include "sam9_smc.h" | 54 | #include "sam9_smc.h" |
| 56 | #include "generic.h" | 55 | #include "generic.h" |
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index 7b8bc961a5d5..0fc4bea272ea 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | #include <mach/system_rev.h> | 48 | #include <mach/system_rev.h> |
| 49 | 49 | ||
| 50 | #include "at91_aic.h" | 50 | #include "at91_aic.h" |
| 51 | #include "at91_shdwc.h" | ||
| 52 | #include "board.h" | 51 | #include "board.h" |
| 53 | #include "sam9_smc.h" | 52 | #include "sam9_smc.h" |
| 54 | #include "generic.h" | 53 | #include "generic.h" |
diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index 262e3f957d9f..5cb82464be1a 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | 35 | ||
| 36 | 36 | ||
| 37 | #include "at91_aic.h" | 37 | #include "at91_aic.h" |
| 38 | #include "at91_shdwc.h" | ||
| 39 | #include "board.h" | 38 | #include "board.h" |
| 40 | #include "sam9_smc.h" | 39 | #include "sam9_smc.h" |
| 41 | #include "generic.h" | 40 | #include "generic.h" |
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index bf9b03df11f6..28ae63b8eb16 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <mach/cpu.h> | 22 | #include <mach/cpu.h> |
| 23 | #include <mach/at91_dbgu.h> | 23 | #include <mach/at91_dbgu.h> |
| 24 | 24 | ||
| 25 | #include "at91_shdwc.h" | ||
| 26 | #include "soc.h" | 25 | #include "soc.h" |
| 27 | #include "generic.h" | 26 | #include "generic.h" |
| 28 | #include "pm.h" | 27 | #include "pm.h" |
