Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d767bc3 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

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: default avatarWenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 9824c447

arch/arm/mach-at91/pm.c

+6 −0
Original line number Diff line number Diff line
@@ -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)

{

arch/arm/mach-at91/pm.h

+0 −8
Original line number Diff line number Diff line
@@ -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