summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-09-29 15:13:35 -0400
committerTom Rini <trini@konsulko.com>2021-09-29 15:13:35 -0400
commit67ae2897235e516d8fa9ab3f296a1caf40f6ebee (patch)
tree11882ed948daee12a7bfa9950e69d2322aaf3088
parent94647e8920b7847330fdd72225c87e6dcb80a10d (diff)
parent33166054c72716e46d492a0588f00900a9684a97 (diff)
downloadu-boot-WIP/29Sep2021.tar.gz
Merge tag 'rpi-next-2021.10.2' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypiWIP/29Sep2021
- fix usb stopt; usb start; bug - update Nicolas email address
-rw-r--r--.mailmap1
-rw-r--r--arch/arm/mach-bcm283x/msg.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index b76f02283c..b09fc321bd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@ Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
Markus Klotzbuecher <mk@denx.de>
+Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
index 347aece3cd..345f7fe2b7 100644
--- a/arch/arm/mach-bcm283x/msg.c
+++ b/arch/arm/mach-bcm283x/msg.c
@@ -170,6 +170,12 @@ int bcm2711_notify_vl805_reset(void)
ALLOC_CACHE_ALIGN_BUFFER(struct msg_notify_vl805_reset,
msg_notify_vl805_reset, 1);
int ret;
+ static int done = false;
+
+ if (done)
+ return 0;
+
+ done = true;
BCM2835_MBOX_INIT_HDR(msg_notify_vl805_reset);
BCM2835_MBOX_INIT_TAG(&msg_notify_vl805_reset->dev_addr,