msm: Move gpiomux.h to include/mach
The gpiomux interface is required for drivers
to manipulate the pinmux functionality of their gpios
at runtime.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index d213fc9..7a00c5e 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -51,6 +51,7 @@
#include <mach/socinfo.h>
#include <mach/rpm.h>
#include <mach/gpio.h>
+#include <mach/gpiomux.h>
#include <mach/msm_bus_board.h>
#include <mach/msm_memtypes.h>
#include <mach/dma.h>
@@ -64,10 +65,8 @@
#endif
#include "timer.h"
-#include "gpiomux.h"
#include "devices.h"
#include "devices-msm8x60.h"
-#include "gpiomux.h"
#include "spm.h"
#include "board-msm8960.h"
#include "pm.h"
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 7490f1b..a3f7121 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -71,6 +71,7 @@
#include <asm/mach/mmc.h>
#include <mach/msm_battery.h>
#include <mach/msm_hsusb.h>
+#include <mach/gpiomux.h>
#ifdef CONFIG_MSM_DSPS
#include <mach/msm_dsps.h>
#endif
@@ -96,7 +97,6 @@
#include "spm.h"
#include "rpm_log.h"
#include "timer.h"
-#include "gpiomux.h"
#include "gpiomux-8x60.h"
#include "rpm_stats.h"
#include "peripheral-loader.h"
diff --git a/arch/arm/mach-msm/btpintest.c b/arch/arm/mach-msm/btpintest.c
index 0abe09b..97a511e 100644
--- a/arch/arm/mach-msm/btpintest.c
+++ b/arch/arm/mach-msm/btpintest.c
@@ -23,7 +23,7 @@
#include <linux/gpio.h>
#include <mach/gpio.h>
#include <mach/vreg.h>
-#include "gpiomux.h"
+#include <mach/gpiomux.h>
#define VERSION "1.0"
struct dentry *pin_debugfs_dent;
diff --git a/arch/arm/mach-msm/gpio-fsm9xxx.c b/arch/arm/mach-msm/gpio-fsm9xxx.c
index 0de5919..b8045ed 100644
--- a/arch/arm/mach-msm/gpio-fsm9xxx.c
+++ b/arch/arm/mach-msm/gpio-fsm9xxx.c
@@ -15,8 +15,8 @@
#include <linux/gpio.h>
#include <linux/io.h>
#include <linux/module.h>
+#include <mach/gpiomux.h>
#include "gpio_hw.h"
-#include "gpiomux.h"
#define MSM_GPIO_BANK(bank, first, last) \
{ \
diff --git a/arch/arm/mach-msm/gpio-v2.c b/arch/arm/mach-msm/gpio-v2.c
index d5d6b92..6398676 100644
--- a/arch/arm/mach-msm/gpio-v2.c
+++ b/arch/arm/mach-msm/gpio-v2.c
@@ -24,7 +24,7 @@
#include <asm/mach/irq.h>
#include <mach/msm_iomap.h>
-#include "gpiomux.h"
+#include <mach/gpiomux.h>
#include "mpm.h"
/* Bits of interest in the GPIO_IN_OUT register.
diff --git a/arch/arm/mach-msm/gpio.c b/arch/arm/mach-msm/gpio.c
index b18db56e..5ad62265 100644
--- a/arch/arm/mach-msm/gpio.c
+++ b/arch/arm/mach-msm/gpio.c
@@ -20,8 +20,8 @@
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/module.h>
+#include <mach/gpiomux.h>
#include "gpio_hw.h"
-#include "gpiomux.h"
#include "proc_comm.h"
#include "smd_private.h"
diff --git a/arch/arm/mach-msm/gpiomux-7x27.c b/arch/arm/mach-msm/gpiomux-7x27.c
index d8579b9..822cd04 100644
--- a/arch/arm/mach-msm/gpiomux-7x27.c
+++ b/arch/arm/mach-msm/gpiomux-7x27.c
@@ -11,7 +11,7 @@
*/
#include <linux/module.h>
#include <mach/irqs.h>
-#include "gpiomux.h"
+#include <mach/gpiomux.h>
static int __init gpiomux_init(void)
{
diff --git a/arch/arm/mach-msm/gpiomux-7x30.c b/arch/arm/mach-msm/gpiomux-7x30.c
index d8579b9..822cd04 100644
--- a/arch/arm/mach-msm/gpiomux-7x30.c
+++ b/arch/arm/mach-msm/gpiomux-7x30.c
@@ -11,7 +11,7 @@
*/
#include <linux/module.h>
#include <mach/irqs.h>
-#include "gpiomux.h"
+#include <mach/gpiomux.h>
static int __init gpiomux_init(void)
{
diff --git a/arch/arm/mach-msm/gpiomux-8x50.c b/arch/arm/mach-msm/gpiomux-8x50.c
index d8579b9..822cd04 100644
--- a/arch/arm/mach-msm/gpiomux-8x50.c
+++ b/arch/arm/mach-msm/gpiomux-8x50.c
@@ -11,7 +11,7 @@
*/
#include <linux/module.h>
#include <mach/irqs.h>
-#include "gpiomux.h"
+#include <mach/gpiomux.h>
static int __init gpiomux_init(void)
{
diff --git a/arch/arm/mach-msm/gpiomux-8x60.c b/arch/arm/mach-msm/gpiomux-8x60.c
index 5cf0776..4293f18 100644
--- a/arch/arm/mach-msm/gpiomux-8x60.c
+++ b/arch/arm/mach-msm/gpiomux-8x60.c
@@ -12,7 +12,7 @@
#include <linux/module.h>
#include <mach/irqs.h>
#include <asm/mach-types.h>
-#include "gpiomux.h"
+#include <mach/gpiomux.h>
#include "gpiomux-8x60.h"
static struct gpiomux_setting console_uart = {
diff --git a/arch/arm/mach-msm/gpiomux-v1.c b/arch/arm/mach-msm/gpiomux-v1.c
index b2ea7f0..a87e9cc 100644
--- a/arch/arm/mach-msm/gpiomux-v1.c
+++ b/arch/arm/mach-msm/gpiomux-v1.c
@@ -12,7 +12,7 @@
#include <linux/bitops.h>
#include <linux/kernel.h>
#include <linux/io.h>
-#include "gpiomux.h"
+#include <mach/gpiomux.h>
#include "proc_comm.h"
#include "gpio.h"
diff --git a/arch/arm/mach-msm/gpiomux-v2.c b/arch/arm/mach-msm/gpiomux-v2.c
index 3029bb4..ee1e17a 100644
--- a/arch/arm/mach-msm/gpiomux-v2.c
+++ b/arch/arm/mach-msm/gpiomux-v2.c
@@ -12,7 +12,7 @@
#include <linux/bitops.h>
#include <linux/io.h>
#include <mach/msm_iomap.h>
-#include "gpiomux.h"
+#include <mach/gpiomux.h>
#define GPIO_CFG(n) (MSM_TLMM_BASE + 0x1000 + (0x10 * n))
#define GPIO_IN_OUT(n) (MSM_TLMM_BASE + 0x1004 + (0x10 * n))
diff --git a/arch/arm/mach-msm/gpiomux.c b/arch/arm/mach-msm/gpiomux.c
index 68b97ce..85936ba 100644
--- a/arch/arm/mach-msm/gpiomux.c
+++ b/arch/arm/mach-msm/gpiomux.c
@@ -12,7 +12,7 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
-#include "gpiomux.h"
+#include <mach/gpiomux.h>
struct msm_gpiomux_rec {
struct gpiomux_setting *sets[GPIOMUX_NSETTINGS];
diff --git a/arch/arm/mach-msm/gpiomux.h b/arch/arm/mach-msm/include/mach/gpiomux.h
similarity index 100%
rename from arch/arm/mach-msm/gpiomux.h
rename to arch/arm/mach-msm/include/mach/gpiomux.h