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

Commit 25cbac77 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Walleij
Browse files

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3a42a042

drivers/pinctrl/Kconfig

+1 −31
Original line number Diff line number Diff line
@@ -168,37 +168,6 @@ config PINCTRL_ST 
	select PINCONF

	select GPIOLIB_IRQCHIP



config PINCTRL_TEGRA

	bool

	select PINMUX

	select PINCONF



config PINCTRL_TEGRA20

	bool

	select PINCTRL_TEGRA



config PINCTRL_TEGRA30

	bool

	select PINCTRL_TEGRA



config PINCTRL_TEGRA114

	bool

	select PINCTRL_TEGRA



config PINCTRL_TEGRA124

	bool

	select PINCTRL_TEGRA



config PINCTRL_TEGRA210

	bool

	select PINCTRL_TEGRA



config PINCTRL_TEGRA_XUSB

	def_bool y if ARCH_TEGRA

	select GENERIC_PHY

	select PINCONF

	select PINMUX



config PINCTRL_TZ1090

	bool "Toumaz Xenif TZ1090 pin control driver"

	depends on SOC_TZ1090
@@ -259,6 +228,7 @@ source "drivers/pinctrl/sh-pfc/Kconfig" 
source "drivers/pinctrl/spear/Kconfig"

source "drivers/pinctrl/stm32/Kconfig"

source "drivers/pinctrl/sunxi/Kconfig"

source "drivers/pinctrl/tegra/Kconfig"

source "drivers/pinctrl/uniphier/Kconfig"

source "drivers/pinctrl/vt8500/Kconfig"

source "drivers/pinctrl/mediatek/Kconfig"

drivers/pinctrl/Makefile

+1 −7
Original line number Diff line number Diff line
@@ -22,13 +22,7 @@ obj-$(CONFIG_PINCTRL_PISTACHIO) += pinctrl-pistachio.o 
obj-$(CONFIG_PINCTRL_ROCKCHIP)	+= pinctrl-rockchip.o

obj-$(CONFIG_PINCTRL_SINGLE)	+= pinctrl-single.o

obj-$(CONFIG_PINCTRL_SIRF)	+= sirf/

obj-$(CONFIG_PINCTRL_TEGRA)	+= pinctrl-tegra.o

obj-$(CONFIG_PINCTRL_TEGRA20)	+= pinctrl-tegra20.o

obj-$(CONFIG_PINCTRL_TEGRA30)	+= pinctrl-tegra30.o

obj-$(CONFIG_PINCTRL_TEGRA114)	+= pinctrl-tegra114.o

obj-$(CONFIG_PINCTRL_TEGRA124)	+= pinctrl-tegra124.o

obj-$(CONFIG_PINCTRL_TEGRA210)	+= pinctrl-tegra210.o

obj-$(CONFIG_PINCTRL_TEGRA_XUSB)	+= pinctrl-tegra-xusb.o

obj-$(CONFIG_PINCTRL_TEGRA)	+= tegra/

obj-$(CONFIG_PINCTRL_TZ1090)	+= pinctrl-tz1090.o

obj-$(CONFIG_PINCTRL_TZ1090_PDC)	+= pinctrl-tz1090-pdc.o

obj-$(CONFIG_PINCTRL_U300)	+= pinctrl-u300.o

drivers/pinctrl/tegra/Kconfig

0 → 100644
+30 −0
Original line number Diff line number Diff line 
config PINCTRL_TEGRA

	bool

	select PINMUX

	select PINCONF



config PINCTRL_TEGRA20

	bool

	select PINCTRL_TEGRA



config PINCTRL_TEGRA30

	bool

	select PINCTRL_TEGRA



config PINCTRL_TEGRA114

	bool

	select PINCTRL_TEGRA



config PINCTRL_TEGRA124

	bool

	select PINCTRL_TEGRA



config PINCTRL_TEGRA210

	bool

	select PINCTRL_TEGRA



config PINCTRL_TEGRA_XUSB

	def_bool y if ARCH_TEGRA

	select GENERIC_PHY

	select PINCONF

	select PINMUX

drivers/pinctrl/tegra/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
obj-y					+= pinctrl-tegra.o

obj-$(CONFIG_PINCTRL_TEGRA20)		+= pinctrl-tegra20.o

obj-$(CONFIG_PINCTRL_TEGRA30)		+= pinctrl-tegra30.o

obj-$(CONFIG_PINCTRL_TEGRA114)		+= pinctrl-tegra114.o

obj-$(CONFIG_PINCTRL_TEGRA124)		+= pinctrl-tegra124.o

obj-$(CONFIG_PINCTRL_TEGRA210)		+= pinctrl-tegra210.o

obj-$(CONFIG_PINCTRL_TEGRA_XUSB)	+= pinctrl-tegra-xusb.o

drivers/pinctrl/pinctrl-tegra-xusb.c→drivers/pinctrl/tegra/pinctrl-tegra-xusb.c

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 


#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>



#include "core.h"

#include "pinctrl-utils.h"

#include "../core.h"

#include "../pinctrl-utils.h"



#define XUSB_PADCTL_ELPG_PROGRAM 0x01c

#define XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_VCORE_DOWN (1 << 26)