Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

+6 -6
+1 -1
arch/arm/mach-at91/include/mach/at91_ramc.h
··· 21 21 .extern at91_ramc_base 22 22 #endif 23 23 24 - #include <soc/at91/at91rm9200_sdramc.h> 24 + #include <linux/mfd/syscon/atmel-mc.h> 25 25 #include <soc/at91/at91sam9_ddrsdr.h> 26 26 #include <soc/at91/at91sam9_sdramc.h> 27 27
+4 -4
arch/arm/mach-at91/pm.c
··· 233 233 */ 234 234 static void at91rm9200_standby(void) 235 235 { 236 - u32 lpr = at91_ramc_read(0, AT91RM9200_SDRAMC_LPR); 236 + u32 lpr = at91_ramc_read(0, AT91_MC_SDRAMC_LPR); 237 237 238 238 asm volatile( 239 239 "b 1f\n\t" ··· 244 244 " mcr p15, 0, %0, c7, c0, 4\n\t" 245 245 " str %5, [%1, %2]" 246 246 : 247 - : "r" (0), "r" (at91_ramc_base[0]), "r" (AT91RM9200_SDRAMC_LPR), 248 - "r" (1), "r" (AT91RM9200_SDRAMC_SRR), 247 + : "r" (0), "r" (at91_ramc_base[0]), "r" (AT91_MC_SDRAMC_LPR), 248 + "r" (1), "r" (AT91_MC_SDRAMC_SRR), 249 249 "r" (lpr)); 250 250 } 251 251 ··· 414 414 /* 415 415 * AT91RM9200 SDRAM low-power mode cannot be used with self-refresh. 416 416 */ 417 - at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0); 417 + at91_ramc_write(0, AT91_MC_SDRAMC_LPR, 0); 418 418 419 419 at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP; 420 420 at91_pm_data.memctrl = AT91_MEMCTRL_MC;
+1 -1
arch/arm/mach-at91/pm_suspend.S
··· 216 216 217 217 /* Active SDRAM self-refresh mode */ 218 218 mov r3, #1 219 - str r3, [r2, #AT91RM9200_SDRAMC_SRR] 219 + str r3, [r2, #AT91_MC_SDRAMC_SRR] 220 220 b exit_sramc_sf 221 221 222 222 ddrc_sf: