diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2012-02-23 15:06:28 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:44 +0200 |
| commit | c8892d1059e4dfffd9c6121d4f345ba2eea4569a (patch) | |
| tree | b53e06fe1bf68120e0d0707dfb978ba9f3aa1baa | |
| parent | 260e6907f1ea2d8c4fb00ef67e8db379056945c1 (diff) | |
ARM: u8500: board-mop500: No ske if hw debugger
Do not load the nomadik ske driver, if a hw debugger is
attached since their gpio usage collides
ST-Ericsson Linux next: -
ST-Ericsson ID: 370799
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Ibe93d4c9f2a6ffeb79dd21cd520abde82f8fa247
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/50231
Reviewed-by: Rickard ANDERSSON <rickard.andersson@stericsson.com>
Reviewed-by: QABUILD
Reviewed-by: QATEST
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index bd20f502c36..2ed4b9ce67b 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -89,6 +89,9 @@ #include "board-mop500-wlan.h" #endif +#define PRCM_DEBUG_NOPWRDOWN_VAL 0x194 +#define ARM_DEBUG_NOPOWER_DOWN_REQ 1 + #ifdef CONFIG_AB8500_DENC static struct ab8500_denc_platform_data ab8500_denc_pdata = { .ddr_enable = true, @@ -1313,7 +1316,13 @@ static void __init hrefv60_init_machine(void) #endif #ifdef CONFIG_KEYBOARD_NOMADIK_SKE - db8500_add_ske_keypad(parent, &mop500_ske_keypad_data, + /* + * If a hw debugger is detected, do not load the ske driver + * since the gpio usage collides. + */ + if (!(prcmu_read(PRCM_DEBUG_NOPWRDOWN_VAL) & + ARM_DEBUG_NOPOWER_DOWN_REQ)) + db8500_add_ske_keypad(parent, &mop500_ske_keypad_data, sizeof(mop500_ske_keypad_data)); #endif |