tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

pinctrl: tegra: move Tegra pinctrl drivers to sub-directory

Tegra has several pinctrl drivers. Now it is reasonable enough to
move them into drivers/pinctrl/tegra/.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Masahiro Yamada and committed by
Linus Walleij 25cbac77 3a42a042

+43 -42
+1 -31
drivers/pinctrl/Kconfig
··· 168 168 select PINCONF 169 169 select GPIOLIB_IRQCHIP 170 170 171 - config PINCTRL_TEGRA 172 - bool 173 - select PINMUX 174 - select PINCONF 175 - 176 - config PINCTRL_TEGRA20 177 - bool 178 - select PINCTRL_TEGRA 179 - 180 - config PINCTRL_TEGRA30 181 - bool 182 - select PINCTRL_TEGRA 183 - 184 - config PINCTRL_TEGRA114 185 - bool 186 - select PINCTRL_TEGRA 187 - 188 - config PINCTRL_TEGRA124 189 - bool 190 - select PINCTRL_TEGRA 191 - 192 - config PINCTRL_TEGRA210 193 - bool 194 - select PINCTRL_TEGRA 195 - 196 - config PINCTRL_TEGRA_XUSB 197 - def_bool y if ARCH_TEGRA 198 - select GENERIC_PHY 199 - select PINCONF 200 - select PINMUX 201 - 202 171 config PINCTRL_TZ1090 203 172 bool "Toumaz Xenif TZ1090 pin control driver" 204 173 depends on SOC_TZ1090 ··· 228 259 source "drivers/pinctrl/spear/Kconfig" 229 260 source "drivers/pinctrl/stm32/Kconfig" 230 261 source "drivers/pinctrl/sunxi/Kconfig" 262 + source "drivers/pinctrl/tegra/Kconfig" 231 263 source "drivers/pinctrl/uniphier/Kconfig" 232 264 source "drivers/pinctrl/vt8500/Kconfig" 233 265 source "drivers/pinctrl/mediatek/Kconfig"
+1 -7
drivers/pinctrl/Makefile
··· 22 22 obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o 23 23 obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o 24 24 obj-$(CONFIG_PINCTRL_SIRF) += sirf/ 25 - obj-$(CONFIG_PINCTRL_TEGRA) += pinctrl-tegra.o 26 - obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o 27 - obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o 28 - obj-$(CONFIG_PINCTRL_TEGRA114) += pinctrl-tegra114.o 29 - obj-$(CONFIG_PINCTRL_TEGRA124) += pinctrl-tegra124.o 30 - obj-$(CONFIG_PINCTRL_TEGRA210) += pinctrl-tegra210.o 31 - obj-$(CONFIG_PINCTRL_TEGRA_XUSB) += pinctrl-tegra-xusb.o 25 + obj-$(CONFIG_PINCTRL_TEGRA) += tegra/ 32 26 obj-$(CONFIG_PINCTRL_TZ1090) += pinctrl-tz1090.o 33 27 obj-$(CONFIG_PINCTRL_TZ1090_PDC) += pinctrl-tz1090-pdc.o 34 28 obj-$(CONFIG_PINCTRL_U300) += pinctrl-u300.o
+2 -2
drivers/pinctrl/pinctrl-tegra-xusb.c drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
··· 24 24 25 25 #include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h> 26 26 27 - #include "core.h" 28 - #include "pinctrl-utils.h" 27 + #include "../core.h" 28 + #include "../pinctrl-utils.h" 29 29 30 30 #define XUSB_PADCTL_ELPG_PROGRAM 0x01c 31 31 #define XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_VCORE_DOWN (1 << 26)
+2 -2
drivers/pinctrl/pinctrl-tegra.c drivers/pinctrl/tegra/pinctrl-tegra.c
··· 30 30 #include <linux/pinctrl/pinconf.h> 31 31 #include <linux/slab.h> 32 32 33 - #include "core.h" 33 + #include "../core.h" 34 + #include "../pinctrl-utils.h" 34 35 #include "pinctrl-tegra.h" 35 - #include "pinctrl-utils.h" 36 36 37 37 struct tegra_pmx { 38 38 struct device *dev;
drivers/pinctrl/pinctrl-tegra.h drivers/pinctrl/tegra/pinctrl-tegra.h
drivers/pinctrl/pinctrl-tegra114.c drivers/pinctrl/tegra/pinctrl-tegra114.c
drivers/pinctrl/pinctrl-tegra124.c drivers/pinctrl/tegra/pinctrl-tegra124.c
drivers/pinctrl/pinctrl-tegra20.c drivers/pinctrl/tegra/pinctrl-tegra20.c
drivers/pinctrl/pinctrl-tegra210.c drivers/pinctrl/tegra/pinctrl-tegra210.c
drivers/pinctrl/pinctrl-tegra30.c drivers/pinctrl/tegra/pinctrl-tegra30.c
+30
drivers/pinctrl/tegra/Kconfig
··· 1 + config PINCTRL_TEGRA 2 + bool 3 + select PINMUX 4 + select PINCONF 5 + 6 + config PINCTRL_TEGRA20 7 + bool 8 + select PINCTRL_TEGRA 9 + 10 + config PINCTRL_TEGRA30 11 + bool 12 + select PINCTRL_TEGRA 13 + 14 + config PINCTRL_TEGRA114 15 + bool 16 + select PINCTRL_TEGRA 17 + 18 + config PINCTRL_TEGRA124 19 + bool 20 + select PINCTRL_TEGRA 21 + 22 + config PINCTRL_TEGRA210 23 + bool 24 + select PINCTRL_TEGRA 25 + 26 + config PINCTRL_TEGRA_XUSB 27 + def_bool y if ARCH_TEGRA 28 + select GENERIC_PHY 29 + select PINCONF 30 + select PINMUX
+7
drivers/pinctrl/tegra/Makefile
··· 1 + obj-y += pinctrl-tegra.o 2 + obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o 3 + obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o 4 + obj-$(CONFIG_PINCTRL_TEGRA114) += pinctrl-tegra114.o 5 + obj-$(CONFIG_PINCTRL_TEGRA124) += pinctrl-tegra124.o 6 + obj-$(CONFIG_PINCTRL_TEGRA210) += pinctrl-tegra210.o 7 + obj-$(CONFIG_PINCTRL_TEGRA_XUSB) += pinctrl-tegra-xusb.o