diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-25 12:56:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-25 12:56:27 -0500 |
| commit | 4b19b89ca4a866b7baa642533e6dbd67cd832d27 (patch) | |
| tree | d5cb75e0e6ec1819224360e80f3f3be0e0210819 /arch/arm/mach-bcm283x/include/mach/mbox.h | |
| parent | e3281aec7405ff509d72ad16218df9ab13b49036 (diff) | |
| parent | 5694090670e262b038377bf196188d8089dc90c4 (diff) | |
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/mbox.h')
| -rw-r--r-- | arch/arm/mach-bcm283x/include/mach/mbox.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h index 0b6c2543d5..60e226ce1d 100644 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h @@ -7,6 +7,7 @@ #define _BCM2835_MBOX_H #include <linux/compiler.h> +#include <asm/arch/base.h> /* * The BCM2835 SoC contains (at least) two CPUs; the VideoCore (a/k/a "GPU") @@ -37,7 +38,8 @@ /* Raw mailbox HW */ -#define BCM2835_MBOX_PHYSADDR (CONFIG_BCM283x_BASE + 0x0000b880) +#define BCM2835_MBOX_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ + rpi_bcm283x_base + 0x0000b880; }) struct bcm2835_mbox_regs { u32 read; |