hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

msm: Featurize gpiomux. 

Featurize gpiomux so that systems like 7x00 which do not wish to use it
do not have to be saddled with the configuration tables.

Signed-off-by: Gregory Bean <gbean@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
This commit is contained in:
Gregory Bean 2010-09-01 16:26:12 -07:00 committed by Daniel Walker
parent 10c4580e79
commit ab78cde589
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-msm/Kconfig
View File

@ -18,6 +18,7 @@ config ARCH_MSM7X30
select MSM_VIC select MSM_VIC
select CPU_V7 select CPU_V7
select MSM_REMOTE_SPINLOCK_DEKKERS select MSM_REMOTE_SPINLOCK_DEKKERS
select MSM_GPIOMUX
config ARCH_QSD8X50 config ARCH_QSD8X50
bool "QSD8X50" bool "QSD8X50"
@ -26,6 +27,7 @@ config ARCH_QSD8X50
select MSM_VIC select MSM_VIC
select CPU_V7 select CPU_V7
select MSM_REMOTE_SPINLOCK_LDREX select MSM_REMOTE_SPINLOCK_LDREX
select MSM_GPIOMUX
endchoice endchoice
config MSM_SOC_REV_A config MSM_SOC_REV_A
@ -106,6 +108,9 @@ config MSM_SMD_PKG3
config MSM_SMD config MSM_SMD
bool bool
config MSM_GPIOMUX
bool
config MSM_V2_TLMM config MSM_V2_TLMM
bool bool
endif endif

20
arch/arm/mach-msm/gpiomux.h
View File

@ -18,6 +18,7 @@
#define __ARCH_ARM_MACH_MSM_GPIOMUX_H #define __ARCH_ARM_MACH_MSM_GPIOMUX_H
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/errno.h>
#if defined(CONFIG_MSM_V2_TLMM) #if defined(CONFIG_MSM_V2_TLMM)
#include "gpiomux-v2.h" #include "gpiomux-v2.h"
@ -60,6 +61,8 @@ enum {
GPIOMUX_CTL_MASK = GPIOMUX_VALID, GPIOMUX_CTL_MASK = GPIOMUX_VALID,
}; };
#ifdef CONFIG_MSM_GPIOMUX
/* Each architecture must provide its own instance of this table. /* Each architecture must provide its own instance of this table.
* To avoid having gpiomux manage any given gpio, one or both of * To avoid having gpiomux manage any given gpio, one or both of
* the entries can avoid setting GPIOMUX_VALID - the absence * the entries can avoid setting GPIOMUX_VALID - the absence
@ -90,5 +93,22 @@ int msm_gpiomux_write(unsigned gpio,
* should use msm_gpiomux_write. * should use msm_gpiomux_write.
*/ */
void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val); void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val);
#else
static inline int __must_check msm_gpiomux_get(unsigned gpio)
{
return -ENOSYS;
}
static inline int msm_gpiomux_put(unsigned gpio)
{
return -ENOSYS;
}
static inline int msm_gpiomux_write(unsigned gpio,
gpiomux_config_t active,
gpiomux_config_t suspended)
{
return -ENOSYS;
}
#endif
#endif #endif