summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2012-02-03 11:04:01 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:27 +0200
commit1e6e55260f65886c7612a06f6136f3d896a07de4 (patch)
treef26310ae6edff8171059ce2f86af6c148b93c25d
parentf0ab282c5b22278ab4f63d2318bb837ab01b9868 (diff)
ux500: Don't disable JTAG on Snowball
JTAG state saved into product config for Snowball seems to be wrong, this disables JTAG debugging, so enabled it always Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/mach-ux500/product.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/product.c b/arch/arm/mach-ux500/product.c
index b6663b8256f..014fe4b145d 100644
--- a/arch/arm/mach-ux500/product.c
+++ b/arch/arm/mach-ux500/product.c
@@ -15,6 +15,7 @@
#include <linux/tee.h>
#include <linux/module.h>
#include <mach/hardware.h>
+#include <asm/mach-types.h>
#define STATIC_TEE_TA_START_LOW 0xBC765EDE
#define STATIC_TEE_TA_START_MID 0x6724
@@ -32,6 +33,8 @@ bool ux500_jtag_enabled(void)
#ifdef CONFIG_UX500_DEBUG_NO_LAUTERBACH
return false;
#else
+ if (machine_is_snowball())
+ return true;
if (cpu_is_u5500())
return readl_relaxed(__io_address(U5500_PRCMU_DBG_PWRCTRL))
& PRCMU_DBG_PWRCTRL_A9DBGCLKEN;