Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86c55af4 authored by Linus Walleij's avatar Linus Walleij
Browse files

powerpc: 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8636f344

arch/powerpc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ config PPC 
	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select SYSCTL_EXCEPTION_TRACE

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select VIRT_TO_BUS if !PPC64

	select HAVE_IDE

	select HAVE_IOREMAP_PROT

arch/powerpc/platforms/40x/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ config STB03xxx 
config PPC4xx_GPIO

	bool "PPC4xx GPIO support"

	depends on 40x

	select ARCH_REQUIRE_GPIOLIB

	select GPIOLIB

	help

	  Enable gpiolib support for ppc40x based boards

arch/powerpc/platforms/44x/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ config PPC44x_SIMPLE 
config PPC4xx_GPIO

	bool "PPC4xx GPIO support"

	depends on 44x

	select ARCH_REQUIRE_GPIOLIB

	select GPIOLIB

	help

	  Enable gpiolib support for ppc440 based boards

arch/powerpc/platforms/512x/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ config PPC_MPC512x 
	select IPIC

	select PPC_PCI_CHOICE

	select FSL_PCI if PCI

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select USB_EHCI_BIG_ENDIAN_MMIO if USB_EHCI_HCD

	select USB_EHCI_BIG_ENDIAN_DESC if USB_EHCI_HCD

arch/powerpc/platforms/83xx/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ endif 
# used for usb & gpio

config PPC_MPC831x

	bool

	select ARCH_WANT_OPTIONAL_GPIOLIB



# used for math-emu

config PPC_MPC832x
@@ -125,9 +124,7 @@ config PPC_MPC832x 
# used for usb & gpio

config PPC_MPC834x

	bool

	select ARCH_WANT_OPTIONAL_GPIOLIB



# used for usb & gpio

config PPC_MPC837x

	bool
 
	select ARCH_WANT_OPTIONAL_GPIOLIB