pinctrl: nomadik: move all Nomadik drivers to subdir

+1 -44

drivers/pinctrl/Kconfig

··· 26 26 help 27 27 Say Y here to add some extra checks and diagnostics to PINCTRL calls. 28 28 29 - config PINCTRL_ABX500 30 - bool "ST-Ericsson ABx500 family Mixed Signal Circuit gpio functions" 31 - depends on AB8500_CORE 32 - select GENERIC_PINCONF 33 - help 34 - Select this to enable the ABx500 family IC GPIO driver 35 - 36 - config PINCTRL_AB8500 37 - bool "AB8500 pin controller driver" 38 - depends on PINCTRL_ABX500 && ARCH_U8500 39 - 40 - config PINCTRL_AB8540 41 - bool "AB8540 pin controller driver" 42 - depends on PINCTRL_ABX500 && ARCH_U8500 43 - 44 - config PINCTRL_AB9540 45 - bool "AB9540 pin controller driver" 46 - depends on PINCTRL_ABX500 && ARCH_U8500 47 - 48 - config PINCTRL_AB8505 49 - bool "AB8505 pin controller driver" 50 - depends on PINCTRL_ABX500 && ARCH_U8500 51 - 52 29 config PINCTRL_ADI2 53 30 bool "ADI pin controller driver" 54 31 depends on BLACKFIN ··· 210 233 bool 211 234 select PINCTRL_MXS 212 235 213 - config PINCTRL_NOMADIK 214 - bool "Nomadik pin controller driver" 215 - depends on ARCH_U8500 || ARCH_NOMADIK 216 - select PINMUX 217 - select PINCONF 218 - select GPIOLIB 219 - select OF_GPIO 220 - select GPIOLIB_IRQCHIP 221 - 222 - config PINCTRL_STN8815 223 - bool "STN8815 pin controller driver" 224 - depends on PINCTRL_NOMADIK && ARCH_NOMADIK 225 - 226 - config PINCTRL_DB8500 227 - bool "DB8500 pin controller driver" 228 - depends on PINCTRL_NOMADIK && ARCH_U8500 229 - 230 - config PINCTRL_DB8540 231 - bool "DB8540 pin controller driver" 232 - depends on PINCTRL_NOMADIK && ARCH_U8500 233 - 234 236 config PINCTRL_ROCKCHIP 235 237 bool 236 238 select PINMUX ··· 301 345 302 346 source "drivers/pinctrl/berlin/Kconfig" 303 347 source "drivers/pinctrl/mvebu/Kconfig" 348 + source "drivers/pinctrl/nomadik/Kconfig" 304 349 source "drivers/pinctrl/qcom/Kconfig" 305 350 source "drivers/pinctrl/samsung/Kconfig" 306 351 source "drivers/pinctrl/sh-pfc/Kconfig"

+1 -9

drivers/pinctrl/Makefile

··· 9 9 obj-$(CONFIG_PINCTRL) += devicetree.o 10 10 endif 11 11 obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o 12 - obj-$(CONFIG_PINCTRL_ABX500) += pinctrl-abx500.o 13 - obj-$(CONFIG_PINCTRL_AB8500) += pinctrl-ab8500.o 14 - obj-$(CONFIG_PINCTRL_AB8540) += pinctrl-ab8540.o 15 - obj-$(CONFIG_PINCTRL_AB9540) += pinctrl-ab9540.o 16 - obj-$(CONFIG_PINCTRL_AB8505) += pinctrl-ab8505.o 17 12 obj-$(CONFIG_PINCTRL_ADI2) += pinctrl-adi2.o 18 13 obj-$(CONFIG_PINCTRL_AS3722) += pinctrl-as3722.o 19 14 obj-$(CONFIG_PINCTRL_BF54x) += pinctrl-adi2-bf54x.o ··· 34 39 obj-$(CONFIG_PINCTRL_IMX23) += pinctrl-imx23.o 35 40 obj-$(CONFIG_PINCTRL_IMX25) += pinctrl-imx25.o 36 41 obj-$(CONFIG_PINCTRL_IMX28) += pinctrl-imx28.o 37 - obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o 38 - obj-$(CONFIG_PINCTRL_STN8815) += pinctrl-nomadik-stn8815.o 39 - obj-$(CONFIG_PINCTRL_DB8500) += pinctrl-nomadik-db8500.o 40 - obj-$(CONFIG_PINCTRL_DB8540) += pinctrl-nomadik-db8540.o 41 42 obj-$(CONFIG_PINCTRL_PALMAS) += pinctrl-palmas.o 42 43 obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o 43 44 obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o ··· 55 64 56 65 obj-$(CONFIG_ARCH_BERLIN) += berlin/ 57 66 obj-$(CONFIG_PLAT_ORION) += mvebu/ 67 + obj-y += nomadik/ 58 68 obj-$(CONFIG_ARCH_QCOM) += qcom/ 59 69 obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ 60 70 obj-$(CONFIG_ARCH_SHMOBILE) += sh-pfc/

+51

drivers/pinctrl/nomadik/Kconfig

··· 1 + if ARCH_U8500 2 + 3 + config PINCTRL_ABX500 4 + bool "ST-Ericsson ABx500 family Mixed Signal Circuit gpio functions" 5 + depends on AB8500_CORE 6 + select GENERIC_PINCONF 7 + help 8 + Select this to enable the ABx500 family IC GPIO driver 9 + 10 + config PINCTRL_AB8500 11 + bool "AB8500 pin controller driver" 12 + depends on PINCTRL_ABX500 && ARCH_U8500 13 + 14 + config PINCTRL_AB8540 15 + bool "AB8540 pin controller driver" 16 + depends on PINCTRL_ABX500 && ARCH_U8500 17 + 18 + config PINCTRL_AB9540 19 + bool "AB9540 pin controller driver" 20 + depends on PINCTRL_ABX500 && ARCH_U8500 21 + 22 + config PINCTRL_AB8505 23 + bool "AB8505 pin controller driver" 24 + depends on PINCTRL_ABX500 && ARCH_U8500 25 + 26 + endif 27 + 28 + if (ARCH_U8500 || ARCH_NOMADIK) 29 + 30 + config PINCTRL_NOMADIK 31 + bool "Nomadik pin controller driver" 32 + depends on ARCH_U8500 || ARCH_NOMADIK 33 + select PINMUX 34 + select PINCONF 35 + select GPIOLIB 36 + select OF_GPIO 37 + select GPIOLIB_IRQCHIP 38 + 39 + config PINCTRL_STN8815 40 + bool "STN8815 pin controller driver" 41 + depends on PINCTRL_NOMADIK && ARCH_NOMADIK 42 + 43 + config PINCTRL_DB8500 44 + bool "DB8500 pin controller driver" 45 + depends on PINCTRL_NOMADIK && ARCH_U8500 46 + 47 + config PINCTRL_DB8540 48 + bool "DB8540 pin controller driver" 49 + depends on PINCTRL_NOMADIK && ARCH_U8500 50 + 51 + endif

+10

drivers/pinctrl/nomadik/Makefile

··· 1 + # Nomadik family pin control drivers 2 + obj-$(CONFIG_PINCTRL_ABX500) += pinctrl-abx500.o 3 + obj-$(CONFIG_PINCTRL_AB8500) += pinctrl-ab8500.o 4 + obj-$(CONFIG_PINCTRL_AB8540) += pinctrl-ab8540.o 5 + obj-$(CONFIG_PINCTRL_AB9540) += pinctrl-ab9540.o 6 + obj-$(CONFIG_PINCTRL_AB8505) += pinctrl-ab8505.o 7 + obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o 8 + obj-$(CONFIG_PINCTRL_STN8815) += pinctrl-nomadik-stn8815.o 9 + obj-$(CONFIG_PINCTRL_DB8500) += pinctrl-nomadik-db8500.o 10 + obj-$(CONFIG_PINCTRL_DB8540) += pinctrl-nomadik-db8540.o

drivers/pinctrl/pinctrl-ab8500.c drivers/pinctrl/nomadik/pinctrl-ab8500.c

drivers/pinctrl/pinctrl-ab8505.c drivers/pinctrl/nomadik/pinctrl-ab8505.c

drivers/pinctrl/pinctrl-ab8540.c drivers/pinctrl/nomadik/pinctrl-ab8540.c

drivers/pinctrl/pinctrl-ab9540.c drivers/pinctrl/nomadik/pinctrl-ab9540.c

+2 -2

drivers/pinctrl/pinctrl-abx500.c drivers/pinctrl/nomadik/pinctrl-abx500.c

··· 32 32 #include <linux/pinctrl/machine.h> 33 33 34 34 #include "pinctrl-abx500.h" 35 - #include "core.h" 36 - #include "pinconf.h" 35 + #include "../core.h" 36 + #include "../pinconf.h" 37 37 38 38 /* 39 39 * The AB9540 and AB8540 GPIO support are extended versions

drivers/pinctrl/pinctrl-abx500.h drivers/pinctrl/nomadik/pinctrl-abx500.h

drivers/pinctrl/pinctrl-nomadik-db8500.c drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c

drivers/pinctrl/pinctrl-nomadik-db8540.c drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c

drivers/pinctrl/pinctrl-nomadik-stn8815.c drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c

+1 -1

drivers/pinctrl/pinctrl-nomadik.c drivers/pinctrl/nomadik/pinctrl-nomadik.c

··· 31 31 /* Since we request GPIOs from ourself */ 32 32 #include <linux/pinctrl/consumer.h> 33 33 #include "pinctrl-nomadik.h" 34 - #include "core.h" 34 + #include "../core.h" 35 35 36 36 /* 37 37 * The GPIO module in the Nomadik family of Systems-on-Chip is an

drivers/pinctrl/pinctrl-nomadik.h drivers/pinctrl/nomadik/pinctrl-nomadik.h