Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB

This replaces:

- "select ARCH_REQUIRE_GPIOLIB" with "select GPIOLIB" as this can
now be selected directly.

- "select ARCH_WANT_OPTIONAL_GPIOLIB" with no dependency: GPIOLIB
is now selectable by everyone, so we need not declare our
intent to select it.

When ordering the symbols the following rationale was used:
if the selects were in alphabetical order, I moved select GPIOLIB
to be in alphabetical order, but if the selects were not
maintained in alphabetical order, I just replaced
"select ARCH_REQUIRE_GPIOLIB" with "select GPIOLIB".

Cc: Michael Büsch <m@bues.ch>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

+13 -23
+1 -10
arch/sh/Kconfig
··· 264 264 select CPU_HAS_FPU 265 265 select SYS_SUPPORTS_SH_CMT 266 266 select SYS_SUPPORTS_SH_MTU2 267 - select ARCH_WANT_OPTIONAL_GPIOLIB 268 267 select PINCTRL 269 268 270 269 config CPU_SUBTYPE_SH7206 ··· 352 353 select CPU_SH3 353 354 select CPU_HAS_DSP 354 355 select SYS_SUPPORTS_SH_CMT 355 - select ARCH_WANT_OPTIONAL_GPIOLIB 356 356 select USB_OHCI_SH if USB_OHCI_HCD 357 357 select PINCTRL 358 358 help ··· 417 419 select ARCH_SHMOBILE 418 420 select ARCH_SPARSEMEM_ENABLE 419 421 select SYS_SUPPORTS_SH_CMT 420 - select ARCH_WANT_OPTIONAL_GPIOLIB 421 422 select PINCTRL 422 423 help 423 424 Select SH7723 if you have an SH-MobileR2 CPU. ··· 428 431 select ARCH_SHMOBILE 429 432 select ARCH_SPARSEMEM_ENABLE 430 433 select SYS_SUPPORTS_SH_CMT 431 - select ARCH_WANT_OPTIONAL_GPIOLIB 432 434 select PINCTRL 433 435 help 434 436 Select SH7724 if you have an SH-MobileR2R CPU. ··· 436 440 bool "Support SH7734 processor" 437 441 select CPU_SH4A 438 442 select CPU_SHX2 439 - select ARCH_WANT_OPTIONAL_GPIOLIB 440 443 select PINCTRL 441 444 help 442 445 Select SH7734 if you have a SH4A SH7734 CPU. ··· 444 449 bool "Support SH7757 processor" 445 450 select CPU_SH4A 446 451 select CPU_SHX2 447 - select ARCH_WANT_OPTIONAL_GPIOLIB 448 452 select PINCTRL 449 453 help 450 454 Select SH7757 if you have a SH4A SH7757 CPU. ··· 469 475 select CPU_SHX2 470 476 select ARCH_SPARSEMEM_ENABLE 471 477 select SYS_SUPPORTS_NUMA 472 - select ARCH_WANT_OPTIONAL_GPIOLIB 473 478 select PINCTRL 474 479 475 480 config CPU_SUBTYPE_SH7786 ··· 477 484 select CPU_SHX3 478 485 select CPU_HAS_PTEAEX 479 486 select GENERIC_CLOCKEVENTS_BROADCAST if SMP 480 - select ARCH_WANT_OPTIONAL_GPIOLIB 481 487 select USB_OHCI_SH if USB_OHCI_HCD 482 488 select USB_EHCI_SH if USB_EHCI_HCD 483 489 select PINCTRL ··· 486 494 select CPU_SH4A 487 495 select CPU_SHX3 488 496 select GENERIC_CLOCKEVENTS_BROADCAST if SMP 489 - select ARCH_REQUIRE_GPIOLIB 497 + select GPIOLIB 490 498 select PINCTRL 491 499 492 500 # SH4AL-DSP Processor Support ··· 505 513 select ARCH_SPARSEMEM_ENABLE 506 514 select SYS_SUPPORTS_NUMA 507 515 select SYS_SUPPORTS_SH_CMT 508 - select ARCH_WANT_OPTIONAL_GPIOLIB 509 516 select PINCTRL 510 517 511 518 config CPU_SUBTYPE_SH7366
+8 -9
arch/sh/boards/Kconfig
··· 70 70 bool "SolutionEngine7724" 71 71 select SOLUTION_ENGINE 72 72 depends on CPU_SUBTYPE_SH7724 73 - select ARCH_REQUIRE_GPIOLIB 73 + select GPIOLIB 74 74 select SND_SOC_AK4642 if SND_SIMPLE_CARD 75 75 select REGULATOR_FIXED_VOLTAGE if REGULATOR 76 76 help ··· 174 174 depends on CPU_SUBTYPE_SH7786 175 175 select SYS_SUPPORTS_PCI 176 176 select NO_IOPORT_MAP if !PCI 177 - select ARCH_WANT_OPTIONAL_GPIOLIB 178 177 select HAVE_SRAM_POOL 179 178 select REGULATOR_FIXED_VOLTAGE if REGULATOR 180 179 help ··· 189 190 config SH_SH7757LCR 190 191 bool "SH7757LCR" 191 192 depends on CPU_SUBTYPE_SH7757 192 - select ARCH_REQUIRE_GPIOLIB 193 + select GPIOLIB 193 194 select REGULATOR_FIXED_VOLTAGE if REGULATOR 194 195 195 196 config SH_SH7785LCR ··· 216 217 config SH_URQUELL 217 218 bool "Urquell" 218 219 depends on CPU_SUBTYPE_SH7786 219 - select ARCH_REQUIRE_GPIOLIB 220 + select GPIOLIB 220 221 select SYS_SUPPORTS_PCI 221 222 select NO_IOPORT_MAP if !PCI 222 223 223 224 config SH_MIGOR 224 225 bool "Migo-R" 225 226 depends on CPU_SUBTYPE_SH7722 226 - select ARCH_REQUIRE_GPIOLIB 227 + select GPIOLIB 227 228 select REGULATOR_FIXED_VOLTAGE if REGULATOR 228 229 help 229 230 Select Migo-R if configuring for the SH7722 Migo-R platform ··· 232 233 config SH_AP325RXA 233 234 bool "AP-325RXA" 234 235 depends on CPU_SUBTYPE_SH7723 235 - select ARCH_REQUIRE_GPIOLIB 236 + select GPIOLIB 236 237 select REGULATOR_FIXED_VOLTAGE if REGULATOR 237 238 help 238 239 Renesas "AP-325RXA" support. ··· 241 242 config SH_KFR2R09 242 243 bool "KFR2R09" 243 244 depends on CPU_SUBTYPE_SH7724 244 - select ARCH_REQUIRE_GPIOLIB 245 + select GPIOLIB 245 246 select REGULATOR_FIXED_VOLTAGE if REGULATOR 246 247 help 247 248 "Kit For R2R for 2009" support. ··· 249 250 config SH_ECOVEC 250 251 bool "EcoVec" 251 252 depends on CPU_SUBTYPE_SH7724 252 - select ARCH_REQUIRE_GPIOLIB 253 + select GPIOLIB 253 254 select SND_SOC_DA7210 if SND_SIMPLE_CARD 254 255 select REGULATOR_FIXED_VOLTAGE if REGULATOR 255 256 help ··· 326 327 config SH_MAGIC_PANEL_R2 327 328 bool "Magic Panel R2" 328 329 depends on CPU_SUBTYPE_SH7720 329 - select ARCH_REQUIRE_GPIOLIB 330 + select GPIOLIB 330 331 select REGULATOR_FIXED_VOLTAGE if REGULATOR 331 332 help 332 333 Select Magic Panel R2 if configuring for Magic Panel R2.
+1 -1
arch/sh/boards/mach-highlander/Kconfig
··· 18 18 config SH_R7785RP 19 19 bool "R7785RP board support" 20 20 depends on CPU_SUBTYPE_SH7785 21 - select ARCH_REQUIRE_GPIOLIB 21 + select GPIOLIB 22 22 23 23 endchoice 24 24
+3 -3
arch/sh/boards/mach-rsk/Kconfig
··· 10 10 11 11 config SH_RSK7203 12 12 bool "RSK7203" 13 - select ARCH_REQUIRE_GPIOLIB 13 + select GPIOLIB 14 14 depends on CPU_SUBTYPE_SH7203 15 15 16 16 config SH_RSK7264 17 17 bool "RSK2+SH7264" 18 - select ARCH_REQUIRE_GPIOLIB 18 + select GPIOLIB 19 19 depends on CPU_SUBTYPE_SH7264 20 20 21 21 config SH_RSK7269 22 22 bool "RSK2+SH7269" 23 - select ARCH_REQUIRE_GPIOLIB 23 + select GPIOLIB 24 24 depends on CPU_SUBTYPE_SH7269 25 25 26 26 endchoice