Commit ba5499eb authored by Dima Zavin's avatar Dima Zavin Committed by David Brown
Browse files

ARM: msm: 7x30: don't force a gpiomux table for the whole arch 



This is completely board specific and therefore must be provided
on a per-board basis.

Signed-off-by: default avatarDima Zavin <dima@android.com>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 1bae4ce2

arch/arm/mach-msm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-msm/board-msm7x30.c

+22 −0
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-msm/gpiomux-7x30.c

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/* 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

};