Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab78cde5 authored by Gregory Bean's avatar Gregory Bean Committed by Daniel Walker
Browse files

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: default avatarGregory Bean <gbean@codeaurora.org>
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent 10c4580e

arch/arm/mach-msm/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ config ARCH_MSM7X30 
	select MSM_VIC

	select CPU_V7

	select MSM_REMOTE_SPINLOCK_DEKKERS

	select MSM_GPIOMUX



config ARCH_QSD8X50

	bool "QSD8X50"
@@ -26,6 +27,7 @@ config ARCH_QSD8X50 
	select MSM_VIC

	select CPU_V7

	select MSM_REMOTE_SPINLOCK_LDREX

	select MSM_GPIOMUX

endchoice



config MSM_SOC_REV_A
@@ -106,6 +108,9 @@ config MSM_SMD_PKG3 
config MSM_SMD

	bool



config MSM_GPIOMUX

	bool



config MSM_V2_TLMM

	bool

endif

arch/arm/mach-msm/gpiomux.h

+20 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define __ARCH_ARM_MACH_MSM_GPIOMUX_H



#include <linux/bitops.h>

#include <linux/errno.h>



#if defined(CONFIG_MSM_V2_TLMM)

#include "gpiomux-v2.h"
@@ -60,6 +61,8 @@ enum { 
	GPIOMUX_CTL_MASK = GPIOMUX_VALID,

};



#ifdef CONFIG_MSM_GPIOMUX



/* Each architecture must provide its own instance of this table.

 * To avoid having gpiomux manage any given gpio, one or both of

 * the entries can avoid setting GPIOMUX_VALID - the absence
@@ -90,5 +93,22 @@ int msm_gpiomux_write(unsigned gpio, 
 * should use msm_gpiomux_write.

 */

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