2 files changed, 25 insertions, 0 deletions

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 4e79580af628..f09ffef4cda8 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -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
diff --git a/arch/arm/mach-msm/gpiomux.h b/arch/arm/mach-msm/gpiomux.h
index bb0acf0c9644..b178d9cb742f 100644
--- a/arch/arm/mach-msm/gpiomux.h
+++ b/arch/arm/mach-msm/gpiomux.h
@@ -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