diff options
author | Rohit Vaswani <rvaswani@codeaurora.org> | 2013-06-10 18:50:19 -0400 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2013-06-12 16:52:51 -0400 |
commit | eda9dcfa56f4864e0e4340f5af3f3e39f514b726 (patch) | |
tree | e7e48f1169aa36fc3eff75135cc8d24b362d3302 /arch/arm/mach-msm/gpiomux.c | |
parent | 1a56e4b23d2b4445397419202ff40e0b34ba3d7e (diff) |
ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
Remove gpiomux-v2 as it's not being used and make way for future improvements.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/gpiomux.c')
-rw-r--r-- | arch/arm/mach-msm/gpiomux.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/gpiomux.c b/arch/arm/mach-msm/gpiomux.c index 53af21abd155..2b8e2d217082 100644 --- a/arch/arm/mach-msm/gpiomux.c +++ b/arch/arm/mach-msm/gpiomux.c | |||
@@ -17,9 +17,24 @@ | |||
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
19 | #include "gpiomux.h" | 19 | #include "gpiomux.h" |
20 | #include "proc_comm.h" | ||
20 | 21 | ||
21 | static DEFINE_SPINLOCK(gpiomux_lock); | 22 | static DEFINE_SPINLOCK(gpiomux_lock); |
22 | 23 | ||
24 | static void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val) | ||
25 | { | ||
26 | unsigned tlmm_config = (val & ~GPIOMUX_CTL_MASK) | | ||
27 | ((gpio & 0x3ff) << 4); | ||
28 | unsigned tlmm_disable = 0; | ||
29 | int rc; | ||
30 | |||
31 | rc = msm_proc_comm(PCOM_RPC_GPIO_TLMM_CONFIG_EX, | ||
32 | &tlmm_config, &tlmm_disable); | ||
33 | if (rc) | ||
34 | pr_err("%s: unexpected proc_comm failure %d: %08x %08x\n", | ||
35 | __func__, rc, tlmm_config, tlmm_disable); | ||
36 | } | ||
37 | |||
23 | int msm_gpiomux_write(unsigned gpio, | 38 | int msm_gpiomux_write(unsigned gpio, |
24 | gpiomux_config_t active, | 39 | gpiomux_config_t active, |
25 | gpiomux_config_t suspended) | 40 | gpiomux_config_t suspended) |