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

Commit da9a1c67 authored by Linus Walleij's avatar Linus Walleij
Browse files

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

Cc: Michael Büsch <m@bues.ch>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 29b4817d

arch/arm64/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ config ARM64 
	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_NUMA_BALANCING

	select ARCH_SUPPORTS_NUMA_BALANCING

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select ARCH_WANT_FRAME_POINTERS

	select ARCH_WANT_FRAME_POINTERS

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAS_UBSAN_SANITIZE_ALL

arch/arm64/Kconfig.platforms

+6 −6
Original line number Original line Diff line number Diff line
@@ -15,8 +15,8 @@ config ARCH_ALPINE 




config ARCH_BCM2835

config ARCH_BCM2835

	bool "Broadcom BCM2835 family"

	bool "Broadcom BCM2835 family"

	select ARCH_REQUIRE_GPIOLIB

	select CLKSRC_OF

	select CLKSRC_OF

	select GPIOLIB

	select PINCTRL

	select PINCTRL

	select PINCTRL_BCM2835

	select PINCTRL_BCM2835

	select ARM_AMBA

	select ARM_AMBA
@@ -29,15 +29,15 @@ config ARCH_BCM2835 
config ARCH_BCM_IPROC

config ARCH_BCM_IPROC

	bool "Broadcom iProc SoC Family"

	bool "Broadcom iProc SoC Family"

	select COMMON_CLK_IPROC

	select COMMON_CLK_IPROC

	select GPIOLIB

	select PINCTRL

	select PINCTRL

	select ARCH_REQUIRE_GPIOLIB

	help

	help

	  This enables support for Broadcom iProc based SoCs

	  This enables support for Broadcom iProc based SoCs





config ARCH_BERLIN

config ARCH_BERLIN

	bool "Marvell Berlin SoC Family"

	bool "Marvell Berlin SoC Family"

	select ARCH_REQUIRE_GPIOLIB

	select DW_APB_ICTL

	select DW_APB_ICTL

	select GPIOLIB

	select PINCTRL

	select PINCTRL

	help

	help

	  This enables support for Marvell Berlin SoC Family

	  This enables support for Marvell Berlin SoC Family
@@ -108,7 +108,7 @@ config ARCH_QCOM 
config ARCH_ROCKCHIP

config ARCH_ROCKCHIP

	bool "Rockchip Platforms"

	bool "Rockchip Platforms"

	select ARCH_HAS_RESET_CONTROLLER

	select ARCH_HAS_RESET_CONTROLLER

	select ARCH_REQUIRE_GPIOLIB

	select GPIOLIB

	select PINCTRL

	select PINCTRL

	select PINCTRL_ROCKCHIP

	select PINCTRL_ROCKCHIP

	select ROCKCHIP_TIMER

	select ROCKCHIP_TIMER
@@ -154,11 +154,11 @@ config ARCH_STRATIX10 
config ARCH_TEGRA

config ARCH_TEGRA

	bool "NVIDIA Tegra SoC Family"

	bool "NVIDIA Tegra SoC Family"

	select ARCH_HAS_RESET_CONTROLLER

	select ARCH_HAS_RESET_CONTROLLER

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_MMIO

	select CLKSRC_OF

	select CLKSRC_OF

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select GPIOLIB

	select HAVE_CLK

	select HAVE_CLK

	select PINCTRL

	select PINCTRL

	select RESET_CONTROLLER

	select RESET_CONTROLLER
@@ -183,8 +183,8 @@ config ARCH_UNIPHIER 




config ARCH_VEXPRESS

config ARCH_VEXPRESS

	bool "ARMv8 software model (Versatile Express)"

	bool "ARMv8 software model (Versatile Express)"

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLK_VERSATILE

	select COMMON_CLK_VERSATILE

	select GPIOLIB

	select PM

	select PM

	select PM_GENERIC_DOMAINS

	select PM_GENERIC_DOMAINS

	select POWER_RESET_VEXPRESS

	select POWER_RESET_VEXPRESS