diff options
| author | Matthias Schiffer <matthias.schiffer@ew.tq-group.com> | 2023-09-27 15:43:14 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-09 15:24:31 -0400 |
| commit | 17deab0edd2ba0a79a2b566c9a4e52e303bed362 (patch) | |
| tree | 78375d50ec82a003dba5af593e1ee7170a90e5e9 | |
| parent | 34124ad9a433eb829b7a1942e074dd500302d964 (diff) | |
arm: mach-k3: common: fix compile warnings with PHYS_64BIT on 32bit
Use uintptr_t instead of phys_addr_t where appropriate, so passing the
addresses to writel() doesn't result in compile warnings when PHYS_64BIT
is set for 32bit builds (which is actually a useful configuration, as
the K3 SoC family boots from an R5 SPL, which may pass bank information
based on gd->bd->bi_dram to fdt_fixup_memory_banks() etc., so PHYS_64BIT
is needed for fixing up the upper bank).
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
| -rw-r--r-- | arch/arm/mach-k3/common.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-k3/common.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index cc755dd1bf6..c3006ba387e 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); diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h index 9bd9ad6d1a0..eabb44f6204 100644 --- a/arch/arm/mach-k3/common.h +++ b/arch/arm/mach-k3/common.h @@ -38,7 +38,7 @@ void remove_fwl_configs(struct fwl_data *fwl_data, size_t fwl_data_size); int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr); void k3_sysfw_print_ver(void); void spl_enable_dcache(void); -void mmr_unlock(phys_addr_t base, u32 partition); +void mmr_unlock(uintptr_t base, u32 partition); bool is_rom_loaded_sysfw(struct rom_extended_boot_data *data); enum k3_device_type get_device_type(void); void ti_secure_image_post_process(void **p_image, size_t *p_size); |