diff mbox

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

Message ID 1464869670-7208-1-git-send-email-linus.walleij@linaro.org
State Superseded
Headers show

Commit Message

Linus Walleij June 2, 2016, 12:14 p.m. UTC
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.

Cc: Michael Büsch <m@bues.ch>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ARM64/AArch64 maintainers:
Please apply this patch directly for cleanups.
---
 arch/arm64/Kconfig           |  1 -
 arch/arm64/Kconfig.platforms | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

Comments

Will Deacon June 2, 2016, 6:05 p.m. UTC | #1
On Thu, Jun 02, 2016 at 02:14:30PM +0200, Linus Walleij wrote:
> 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.

> 

> Cc: Michael Büsch <m@bues.ch>

> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

> ---

> ARM64/AArch64 maintainers:

> Please apply this patch directly for cleanups.


Just checking -- you're aiming to have this in 4.7-rc ?

Will

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Linus Walleij June 2, 2016, 10:28 p.m. UTC | #2
On Thu, Jun 2, 2016 at 8:05 PM, Will Deacon <will.deacon@arm.com> wrote:
> On Thu, Jun 02, 2016 at 02:14:30PM +0200, Linus Walleij wrote:
>> 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.
>>
>> Cc: Michael Büsch <m@bues.ch>
>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>> ---
>> ARM64/AArch64 maintainers:
>> Please apply this patch directly for cleanups.
>
> Just checking -- you're aiming to have this in 4.7-rc ?

No cleanups for v4.8, not fixes for v4.7.
There is no hurry, I have all patience in the world.

Just letting these trickle out in the beginning of the
development cycle to be safe.

Yours,
Linus Walleij
Will Deacon June 3, 2016, 9:16 a.m. UTC | #3
On Fri, Jun 03, 2016 at 12:28:15AM +0200, Linus Walleij wrote:
> On Thu, Jun 2, 2016 at 8:05 PM, Will Deacon <will.deacon@arm.com> wrote:

> > On Thu, Jun 02, 2016 at 02:14:30PM +0200, Linus Walleij wrote:

> >> 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.

> >>

> >> Cc: Michael Büsch <m@bues.ch>

> >> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

> >> ---

> >> ARM64/AArch64 maintainers:

> >> Please apply this patch directly for cleanups.

> >

> > Just checking -- you're aiming to have this in 4.7-rc ?

> 

> No cleanups for v4.8, not fixes for v4.7.

> There is no hurry, I have all patience in the world.


Okey doke! I thought this might be blocking some bigger work for the merge
window, but I'll leave it to Catalin given that's not the case.

Thanks for the clarification,

Will

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff mbox

Patch

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 76747d92bc72..2cfbf83b2498 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -12,7 +12,6 @@  config ARM64
 	select ARCH_USE_CMPXCHG_LOCKREF
 	select ARCH_SUPPORTS_ATOMIC_RMW
 	select ARCH_SUPPORTS_NUMA_BALANCING
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
 	select ARCH_WANT_FRAME_POINTERS
 	select ARCH_HAS_UBSAN_SANITIZE_ALL
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 7ef1d05859ae..fe66708e9a20 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -16,15 +16,15 @@  config ARCH_ALPINE
 config ARCH_BCM_IPROC
 	bool "Broadcom iProc SoC Family"
 	select COMMON_CLK_IPROC
+	select GPIOLIB
 	select PINCTRL
-	select ARCH_REQUIRE_GPIOLIB
 	help
 	  This enables support for Broadcom iProc based SoCs
 
 config ARCH_BERLIN
 	bool "Marvell Berlin SoC Family"
-	select ARCH_REQUIRE_GPIOLIB
 	select DW_APB_ICTL
+	select GPIOLIB
 	select PINCTRL
 	help
 	  This enables support for Marvell Berlin SoC Family
@@ -89,7 +89,7 @@  config ARCH_QCOM
 config ARCH_ROCKCHIP
 	bool "Rockchip Platforms"
 	select ARCH_HAS_RESET_CONTROLLER
-	select ARCH_REQUIRE_GPIOLIB
+	select GPIOLIB
 	select PINCTRL
 	select PINCTRL_ROCKCHIP
 	select ROCKCHIP_TIMER
@@ -129,11 +129,11 @@  config ARCH_STRATIX10
 config ARCH_TEGRA
 	bool "NVIDIA Tegra SoC Family"
 	select ARCH_HAS_RESET_CONTROLLER
-	select ARCH_REQUIRE_GPIOLIB
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select CLKSRC_OF
 	select GENERIC_CLOCKEVENTS
+	select GPIOLIB
 	select HAVE_CLK
 	select PINCTRL
 	select RESET_CONTROLLER
@@ -158,8 +158,8 @@  config ARCH_UNIPHIER
 
 config ARCH_VEXPRESS
 	bool "ARMv8 software model (Versatile Express)"
-	select ARCH_REQUIRE_GPIOLIB
 	select COMMON_CLK_VERSATILE
+	select GPIOLIB
 	select POWER_RESET_VEXPRESS
 	select VEXPRESS_CONFIG
 	help