openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2016-04-19 13:21:02 +02:00
parent 8636f344cf
commit 86c55af4a4
9 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/Kconfig
View File

@ -98,7 +98,6 @@ config PPC
select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACER
select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_GRAPH_TRACER
select SYSCTL_EXCEPTION_TRACE select SYSCTL_EXCEPTION_TRACE
select ARCH_WANT_OPTIONAL_GPIOLIB
select VIRT_TO_BUS if !PPC64 select VIRT_TO_BUS if !PPC64
select HAVE_IDE select HAVE_IDE
select HAVE_IOREMAP_PROT select HAVE_IOREMAP_PROT

2
arch/powerpc/platforms/40x/Kconfig
View File

@ -137,7 +137,7 @@ config STB03xxx
config PPC4xx_GPIO config PPC4xx_GPIO
bool "PPC4xx GPIO support" bool "PPC4xx GPIO support"
depends on 40x depends on 40x
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
help help
Enable gpiolib support for ppc40x based boards Enable gpiolib support for ppc40x based boards

2
arch/powerpc/platforms/44x/Kconfig
View File

@ -273,7 +273,7 @@ config PPC44x_SIMPLE
config PPC4xx_GPIO config PPC4xx_GPIO
bool "PPC4xx GPIO support" bool "PPC4xx GPIO support"
depends on 44x depends on 44x
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
help help
Enable gpiolib support for ppc440 based boards Enable gpiolib support for ppc440 based boards

1
arch/powerpc/platforms/512x/Kconfig
View File

@ -6,7 +6,6 @@ config PPC_MPC512x
select IPIC select IPIC
select PPC_PCI_CHOICE select PPC_PCI_CHOICE
select FSL_PCI if PCI 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_MMIO if USB_EHCI_HCD
select USB_EHCI_BIG_ENDIAN_DESC if USB_EHCI_HCD select USB_EHCI_BIG_ENDIAN_DESC if USB_EHCI_HCD

3
arch/powerpc/platforms/83xx/Kconfig
View File

@ -116,7 +116,6 @@ endif
# used for usb & gpio # used for usb & gpio
config PPC_MPC831x config PPC_MPC831x
bool bool
select ARCH_WANT_OPTIONAL_GPIOLIB
# used for math-emu # used for math-emu
config PPC_MPC832x config PPC_MPC832x
@ -125,9 +124,7 @@ config PPC_MPC832x
# used for usb & gpio # used for usb & gpio
config PPC_MPC834x config PPC_MPC834x
bool bool
select ARCH_WANT_OPTIONAL_GPIOLIB
# used for usb & gpio # used for usb & gpio
config PPC_MPC837x config PPC_MPC837x
bool bool
select ARCH_WANT_OPTIONAL_GPIOLIB

4
arch/powerpc/platforms/85xx/Kconfig
View File

@ -225,7 +225,7 @@ config GE_IMP3A
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select SWIOTLB select SWIOTLB
select MMIO_NVRAM select MMIO_NVRAM
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
select GE_FPGA select GE_FPGA
help help
This option enables support for the GE Intelligent Platforms IMP3A This option enables support for the GE Intelligent Platforms IMP3A
@ -272,7 +272,7 @@ config CORENET_GENERIC
select PPC_E500MC select PPC_E500MC
select PHYS_64BIT select PHYS_64BIT
select SWIOTLB select SWIOTLB
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
select GPIO_MPC8XXX select GPIO_MPC8XXX
select HAS_RAPIDIO select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC select PPC_EPAPR_HV_PIC

7
arch/powerpc/platforms/86xx/Kconfig
View File

@ -4,7 +4,6 @@ menuconfig PPC_86xx
depends on 6xx depends on 6xx
select FSL_SOC select FSL_SOC
select ALTIVEC select ALTIVEC
select ARCH_WANT_OPTIONAL_GPIOLIB
help help
The Freescale E600 SoCs have 74xx cores. The Freescale E600 SoCs have 74xx cores.
@ -37,7 +36,7 @@ config GEF_PPC9A
bool "GE PPC9A" bool "GE PPC9A"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select MMIO_NVRAM select MMIO_NVRAM
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
select GE_FPGA select GE_FPGA
help help
This option enables support for the GE PPC9A. This option enables support for the GE PPC9A.
@ -46,7 +45,7 @@ config GEF_SBC310
bool "GE SBC310" bool "GE SBC310"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select MMIO_NVRAM select MMIO_NVRAM
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
select GE_FPGA select GE_FPGA
help help
This option enables support for the GE SBC310. This option enables support for the GE SBC310.
@ -55,7 +54,7 @@ config GEF_SBC610
bool "GE SBC610" bool "GE SBC610"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select MMIO_NVRAM select MMIO_NVRAM
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
select GE_FPGA select GE_FPGA
select HAS_RAPIDIO select HAS_RAPIDIO
help help

2
arch/powerpc/platforms/8xx/Kconfig
View File

@ -109,7 +109,7 @@ config 8xx_COPYBACK
config 8xx_GPIO config 8xx_GPIO
bool "GPIO API Support" bool "GPIO API Support"
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
help help
Saying Y here will cause the ports on an MPC8xx processor to be used Saying Y here will cause the ports on an MPC8xx processor to be used
with the GPIO API. If you say N here, the kernel needs less memory. with the GPIO API. If you say N here, the kernel needs less memory.

8
arch/powerpc/platforms/Kconfig
View File

@ -275,7 +275,7 @@ config TAU_AVERAGE
config QE_GPIO config QE_GPIO
bool "QE GPIO support" bool "QE GPIO support"
depends on QUICC_ENGINE depends on QUICC_ENGINE
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
help help
Say Y here if you're going to use hardware that connects to the Say Y here if you're going to use hardware that connects to the
QE GPIOs. QE GPIOs.
@ -285,7 +285,7 @@ config CPM2
depends on (FSL_SOC_BOOKE && PPC32) || 8260 depends on (FSL_SOC_BOOKE && PPC32) || 8260
select CPM select CPM
select PPC_PCI_CHOICE select PPC_PCI_CHOICE
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
help help
The CPM2 (Communications Processor Module) is a coprocessor on The CPM2 (Communications Processor Module) is a coprocessor on
embedded CPUs made by Freescale. Selecting this option means that embedded CPUs made by Freescale. Selecting this option means that
@ -324,7 +324,7 @@ config OF_RTC
config SIMPLE_GPIO config SIMPLE_GPIO
bool "Support for simple, memory-mapped GPIO controllers" bool "Support for simple, memory-mapped GPIO controllers"
depends on PPC depends on PPC
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
help help
Say Y here to support simple, memory-mapped GPIO controllers. Say Y here to support simple, memory-mapped GPIO controllers.
These are usually BCSRs used to control board's switches, LEDs, These are usually BCSRs used to control board's switches, LEDs,
@ -334,7 +334,7 @@ config SIMPLE_GPIO
config MCU_MPC8349EMITX config MCU_MPC8349EMITX
bool "MPC8349E-mITX MCU driver" bool "MPC8349E-mITX MCU driver"
depends on I2C=y && PPC_83xx depends on I2C=y && PPC_83xx
select ARCH_REQUIRE_GPIOLIB select GPIOLIB
help help
Say Y here to enable soft power-off functionality on the Freescale Say Y here to enable soft power-off functionality on the Freescale
boards with the MPC8349E-mITX-compatible MCU chips. This driver will boards with the MPC8349E-mITX-compatible MCU chips. This driver will