Browse Source

ARM: 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: arm@kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij 9 years ago
parent
commit
5c34a4e89c

+ 16 - 18
arch/arm/Kconfig

@@ -327,7 +327,6 @@ choice
 config ARCH_MULTIPLATFORM
 config ARCH_MULTIPLATFORM
 	bool "Allow multiple platforms to be selected"
 	bool "Allow multiple platforms to be selected"
 	depends on MMU
 	depends on MMU
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select ARM_HAS_SG_CHAIN
 	select ARM_HAS_SG_CHAIN
 	select ARM_PATCH_PHYS_VIRT
 	select ARM_PATCH_PHYS_VIRT
 	select AUTO_ZRELADDR
 	select AUTO_ZRELADDR
@@ -342,7 +341,6 @@ config ARCH_MULTIPLATFORM
 config ARM_SINGLE_ARMV7M
 config ARM_SINGLE_ARMV7M
 	bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
 	bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
 	depends on !MMU
 	depends on !MMU
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select ARM_NVIC
 	select ARM_NVIC
 	select AUTO_ZRELADDR
 	select AUTO_ZRELADDR
 	select CLKSRC_OF
 	select CLKSRC_OF
@@ -356,12 +354,12 @@ config ARM_SINGLE_ARMV7M
 
 
 config ARCH_CLPS711X
 config ARCH_CLPS711X
 	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
 	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
-	select ARCH_REQUIRE_GPIOLIB
 	select AUTO_ZRELADDR
 	select AUTO_ZRELADDR
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select COMMON_CLK
 	select COMMON_CLK
 	select CPU_ARM720T
 	select CPU_ARM720T
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	select MFD_SYSCON
 	select MFD_SYSCON
 	select SOC_BUS
 	select SOC_BUS
 	help
 	help
@@ -369,10 +367,10 @@ config ARCH_CLPS711X
 
 
 config ARCH_GEMINI
 config ARCH_GEMINI
 	bool "Cortina Systems Gemini"
 	bool "Cortina Systems Gemini"
-	select ARCH_REQUIRE_GPIOLIB
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select CPU_FA526
 	select CPU_FA526
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	help
 	help
 	  Support for the Cortina Systems Gemini family SoCs
 	  Support for the Cortina Systems Gemini family SoCs
 
 
@@ -393,7 +391,6 @@ config ARCH_EBSA110
 config ARCH_EP93XX
 config ARCH_EP93XX
 	bool "EP93xx-based"
 	bool "EP93xx-based"
 	select ARCH_HAS_HOLES_MEMORYMODEL
 	select ARCH_HAS_HOLES_MEMORYMODEL
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select ARM_PATCH_PHYS_VIRT
 	select ARM_PATCH_PHYS_VIRT
 	select ARM_VIC
 	select ARM_VIC
@@ -402,6 +399,7 @@ config ARCH_EP93XX
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select CPU_ARM920T
 	select CPU_ARM920T
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	help
 	help
 	  This enables support for the Cirrus EP93xx series of CPUs.
 	  This enables support for the Cirrus EP93xx series of CPUs.
 
 
@@ -442,9 +440,9 @@ config ARCH_IOP13XX
 config ARCH_IOP32X
 config ARCH_IOP32X
 	bool "IOP32x-based"
 	bool "IOP32x-based"
 	depends on MMU
 	depends on MMU
-	select ARCH_REQUIRE_GPIOLIB
 	select CPU_XSCALE
 	select CPU_XSCALE
 	select GPIO_IOP
 	select GPIO_IOP
+	select GPIOLIB
 	select NEED_RET_TO_USER
 	select NEED_RET_TO_USER
 	select PCI
 	select PCI
 	select PLAT_IOP
 	select PLAT_IOP
@@ -455,9 +453,9 @@ config ARCH_IOP32X
 config ARCH_IOP33X
 config ARCH_IOP33X
 	bool "IOP33x-based"
 	bool "IOP33x-based"
 	depends on MMU
 	depends on MMU
-	select ARCH_REQUIRE_GPIOLIB
 	select CPU_XSCALE
 	select CPU_XSCALE
 	select GPIO_IOP
 	select GPIO_IOP
+	select GPIOLIB
 	select NEED_RET_TO_USER
 	select NEED_RET_TO_USER
 	select PCI
 	select PCI
 	select PLAT_IOP
 	select PLAT_IOP
@@ -468,12 +466,12 @@ config ARCH_IXP4XX
 	bool "IXP4xx-based"
 	bool "IXP4xx-based"
 	depends on MMU
 	depends on MMU
 	select ARCH_HAS_DMA_SET_COHERENT_MASK
 	select ARCH_HAS_DMA_SET_COHERENT_MASK
-	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select CPU_XSCALE
 	select CPU_XSCALE
 	select DMABOUNCE if PCI
 	select DMABOUNCE if PCI
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	select MIGHT_HAVE_PCI
 	select MIGHT_HAVE_PCI
 	select NEED_MACH_IO_H
 	select NEED_MACH_IO_H
 	select USB_EHCI_BIG_ENDIAN_DESC
 	select USB_EHCI_BIG_ENDIAN_DESC
@@ -483,9 +481,9 @@ config ARCH_IXP4XX
 
 
 config ARCH_DOVE
 config ARCH_DOVE
 	bool "Marvell Dove"
 	bool "Marvell Dove"
-	select ARCH_REQUIRE_GPIOLIB
 	select CPU_PJ4
 	select CPU_PJ4
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	select MIGHT_HAVE_PCI
 	select MIGHT_HAVE_PCI
 	select MULTI_IRQ_HANDLER
 	select MULTI_IRQ_HANDLER
 	select MVEBU_MBUS
 	select MVEBU_MBUS
@@ -499,10 +497,10 @@ config ARCH_DOVE
 
 
 config ARCH_KS8695
 config ARCH_KS8695
 	bool "Micrel/Kendin KS8695"
 	bool "Micrel/Kendin KS8695"
-	select ARCH_REQUIRE_GPIOLIB
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select CPU_ARM922T
 	select CPU_ARM922T
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	select NEED_MACH_MEMORY_H
 	select NEED_MACH_MEMORY_H
 	help
 	help
 	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
 	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
@@ -510,11 +508,11 @@ config ARCH_KS8695
 
 
 config ARCH_W90X900
 config ARCH_W90X900
 	bool "Nuvoton W90X900 CPU"
 	bool "Nuvoton W90X900 CPU"
-	select ARCH_REQUIRE_GPIOLIB
 	select CLKDEV_LOOKUP
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select CPU_ARM926T
 	select CPU_ARM926T
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	help
 	help
 	  Support for Nuvoton (Winbond logic dept.) ARM9 processor,
 	  Support for Nuvoton (Winbond logic dept.) ARM9 processor,
 	  At present, the w90x900 has been renamed nuc900, regarding
 	  At present, the w90x900 has been renamed nuc900, regarding
@@ -526,13 +524,13 @@ config ARCH_W90X900
 
 
 config ARCH_LPC32XX
 config ARCH_LPC32XX
 	bool "NXP LPC32XX"
 	bool "NXP LPC32XX"
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select CLKDEV_LOOKUP
 	select CLKDEV_LOOKUP
 	select CLKSRC_LPC32XX
 	select CLKSRC_LPC32XX
 	select COMMON_CLK
 	select COMMON_CLK
 	select CPU_ARM926T
 	select CPU_ARM926T
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	select MULTI_IRQ_HANDLER
 	select MULTI_IRQ_HANDLER
 	select SPARSE_IRQ
 	select SPARSE_IRQ
 	select USE_OF
 	select USE_OF
@@ -543,7 +541,6 @@ config ARCH_PXA
 	bool "PXA2xx/PXA3xx-based"
 	bool "PXA2xx/PXA3xx-based"
 	depends on MMU
 	depends on MMU
 	select ARCH_MTD_XIP
 	select ARCH_MTD_XIP
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_CPU_SUSPEND if PM
 	select ARM_CPU_SUSPEND if PM
 	select AUTO_ZRELADDR
 	select AUTO_ZRELADDR
 	select COMMON_CLK
 	select COMMON_CLK
@@ -554,6 +551,7 @@ config ARCH_PXA
 	select CPU_XSCALE if !CPU_XSC3
 	select CPU_XSCALE if !CPU_XSC3
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
 	select GPIO_PXA
 	select GPIO_PXA
+	select GPIOLIB
 	select HAVE_IDE
 	select HAVE_IDE
 	select IRQ_DOMAIN
 	select IRQ_DOMAIN
 	select MULTI_IRQ_HANDLER
 	select MULTI_IRQ_HANDLER
@@ -584,7 +582,6 @@ config ARCH_RPC
 config ARCH_SA1100
 config ARCH_SA1100
 	bool "SA1100-based"
 	bool "SA1100-based"
 	select ARCH_MTD_XIP
 	select ARCH_MTD_XIP
-	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_SPARSEMEM_ENABLE
 	select ARCH_SPARSEMEM_ENABLE
 	select CLKDEV_LOOKUP
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
@@ -593,6 +590,7 @@ config ARCH_SA1100
 	select CPU_FREQ
 	select CPU_FREQ
 	select CPU_SA1100
 	select CPU_SA1100
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	select HAVE_IDE
 	select HAVE_IDE
 	select IRQ_DOMAIN
 	select IRQ_DOMAIN
 	select ISA
 	select ISA
@@ -604,12 +602,12 @@ config ARCH_SA1100
 
 
 config ARCH_S3C24XX
 config ARCH_S3C24XX
 	bool "Samsung S3C24XX SoCs"
 	bool "Samsung S3C24XX SoCs"
-	select ARCH_REQUIRE_GPIOLIB
 	select ATAGS
 	select ATAGS
 	select CLKDEV_LOOKUP
 	select CLKDEV_LOOKUP
 	select CLKSRC_SAMSUNG_PWM
 	select CLKSRC_SAMSUNG_PWM
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
 	select GPIO_SAMSUNG
 	select GPIO_SAMSUNG
+	select GPIOLIB
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select HAVE_S3C_RTC if RTC_CLASS
@@ -625,12 +623,12 @@ config ARCH_S3C24XX
 config ARCH_DAVINCI
 config ARCH_DAVINCI
 	bool "TI DaVinci"
 	bool "TI DaVinci"
 	select ARCH_HAS_HOLES_MEMORYMODEL
 	select ARCH_HAS_HOLES_MEMORYMODEL
-	select ARCH_REQUIRE_GPIOLIB
 	select CLKDEV_LOOKUP
 	select CLKDEV_LOOKUP
 	select CPU_ARM926T
 	select CPU_ARM926T
 	select GENERIC_ALLOCATOR
 	select GENERIC_ALLOCATOR
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
+	select GPIOLIB
 	select HAVE_IDE
 	select HAVE_IDE
 	select USE_OF
 	select USE_OF
 	select ZONE_DMA
 	select ZONE_DMA
@@ -642,11 +640,11 @@ config ARCH_OMAP1
 	depends on MMU
 	depends on MMU
 	select ARCH_HAS_HOLES_MEMORYMODEL
 	select ARCH_HAS_HOLES_MEMORYMODEL
 	select ARCH_OMAP
 	select ARCH_OMAP
-	select ARCH_REQUIRE_GPIOLIB
 	select CLKDEV_LOOKUP
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
+	select GPIOLIB
 	select HAVE_IDE
 	select HAVE_IDE
 	select IRQ_DOMAIN
 	select IRQ_DOMAIN
 	select MULTI_IRQ_HANDLER
 	select MULTI_IRQ_HANDLER
@@ -868,7 +866,7 @@ source "arch/arm/mach-zynq/Kconfig"
 config ARCH_EFM32
 config ARCH_EFM32
 	bool "Energy Micro efm32"
 	bool "Energy Micro efm32"
 	depends on ARM_SINGLE_ARMV7M
 	depends on ARM_SINGLE_ARMV7M
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	help
 	help
 	  Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko
 	  Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko
 	  processors.
 	  processors.

+ 1 - 1
arch/arm/mach-at91/Kconfig

@@ -1,8 +1,8 @@
 menuconfig ARCH_AT91
 menuconfig ARCH_AT91
 	bool "Atmel SoCs"
 	bool "Atmel SoCs"
 	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
 	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
-	select ARCH_REQUIRE_GPIOLIB
 	select COMMON_CLK_AT91
 	select COMMON_CLK_AT91
+	select GPIOLIB
 	select PINCTRL
 	select PINCTRL
 	select SOC_BUS
 	select SOC_BUS
 
 

+ 3 - 4
arch/arm/mach-bcm/Kconfig

@@ -17,7 +17,7 @@ config ARCH_BCM_IPROC
 	select ARM_GLOBAL_TIMER
 	select ARM_GLOBAL_TIMER
 	select COMMON_CLK_IPROC
 	select COMMON_CLK_IPROC
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select PINCTRL
 	select PINCTRL
 	help
 	help
@@ -80,7 +80,7 @@ comment "KONA architected SoCs"
 
 
 config ARCH_BCM_MOBILE
 config ARCH_BCM_MOBILE
 	bool
 	bool
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_775420
 	select ARM_ERRATA_775420
 	select ARM_GIC
 	select ARM_GIC
@@ -137,7 +137,7 @@ comment "Other Architectures"
 config ARCH_BCM2835
 config ARCH_BCM2835
 	bool "Broadcom BCM2835 family"
 	bool "Broadcom BCM2835 family"
 	depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
 	depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select ARM_ERRATA_411920 if ARCH_MULTI_V6
 	select ARM_ERRATA_411920 if ARCH_MULTI_V6
 	select ARM_TIMER_SP804
 	select ARM_TIMER_SP804
@@ -176,7 +176,6 @@ config ARCH_BRCMSTB
 	select BRCMSTB_L2_IRQ
 	select BRCMSTB_L2_IRQ
 	select BCM7120_L2_IRQ
 	select BCM7120_L2_IRQ
 	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select SOC_BRCMSTB
 	select SOC_BRCMSTB
 	select SOC_BUS
 	select SOC_BUS
 	help
 	help

+ 1 - 1
arch/arm/mach-berlin/Kconfig

@@ -2,11 +2,11 @@ menuconfig ARCH_BERLIN
 	bool "Marvell Berlin SoCs"
 	bool "Marvell Berlin SoCs"
 	depends on ARCH_MULTI_V7
 	depends on ARCH_MULTI_V7
 	select ARCH_HAS_RESET_CONTROLLER
 	select ARCH_HAS_RESET_CONTROLLER
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_GIC
 	select ARM_GIC
 	select DW_APB_ICTL
 	select DW_APB_ICTL
 	select DW_APB_TIMER_OF
 	select DW_APB_TIMER_OF
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
+	select GPIOLIB
 	select MFD_SYSCON
 	select MFD_SYSCON
 	select PINCTRL
 	select PINCTRL
 
 

+ 1 - 1
arch/arm/mach-digicolor/Kconfig

@@ -1,10 +1,10 @@
 config ARCH_DIGICOLOR
 config ARCH_DIGICOLOR
 	bool "Conexant Digicolor SoC Support"
 	bool "Conexant Digicolor SoC Support"
 	depends on ARCH_MULTI_V7
 	depends on ARCH_MULTI_V7
-	select ARCH_REQUIRE_GPIOLIB
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select DIGICOLOR_TIMER
 	select DIGICOLOR_TIMER
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
+	select GPIOLIB
 	select MFD_SYSCON
 	select MFD_SYSCON
 	select PINCTRL
 	select PINCTRL
 	select PINCTRL_DIGICOLOR
 	select PINCTRL_DIGICOLOR

+ 1 - 1
arch/arm/mach-exynos/Kconfig

@@ -12,13 +12,13 @@ menuconfig ARCH_EXYNOS
 	depends on ARCH_MULTI_V7
 	depends on ARCH_MULTI_V7
 	select ARCH_HAS_BANDGAP
 	select ARCH_HAS_BANDGAP
 	select ARCH_HAS_HOLES_MEMORYMODEL
 	select ARCH_HAS_HOLES_MEMORYMODEL
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select ARM_GIC
 	select ARM_GIC
 	select COMMON_CLK_SAMSUNG
 	select COMMON_CLK_SAMSUNG
 	select EXYNOS_THERMAL
 	select EXYNOS_THERMAL
 	select EXYNOS_PMU
 	select EXYNOS_PMU
 	select EXYNOS_SROM
 	select EXYNOS_SROM
+	select GPIOLIB
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_SCU if SMP
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG

+ 1 - 1
arch/arm/mach-imx/Kconfig

@@ -1,10 +1,10 @@
 menuconfig ARCH_MXC
 menuconfig ARCH_MXC
 	bool "Freescale i.MX family"
 	bool "Freescale i.MX family"
 	depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
 	depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
-	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select CLKSRC_IMX_GPT
 	select CLKSRC_IMX_GPT
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
+	select GPIOLIB
 	select PINCTRL
 	select PINCTRL
 	select PM_OPP if PM
 	select PM_OPP if PM
 	select SOC_BUS
 	select SOC_BUS

+ 2 - 2
arch/arm/mach-integrator/Kconfig

@@ -32,9 +32,9 @@ config ARCH_INTEGRATOR_AP
 config INTEGRATOR_IMPD1
 config INTEGRATOR_IMPD1
 	bool "Include support for Integrator/IM-PD1"
 	bool "Include support for Integrator/IM-PD1"
 	depends on ARCH_INTEGRATOR_AP
 	depends on ARCH_INTEGRATOR_AP
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_VIC
 	select ARM_VIC
-	select GPIO_PL061 if GPIOLIB
+	select GPIO_PL061
+	select GPIOLIB
 	help
 	help
 	  The IM-PD1 is an add-on logic module for the Integrator which
 	  The IM-PD1 is an add-on logic module for the Integrator which
 	  allows ARM(R) Ltd PrimeCells to be developed and evaluated.
 	  allows ARM(R) Ltd PrimeCells to be developed and evaluated.

+ 1 - 1
arch/arm/mach-meson/Kconfig

@@ -1,7 +1,7 @@
 menuconfig ARCH_MESON
 menuconfig ARCH_MESON
 	bool "Amlogic Meson SoCs"
 	bool "Amlogic Meson SoCs"
 	depends on ARCH_MULTI_V7
 	depends on ARCH_MULTI_V7
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
 	select ARM_GIC
 	select ARM_GIC
 	select CACHE_L2X0
 	select CACHE_L2X0

+ 1 - 1
arch/arm/mach-mmp/Kconfig

@@ -1,8 +1,8 @@
 menuconfig ARCH_MMP
 menuconfig ARCH_MMP
 	bool "Marvell PXA168/910/MMP2"
 	bool "Marvell PXA168/910/MMP2"
 	depends on ARCH_MULTI_V5 || ARCH_MULTI_V7
 	depends on ARCH_MULTI_V5 || ARCH_MULTI_V7
-	select ARCH_REQUIRE_GPIOLIB
 	select GPIO_PXA
 	select GPIO_PXA
+	select GPIOLIB
 	select PINCTRL
 	select PINCTRL
 	select PLAT_PXA
 	select PLAT_PXA
 	help
 	help

+ 1 - 1
arch/arm/mach-moxart/Kconfig

@@ -5,7 +5,7 @@ menuconfig ARCH_MOXART
 	select ARM_DMA_MEM_BUFFERABLE
 	select ARM_DMA_MEM_BUFFERABLE
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select PHYLIB if NETDEVICES
 	select PHYLIB if NETDEVICES
 	help
 	help
 	  Say Y here if you want to run your kernel on hardware with a
 	  Say Y here if you want to run your kernel on hardware with a

+ 1 - 1
arch/arm/mach-mv78xx0/Kconfig

@@ -1,8 +1,8 @@
 menuconfig ARCH_MV78XX0
 menuconfig ARCH_MV78XX0
 	bool "Marvell MV78xx0"
 	bool "Marvell MV78xx0"
 	depends on ARCH_MULTI_V5
 	depends on ARCH_MULTI_V5
-	select ARCH_REQUIRE_GPIOLIB
 	select CPU_FEROCEON
 	select CPU_FEROCEON
+	select GPIOLIB
 	select MVEBU_MBUS
 	select MVEBU_MBUS
 	select PCI
 	select PCI
 	select PLAT_ORION_LEGACY
 	select PLAT_ORION_LEGACY

+ 2 - 2
arch/arm/mach-mvebu/Kconfig

@@ -8,7 +8,7 @@ menuconfig ARCH_MVEBU
 	select SOC_BUS
 	select SOC_BUS
 	select MVEBU_MBUS
 	select MVEBU_MBUS
 	select ZONE_DMA if ARM_LPAE
 	select ZONE_DMA if ARM_LPAE
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select PCI_QUIRKS if PCI
 	select PCI_QUIRKS if PCI
 	select OF_ADDRESS_PCI
 	select OF_ADDRESS_PCI
 
 
@@ -119,8 +119,8 @@ config MACH_DOVE
 config MACH_KIRKWOOD
 config MACH_KIRKWOOD
 	bool "Marvell Kirkwood boards"
 	bool "Marvell Kirkwood boards"
 	depends on ARCH_MULTI_V5
 	depends on ARCH_MULTI_V5
-	select ARCH_REQUIRE_GPIOLIB
 	select CPU_FEROCEON
 	select CPU_FEROCEON
+	select GPIOLIB
 	select KIRKWOOD_CLK
 	select KIRKWOOD_CLK
 	select MACH_MVEBU_ANY
 	select MACH_MVEBU_ANY
 	select ORION_IRQCHIP
 	select ORION_IRQCHIP

+ 1 - 1
arch/arm/mach-mxs/Kconfig

@@ -15,8 +15,8 @@ config SOC_IMX28
 config ARCH_MXS
 config ARCH_MXS
 	bool "Freescale MXS (i.MX23, i.MX28) support"
 	bool "Freescale MXS (i.MX23, i.MX28) support"
 	depends on ARCH_MULTI_V5
 	depends on ARCH_MULTI_V5
-	select ARCH_REQUIRE_GPIOLIB
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
+	select GPIOLIB
 	select PINCTRL
 	select PINCTRL
 	select SOC_BUS
 	select SOC_BUS
 	select SOC_IMX23
 	select SOC_IMX23

+ 1 - 1
arch/arm/mach-nomadik/Kconfig

@@ -1,12 +1,12 @@
 menuconfig ARCH_NOMADIK
 menuconfig ARCH_NOMADIK
 	bool "ST-Ericsson Nomadik"
 	bool "ST-Ericsson Nomadik"
 	depends on ARCH_MULTI_V5
 	depends on ARCH_MULTI_V5
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select ARM_VIC
 	select ARM_VIC
 	select CLKSRC_NOMADIK_MTU
 	select CLKSRC_NOMADIK_MTU
 	select CLKSRC_NOMADIK_MTU_SCHED_CLOCK
 	select CLKSRC_NOMADIK_MTU_SCHED_CLOCK
 	select CPU_ARM926T
 	select CPU_ARM926T
+	select GPIOLIB
 	select MIGHT_HAVE_CACHE_L2X0
 	select MIGHT_HAVE_CACHE_L2X0
 	select PINCTRL
 	select PINCTRL
 	select PINCTRL_NOMADIK
 	select PINCTRL_NOMADIK

+ 1 - 1
arch/arm/mach-omap2/Kconfig

@@ -88,9 +88,9 @@ config ARCH_OMAP2PLUS
 	select ARCH_HAS_BANDGAP
 	select ARCH_HAS_BANDGAP
 	select ARCH_HAS_HOLES_MEMORYMODEL
 	select ARCH_HAS_HOLES_MEMORYMODEL
 	select ARCH_OMAP
 	select ARCH_OMAP
-	select ARCH_REQUIRE_GPIOLIB
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
+	select GPIOLIB
 	select MACH_OMAP_GENERIC
 	select MACH_OMAP_GENERIC
 	select MEMORY
 	select MEMORY
 	select MFD_SYSCON
 	select MFD_SYSCON

+ 1 - 1
arch/arm/mach-orion5x/Kconfig

@@ -1,9 +1,9 @@
 menuconfig ARCH_ORION5X
 menuconfig ARCH_ORION5X
 	bool "Marvell Orion"
 	bool "Marvell Orion"
 	depends on MMU && ARCH_MULTI_V5
 	depends on MMU && ARCH_MULTI_V5
-	select ARCH_REQUIRE_GPIOLIB
 	select CPU_FEROCEON
 	select CPU_FEROCEON
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	select MVEBU_MBUS
 	select MVEBU_MBUS
 	select PCI
 	select PCI
 	select PLAT_ORION_LEGACY
 	select PLAT_ORION_LEGACY

+ 1 - 1
arch/arm/mach-oxnas/Kconfig

@@ -1,7 +1,7 @@
 menuconfig ARCH_OXNAS
 menuconfig ARCH_OXNAS
 	bool "Oxford Semiconductor OXNAS Family SoCs"
 	bool "Oxford Semiconductor OXNAS Family SoCs"
-	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_HAS_RESET_CONTROLLER
 	select ARCH_HAS_RESET_CONTROLLER
+	select GPIOLIB
 	select PINCTRL
 	select PINCTRL
 	depends on ARCH_MULTI_V5
 	depends on ARCH_MULTI_V5
 	help
 	help

+ 1 - 1
arch/arm/mach-picoxcell/Kconfig

@@ -1,8 +1,8 @@
 config ARCH_PICOXCELL
 config ARCH_PICOXCELL
 	bool "Picochip PicoXcell"
 	bool "Picochip PicoXcell"
 	depends on ARCH_MULTI_V6
 	depends on ARCH_MULTI_V6
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_VIC
 	select ARM_VIC
 	select DW_APB_TIMER_OF
 	select DW_APB_TIMER_OF
+	select GPIOLIB
 	select HAVE_TCM
 	select HAVE_TCM
 	select NO_IOPORT_MAP
 	select NO_IOPORT_MAP

+ 1 - 1
arch/arm/mach-prima2/Kconfig

@@ -3,8 +3,8 @@ menuconfig ARCH_SIRF
 	depends on ARCH_MULTI_V7
 	depends on ARCH_MULTI_V7
 	select ARCH_HAS_RESET_CONTROLLER
 	select ARCH_HAS_RESET_CONTROLLER
 	select RESET_CONTROLLER
 	select RESET_CONTROLLER
-	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
+	select GPIOLIB
 	select NO_IOPORT_MAP
 	select NO_IOPORT_MAP
 	select REGMAP
 	select REGMAP
 	select PINCTRL
 	select PINCTRL

+ 1 - 1
arch/arm/mach-rockchip/Kconfig

@@ -4,10 +4,10 @@ config ARCH_ROCKCHIP
 	select PINCTRL
 	select PINCTRL
 	select PINCTRL_ROCKCHIP
 	select PINCTRL_ROCKCHIP
 	select ARCH_HAS_RESET_CONTROLLER
 	select ARCH_HAS_RESET_CONTROLLER
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select ARM_GIC
 	select ARM_GIC
 	select CACHE_L2X0
 	select CACHE_L2X0
+	select GPIOLIB
 	select HAVE_ARM_ARCH_TIMER
 	select HAVE_ARM_ARCH_TIMER
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
 	select HAVE_ARM_TWD if SMP

+ 1 - 1
arch/arm/mach-s3c24xx/Kconfig

@@ -11,7 +11,7 @@ if ARCH_S3C24XX
 
 
 config PLAT_S3C24XX
 config PLAT_S3C24XX
 	def_bool y
 	def_bool y
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select NO_IOPORT_MAP
 	select NO_IOPORT_MAP
 	select S3C_DEV_NAND
 	select S3C_DEV_NAND
 	select IRQ_DOMAIN
 	select IRQ_DOMAIN

+ 1 - 1
arch/arm/mach-s3c64xx/Kconfig

@@ -5,12 +5,12 @@
 menuconfig ARCH_S3C64XX
 menuconfig ARCH_S3C64XX
 	bool "Samsung S3C64XX"
 	bool "Samsung S3C64XX"
 	depends on ARCH_MULTI_V6
 	depends on ARCH_MULTI_V6
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select ARM_VIC
 	select ARM_VIC
 	select CLKSRC_SAMSUNG_PWM
 	select CLKSRC_SAMSUNG_PWM
 	select COMMON_CLK_SAMSUNG
 	select COMMON_CLK_SAMSUNG
 	select GPIO_SAMSUNG if ATAGS
 	select GPIO_SAMSUNG if ATAGS
+	select GPIOLIB
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_TCM
 	select HAVE_TCM

+ 1 - 1
arch/arm/mach-s5pv210/Kconfig

@@ -11,10 +11,10 @@ config ARCH_S5PV210
 	bool "Samsung S5PV210/S5PC110"
 	bool "Samsung S5PV210/S5PC110"
 	depends on ARCH_MULTI_V7
 	depends on ARCH_MULTI_V7
 	select ARCH_HAS_HOLES_MEMORYMODEL
 	select ARCH_HAS_HOLES_MEMORYMODEL
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_VIC
 	select ARM_VIC
 	select CLKSRC_SAMSUNG_PWM
 	select CLKSRC_SAMSUNG_PWM
 	select COMMON_CLK_SAMSUNG
 	select COMMON_CLK_SAMSUNG
+	select GPIOLIB
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select HAVE_S3C_RTC if RTC_CLASS

+ 1 - 1
arch/arm/mach-shmobile/Kconfig

@@ -41,7 +41,7 @@ menuconfig ARCH_RENESAS
 	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 	select NO_IOPORT_MAP
 	select NO_IOPORT_MAP
 	select PINCTRL
 	select PINCTRL
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select ZONE_DMA if ARM_LPAE
 	select ZONE_DMA if ARM_LPAE
 
 
 if ARCH_RENESAS
 if ARCH_RENESAS

+ 1 - 1
arch/arm/mach-spear/Kconfig

@@ -5,9 +5,9 @@
 menuconfig PLAT_SPEAR
 menuconfig PLAT_SPEAR
 	bool "ST SPEAr Family"
 	bool "ST SPEAr Family"
 	depends on ARCH_MULTI_V7 || ARCH_MULTI_V5
 	depends on ARCH_MULTI_V7 || ARCH_MULTI_V5
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
+	select GPIOLIB
 
 
 if PLAT_SPEAR
 if PLAT_SPEAR
 
 

+ 1 - 1
arch/arm/mach-sti/Kconfig

@@ -10,7 +10,7 @@ menuconfig ARCH_STI
 	select MFD_SYSCON
 	select MFD_SYSCON
 	select ARCH_HAS_RESET_CONTROLLER
 	select ARCH_HAS_RESET_CONTROLLER
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_SCU if SMP
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_764369 if SMP
 	select ARM_ERRATA_764369 if SMP
 	select ARM_ERRATA_775420
 	select ARM_ERRATA_775420

+ 1 - 1
arch/arm/mach-sunxi/Kconfig

@@ -1,10 +1,10 @@
 menuconfig ARCH_SUNXI
 menuconfig ARCH_SUNXI
 	bool "Allwinner SoCs"
 	bool "Allwinner SoCs"
 	depends on ARCH_MULTI_V7
 	depends on ARCH_MULTI_V7
-	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_HAS_RESET_CONTROLLER
 	select ARCH_HAS_RESET_CONTROLLER
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
+	select GPIOLIB
 	select PINCTRL
 	select PINCTRL
 	select SUN4I_TIMER
 	select SUN4I_TIMER
 	select RESET_CONTROLLER
 	select RESET_CONTROLLER

+ 1 - 1
arch/arm/mach-tegra/Kconfig

@@ -1,11 +1,11 @@
 menuconfig ARCH_TEGRA
 menuconfig ARCH_TEGRA
 	bool "NVIDIA Tegra"
 	bool "NVIDIA Tegra"
 	depends on ARCH_MULTI_V7
 	depends on ARCH_MULTI_V7
-	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
 	select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
 	select ARM_AMBA
 	select ARM_AMBA
 	select ARM_GIC
 	select ARM_GIC
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
+	select GPIOLIB
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
 	select HAVE_ARM_TWD if SMP
 	select PINCTRL
 	select PINCTRL

+ 1 - 1
arch/arm/mach-u300/Kconfig

@@ -1,11 +1,11 @@
 menuconfig ARCH_U300
 menuconfig ARCH_U300
 	bool "ST-Ericsson U300 Series"
 	bool "ST-Ericsson U300 Series"
 	depends on ARCH_MULTI_V5 && MMU
 	depends on ARCH_MULTI_V5 && MMU
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select ARM_VIC
 	select ARM_VIC
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select CPU_ARM926T
 	select CPU_ARM926T
+	select GPIOLIB
 	select HAVE_TCM
 	select HAVE_TCM
 	select PINCTRL
 	select PINCTRL
 	select PINCTRL_COH901
 	select PINCTRL_COH901

+ 1 - 1
arch/arm/mach-ux500/Kconfig

@@ -3,13 +3,13 @@ menuconfig ARCH_U8500
 	depends on ARCH_MULTI_V7 && MMU
 	depends on ARCH_MULTI_V7 && MMU
 	select AB8500_CORE
 	select AB8500_CORE
 	select ABX500_CORE
 	select ABX500_CORE
-	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select ARM_AMBA
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_764369 if SMP
 	select ARM_ERRATA_764369 if SMP
 	select ARM_GIC
 	select ARM_GIC
 	select CACHE_L2X0
 	select CACHE_L2X0
 	select CLKSRC_NOMADIK_MTU
 	select CLKSRC_NOMADIK_MTU
+	select GPIOLIB
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
 	select HAVE_ARM_TWD if SMP
 	select PINCTRL
 	select PINCTRL

+ 1 - 1
arch/arm/mach-vexpress/Kconfig

@@ -1,13 +1,13 @@
 menuconfig ARCH_VEXPRESS
 menuconfig ARCH_VEXPRESS
 	bool "ARM Ltd. Versatile Express family"
 	bool "ARM Ltd. Versatile Express family"
 	depends on ARCH_MULTI_V7
 	depends on ARCH_MULTI_V7
-	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select ARM_AMBA
 	select ARM_AMBA
 	select ARM_GIC
 	select ARM_GIC
 	select ARM_GLOBAL_TIMER
 	select ARM_GLOBAL_TIMER
 	select ARM_TIMER_SP804
 	select ARM_TIMER_SP804
 	select COMMON_CLK_VERSATILE
 	select COMMON_CLK_VERSATILE
+	select GPIOLIB
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
 	select HAVE_ARM_TWD if SMP
 	select HAVE_PATA_PLATFORM
 	select HAVE_PATA_PLATFORM

+ 1 - 1
arch/arm/mach-vt8500/Kconfig

@@ -1,6 +1,6 @@
 config ARCH_VT8500
 config ARCH_VT8500
 	bool
 	bool
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select CLKDEV_LOOKUP
 	select CLKDEV_LOOKUP
 	select VT8500_TIMER
 	select VT8500_TIMER
 	select PINCTRL
 	select PINCTRL