config ARCH_ROCKCHIP
        bool "Rockchip Platforms"
        select ARCH_HAS_RESET_CONTROLLER
-       select GPIOLIB
        select PINCTRL
-       select PINCTRL_ROCKCHIP
        select PM
        select ROCKCHIP_TIMER
        help
 
 config PINCTRL_ROCKCHIP
        bool
        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"