4e6fb518fbf08dfee7dc45de40b650d50db2cdda
[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / board / calao / snowball / linux-3.4.patch
1 From 3d1a9b44b9dcd2c0f5d54c09596c96c0524d8340 Mon Sep 17 00:00:00 2001
2 From: Gregory Hermant <gregory.hermant@calao-systems.com>
3 Date: Tue, 13 Nov 2012 11:47:41 +0100
4 Subject: [PATCH] trace-debug[stm]: Fix for BT/WLAN instability
5
6 Pins under mop500_ske_pins array are used for different
7 functionalities in snowball. Ex: GPIO161 pin configured
8 for keypad here must stay configured as GPIO alternate
9 function for operating PMU_EN pin of BT/WLAN chip in snowball.
10 So forbid configuring these pins, for snowball
11
12 Signed-off-by: Rajanikanth H.V <rajanikanth.hv@stericsson.com>
13 Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
14 ---
15  arch/arm/mach-ux500/board-mop500-stm.c |    7 +++++--
16  1 file changed, 5 insertions(+), 2 deletions(-)
17
18 diff --git a/arch/arm/mach-ux500/board-mop500-stm.c b/arch/arm/mach-ux500/board-mop500-stm.c
19 index 1bef2a0..532fb9e 100644
20 --- a/arch/arm/mach-ux500/board-mop500-stm.c
21 +++ b/arch/arm/mach-ux500/board-mop500-stm.c
22 @@ -121,7 +121,9 @@ static int stm_ste_disable_ape_on_mipi60(void)
23         if (retval)
24                 STM_ERR("Failed to disable MIPI60\n");
25         else {
26 -               retval = nmk_config_pins(ARRAY_AND_SIZE(mop500_ske_pins));
27 +               if (!machine_is_snowball())
28 +                       retval = nmk_config_pins(
29 +                               ARRAY_AND_SIZE(mop500_ske_pins));
30                 if (retval)
31                         STM_ERR("Failed to enable SKE gpio\n");
32         }
33 @@ -314,7 +316,8 @@ static int stm_ste_connection(enum stm_connection_type con_type)
34                 /* Enable altC3 on GPIO70-74 (STMMOD) and GPIO75-76 (UARTMOD) */
35                 prcmu_enable_stm_mod_uart();
36                 /* Enable APE on MIPI60 */
37 -               retval = nmk_config_pins_sleep(ARRAY_AND_SIZE(mop500_ske_pins));
38 +               if (!machine_is_snowball())
39 +                       retval = nmk_config_pins_sleep(ARRAY_AND_SIZE(mop500_ske_pins));
40                 if (retval)
41                         STM_ERR("Failed to disable SKE GPIO\n");
42                 else {
43 -- 
44 1.7.9.5
45