1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index 0e1f99c33d47..f8a2ae413c7f 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -6,7 +6,7 @@ if ARCH_SHMOBILE || SUPERH
 config PINCTRL_SH_PFC
        # XXX move off the gpio dependency
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
        select PINMUX
        select PINCONF
@@ -40,19 +40,19 @@ config PINCTRL_PFC_R8A7779
 config PINCTRL_PFC_SH7203
        def_bool y
        depends on CPU_SUBTYPE_SH7203
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SH7264
        def_bool y
        depends on CPU_SUBTYPE_SH7264
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SH7269
        def_bool y
        depends on CPU_SUBTYPE_SH7269
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SH7372
@@ -68,55 +68,55 @@ config PINCTRL_PFC_SH73A0
 config PINCTRL_PFC_SH7720
        def_bool y
        depends on CPU_SUBTYPE_SH7720
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SH7722
        def_bool y
        depends on CPU_SUBTYPE_SH7722
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SH7723
        def_bool y
        depends on CPU_SUBTYPE_SH7723
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SH7724
        def_bool y
        depends on CPU_SUBTYPE_SH7724
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SH7734
        def_bool y
        depends on CPU_SUBTYPE_SH7734
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SH7757
        def_bool y
        depends on CPU_SUBTYPE_SH7757
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SH7785
        def_bool y
        depends on CPU_SUBTYPE_SH7785
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SH7786
        def_bool y
        depends on CPU_SUBTYPE_SH7786
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 config PINCTRL_PFC_SHX3
        def_bool y
        depends on CPU_SUBTYPE_SHX3
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        select PINCTRL_SH_PFC
 endif

diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig index 0e1f99c33d47..f8a2ae413c7f 100644 --- a/drivers/pinctrl/sh-pfc/Kconfig +++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -6,7 +6,7 @@ if ARCH_SHMOBILE \|\| SUPERH
6		6
7	config PINCTRL_SH_PFC	7	config PINCTRL_SH_PFC
8	# XXX move off the gpio dependency	8	# XXX move off the gpio dependency
9	depends on GENERIC_GPIO	9	depends on GPIOLIB
10	select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB	10	select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
11	select PINMUX	11	select PINMUX
12	select PINCONF	12	select PINCONF
@@ -40,19 +40,19 @@ config PINCTRL_PFC_R8A7779
40	config PINCTRL_PFC_SH7203	40	config PINCTRL_PFC_SH7203
41	def_bool y	41	def_bool y
42	depends on CPU_SUBTYPE_SH7203	42	depends on CPU_SUBTYPE_SH7203
43	depends on GENERIC_GPIO	43	depends on GPIOLIB
44	select PINCTRL_SH_PFC	44	select PINCTRL_SH_PFC
45		45
46	config PINCTRL_PFC_SH7264	46	config PINCTRL_PFC_SH7264
47	def_bool y	47	def_bool y
48	depends on CPU_SUBTYPE_SH7264	48	depends on CPU_SUBTYPE_SH7264
49	depends on GENERIC_GPIO	49	depends on GPIOLIB
50	select PINCTRL_SH_PFC	50	select PINCTRL_SH_PFC
51		51
52	config PINCTRL_PFC_SH7269	52	config PINCTRL_PFC_SH7269
53	def_bool y	53	def_bool y
54	depends on CPU_SUBTYPE_SH7269	54	depends on CPU_SUBTYPE_SH7269
55	depends on GENERIC_GPIO	55	depends on GPIOLIB
56	select PINCTRL_SH_PFC	56	select PINCTRL_SH_PFC
57		57
58	config PINCTRL_PFC_SH7372	58	config PINCTRL_PFC_SH7372
@@ -68,55 +68,55 @@ config PINCTRL_PFC_SH73A0
68	config PINCTRL_PFC_SH7720	68	config PINCTRL_PFC_SH7720
69	def_bool y	69	def_bool y
70	depends on CPU_SUBTYPE_SH7720	70	depends on CPU_SUBTYPE_SH7720
71	depends on GENERIC_GPIO	71	depends on GPIOLIB
72	select PINCTRL_SH_PFC	72	select PINCTRL_SH_PFC
73		73
74	config PINCTRL_PFC_SH7722	74	config PINCTRL_PFC_SH7722
75	def_bool y	75	def_bool y
76	depends on CPU_SUBTYPE_SH7722	76	depends on CPU_SUBTYPE_SH7722
77	depends on GENERIC_GPIO	77	depends on GPIOLIB
78	select PINCTRL_SH_PFC	78	select PINCTRL_SH_PFC
79		79
80	config PINCTRL_PFC_SH7723	80	config PINCTRL_PFC_SH7723
81	def_bool y	81	def_bool y
82	depends on CPU_SUBTYPE_SH7723	82	depends on CPU_SUBTYPE_SH7723
83	depends on GENERIC_GPIO	83	depends on GPIOLIB
84	select PINCTRL_SH_PFC	84	select PINCTRL_SH_PFC
85		85
86	config PINCTRL_PFC_SH7724	86	config PINCTRL_PFC_SH7724
87	def_bool y	87	def_bool y
88	depends on CPU_SUBTYPE_SH7724	88	depends on CPU_SUBTYPE_SH7724
89	depends on GENERIC_GPIO	89	depends on GPIOLIB
90	select PINCTRL_SH_PFC	90	select PINCTRL_SH_PFC
91		91
92	config PINCTRL_PFC_SH7734	92	config PINCTRL_PFC_SH7734
93	def_bool y	93	def_bool y
94	depends on CPU_SUBTYPE_SH7734	94	depends on CPU_SUBTYPE_SH7734
95	depends on GENERIC_GPIO	95	depends on GPIOLIB
96	select PINCTRL_SH_PFC	96	select PINCTRL_SH_PFC
97		97
98	config PINCTRL_PFC_SH7757	98	config PINCTRL_PFC_SH7757
99	def_bool y	99	def_bool y
100	depends on CPU_SUBTYPE_SH7757	100	depends on CPU_SUBTYPE_SH7757
101	depends on GENERIC_GPIO	101	depends on GPIOLIB
102	select PINCTRL_SH_PFC	102	select PINCTRL_SH_PFC
103		103
104	config PINCTRL_PFC_SH7785	104	config PINCTRL_PFC_SH7785
105	def_bool y	105	def_bool y
106	depends on CPU_SUBTYPE_SH7785	106	depends on CPU_SUBTYPE_SH7785
107	depends on GENERIC_GPIO	107	depends on GPIOLIB
108	select PINCTRL_SH_PFC	108	select PINCTRL_SH_PFC
109		109
110	config PINCTRL_PFC_SH7786	110	config PINCTRL_PFC_SH7786
111	def_bool y	111	def_bool y
112	depends on CPU_SUBTYPE_SH7786	112	depends on CPU_SUBTYPE_SH7786
113	depends on GENERIC_GPIO	113	depends on GPIOLIB
114	select PINCTRL_SH_PFC	114	select PINCTRL_SH_PFC
115		115
116	config PINCTRL_PFC_SHX3	116	config PINCTRL_PFC_SHX3
117	def_bool y	117	def_bool y
118	depends on CPU_SUBTYPE_SHX3	118	depends on CPU_SUBTYPE_SHX3
119	depends on GENERIC_GPIO	119	depends on GPIOLIB
120	select PINCTRL_SH_PFC	120	select PINCTRL_SH_PFC
121		121
122	endif	122	endif