diff options
author | Tom Rini <trini@konsulko.com> | 2020-07-10 14:30:46 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-07-10 14:30:46 -0400 |
commit | 618c30679086e0b6d74e427b52931a31a2767af6 (patch) | |
tree | 61af852fc7f4c4a7a673f21aeaa061cc358dda09 /arch/arm/mach-bcm283x/include/mach/base.h | |
parent | 506d52308a2f5de48c2b9a08229fee9a0ee2842a (diff) | |
parent | c1b0bcc870285b6f92d33d8bbb10fb5ba901fb42 (diff) |
Merge branch '2020-08-10-arbitrary-virt-phys-mappings'
- Bring in Marek Szyprowski's series to allow for arbitrary
virtual-physical address mappings.
Diffstat (limited to 'arch/arm/mach-bcm283x/include/mach/base.h')
-rw-r--r-- | arch/arm/mach-bcm283x/include/mach/base.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-bcm283x/include/mach/base.h b/arch/arm/mach-bcm283x/include/mach/base.h index c4ae39852f..4ccaf69693 100644 --- a/arch/arm/mach-bcm283x/include/mach/base.h +++ b/arch/arm/mach-bcm283x/include/mach/base.h @@ -8,4 +8,12 @@ extern unsigned long rpi_bcm283x_base; +#ifdef CONFIG_ARMV7_LPAE +#ifdef CONFIG_TARGET_RPI_4_32B +#include <addr_map.h> +#define phys_to_virt addrmap_phys_to_virt +#define virt_to_phys addrmap_virt_to_phys +#endif +#endif + #endif |