diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-04 13:34:57 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-04 13:34:57 -0700 |
| commit | a621cd55b466dab45085cea56f2d5b115bc2274c (patch) | |
| tree | 6d2c6ac0a4afacd5d97d01b4de775fdccf48d66e /arch/arm/mach-msm/gpiomux.h | |
| parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) | |
| parent | 8fd62389a778c902c7e8532594ea924bbaf465e8 (diff) | |
Merge tag 'msm-3.11-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into fixes
From David Brown, fixes for MSM for 3.11:
Two small fixes for MSM.
The first fixes the a gpio controller register address. I didn't see
any acks from the devicetree maintainers, so I've copied them on this
pull request. The change itself is minor, and just to the register
address.
The second change removes the gpiomux V1 code from MSM. This was
breaking compilation for some of the targets.
* tag 'msm-3.11-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
ARM: msm: Consolidate gpiomux for older architectures
ARM: msm: dts: Fix the gpio register address for msm8960
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-msm/gpiomux.h')
| -rw-r--r-- | arch/arm/mach-msm/gpiomux.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-msm/gpiomux.h b/arch/arm/mach-msm/gpiomux.h index 8e82f41a8923..4410d7766f93 100644 --- a/arch/arm/mach-msm/gpiomux.h +++ b/arch/arm/mach-msm/gpiomux.h @@ -73,16 +73,6 @@ extern struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS]; int msm_gpiomux_write(unsigned gpio, gpiomux_config_t active, gpiomux_config_t suspended); - -/* Architecture-internal function for use by the framework only. - * This function can assume the following: - * - the gpio value has passed a bounds-check - * - the gpiomux spinlock has been obtained - * - * This function is not for public consumption. External users - * should use msm_gpiomux_write. - */ -void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val); #else static inline int msm_gpiomux_write(unsigned gpio, gpiomux_config_t active, |