diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-06 19:49:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-06 19:49:51 -0400 |
| commit | ba83753289f5ad99f64e72fd0ee141c647aeda0f (patch) | |
| tree | d1758ddd69cf9c754494d63f2f9e9b98ce61842f /arch/arm/mach-bcm283x/mbox.c | |
| parent | 9562b20dba65e33fc4afc27d83641463f017221b (diff) | |
| parent | e0351b242a9bf60dd6abdfd44104bb702e7000a0 (diff) | |
Merge tag 'rpi-next-2019.10' of https://github.com/mbgg/u-boot
- fix mailbox status register used for polling
- fix bcm2835_sdhost to wait long enough for a transfer to complete
- increase kernel image size from 8 MB to 64 MB on arm64
- add support for RPi4
- add prefixes for raspberry pi related stuff to git-mailrc
Diffstat (limited to 'arch/arm/mach-bcm283x/mbox.c')
| -rw-r--r-- | arch/arm/mach-bcm283x/mbox.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c index 1642ebd103..3c67f68c17 100644 --- a/arch/arm/mach-bcm283x/mbox.c +++ b/arch/arm/mach-bcm283x/mbox.c @@ -27,7 +27,7 @@ int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv) /* Drain any stale responses */ for (;;) { - val = readl(®s->status); + val = readl(®s->mail0_status); if (val & BCM2835_MBOX_STATUS_RD_EMPTY) break; if (get_timer(0) >= endtime) { @@ -40,7 +40,7 @@ int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv) /* Wait for space to send */ for (;;) { - val = readl(®s->status); + val = readl(®s->mail1_status); if (!(val & BCM2835_MBOX_STATUS_WR_FULL)) break; if (get_timer(0) >= endtime) { @@ -58,7 +58,7 @@ int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv) /* Wait for the response */ for (;;) { - val = readl(®s->status); + val = readl(®s->mail0_status); if (!(val & BCM2835_MBOX_STATUS_RD_EMPTY)) break; if (get_timer(0) >= endtime) { |