summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2014-01-13 19:50:12 -0700
committerTom Rini <trini@ti.com>2014-01-20 17:11:39 -0500
commit004c10598b648341c08ebcbf77e9385a064aec47 (patch)
treea4e5eb2c7fb23388ffa5a7e4e658932dcab6021c /arch
parentf66f2aa265f00d4fcf49cdfb23bcfd64360b291d (diff)
ARM: bcm2835: fix mailbox timeout
My original intention was to have a 100ms timeout. However, the timer operations used return values in ms not us, so we ended up with a 100s timeout instead. Fixing this exposes that some operations need longer to operate than 100ms, so bump the timeout up to a whole second. Reported-by: Andre Heider <a.heider@gmail.com> Reviewed-by: Andre Heider <a.heider@gmail.com> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/arm1176/bcm2835/mbox.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm1176/bcm2835/mbox.c b/arch/arm/cpu/arm1176/bcm2835/mbox.c
index 4daf1e410c7..3b17a31eacf 100644
--- a/arch/arm/cpu/arm1176/bcm2835/mbox.c
+++ b/arch/arm/cpu/arm1176/bcm2835/mbox.c
@@ -8,7 +8,7 @@
#include <asm/io.h>
#include <asm/arch/mbox.h>
-#define TIMEOUT (100 * 1000) /* 100mS in uS */
+#define TIMEOUT 1000 /* ms */
int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv)
{