shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-20 04:21:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2020-05-15 23:03:04 +02:00
parent a7426a0e7f d33e3d542b
commit 5df04698bd
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap2/Kconfig
View File

@@ -66,7 +66,6 @@ config SOC_AM43XX
select ARCH_OMAP2PLUS
select ARM_GIC
select MACH_OMAP_GENERIC
select MIGHT_HAVE_CACHE_L2X0
select HAVE_ARM_SCU
select GENERIC_CLOCKEVENTS_BROADCAST
select HAVE_ARM_TWD

2
arch/arm/mach-omap2/omap-smp.c
View File

@@ -72,7 +72,7 @@ void __iomem *omap4_get_scu_base(void)
}
#ifdef CONFIG_OMAP5_ERRATA_801819
void omap5_erratum_workaround_801819(void)
static void omap5_erratum_workaround_801819(void)
{
u32 acr, revidr;
u32 acr_mask;

2
arch/arm/mach-omap2/pm33xx-core.c
View File

@@ -267,7 +267,7 @@ static struct am33xx_pm_sram_addr *amx3_get_sram_addrs(void)
return NULL;
}
void __iomem *am43xx_get_rtc_base_addr(void)
static void __iomem *am43xx_get_rtc_base_addr(void)
{
rtc_oh = omap_hwmod_lookup("rtc");

2
arch/arm/mach-omap2/sleep34xx.S
View File

@@ -72,7 +72,7 @@ ENTRY(enable_omap3630_toggle_l2_on_restore)
stmfd sp!, {lr} @ save registers on stack
/* Setup so that we will disable and enable l2 */
mov r1, #0x1
adrl r3, l2dis_3630_offset @ may be too distant for plain adr
adr r3, l2dis_3630_offset
ldr r2, [r3] @ value for offset
str r1, [r2, r3] @ write to l2dis_3630
ldmfd sp!, {pc} @ restore regs and return