]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: msm: 7x30: don't force a gpiomux table for the whole arch
authorDima Zavin <dima@android.com>
Mon, 10 Jan 2011 19:00:30 +0000 (11:00 -0800)
committerDavid Brown <davidb@codeaurora.org>
Mon, 24 Jan 2011 19:05:01 +0000 (11:05 -0800)
This is completely board specific and therefore must be provided
on a per-board basis.

Signed-off-by: Dima Zavin <dima@android.com>
Signed-off-by: David Brown <davidb@codeaurora.org>
arch/arm/mach-msm/Makefile
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-msm/gpiomux-7x30.c [deleted file]

index 94195c190e13a495cf0701af1783a54af77a2a8c..f4601256f35f300420c8e997bad5e5dee6fde926 100644 (file)
@@ -30,7 +30,7 @@ obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
 obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
 obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60.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
index 6f3b9735e970828a361b91bb499da689d9ae1caf..0707cc041f27db04fa491c5ddffe7e4949aae86b 100644 (file)
@@ -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/gpiomux-7x30.c b/arch/arm/mach-msm/gpiomux-7x30.c
deleted file mode 100644 (file)
index 6ce41c5..0000000
+++ /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
-};