7 files changed, 32 insertions, 43 deletions

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 02294279290d..0e5c9dc23830 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -26,7 +26,7 @@ obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
 obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60.o
 obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o
 
-obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-7x30.o gpiomux-v1.o gpiomux.o
+obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o
 obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o
 obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o
 ifdef CONFIG_MSM_V2_TLMM
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index 6f3b9735e970..0707cc041f27 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -36,6 +36,7 @@
 
 #include <mach/vreg.h>
 #include "devices.h"
+#include "gpiomux.h"
 #include "proc_comm.h"
 
 extern struct sys_timer msm_timer;
@@ -52,6 +53,27 @@ static struct msm_otg_platform_data msm_otg_pdata = {
         .otg_control            = OTG_PHY_CONTROL,
 };
 
+struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
+#ifdef CONFIG_SERIAL_MSM_CONSOLE
+        [49] = { /* UART2 RFR */
+                .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
+                             GPIOMUX_FUNC_2 | GPIOMUX_VALID,
+        },
+        [50] = { /* UART2 CTS */
+                .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
+                             GPIOMUX_FUNC_2 | GPIOMUX_VALID,
+        },
+        [51] = { /* UART2 RX */
+                .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
+                             GPIOMUX_FUNC_2 | GPIOMUX_VALID,
+        },
+        [52] = { /* UART2 TX */
+                .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
+                             GPIOMUX_FUNC_2 | GPIOMUX_VALID,
+        },
+#endif
+};
+
 static struct platform_device *devices[] __initdata = {
 #if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER)
         &msm_device_uart2,
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index 2e8391307f55..6dde8185205f 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -43,7 +43,7 @@ static const unsigned        qsd8x50_surf_smc91x_gpio __initdata = 156;
  * at run-time: they vary from board to board, and the true
  * configuration won't be known until boot.
  */
-static struct resource smc91x_resources[] __initdata = {
+static struct resource smc91x_resources[] = {
         [0] = {
                 .flags = IORESOURCE_MEM,
         },
@@ -52,7 +52,7 @@ static struct resource smc91x_resources[] __initdata = {
         },
 };
 
-static struct platform_device smc91x_device __initdata = {
+static struct platform_device smc91x_device = {
         .name           = "smc91x",
         .id             = 0,
         .num_resources  = ARRAY_SIZE(smc91x_resources),
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
index fb548a8a21db..2549fb23ee9e 100644
--- a/arch/arm/mach-msm/devices-msm7x00.c
+++ b/arch/arm/mach-msm/devices-msm7x00.c
@@ -38,6 +38,7 @@ static struct resource resources_uart1[] = {
                 .start  = MSM_UART1_PHYS,
                 .end    = MSM_UART1_PHYS + MSM_UART1_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
+                .name  = "uart_resource"
         },
 };
 
@@ -51,6 +52,7 @@ static struct resource resources_uart2[] = {
                 .start  = MSM_UART2_PHYS,
                 .end    = MSM_UART2_PHYS + MSM_UART2_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
+                .name  = "uart_resource"
         },
 };
 
@@ -64,6 +66,7 @@ static struct resource resources_uart3[] = {
                 .start  = MSM_UART3_PHYS,
                 .end    = MSM_UART3_PHYS + MSM_UART3_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
+                .name  = "uart_resource"
         },
 };
 
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 4e9a0ab3e937..d4c7afccbdb9 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008 Google, Inc.
- * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -41,6 +41,7 @@ static struct resource resources_uart2[] = {
                 .start  = MSM_UART2_PHYS,
                 .end    = MSM_UART2_PHYS + MSM_UART2_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
+                .name  = "uart_resource"
         },
 };
 
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index a4b798f20ccb..93bddacad904 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008 Google, Inc.
- * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -38,6 +38,7 @@ static struct resource resources_uart3[] = {
                 .start  = MSM_UART3_PHYS,
                 .end    = MSM_UART3_PHYS + MSM_UART3_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
+                .name  = "uart_resource"
         },
 };
 
diff --git a/arch/arm/mach-msm/gpiomux-7x30.c b/arch/arm/mach-msm/gpiomux-7x30.c
deleted file mode 100644
index 6ce41c5241a5..000000000000
--- a/arch/arm/mach-msm/gpiomux-7x30.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-#include "gpiomux.h"
-
-struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
-#ifdef CONFIG_SERIAL_MSM_CONSOLE
-        [49] = { /* UART2 RFR */
-                .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
-                             GPIOMUX_FUNC_2 | GPIOMUX_VALID,
-        },
-        [50] = { /* UART2 CTS */
-                .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
-                             GPIOMUX_FUNC_2 | GPIOMUX_VALID,
-        },
-        [51] = { /* UART2 RX */
-                .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
-                             GPIOMUX_FUNC_2 | GPIOMUX_VALID,
-        },
-        [52] = { /* UART2 TX */
-                .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
-                             GPIOMUX_FUNC_2 | GPIOMUX_VALID,
-        },
-#endif
-};