浏览代码

pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI

CONFIG_PINCTRL_SUNXI is more suitable than CONFIG_ARCH_SUNXI
to guard the drivers/pinctrl/sunxi/ directory.
(I renamed CONFIG_PINCTRL_SUNXI_COMMON to CONFIG_PINCTRL_SUNXI.)

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Masahiro Yamada 9 年之前
父节点
当前提交
3a42a042f5
共有 3 个文件被更改,包括 17 次插入17 次删除
  1. 1 1
      drivers/pinctrl/Makefile
  2. 15 15
      drivers/pinctrl/sunxi/Kconfig
  3. 1 1
      drivers/pinctrl/sunxi/Makefile

+ 1 - 1
drivers/pinctrl/Makefile

@@ -52,7 +52,7 @@ obj-$(CONFIG_PINCTRL_SAMSUNG)	+= samsung/
 obj-$(CONFIG_PINCTRL_SH_PFC)	+= sh-pfc/
 obj-$(CONFIG_PINCTRL_SH_PFC)	+= sh-pfc/
 obj-$(CONFIG_PINCTRL_SPEAR)	+= spear/
 obj-$(CONFIG_PINCTRL_SPEAR)	+= spear/
 obj-$(CONFIG_ARCH_STM32)	+= stm32/
 obj-$(CONFIG_ARCH_STM32)	+= stm32/
-obj-$(CONFIG_ARCH_SUNXI)	+= sunxi/
+obj-$(CONFIG_PINCTRL_SUNXI)	+= sunxi/
 obj-$(CONFIG_PINCTRL_UNIPHIER)	+= uniphier/
 obj-$(CONFIG_PINCTRL_UNIPHIER)	+= uniphier/
 obj-$(CONFIG_ARCH_VT8500)	+= vt8500/
 obj-$(CONFIG_ARCH_VT8500)	+= vt8500/
 obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/
 obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/

+ 15 - 15
drivers/pinctrl/sunxi/Kconfig

@@ -1,67 +1,67 @@
 if ARCH_SUNXI
 if ARCH_SUNXI
 
 
-config PINCTRL_SUNXI_COMMON
+config PINCTRL_SUNXI
 	bool
 	bool
 	select PINMUX
 	select PINMUX
 	select GENERIC_PINCONF
 	select GENERIC_PINCONF
 
 
 config PINCTRL_SUN4I_A10
 config PINCTRL_SUN4I_A10
 	def_bool MACH_SUN4I
 	def_bool MACH_SUN4I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN5I_A10S
 config PINCTRL_SUN5I_A10S
 	def_bool MACH_SUN5I
 	def_bool MACH_SUN5I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN5I_A13
 config PINCTRL_SUN5I_A13
 	def_bool MACH_SUN5I
 	def_bool MACH_SUN5I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN6I_A31
 config PINCTRL_SUN6I_A31
 	def_bool MACH_SUN6I
 	def_bool MACH_SUN6I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN6I_A31S
 config PINCTRL_SUN6I_A31S
 	def_bool MACH_SUN6I
 	def_bool MACH_SUN6I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN6I_A31_R
 config PINCTRL_SUN6I_A31_R
 	def_bool MACH_SUN6I
 	def_bool MACH_SUN6I
 	depends on RESET_CONTROLLER
 	depends on RESET_CONTROLLER
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN7I_A20
 config PINCTRL_SUN7I_A20
 	def_bool MACH_SUN7I
 	def_bool MACH_SUN7I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN8I_A23
 config PINCTRL_SUN8I_A23
 	def_bool MACH_SUN8I
 	def_bool MACH_SUN8I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN8I_A33
 config PINCTRL_SUN8I_A33
 	def_bool MACH_SUN8I
 	def_bool MACH_SUN8I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN8I_A83T
 config PINCTRL_SUN8I_A83T
 	def_bool MACH_SUN8I
 	def_bool MACH_SUN8I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN8I_A23_R
 config PINCTRL_SUN8I_A23_R
 	def_bool MACH_SUN8I
 	def_bool MACH_SUN8I
 	depends on RESET_CONTROLLER
 	depends on RESET_CONTROLLER
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN8I_H3
 config PINCTRL_SUN8I_H3
 	def_bool MACH_SUN8I
 	def_bool MACH_SUN8I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN9I_A80
 config PINCTRL_SUN9I_A80
 	def_bool MACH_SUN9I
 	def_bool MACH_SUN9I
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 config PINCTRL_SUN9I_A80_R
 config PINCTRL_SUN9I_A80_R
 	def_bool MACH_SUN9I
 	def_bool MACH_SUN9I
 	depends on RESET_CONTROLLER
 	depends on RESET_CONTROLLER
-	select PINCTRL_SUNXI_COMMON
+	select PINCTRL_SUNXI
 
 
 endif
 endif

+ 1 - 1
drivers/pinctrl/sunxi/Makefile

@@ -1,5 +1,5 @@
 # Core
 # Core
-obj-$(CONFIG_PINCTRL_SUNXI_COMMON)	+= pinctrl-sunxi.o
+obj-y					+= pinctrl-sunxi.o
 
 
 # SoC Drivers
 # SoC Drivers
 obj-$(CONFIG_PINCTRL_SUN4I_A10)		+= pinctrl-sun4i-a10.o
 obj-$(CONFIG_PINCTRL_SUN4I_A10)		+= pinctrl-sun4i-a10.o