diff -drupN a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
--- a/drivers/pinctrl/sunxi/Kconfig	2018-08-06 17:23:04.000000000 +0300
+++ b/drivers/pinctrl/sunxi/Kconfig	2022-06-12 05:28:14.000000000 +0300
@@ -1,10 +1,15 @@
 if ARCH_SUNXI
+menu "Allwinner SOC PINCTRL DRIVER"
 
 config PINCTRL_SUNXI
 	bool
 	select PINMUX
 	select GENERIC_PINCONF
 
+config PINCTRL_SUNXI_TEST
+	tristate "pinctrl sunxi test driver"
+	default n
+
 config PINCTRL_SUN4I_A10
 	def_bool MACH_SUN4I
 	select PINCTRL_SUNXI
@@ -72,8 +77,202 @@ config PINCTRL_SUN9I_A80_R
 	depends on RESET_CONTROLLER
 	select PINCTRL_SUNXI
 
-config PINCTRL_SUN50I_A64
-	bool
+config PINCTRL_SUN8IW7P1
+	def_bool ARCH_SUN8IW7
+	depends on ARCH_SUN8IW7
+	bool "Pinctrl sun8iw7p1 PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW7P1_R
+	def_bool PINCTRL_SUN8IW7P1
+	depends on PINCTRL_SUN8IW7P1
+	bool "Pinctrl PINCTRL_SUN8IW7P1 R_PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW6P1
+	def_bool ARCH_SUN8IW6
+	depends on ARCH_SUN8IW6
+	bool "Pinctrl sun8iw6p1 PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW6P1_R
+	def_bool PINCTRL_SUN8IW6P1
+	depends on PINCTRL_SUN8IW6P1
+	bool "Pinctrl PINCTRL_SUN8IW6P1 R_PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW11P1
+	def_bool ARCH_SUN8IW11
+	depends on ARCH_SUN8IW11
+	bool "Pinctrl sun8iw11p1 PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW12P1
+	def_bool ARCH_SUN8IW12
+	depends on ARCH_SUN8IW12
+	bool "Pinctrl sun8iw12p1 PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW12P1_R
+	def_bool PINCTRL_SUN8IW12P1
+	depends on PINCTRL_SUN8IW12P1
+	bool "Pinctrl PINCTRL_SUN8IW12P1 R_PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW8P1
+	def_bool ARCH_SUN8IW8
+	depends on ARCH_SUN8IW8
+	bool "Pinctrl sun8iw8p1 PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW15P1
+	def_bool ARCH_SUN8IW15
+	depends on ARCH_SUN8IW15
+	bool "Pinctrl sun8iw15p1 PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW15P1_R
+	def_bool PINCTRL_SUN8IW15P1
+	depends on PINCTRL_SUN8IW15P1
+	bool "Pinctrl PINCTRL_SUN8IW15P1 R_PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW16P1
+	def_bool ARCH_SUN8IW16
+	depends on ARCH_SUN8IW16
+	bool "Pinctrl sun8iw16p1 PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW16P1_R
+	def_bool PINCTRL_SUN8IW16P1
+	depends on PINCTRL_SUN8IW16P1
+	bool "Pinctrl PINCTRL_SUN8IW16P1 R_PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW17P1
+	def_bool ARCH_SUN8IW17
+	depends on ARCH_SUN8IW17
+	bool "Pinctrl sun8iw17p1 PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW17P1_R
+	def_bool PINCTRL_SUN8IW17P1
+	depends on PINCTRL_SUN8IW17P1
+	bool "Pinctrl PINCTRL_SUN8IW17P1 R_PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW19P1
+	def_bool ARCH_SUN8IW19
+	depends on ARCH_SUN8IW19
+	bool "Pinctrl sun8iw19p1 PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN8IW19P1_R
+	def_bool ARCH_SUN8IW19P1
+	depends on ARCH_SUN8IW19P1
+	bool "Pinctrl sun8iw19p1 R_PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN50IW1P1
+	def_bool ARCH_SUN50IW1P1
+	depends on ARCH_SUN50IW1P1
+	bool "Pinctrl sun50iw1p1 PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW1P1_R
+	def_bool ARCH_SUN50IW1P1
+	depends on ARCH_SUN50IW1P1
+	bool "Pinctrl sun50iw1p1 R_PIO controller"
+	select PINCTRL_SUNXI
+config PINCTRL_SUN50IW3P1
+	def_bool ARCH_SUN50IW3P1
+	depends on ARCH_SUN50IW3P1
+	bool "Pinctrl sun50iw3p1 PIO controller"
 	select PINCTRL_SUNXI
 
+config PINCTRL_SUN50IW3P1_R
+	def_bool ARCH_SUN50IW3P1
+	depends on ARCH_SUN50IW3P1
+	bool "Pinctrl sun50iw3p1 R_PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW6P1
+	def_bool ARCH_SUN50IW6P1
+	depends on ARCH_SUN50IW6P1
+	bool "Pinctrl sun50iw6p1 PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW6P1_R
+	def_bool ARCH_SUN50IW6P1
+	depends on ARCH_SUN50IW6P1
+	bool "Pinctrl sun50iw6p1 R_PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW8P1
+	def_bool ARCH_SUN50IW8P1
+	depends on ARCH_SUN50IW8P1
+	bool "Pinctrl sun50iw8p1 PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW8P1_R
+	def_bool ARCH_SUN50IW8P1
+	depends on ARCH_SUN50IW8P1
+	bool "Pinctrl sun50iw8p1 R_PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW9P1
+	def_bool ARCH_SUN50IW9P1
+	depends on ARCH_SUN50IW9P1
+	bool "Pinctrl sun50iw9p1 PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW9P1_R
+	def_bool ARCH_SUN50IW9P1
+	depends on ARCH_SUN50IW9P1
+	bool "Pinctrl sun50iw9p1 R_PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW10P1
+	def_bool ARCH_SUN50IW10P1
+	depends on ARCH_SUN50IW10P1
+	bool "Pinctrl sun50iw10p1 PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW10P1_R
+	def_bool ARCH_SUN50IW10P1
+	depends on ARCH_SUN50IW10P1
+	bool "Pinctrl sun50iw10p1 R_PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW11P1
+	def_bool ARCH_SUN50IW11P1
+	depends on ARCH_SUN50IW11P1
+	bool "Pinctrl sun50iw11p1 PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW11P1_R
+	def_bool ARCH_SUN50IW11P1
+	depends on ARCH_SUN50IW11P1
+	bool "Pinctrl sun50iw11p1 R_PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN8IW18P1
+	def_bool ARCH_SUN8IW18
+	depends on ARCH_SUN8IW18
+	bool "Pinctrl sun8iw18p1 PIO controller"
+	select PINCTRL_SUNXI_COMMON
+
+config PINCTRL_SUN50IW5T
+	def_bool ARCH_SUN50IW5T
+	depends on ARCH_SUN50IW5T
+	bool "Pinctrl sun50iw5t PIO controller"
+	select PINCTRL_SUNXI
+
+config PINCTRL_SUN50IW5T_R
+	def_bool ARCH_SUN50IW5T
+	depends on ARCH_SUN50IW5T
+	bool "Pinctrl sun50iw5t R_PIO controller"
+	select PINCTRL_SUNXI
+
+endmenu
 endif