Commit e3821ed4 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Nicolas Ferre
Browse files

ARM: at91: pm: s/CONFIG_SOC_SAM9X60/CONFIG_HAVE_AT91_SAM9X60_PLL/g 



Replace CONFIG_SOC_SAM9X60 with CONFIG_HAVE_AT91_SAM9X60_PLL as the
SAM9X60's PLL is also present on SAMA7G5.

Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20210415105010.569620-9-claudiu.beznea@microchip.com
parent 87e1b30c

arch/arm/mach-at91/pm_suspend.S

+2 −2
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ sr_dis_exit: 
	cmp	tmp1, #AT91_PMC_V1

	beq	1f



#ifdef CONFIG_SOC_SAM9X60

#ifdef CONFIG_HAVE_AT91_SAM9X60_PLL

	/* Save PLLA settings. */

	ldr	tmp2, [pmc, #AT91_PMC_PLL_UPDT]

	bic	tmp2, tmp2, #AT91_PMC_PLL_UPDT_ID
@@ -489,7 +489,7 @@ sr_dis_exit: 
	cmp	tmp3, #AT91_PMC_V1

	beq	4f



#ifdef CONFIG_SOC_SAM9X60

#ifdef CONFIG_HAVE_AT91_SAM9X60_PLL

	/* step 1. */

	ldr	tmp1, [pmc, #AT91_PMC_PLL_UPDT]

	bic	tmp1, tmp1, #AT91_PMC_PLL_UPDT_ID