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

Merge tag 'omap-for-v5.8/soc-signed-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

SoC changes for omaps for v5.8 merge window

SoC related changes for omaps:

- Use ard instead of adrl for sleep34xx.S for clang

- Stop selecting MIGHT_HAVE_CACHE_L2X0, it's already selected
by ARCH_MULTI_V6_V7

- Make omap5_erratum_workaround_801819() and am43xx_get_rtc_base_addr()
static

* tag 'omap-for-v5.8/soc-signed-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: pm33xx-core: Make am43xx_get_rtc_base_addr static
ARM: omap2: make omap5_erratum_workaround_801819 static
ARM: omap2plus: Drop unneeded select of MIGHT_HAVE_CACHE_L2X0
ARM: OMAP2+: drop unnecessary adrl

Link: https://lore.kernel.org/r/pull-1589387719-605999@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+3 -4
-1
arch/arm/mach-omap2/Kconfig
··· 66 66 select ARCH_OMAP2PLUS 67 67 select ARM_GIC 68 68 select MACH_OMAP_GENERIC 69 - select MIGHT_HAVE_CACHE_L2X0 70 69 select HAVE_ARM_SCU 71 70 select GENERIC_CLOCKEVENTS_BROADCAST 72 71 select HAVE_ARM_TWD
+1 -1
arch/arm/mach-omap2/omap-smp.c
··· 72 72 } 73 73 74 74 #ifdef CONFIG_OMAP5_ERRATA_801819 75 - void omap5_erratum_workaround_801819(void) 75 + static void omap5_erratum_workaround_801819(void) 76 76 { 77 77 u32 acr, revidr; 78 78 u32 acr_mask;
+1 -1
arch/arm/mach-omap2/pm33xx-core.c
··· 267 267 return NULL; 268 268 } 269 269 270 - void __iomem *am43xx_get_rtc_base_addr(void) 270 + static void __iomem *am43xx_get_rtc_base_addr(void) 271 271 { 272 272 rtc_oh = omap_hwmod_lookup("rtc"); 273 273
+1 -1
arch/arm/mach-omap2/sleep34xx.S
··· 72 72 stmfd sp!, {lr} @ save registers on stack 73 73 /* Setup so that we will disable and enable l2 */ 74 74 mov r1, #0x1 75 - adrl r3, l2dis_3630_offset @ may be too distant for plain adr 75 + adr r3, l2dis_3630_offset 76 76 ldr r2, [r3] @ value for offset 77 77 str r1, [r2, r3] @ write to l2dis_3630 78 78 ldmfd sp!, {pc} @ restore regs and return