| Message ID | 20210204160129.2249394-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d30337da8677cd73cb19444436b311c13e57356f |
| Headers | show |
| Series | ARM: at91: use proper asm syntax in pm_suspend | expand |
On 04.02.2021 18:01, Arnd Bergmann wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > From: Arnd Bergmann <arnd@arndb.de> > > Compiling with the clang integrated assembler warns about > a recently added instruction: > > <instantiation>:14:13: error: unknown token in expression > ldr tmp1, =#0x00020010UL > arch/arm/mach-at91/pm_suspend.S:542:2: note: while in macro instantiation > at91_plla_enable > > Remove the extra '#' character that is not used for the 'ldr' > instruction when doing an indirect load of a constant. > > Fixes: 4fd36e458392 ("ARM: at91: pm: add plla disable/enable support for sam9x60") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com> Tested-by: Claudiu Beznea <claudiu.beznea@microchip.com> > --- > arch/arm/mach-at91/pm_suspend.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S > index 909856c8a8c6..0d467cc40129 100644 > --- a/arch/arm/mach-at91/pm_suspend.S > +++ b/arch/arm/mach-at91/pm_suspend.S > @@ -446,7 +446,7 @@ ENDPROC(at91_backup_mode) > str tmp1, [pmc, #AT91_PMC_PLL_UPDT] > > /* step 2. */ > - ldr tmp1, =#AT91_PMC_PLL_ACR_DEFAULT_PLLA > + ldr tmp1, =AT91_PMC_PLL_ACR_DEFAULT_PLLA > str tmp1, [pmc, #AT91_PMC_PLL_ACR] > > /* step 3. */ > -- > 2.29.2 >
On 04/02/2021 at 17:01, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Compiling with the clang integrated assembler warns about > a recently added instruction: > > <instantiation>:14:13: error: unknown token in expression > ldr tmp1, =#0x00020010UL > arch/arm/mach-at91/pm_suspend.S:542:2: note: while in macro instantiation > at91_plla_enable > > Remove the extra '#' character that is not used for the 'ldr' > instruction when doing an indirect load of a constant. > > Fixes: 4fd36e458392 ("ARM: at91: pm: add plla disable/enable support for sam9x60") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Looks good to me: Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Thanks! Best regards, Nicolas > --- > arch/arm/mach-at91/pm_suspend.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S > index 909856c8a8c6..0d467cc40129 100644 > --- a/arch/arm/mach-at91/pm_suspend.S > +++ b/arch/arm/mach-at91/pm_suspend.S > @@ -446,7 +446,7 @@ ENDPROC(at91_backup_mode) > str tmp1, [pmc, #AT91_PMC_PLL_UPDT] > > /* step 2. */ > - ldr tmp1, =#AT91_PMC_PLL_ACR_DEFAULT_PLLA > + ldr tmp1, =AT91_PMC_PLL_ACR_DEFAULT_PLLA > str tmp1, [pmc, #AT91_PMC_PLL_ACR] > > /* step 3. */ > -- > 2.29.2 >
On Thu, Feb 04, 2021 at 05:01:20PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Compiling with the clang integrated assembler warns about > a recently added instruction: > > <instantiation>:14:13: error: unknown token in expression > ldr tmp1, =#0x00020010UL > arch/arm/mach-at91/pm_suspend.S:542:2: note: while in macro instantiation > at91_plla_enable > > Remove the extra '#' character that is not used for the 'ldr' > instruction when doing an indirect load of a constant. > > Fixes: 4fd36e458392 ("ARM: at91: pm: add plla disable/enable support for sam9x60") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > arch/arm/mach-at91/pm_suspend.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S > index 909856c8a8c6..0d467cc40129 100644 > --- a/arch/arm/mach-at91/pm_suspend.S > +++ b/arch/arm/mach-at91/pm_suspend.S > @@ -446,7 +446,7 @@ ENDPROC(at91_backup_mode) > str tmp1, [pmc, #AT91_PMC_PLL_UPDT] > > /* step 2. */ > - ldr tmp1, =#AT91_PMC_PLL_ACR_DEFAULT_PLLA > + ldr tmp1, =AT91_PMC_PLL_ACR_DEFAULT_PLLA > str tmp1, [pmc, #AT91_PMC_PLL_ACR] > > /* step 3. */ > -- > 2.29.2 >
Hello: This patch was applied to soc/soc.git (refs/heads/arm/fixes): On Thu, 4 Feb 2021 17:01:20 +0100 you wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Compiling with the clang integrated assembler warns about > a recently added instruction: > > <instantiation>:14:13: error: unknown token in expression > ldr tmp1, =#0x00020010UL > arch/arm/mach-at91/pm_suspend.S:542:2: note: while in macro instantiation > at91_plla_enable > > [...] Here is the summary with links: - ARM: at91: use proper asm syntax in pm_suspend https://git.kernel.org/soc/soc/c/d30337da8677 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S index 909856c8a8c6..0d467cc40129 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -446,7 +446,7 @@ ENDPROC(at91_backup_mode) str tmp1, [pmc, #AT91_PMC_PLL_UPDT] /* step 2. */ - ldr tmp1, =#AT91_PMC_PLL_ACR_DEFAULT_PLLA + ldr tmp1, =AT91_PMC_PLL_ACR_DEFAULT_PLLA str tmp1, [pmc, #AT91_PMC_PLL_ACR] /* step 3. */