Merge tag 'v5.0-rc6' into devel

Linux 5.0-rc6

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig
index 1817786ab6aa..a005cbccb4f7 100644
--- a/drivers/pinctrl/mediatek/Kconfig
+++ b/drivers/pinctrl/mediatek/Kconfig
@@ -45,12 +45,14 @@ config PINCTRL_MT2701
 config PINCTRL_MT7623
         bool "Mediatek MT7623 pin control with generic binding"
         depends on MACH_MT7623 || COMPILE_TEST
+        depends on OF
         default MACH_MT7623
         select PINCTRL_MTK_MOORE
 
 config PINCTRL_MT7629
         bool "Mediatek MT7629 pin control"
         depends on MACH_MT7629 || COMPILE_TEST
+        depends on OF
         default MACH_MT7629
         select PINCTRL_MTK_MOORE
 
@@ -92,6 +94,7 @@ config PINCTRL_MT6797
 
 config PINCTRL_MT7622
         bool "MediaTek MT7622 pin control"
+        depends on OF
         depends on ARM64 || COMPILE_TEST
         default ARM64 && ARCH_MEDIATEK
         select PINCTRL_MTK_MOORE