Skip to contentSkip to conversation

ARM: at91: use proper asm syntax in pm_suspend

PATCH Applied Arnd Bergmann 5 participants 5 messages Feb 4, 2021 – Feb 9, 2021

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 ARM: at91: use proper asm syntax in pm_suspend

From: Arnd Bergmann <[email protected]>

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 <[email protected]>
---
 arch/arm/mach-at91/pm_suspend.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-at91/pm_suspend.S +1 -1
index 909856c8a8c6..0d467cc40129 100644
@@ -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. */
Signature · 1 line
2.29.2
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 12 lines · Arnd Bergmann

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

From: Arnd Bergmann <[email protected]>

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

Quoted 5 lines

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 <[email protected]>
Reviewed-by Claudiu Beznea <[email protected]>
Tested-by Claudiu Beznea <[email protected]>
Quoted 20 lines
---
 arch/arm/mach-at91/pm_suspend.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-at91/pm_suspend.S +1 -2
index 909856c8a8c6..0d467cc40129 100644
@@ -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

maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 10 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

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

Quoted 5 lines

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 <[email protected]>

Looks good to me:

Acked-by Nicolas Ferre <[email protected]>

Thanks!

Best regards,
Nicolas

Quoted 20 lines
---
  arch/arm/mach-at91/pm_suspend.S | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-at91/pm_suspend.S +1 -2
index 909856c8a8c6..0d467cc40129 100644
@@ -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

Signature · 1 line
Nicolas Ferre
Reviewed-by on v1 1/1
#3 lore raw
In reply to Arnd Bergmann
Quoted 10 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

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

Quoted 5 lines

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 <[email protected]>
Reviewed-by Nathan Chancellor <[email protected]>
Quoted 20 lines
---
 arch/arm/mach-at91/pm_suspend.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-at91/pm_suspend.S +1 -1
index 909856c8a8c6..0d467cc40129 100644
@@ -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. */
Signature · 1 line
2.29.2
CI Applied
#4 lore raw
In reply to Arnd Bergmann
This patch was applied to soc/soc.git (refs/heads/arm/fixes):

Hello:

This patch was applied to soc/soc.git (refs/heads/arm/fixes):

Quoted 11 lines · On Thu, 4 Feb 2021 17:01:20 +0100 you wrote:

From: Arnd Bergmann <[email protected]>

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