Commit 1a5ab4b3 authored by David Brown's avatar David Brown
Browse files

gpio_msm: Move Qualcomm MSM v2 gpio driver into drivers 



Migrate the driver for the v7-based MSM chips into drivers/gpio.  The
driver is unchanged, only moved.

Change-Id: I810db5b50b71cdca4e869aa0d0310f7f48781a55
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent 74d10d74

arch/arm/mach-msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ config ARCH_MSM8X60 
	select ARM_GIC

	select CPU_V7

	select MSM_V2_TLMM

	select GPIO_MSM_V2

	select MSM_GPIOMUX

	select MSM_SCM if SMP

arch/arm/mach-msm/Makefile

+0 −6
Original line number Diff line number Diff line
@@ -29,9 +29,3 @@ obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.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

ifndef CONFIG_ARCH_MSM8960

# TODO: TLMM Mapping issues need to be resolved

obj-y	+= gpio-v2.o

endif

endif

drivers/gpio/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -98,6 +98,14 @@ config GPIO_MSM_V1 
	  Qualcomm MSM chips.  Most of the pins on the MSM can be

	  selected for GPIO, and are controlled by this driver.



config GPIO_MSM_V2

	tristate "Qualcomm MSM GPIO v2"

	depends on GPIOLIB && ARCH_MSM

	help

	  Say yes here to support the GPIO interface on ARM v7 based

	  Qualcomm MSM chips.  Most of the pins on the MSM can be

	  selected for GPIO, and are controlled by this driver.



config GPIO_PLAT_SAMSUNG

	def_bool y

	depends on SAMSUNG_GPIOLIB_4BIT

drivers/gpio/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_GPIO_MAX732X) += max732x.o 
obj-$(CONFIG_GPIO_MC33880)	+= mc33880.o

obj-$(CONFIG_GPIO_MCP23S08)	+= mcp23s08.o

obj-$(CONFIG_GPIO_MSM_V1)	+= gpio-msm-v1.o

obj-$(CONFIG_GPIO_MSM_V2)	+= gpio-msm-v2.o

obj-$(CONFIG_GPIO_74X164)	+= 74x164.o

obj-$(CONFIG_ARCH_OMAP)         += gpio-omap.o

obj-$(CONFIG_GPIO_PCA953X)	+= pca953x.o

arch/arm/mach-msm/gpio-v2.c→drivers/gpio/gpio-msm-v2.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.

/* Copyright (c) 2010-2011, 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
@@ -30,8 +30,8 @@ 


#include <asm/mach/irq.h>



#include <mach/msm_gpiomux.h>

#include <mach/msm_iomap.h>

#include "gpiomux.h"



/* Bits of interest in the GPIO_IN_OUT register.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE