aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-09 12:59:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-09 12:59:16 -0400
commit5647ac0ad4f355817b788372a01cb293ed63bde4 (patch)
treebb454ce9bf63f145c467e042cd2f5b3367c1a9aa /arch
parent1763e735b0a093a6747078b3bd101f079e576ab6 (diff)
parentf4c54050640e7afa4749875cf9b900d42db361c0 (diff)
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
Pull removal of GENERIC_GPIO from Grant Likely: "GENERIC_GPIO now synonymous with GPIOLIB. There are no longer any valid cases for enableing GENERIC_GPIO without GPIOLIB, even though it is possible to do so which has been causing confusion and breakage. This branch does the work to completely eliminate GENERIC_GPIO." * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux: gpio: update gpio Chinese documentation Remove GENERIC_GPIO config option Convert selectors of GENERIC_GPIO to GPIOLIB blackfin: force use of gpiolib m68k: coldfire: use gpiolib mips: pnx833x: remove requirement for GENERIC_GPIO openrisc: default GENERIC_GPIO to false avr32: default GENERIC_GPIO to false xtensa: remove explicit selection of GENERIC_GPIO sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB powerpc: remove redundant GENERIC_GPIO selection unicore32: default GENERIC_GPIO to false unicore32: remove unneeded select GENERIC_GPIO arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB arm: remove redundant GENERIC_GPIO selection mips: alchemy: require gpiolib mips: txx9: change GENERIC_GPIO to GPIOLIB mips: loongson: use GPIO driver on CONFIG_GPIOLIB mips: remove redundant GENERIC_GPIO select
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/Kconfig3
-rw-r--r--arch/arm/Kconfig3
-rw-r--r--arch/arm/plat-orion/Makefile2
-rw-r--r--arch/arm/plat-orion/gpio.c2
-rw-r--r--arch/arm64/Kconfig3
-rw-r--r--arch/avr32/Kconfig3
-rw-r--r--arch/blackfin/Kconfig5
-rw-r--r--arch/hexagon/Kconfig3
-rw-r--r--arch/ia64/Kconfig3
-rw-r--r--arch/m68k/Kconfig3
-rw-r--r--arch/m68k/Kconfig.cpu3
-rw-r--r--arch/metag/Kconfig3
-rw-r--r--arch/microblaze/Kconfig3
-rw-r--r--arch/mips/Kconfig10
-rw-r--r--arch/mips/loongson/common/Makefile2
-rw-r--r--arch/mips/txx9/generic/setup.c2
-rw-r--r--arch/openrisc/Kconfig3
-rw-r--r--arch/powerpc/Kconfig5
-rw-r--r--arch/powerpc/platforms/40x/Kconfig1
-rw-r--r--arch/powerpc/platforms/44x/Kconfig1
-rw-r--r--arch/powerpc/platforms/85xx/Kconfig3
-rw-r--r--arch/powerpc/platforms/86xx/Kconfig3
-rw-r--r--arch/powerpc/platforms/8xx/Kconfig1
-rw-r--r--arch/powerpc/platforms/Kconfig4
-rw-r--r--arch/sh/Kconfig3
-rw-r--r--arch/sh/boards/mach-sdk7786/Makefile2
-rw-r--r--arch/sh/boards/mach-x3proto/Makefile2
-rw-r--r--arch/sh/kernel/cpu/sh2a/Makefile2
-rw-r--r--arch/sh/kernel/cpu/sh3/Makefile2
-rw-r--r--arch/sh/kernel/cpu/sh4a/Makefile2
-rw-r--r--arch/sparc/Kconfig5
-rw-r--r--arch/unicore32/Kconfig6
-rw-r--r--arch/x86/Kconfig3
-rw-r--r--arch/xtensa/Kconfig3
-rw-r--r--arch/xtensa/configs/iss_defconfig1
-rw-r--r--arch/xtensa/configs/s6105_defconfig1
36 files changed, 14 insertions, 92 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 8629127640cf..837a1f2d8b96 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -55,9 +55,6 @@ config GENERIC_CALIBRATE_DELAY
55 bool 55 bool
56 default y 56 default y
57 57
58config GENERIC_GPIO
59 bool
60
61config ZONE_DMA 58config ZONE_DMA
62 bool 59 bool
63 default y 60 default y
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index aa71a2321040..46e2b5228606 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -109,9 +109,6 @@ config MIGHT_HAVE_PCI
109config SYS_SUPPORTS_APM_EMULATION 109config SYS_SUPPORTS_APM_EMULATION
110 bool 110 bool
111 111
112config GENERIC_GPIO
113 bool
114
115config HAVE_TCM 112config HAVE_TCM
116 bool 113 bool
117 select GENERIC_ALLOCATOR 114 select GENERIC_ALLOCATOR
diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile
index 2eca54b65906..9433605cd290 100644
--- a/arch/arm/plat-orion/Makefile
+++ b/arch/arm/plat-orion/Makefile
@@ -3,6 +3,6 @@
3# 3#
4ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include 4ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
5 5
6orion-gpio-$(CONFIG_GENERIC_GPIO) += gpio.o 6orion-gpio-$(CONFIG_GPIOLIB) += gpio.o
7obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o 7obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o
8obj-$(CONFIG_PLAT_ORION_LEGACY) += $(orion-gpio-y) 8obj-$(CONFIG_PLAT_ORION_LEGACY) += $(orion-gpio-y)
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index e39c2ba6e2fb..249fe6333e18 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -150,7 +150,7 @@ err_out:
150} 150}
151 151
152/* 152/*
153 * GENERIC_GPIO primitives. 153 * GPIO primitives.
154 */ 154 */
155static int orion_gpio_request(struct gpio_chip *chip, unsigned pin) 155static int orion_gpio_request(struct gpio_chip *chip, unsigned pin)
156{ 156{
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 43b0e9f10a39..48347dcf0566 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -95,9 +95,6 @@ config SWIOTLB
95config IOMMU_HELPER 95config IOMMU_HELPER
96 def_bool SWIOTLB 96 def_bool SWIOTLB
97 97
98config GENERIC_GPIO
99 bool
100
101source "init/Kconfig" 98source "init/Kconfig"
102 99
103source "kernel/Kconfig.freezer" 100source "kernel/Kconfig.freezer"
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 22c40308360b..bdc35589277f 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -26,9 +26,6 @@ config AVR32
26 There is an AVR32 Linux project with a web page at 26 There is an AVR32 Linux project with a web page at
27 http://avr32linux.org/. 27 http://avr32linux.org/.
28 28
29config GENERIC_GPIO
30 def_bool y
31
32config STACKTRACE_SUPPORT 29config STACKTRACE_SUPPORT
33 def_bool y 30 def_bool y
34 31
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 453ebe46b065..a117652b5fea 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -27,7 +27,7 @@ config BLACKFIN
27 select HAVE_OPROFILE 27 select HAVE_OPROFILE
28 select HAVE_PERF_EVENTS 28 select HAVE_PERF_EVENTS
29 select ARCH_HAVE_CUSTOM_GPIO_H 29 select ARCH_HAVE_CUSTOM_GPIO_H
30 select ARCH_WANT_OPTIONAL_GPIOLIB 30 select ARCH_REQUIRE_GPIOLIB
31 select HAVE_UID16 31 select HAVE_UID16
32 select HAVE_UNDERSCORE_SYMBOL_PREFIX 32 select HAVE_UNDERSCORE_SYMBOL_PREFIX
33 select VIRT_TO_BUS 33 select VIRT_TO_BUS
@@ -52,9 +52,6 @@ config GENERIC_BUG
52config ZONE_DMA 52config ZONE_DMA
53 def_bool y 53 def_bool y
54 54
55config GENERIC_GPIO
56 def_bool y
57
58config FORCE_MAX_ZONEORDER 55config FORCE_MAX_ZONEORDER
59 int 56 int
60 default "14" 57 default "14"
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 841325f60df8..33a97929d055 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -155,9 +155,6 @@ source "mm/Kconfig"
155 155
156source "kernel/Kconfig.hz" 156source "kernel/Kconfig.hz"
157 157
158config GENERIC_GPIO
159 def_bool n
160
161endmenu 158endmenu
162 159
163source "init/Kconfig" 160source "init/Kconfig"
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index d393f841ff5a..1a2b7749b047 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -101,9 +101,6 @@ config GENERIC_CALIBRATE_DELAY
101config HAVE_SETUP_PER_CPU_AREA 101config HAVE_SETUP_PER_CPU_AREA
102 def_bool y 102 def_bool y
103 103
104config GENERIC_GPIO
105 bool
106
107config DMI 104config DMI
108 bool 105 bool
109 default y 106 default y
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 6de813370b8c..821170e5f6ed 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -35,9 +35,6 @@ config ARCH_HAS_ILOG2_U32
35config ARCH_HAS_ILOG2_U64 35config ARCH_HAS_ILOG2_U64
36 bool 36 bool
37 37
38config GENERIC_GPIO
39 bool
40
41config GENERIC_HWEIGHT 38config GENERIC_HWEIGHT
42 bool 39 bool
43 default y 40 default y
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index b1cfff832fb5..d266787725b4 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -22,8 +22,7 @@ config M68KCLASSIC
22 22
23config COLDFIRE 23config COLDFIRE
24 bool "Coldfire CPU family support" 24 bool "Coldfire CPU family support"
25 select GENERIC_GPIO 25 select ARCH_REQUIRE_GPIOLIB
26 select ARCH_WANT_OPTIONAL_GPIOLIB
27 select ARCH_HAVE_CUSTOM_GPIO_H 26 select ARCH_HAVE_CUSTOM_GPIO_H
28 select CPU_HAS_NO_BITFIELDS 27 select CPU_HAS_NO_BITFIELDS
29 select CPU_HAS_NO_MULDIV64 28 select CPU_HAS_NO_MULDIV64
diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 6f16c1469327..dcd94406030e 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -52,9 +52,6 @@ config GENERIC_HWEIGHT
52config GENERIC_CALIBRATE_DELAY 52config GENERIC_CALIBRATE_DELAY
53 def_bool y 53 def_bool y
54 54
55config GENERIC_GPIO
56 def_bool n
57
58config NO_IOPORT 55config NO_IOPORT
59 def_bool y 56 def_bool y
60 57
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 54237af0b07c..d22a4ecffff4 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -54,9 +54,6 @@ config GENERIC_HWEIGHT
54config GENERIC_CALIBRATE_DELAY 54config GENERIC_CALIBRATE_DELAY
55 def_bool y 55 def_bool y
56 56
57config GENERIC_GPIO
58 bool
59
60config GENERIC_CSUM 57config GENERIC_CSUM
61 def_bool y 58 def_bool y
62 59
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e5f3794744f1..a90cfc702bb1 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -61,8 +61,7 @@ config MIPS_ALCHEMY
61 select SYS_HAS_CPU_MIPS32_R1 61 select SYS_HAS_CPU_MIPS32_R1
62 select SYS_SUPPORTS_32BIT_KERNEL 62 select SYS_SUPPORTS_32BIT_KERNEL
63 select SYS_SUPPORTS_APM_EMULATION 63 select SYS_SUPPORTS_APM_EMULATION
64 select GENERIC_GPIO 64 select ARCH_REQUIRE_GPIOLIB
65 select ARCH_WANT_OPTIONAL_GPIOLIB
66 select SYS_SUPPORTS_ZBOOT 65 select SYS_SUPPORTS_ZBOOT
67 select USB_ARCH_HAS_OHCI 66 select USB_ARCH_HAS_OHCI
68 select USB_ARCH_HAS_EHCI 67 select USB_ARCH_HAS_EHCI
@@ -225,7 +224,6 @@ config MACH_JZ4740
225 select SYS_SUPPORTS_ZBOOT_UART16550 224 select SYS_SUPPORTS_ZBOOT_UART16550
226 select DMA_NONCOHERENT 225 select DMA_NONCOHERENT
227 select IRQ_CPU 226 select IRQ_CPU
228 select GENERIC_GPIO
229 select ARCH_REQUIRE_GPIOLIB 227 select ARCH_REQUIRE_GPIOLIB
230 select SYS_HAS_EARLY_PRINTK 228 select SYS_HAS_EARLY_PRINTK
231 select HAVE_PWM 229 select HAVE_PWM
@@ -937,7 +935,6 @@ config CSRC_SB1250
937 bool 935 bool
938 936
939config GPIO_TXX9 937config GPIO_TXX9
940 select GENERIC_GPIO
941 select ARCH_REQUIRE_GPIOLIB 938 select ARCH_REQUIRE_GPIOLIB
942 bool 939 bool
943 940
@@ -1009,9 +1006,6 @@ config GENERIC_ISA_DMA_SUPPORT_BROKEN
1009config ISA_DMA_API 1006config ISA_DMA_API
1010 bool 1007 bool
1011 1008
1012config GENERIC_GPIO
1013 bool
1014
1015config HOLES_IN_ZONE 1009config HOLES_IN_ZONE
1016 bool 1010 bool
1017 1011
@@ -1112,7 +1106,6 @@ config SOC_PNX833X
1112 select SYS_SUPPORTS_32BIT_KERNEL 1106 select SYS_SUPPORTS_32BIT_KERNEL
1113 select SYS_SUPPORTS_LITTLE_ENDIAN 1107 select SYS_SUPPORTS_LITTLE_ENDIAN
1114 select SYS_SUPPORTS_BIG_ENDIAN 1108 select SYS_SUPPORTS_BIG_ENDIAN
1115 select GENERIC_GPIO
1116 select CPU_MIPSR2_IRQ_VI 1109 select CPU_MIPSR2_IRQ_VI
1117 1110
1118config SOC_PNX8335 1111config SOC_PNX8335
@@ -1203,7 +1196,6 @@ config CPU_LOONGSON2F
1203 bool "Loongson 2F" 1196 bool "Loongson 2F"
1204 depends on SYS_HAS_CPU_LOONGSON2F 1197 depends on SYS_HAS_CPU_LOONGSON2F
1205 select CPU_LOONGSON2 1198 select CPU_LOONGSON2
1206 select GENERIC_GPIO
1207 select ARCH_REQUIRE_GPIOLIB 1199 select ARCH_REQUIRE_GPIOLIB
1208 help 1200 help
1209 The Loongson 2F processor implements the MIPS III instruction set 1201 The Loongson 2F processor implements the MIPS III instruction set
diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile
index e526488df655..4c57b3e5743f 100644
--- a/arch/mips/loongson/common/Makefile
+++ b/arch/mips/loongson/common/Makefile
@@ -4,7 +4,7 @@
4 4
5obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \ 5obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \
6 pci.o bonito-irq.o mem.o machtype.o platform.o 6 pci.o bonito-irq.o mem.o machtype.o platform.o
7obj-$(CONFIG_GENERIC_GPIO) += gpio.o 7obj-$(CONFIG_GPIOLIB) += gpio.o
8 8
9# 9#
10# Serial port support 10# Serial port support
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 5524f2c7b05c..5364aabc2102 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -118,7 +118,7 @@ EXPORT_SYMBOL(clk_put);
118 118
119/* GPIO support */ 119/* GPIO support */
120 120
121#ifdef CONFIG_GENERIC_GPIO 121#ifdef CONFIG_GPIOLIB
122int gpio_to_irq(unsigned gpio) 122int gpio_to_irq(unsigned gpio)
123{ 123{
124 return -EINVAL; 124 return -EINVAL;
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 81b9ddbc9166..1072bfd18c50 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -44,9 +44,6 @@ config GENERIC_HWEIGHT
44config NO_IOPORT 44config NO_IOPORT
45 def_bool y 45 def_bool y
46 46
47config GENERIC_GPIO
48 def_bool y
49
50config TRACE_IRQFLAGS_SUPPORT 47config TRACE_IRQFLAGS_SUPPORT
51 def_bool y 48 def_bool y
52 49
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index bbbe02197afb..c33e3ad2c8fd 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -82,11 +82,6 @@ config GENERIC_HWEIGHT
82 bool 82 bool
83 default y 83 default y
84 84
85config GENERIC_GPIO
86 bool
87 help
88 Generic GPIO API support
89
90config PPC 85config PPC
91 bool 86 bool
92 default y 87 default y
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index bd40bbb15e14..6e287f1294fa 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -138,7 +138,6 @@ config PPC4xx_GPIO
138 bool "PPC4xx GPIO support" 138 bool "PPC4xx GPIO support"
139 depends on 40x 139 depends on 40x
140 select ARCH_REQUIRE_GPIOLIB 140 select ARCH_REQUIRE_GPIOLIB
141 select GENERIC_GPIO
142 help 141 help
143 Enable gpiolib support for ppc40x based boards 142 Enable gpiolib support for ppc40x based boards
144 143
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 7be93367d92f..d6c7506ec7d9 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -248,7 +248,6 @@ config PPC4xx_GPIO
248 bool "PPC4xx GPIO support" 248 bool "PPC4xx GPIO support"
249 depends on 44x 249 depends on 44x
250 select ARCH_REQUIRE_GPIOLIB 250 select ARCH_REQUIRE_GPIOLIB
251 select GENERIC_GPIO
252 help 251 help
253 Enable gpiolib support for ppc440 based boards 252 Enable gpiolib support for ppc440 based boards
254 253
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 8f02b05f4c96..efdd37c775ad 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -203,7 +203,6 @@ config GE_IMP3A
203 select DEFAULT_UIMAGE 203 select DEFAULT_UIMAGE
204 select SWIOTLB 204 select SWIOTLB
205 select MMIO_NVRAM 205 select MMIO_NVRAM
206 select GENERIC_GPIO
207 select ARCH_REQUIRE_GPIOLIB 206 select ARCH_REQUIRE_GPIOLIB
208 select GE_FPGA 207 select GE_FPGA
209 help 208 help
@@ -328,7 +327,7 @@ config B4_QDS
328 select PPC_E500MC 327 select PPC_E500MC
329 select PHYS_64BIT 328 select PHYS_64BIT
330 select SWIOTLB 329 select SWIOTLB
331 select GENERIC_GPIO 330 select GPIOLIB
332 select ARCH_REQUIRE_GPIOLIB 331 select ARCH_REQUIRE_GPIOLIB
333 select HAS_RAPIDIO 332 select HAS_RAPIDIO
334 select PPC_EPAPR_HV_PIC 333 select PPC_EPAPR_HV_PIC
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 7a6279e38213..1afd1e4a2dd2 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -37,7 +37,6 @@ config GEF_PPC9A
37 bool "GE PPC9A" 37 bool "GE PPC9A"
38 select DEFAULT_UIMAGE 38 select DEFAULT_UIMAGE
39 select MMIO_NVRAM 39 select MMIO_NVRAM
40 select GENERIC_GPIO
41 select ARCH_REQUIRE_GPIOLIB 40 select ARCH_REQUIRE_GPIOLIB
42 select GE_FPGA 41 select GE_FPGA
43 help 42 help
@@ -47,7 +46,6 @@ config GEF_SBC310
47 bool "GE SBC310" 46 bool "GE SBC310"
48 select DEFAULT_UIMAGE 47 select DEFAULT_UIMAGE
49 select MMIO_NVRAM 48 select MMIO_NVRAM
50 select GENERIC_GPIO
51 select ARCH_REQUIRE_GPIOLIB 49 select ARCH_REQUIRE_GPIOLIB
52 select GE_FPGA 50 select GE_FPGA
53 help 51 help
@@ -57,7 +55,6 @@ config GEF_SBC610
57 bool "GE SBC610" 55 bool "GE SBC610"
58 select DEFAULT_UIMAGE 56 select DEFAULT_UIMAGE
59 select MMIO_NVRAM 57 select MMIO_NVRAM
60 select GENERIC_GPIO
61 select ARCH_REQUIRE_GPIOLIB 58 select ARCH_REQUIRE_GPIOLIB
62 select GE_FPGA 59 select GE_FPGA
63 select HAS_RAPIDIO 60 select HAS_RAPIDIO
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index 1fb0b3cddeb3..8dec3c0911ad 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -114,7 +114,6 @@ config 8xx_COPYBACK
114 114
115config 8xx_GPIO 115config 8xx_GPIO
116 bool "GPIO API Support" 116 bool "GPIO API Support"
117 select GENERIC_GPIO
118 select ARCH_REQUIRE_GPIOLIB 117 select ARCH_REQUIRE_GPIOLIB
119 help 118 help
120 Saying Y here will cause the ports on an MPC8xx processor to be used 119 Saying Y here will cause the ports on an MPC8xx processor to be used
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 34d224be93ba..a881232a3cce 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -302,7 +302,6 @@ config QUICC_ENGINE
302config QE_GPIO 302config QE_GPIO
303 bool "QE GPIO support" 303 bool "QE GPIO support"
304 depends on QUICC_ENGINE 304 depends on QUICC_ENGINE
305 select GENERIC_GPIO
306 select ARCH_REQUIRE_GPIOLIB 305 select ARCH_REQUIRE_GPIOLIB
307 help 306 help
308 Say Y here if you're going to use hardware that connects to the 307 Say Y here if you're going to use hardware that connects to the
@@ -315,7 +314,6 @@ config CPM2
315 select PPC_LIB_RHEAP 314 select PPC_LIB_RHEAP
316 select PPC_PCI_CHOICE 315 select PPC_PCI_CHOICE
317 select ARCH_REQUIRE_GPIOLIB 316 select ARCH_REQUIRE_GPIOLIB
318 select GENERIC_GPIO
319 help 317 help
320 The CPM2 (Communications Processor Module) is a coprocessor on 318 The CPM2 (Communications Processor Module) is a coprocessor on
321 embedded CPUs made by Freescale. Selecting this option means that 319 embedded CPUs made by Freescale. Selecting this option means that
@@ -353,7 +351,6 @@ config OF_RTC
353config SIMPLE_GPIO 351config SIMPLE_GPIO
354 bool "Support for simple, memory-mapped GPIO controllers" 352 bool "Support for simple, memory-mapped GPIO controllers"
355 depends on PPC 353 depends on PPC
356 select GENERIC_GPIO
357 select ARCH_REQUIRE_GPIOLIB 354 select ARCH_REQUIRE_GPIOLIB
358 help 355 help
359 Say Y here to support simple, memory-mapped GPIO controllers. 356 Say Y here to support simple, memory-mapped GPIO controllers.
@@ -364,7 +361,6 @@ config SIMPLE_GPIO
364config MCU_MPC8349EMITX 361config MCU_MPC8349EMITX
365 bool "MPC8349E-mITX MCU driver" 362 bool "MPC8349E-mITX MCU driver"
366 depends on I2C=y && PPC_83xx 363 depends on I2C=y && PPC_83xx
367 select GENERIC_GPIO
368 select ARCH_REQUIRE_GPIOLIB 364 select ARCH_REQUIRE_GPIOLIB
369 help 365 help
370 Say Y here to enable soft power-off functionality on the Freescale 366 Say Y here to enable soft power-off functionality on the Freescale
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 78d8ace57272..8c868cf2cf93 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -93,9 +93,6 @@ config GENERIC_CSUM
93config GENERIC_HWEIGHT 93config GENERIC_HWEIGHT
94 def_bool y 94 def_bool y
95 95
96config GENERIC_GPIO
97 def_bool n
98
99config GENERIC_CALIBRATE_DELAY 96config GENERIC_CALIBRATE_DELAY
100 bool 97 bool
101 98
diff --git a/arch/sh/boards/mach-sdk7786/Makefile b/arch/sh/boards/mach-sdk7786/Makefile
index 8ae56e9560ac..45d32e3590b9 100644
--- a/arch/sh/boards/mach-sdk7786/Makefile
+++ b/arch/sh/boards/mach-sdk7786/Makefile
@@ -1,4 +1,4 @@
1obj-y := fpga.o irq.o nmi.o setup.o 1obj-y := fpga.o irq.o nmi.o setup.o
2 2
3obj-$(CONFIG_GENERIC_GPIO) += gpio.o 3obj-$(CONFIG_GPIOLIB) += gpio.o
4obj-$(CONFIG_HAVE_SRAM_POOL) += sram.o 4obj-$(CONFIG_HAVE_SRAM_POOL) += sram.o
diff --git a/arch/sh/boards/mach-x3proto/Makefile b/arch/sh/boards/mach-x3proto/Makefile
index 708c21c919ff..0cbe3d02dea3 100644
--- a/arch/sh/boards/mach-x3proto/Makefile
+++ b/arch/sh/boards/mach-x3proto/Makefile
@@ -1,3 +1,3 @@
1obj-y += setup.o ilsel.o 1obj-y += setup.o ilsel.o
2 2
3obj-$(CONFIG_GENERIC_GPIO) += gpio.o 3obj-$(CONFIG_GPIOLIB) += gpio.o
diff --git a/arch/sh/kernel/cpu/sh2a/Makefile b/arch/sh/kernel/cpu/sh2a/Makefile
index 7fdc102d0dd6..990195d98456 100644
--- a/arch/sh/kernel/cpu/sh2a/Makefile
+++ b/arch/sh/kernel/cpu/sh2a/Makefile
@@ -21,4 +21,4 @@ pinmux-$(CONFIG_CPU_SUBTYPE_SH7203) := pinmux-sh7203.o
21pinmux-$(CONFIG_CPU_SUBTYPE_SH7264) := pinmux-sh7264.o 21pinmux-$(CONFIG_CPU_SUBTYPE_SH7264) := pinmux-sh7264.o
22pinmux-$(CONFIG_CPU_SUBTYPE_SH7269) := pinmux-sh7269.o 22pinmux-$(CONFIG_CPU_SUBTYPE_SH7269) := pinmux-sh7269.o
23 23
24obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y) 24obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index 6f13f33a35ff..d3634ae7b71a 100644
--- a/arch/sh/kernel/cpu/sh3/Makefile
+++ b/arch/sh/kernel/cpu/sh3/Makefile
@@ -30,4 +30,4 @@ clock-$(CONFIG_CPU_SUBTYPE_SH7712) := clock-sh7712.o
30pinmux-$(CONFIG_CPU_SUBTYPE_SH7720) := pinmux-sh7720.o 30pinmux-$(CONFIG_CPU_SUBTYPE_SH7720) := pinmux-sh7720.o
31 31
32obj-y += $(clock-y) 32obj-y += $(clock-y)
33obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y) 33obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile
index 8fc6ec2be2fa..0705df775208 100644
--- a/arch/sh/kernel/cpu/sh4a/Makefile
+++ b/arch/sh/kernel/cpu/sh4a/Makefile
@@ -47,6 +47,6 @@ pinmux-$(CONFIG_CPU_SUBTYPE_SHX3) := pinmux-shx3.o
47 47
48obj-y += $(clock-y) 48obj-y += $(clock-y)
49obj-$(CONFIG_SMP) += $(smp-y) 49obj-$(CONFIG_SMP) += $(smp-y)
50obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y) 50obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
51obj-$(CONFIG_PERF_EVENTS) += perf_event.o 51obj-$(CONFIG_PERF_EVENTS) += perf_event.o
52obj-$(CONFIG_HAVE_HW_BREAKPOINT) += ubc.o 52obj-$(CONFIG_HAVE_HW_BREAKPOINT) += ubc.o
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index a639c0d07b8b..9ac9f1666339 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -137,11 +137,6 @@ config GENERIC_ISA_DMA
137 bool 137 bool
138 default y if SPARC32 138 default y if SPARC32
139 139
140config GENERIC_GPIO
141 bool
142 help
143 Generic GPIO API support
144
145config ARCH_SUPPORTS_DEBUG_PAGEALLOC 140config ARCH_SUPPORTS_DEBUG_PAGEALLOC
146 def_bool y if SPARC64 141 def_bool y if SPARC64
147 142
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 2943e3acdf0c..41bcc0013442 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -23,9 +23,6 @@ config UNICORE32
23 designs licensed by PKUnity Ltd. 23 designs licensed by PKUnity Ltd.
24 Please see web page at <http://www.pkunity.com/>. 24 Please see web page at <http://www.pkunity.com/>.
25 25
26config GENERIC_GPIO
27 def_bool y
28
29config GENERIC_CSUM 26config GENERIC_CSUM
30 def_bool y 27 def_bool y
31 28
@@ -156,7 +153,7 @@ source "mm/Kconfig"
156 153
157config LEDS 154config LEDS
158 def_bool y 155 def_bool y
159 depends on GENERIC_GPIO 156 depends on GPIOLIB
160 157
161config ALIGNMENT_TRAP 158config ALIGNMENT_TRAP
162 def_bool y 159 def_bool y
@@ -219,7 +216,6 @@ if ARCH_PUV3
219config PUV3_GPIO 216config PUV3_GPIO
220 bool 217 bool
221 depends on !ARCH_FPGA 218 depends on !ARCH_FPGA
222 select GENERIC_GPIO
223 select GPIO_SYSFS 219 select GPIO_SYSFS
224 default y 220 default y
225 221
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5db2117ae288..6a154a91c7e7 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -174,9 +174,6 @@ config GENERIC_BUG_RELATIVE_POINTERS
174config GENERIC_HWEIGHT 174config GENERIC_HWEIGHT
175 def_bool y 175 def_bool y
176 176
177config GENERIC_GPIO
178 bool
179
180config ARCH_MAY_HAVE_PC_FDC 177config ARCH_MAY_HAVE_PC_FDC
181 def_bool y 178 def_bool y
182 depends on ISA_DMA_API 179 depends on ISA_DMA_API
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index b09de49dbec5..acdfc615cca2 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -33,9 +33,6 @@ config RWSEM_XCHGADD_ALGORITHM
33config GENERIC_HWEIGHT 33config GENERIC_HWEIGHT
34 def_bool y 34 def_bool y
35 35
36config GENERIC_GPIO
37 bool
38
39config ARCH_HAS_ILOG2_U32 36config ARCH_HAS_ILOG2_U32
40 def_bool n 37 def_bool n
41 38
diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
index ddab37b24741..77c52f80187a 100644
--- a/arch/xtensa/configs/iss_defconfig
+++ b/arch/xtensa/configs/iss_defconfig
@@ -10,7 +10,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
10CONFIG_GENERIC_FIND_NEXT_BIT=y 10CONFIG_GENERIC_FIND_NEXT_BIT=y
11CONFIG_GENERIC_HWEIGHT=y 11CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_HARDIRQS=y 12CONFIG_GENERIC_HARDIRQS=y
13CONFIG_GENERIC_GPIO=y
14# CONFIG_ARCH_HAS_ILOG2_U32 is not set 13# CONFIG_ARCH_HAS_ILOG2_U32 is not set
15# CONFIG_ARCH_HAS_ILOG2_U64 is not set 14# CONFIG_ARCH_HAS_ILOG2_U64 is not set
16CONFIG_NO_IOPORT=y 15CONFIG_NO_IOPORT=y
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
index eaf1b8fc6556..4799c6a526b5 100644
--- a/arch/xtensa/configs/s6105_defconfig
+++ b/arch/xtensa/configs/s6105_defconfig
@@ -10,7 +10,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
10CONFIG_GENERIC_FIND_NEXT_BIT=y 10CONFIG_GENERIC_FIND_NEXT_BIT=y
11CONFIG_GENERIC_HWEIGHT=y 11CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_HARDIRQS=y 12CONFIG_GENERIC_HARDIRQS=y
13CONFIG_GENERIC_GPIO=y
14# CONFIG_ARCH_HAS_ILOG2_U32 is not set 13# CONFIG_ARCH_HAS_ILOG2_U32 is not set
15# CONFIG_ARCH_HAS_ILOG2_U64 is not set 14# CONFIG_ARCH_HAS_ILOG2_U64 is not set
16CONFIG_NO_IOPORT=y 15CONFIG_NO_IOPORT=y
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-30 20:33:28 -0500