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

Commit e9004f50 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: plat-iop: move the GPIO driver to drivers/gpio 



Move the IOP GPIO driver to live with its siblings in the
GPIO subsystem.

Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Mikael Pettersson <mikpe@it.uu.se>
Tested-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 272b98c6

arch/arm/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -457,6 +457,7 @@ config ARCH_IOP32X 
	depends on MMU

	depends on MMU

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select CPU_XSCALE

	select CPU_XSCALE

	select GPIO_IOP

	select NEED_MACH_GPIO_H

	select NEED_MACH_GPIO_H

	select NEED_RET_TO_USER

	select NEED_RET_TO_USER

	select PCI

	select PCI
@@ -470,6 +471,7 @@ config ARCH_IOP33X 
	depends on MMU

	depends on MMU

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select CPU_XSCALE

	select CPU_XSCALE

	select GPIO_IOP

	select NEED_MACH_GPIO_H

	select NEED_MACH_GPIO_H

	select NEED_RET_TO_USER

	select NEED_RET_TO_USER

	select PCI

	select PCI

arch/arm/plat-iop/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -5,7 +5,6 @@ 
obj-y :=

obj-y :=





# IOP32X

# IOP32X

obj-$(CONFIG_ARCH_IOP32X) += gpio.o

obj-$(CONFIG_ARCH_IOP32X) += i2c.o

obj-$(CONFIG_ARCH_IOP32X) += i2c.o

obj-$(CONFIG_ARCH_IOP32X) += pci.o

obj-$(CONFIG_ARCH_IOP32X) += pci.o

obj-$(CONFIG_ARCH_IOP32X) += setup.o

obj-$(CONFIG_ARCH_IOP32X) += setup.o
@@ -16,7 +15,6 @@ obj-$(CONFIG_ARCH_IOP32X) += pmu.o 
obj-$(CONFIG_ARCH_IOP32X) += restart.o

obj-$(CONFIG_ARCH_IOP32X) += restart.o





# IOP33X

# IOP33X

obj-$(CONFIG_ARCH_IOP33X) += gpio.o

obj-$(CONFIG_ARCH_IOP33X) += i2c.o

obj-$(CONFIG_ARCH_IOP33X) += i2c.o

obj-$(CONFIG_ARCH_IOP33X) += pci.o

obj-$(CONFIG_ARCH_IOP33X) += pci.o

obj-$(CONFIG_ARCH_IOP33X) += setup.o

obj-$(CONFIG_ARCH_IOP33X) += setup.o

drivers/gpio/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -320,6 +320,15 @@ config GPIO_ICH 




	  If unsure, say N.

	  If unsure, say N.





config GPIO_IOP

	tristate "Intel IOP GPIO"

	depends on ARM && (ARCH_IOP32X || ARCH_IOP33X)

	help

	  Say yes here to support the GPIO functionality of a number of Intel

	  IOP32X or IOP33X.



	  If unsure, say N.



config GPIO_VX855

config GPIO_VX855

	tristate "VIA VX855/VX875 GPIO"

	tristate "VIA VX855/VX875 GPIO"

	depends on PCI

	depends on PCI

drivers/gpio/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o 
obj-$(CONFIG_GPIO_GE_FPGA)	+= gpio-ge.o

obj-$(CONFIG_GPIO_GE_FPGA)	+= gpio-ge.o

obj-$(CONFIG_GPIO_GRGPIO)	+= gpio-grgpio.o

obj-$(CONFIG_GPIO_GRGPIO)	+= gpio-grgpio.o

obj-$(CONFIG_GPIO_ICH)		+= gpio-ich.o

obj-$(CONFIG_GPIO_ICH)		+= gpio-ich.o

obj-$(CONFIG_GPIO_IOP)		+= gpio-iop.o

obj-$(CONFIG_GPIO_IT8761E)	+= gpio-it8761e.o

obj-$(CONFIG_GPIO_IT8761E)	+= gpio-it8761e.o

obj-$(CONFIG_GPIO_JANZ_TTL)	+= gpio-janz-ttl.o

obj-$(CONFIG_GPIO_JANZ_TTL)	+= gpio-janz-ttl.o

obj-$(CONFIG_GPIO_KEMPLD)	+= gpio-kempld.o

obj-$(CONFIG_GPIO_KEMPLD)	+= gpio-kempld.o

arch/arm/plat-iop/gpio.c→drivers/gpio/gpio-iop.c

+0 −0

File moved.

View file