diff options
author | Tom Rini <trini@konsulko.com> | 2019-11-25 20:56:27 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-11-25 20:56:27 +0300 |
commit | 4b19b89ca4a866b7baa642533e6dbd67cd832d27 (patch) | |
tree | d5cb75e0e6ec1819224360e80f3f3be0e0210819 /arch/arm/mach-bcm283x/include/mach/timer.h | |
parent | e3281aec7405ff509d72ad16218df9ab13b49036 (diff) | |
parent | 5694090670e262b038377bf196188d8089dc90c4 (diff) | |
download | u-boot-4b19b89ca4a866b7baa642533e6dbd67cd832d27.tar.xz |
Merge tag 'rpi-next-2020.01' of https://github.com/mbgg/u-boot
- add RPi4 upstream compatible to pinctrl
- fix boot banner on RPi3/4
- add support for one binary on RPi3/4
Diffstat (limited to 'arch/arm/mach-bcm283x/include/mach/timer.h')
-rw-r--r-- | arch/arm/mach-bcm283x/include/mach/timer.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h index 61beb1aba1..01c0ebad64 100644 --- a/arch/arm/mach-bcm283x/include/mach/timer.h +++ b/arch/arm/mach-bcm283x/include/mach/timer.h @@ -6,7 +6,12 @@ #ifndef _BCM2835_TIMER_H #define _BCM2835_TIMER_H -#define BCM2835_TIMER_PHYSADDR (CONFIG_BCM283x_BASE + 0x00003000) +#ifndef __ASSEMBLY__ +#include <asm/arch/base.h> +#endif + +#define BCM2835_TIMER_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ + rpi_bcm283x_base + 0x00003000; }) #define BCM2835_TIMER_CS_M3 (1 << 3) #define BCM2835_TIMER_CS_M2 (1 << 2) |