Commit d7d45f25 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

ARM: at91/pm: use the atmel-mc syscon defines 



Use the defines from atmel-mc.h instead of at91rm9200_sdramc.h

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent eaa9a21d

arch/arm/mach-at91/include/mach/at91_ramc.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ extern void __iomem *at91_ramc_base[]; 
.extern at91_ramc_base

#endif



#include <soc/at91/at91rm9200_sdramc.h>

#include <linux/mfd/syscon/atmel-mc.h>

#include <soc/at91/at91sam9_ddrsdr.h>

#include <soc/at91/at91sam9_sdramc.h>

arch/arm/mach-at91/pm.c

+4 −4
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void at91_pm_set_standby(void (*at91_standby)(void)) 
 */

static void at91rm9200_standby(void)

{

	u32 lpr = at91_ramc_read(0, AT91RM9200_SDRAMC_LPR);

	u32 lpr = at91_ramc_read(0, AT91_MC_SDRAMC_LPR);



	asm volatile(

		"b    1f\n\t"
@@ -244,8 +244,8 @@ static void at91rm9200_standby(void) 
		"    mcr    p15, 0, %0, c7, c0, 4\n\t"

		"    str    %5, [%1, %2]"

		:

		: "r" (0), "r" (at91_ramc_base[0]), "r" (AT91RM9200_SDRAMC_LPR),

		  "r" (1), "r" (AT91RM9200_SDRAMC_SRR),

		: "r" (0), "r" (at91_ramc_base[0]), "r" (AT91_MC_SDRAMC_LPR),

		  "r" (1), "r" (AT91_MC_SDRAMC_SRR),

		  "r" (lpr));

}
@@ -414,7 +414,7 @@ void __init at91rm9200_pm_init(void) 
	/*

	 * AT91RM9200 SDRAM low-power mode cannot be used with self-refresh.

	 */

	at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0);

	at91_ramc_write(0, AT91_MC_SDRAMC_LPR, 0);



	at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP;

	at91_pm_data.memctrl = AT91_MEMCTRL_MC;

arch/arm/mach-at91/pm_suspend.S

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ ENTRY(at91_sramc_self_refresh) 


	/* Active SDRAM self-refresh mode */

	mov	r3, #1

	str	r3, [r2, #AT91RM9200_SDRAMC_SRR]

	str	r3, [r2, #AT91_MC_SDRAMC_SRR]

	b	exit_sramc_sf



ddrc_sf: