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

Commit 37d72457 authored by Grant Likely's avatar Grant Likely
Browse files

gpio: move Nomadik GPIO driver to drivers/gpio 



This moves the Nomadik GPIO driver out of arch/arm/plat-nomadik
and into the desired location indicated by the subsystem
maintainer.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
[grant.likely: squashed with kconfig fixup]
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 06caa7ad

arch/arm/mach-nomadik/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ config MACH_NOMADIK_8815NHK 
	bool "ST 8815 Nomadik Hardware Kit (evaluation board)"

	select NOMADIK_8815

	select HAS_MTU

	select NOMADIK_GPIO



endmenu

arch/arm/mach-ux500/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ config UX500_SOC_COMMON 
	default y

	select ARM_GIC

	select HAS_MTU

	select NOMADIK_GPIO

	select ARM_ERRATA_753970



menu "Ux500 SoC"

arch/arm/plat-nomadik/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -21,9 +21,4 @@ config HAS_MTU 
	  to multiple interrupt generating programmable

	  32-bit free running decrementing counters.



config NOMADIK_GPIO

	bool

	help

	  Support for the Nomadik GPIO controller.



endif

arch/arm/plat-nomadik/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,4 +3,3 @@ 
# Licensed under GPLv2



obj-$(CONFIG_HAS_MTU)	+= timer.o
 
obj-$(CONFIG_NOMADIK_GPIO)	+= gpio.o

drivers/gpio/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ obj-$(CONFIG_GPIO_WM8350) += wm8350-gpiolib.o 
obj-$(CONFIG_GPIO_WM8994)	+= wm8994-gpio.o

obj-$(CONFIG_GPIO_SCH)		+= sch_gpio.o

obj-$(CONFIG_MACH_U300)		+= gpio-u300.o

obj-$(CONFIG_PLAT_NOMADIK)	+= gpio-nomadik.o

obj-$(CONFIG_GPIO_RDC321X)	+= rdc321x-gpio.o

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

obj-$(CONFIG_GPIO_SX150X)	+= sx150x.o