diff options
author | Tom Rini <trini@konsulko.com> | 2023-10-10 08:54:17 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-10-10 08:54:17 -0400 |
commit | 833ff23047c50e4053fb1bda21f4e2c9f6a3aa6a (patch) | |
tree | 422a1ac1688b75a6c4edcbaa2024346acbaddfb8 /arch/arm/mach-k3/common.c | |
parent | d9bb6d779b69c2548891e568e5e2a23e1b7eedaa (diff) | |
parent | 3f876cb7c57511174d1b6a3e089443ccbaf236ec (diff) |
Merge branch '2023-10-09-assorted-fixes'
- Cleanup how we pick what to launch in SPL, a few test changes, some TI
K3 platform updates, top-level Makefile fixes and related cleanup,
correct a problem with LMB overlap, other assorted fixes.
Diffstat (limited to 'arch/arm/mach-k3/common.c')
-rw-r--r-- | arch/arm/mach-k3/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index cc755dd1bf..c3006ba387 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -84,10 +84,10 @@ void k3_sysfw_print_ver(void) ti_sci->version.firmware_revision, fw_desc); } -void mmr_unlock(phys_addr_t base, u32 partition) +void mmr_unlock(uintptr_t base, u32 partition) { /* Translate the base address */ - phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE; + uintptr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE; /* Unlock the requested partition if locked using two-step sequence */ writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0); |