Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74d10d74 authored by David Brown's avatar David Brown
Browse files

gpio_msm: Move Qualcomm v6 MSM driver into drivers 



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

Change-Id: I03ba597b95b4d62b42da112a8efac88d67aa40f9
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 9def3efc

arch/arm/mach-msm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config ARCH_MSM7X00A 
	select MSM_SMD

	select MSM_SMD_PKG3

	select CPU_V6

	select GPIO_MSM_V1

	select MSM_PROC_COMM

	select HAS_MSM_DEBUG_UART_PHYS
@@ -22,6 +23,7 @@ config ARCH_MSM7X30 
	select MSM_VIC

	select CPU_V7

	select MSM_GPIOMUX

	select GPIO_MSM_V1

	select MSM_PROC_COMM

	select HAS_MSM_DEBUG_UART_PHYS
@@ -33,6 +35,7 @@ config ARCH_QSD8X50 
	select MSM_VIC

	select CPU_V7

	select MSM_GPIOMUX

	select GPIO_MSM_V1

	select MSM_PROC_COMM

	select HAS_MSM_DEBUG_UART_PHYS

arch/arm/mach-msm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -34,6 +34,4 @@ ifndef CONFIG_ARCH_MSM8960 
# TODO: TLMM Mapping issues need to be resolved

obj-y	+= gpio-v2.o

endif

else

obj-y	+= gpio.o

endif

drivers/gpio/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -90,6 +90,14 @@ config GPIO_EXYNOS4 
	def_bool y

	depends on CPU_EXYNOS4210



config GPIO_MSM_V1

	tristate "Qualcomm MSM GPIO v1"

	depends on GPIOLIB && ARCH_MSM

	help

	  Say yes here to support the GPIO interface on ARM v6 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
@@ -19,6 +19,7 @@ obj-$(CONFIG_GPIO_MAX7301) += max7301.o 
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_74X164)	+= 74x164.o

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

obj-$(CONFIG_GPIO_PCA953X)	+= pca953x.o

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

+2 −3
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-msm/gpio.c

 *

/*

 * Copyright (C) 2007 Google, Inc.

 * Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.

 * Copyright (c) 2009-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