From 0dbff7b9e0fdf77414d39c4bb3d358519605559c Mon Sep 17 00:00:00 2001 From: Jianqun Xu Date: Fri, 5 Mar 2021 08:39:06 +0800 Subject: [PATCH] UPSTREAM: arm64: remove select PINCTRL_ROCKCHIP from ARCH_ROCKCHIP Prepare to make pinctrl driver of rockchip to be module able, this patch remove the select of PINCTRL_ROCKCHIP from ARCH_ROCKCHIP. Change-Id: Ibc725c09c92e057b22a035b43b96c9e7c60d3f52 Signed-off-by: Jianqun Xu Link: https://lore.kernel.org/r/20210305003907.1692515-2-jay.xu@rock-chips.com Signed-off-by: Linus Walleij (cherry picked from commit 25fda51ca33b3d7977c351ab9420b32df3289b5f) --- arch/arm64/Kconfig.platforms | 2 -- drivers/pinctrl/Kconfig | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 10d05685da29..4059e03888a0 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -218,9 +218,7 @@ config ARCH_RENESAS config ARCH_ROCKCHIP bool "Rockchip Platforms" select ARCH_HAS_RESET_CONTROLLER - select GPIOLIB select PINCTRL - select PINCTRL_ROCKCHIP select PM select ROCKCHIP_TIMER help diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index bc9774c1ae8d..c89bdc3e8f3b 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -209,11 +209,15 @@ config PINCTRL_OXNAS config PINCTRL_ROCKCHIP tristate "Rockchip gpio and pinctrl driver" depends on OF + select GPIOLIB select PINMUX select GENERIC_PINCONF select GENERIC_IRQ_CHIP select MFD_SYSCON select OF_GPIO + default ARCH_ROCKCHIP + help + This support pinctrl and gpio driver for Rockchip SoCs. config PINCTRL_SINGLE tristate "One-register-per-pin type device tree based pinctrl driver"