diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-01-31 14:08:47 +0100 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-03-31 20:36:04 +0200 |
| commit | 4d767bc3c3ae4894877061b58fce0acf63096576 (patch) | |
| tree | 7f397515d571e44390abec787dfbc5ecfc5cda6d | |
| parent | 9824c447aafa6fbca1be6a2dae7e99e1f0c8c564 (diff) | |
| download | linux-next-4d767bc3c3ae4894877061b58fce0acf63096576.tar.gz | |
ARM: at91: pm: Move at91_ramc_read/write to pm.c
Those macros are only used in pm.c, move them there so we can remove the
test on __ASSEMBLY__.
Acked-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-at91/pm.h | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 9e2b5c1e503e..41789aa4df86 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -45,6 +45,12 @@ static struct { } at91_pm_data; static void __iomem *at91_ramc_base[2]; +#define at91_ramc_read(id, field) \ + __raw_readl(at91_ramc_base[id] + field) + +#define at91_ramc_write(id, field, value) \ + __raw_writel(value, at91_ramc_base[id] + field) + static int at91_pm_valid_state(suspend_state_t state) { diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index bf980c6ef294..8eed156ef19a 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -17,14 +17,6 @@ #include <soc/at91/at91sam9_ddrsdr.h> #include <soc/at91/at91sam9_sdramc.h> -#ifndef __ASSEMBLY__ -#define at91_ramc_read(id, field) \ - __raw_readl(at91_ramc_base[id] + field) - -#define at91_ramc_write(id, field, value) \ - __raw_writel(value, at91_ramc_base[id] + field) -#endif - #define AT91_MEMCTRL_MC 0 #define AT91_MEMCTRL_SDRAMC 1 #define AT91_MEMCTRL_DDRSDR 2 |