Merge remote-tracking branch 'pinctrl/for-next'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/boot/dts/mediatek/mt8183.dtsi
Simple merge

diff --cc drivers/pinctrl/bcm/pinctrl-bcm2835.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-ingenic.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-single.c
Simple merge

diff --cc drivers/pinctrl/qcom/Kconfig
index cad4e60df618c86a057ee9dfb6ab1962dd86f03e,2bc6206555506190c785a03f30d68299fce56f62..32ea2a8ec02b54a1b9323cd5cc6c1663403f774a
--- 1/drivers/pinctrl/qcom/Kconfig
--- 2/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@@ -88,9 -88,17 +88,17 @@@ config PINCTRL_MSM896
          This is the pinctrl, pinmux, pinconf and gpiolib driver for the
          Qualcomm TLMM block found in the Qualcomm 8960 platform.
  
+ config PINCTRL_MDM9607
+       tristate "Qualcomm 9607 pin controller driver"
+       depends on GPIOLIB && OF
+       depends on PINCTRL_MSM
+       help
+         This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+         Qualcomm TLMM block found in the Qualcomm 9607 platform.
+ 
  config PINCTRL_MDM9615
        tristate "Qualcomm 9615 pin controller driver"
 -      depends on GPIOLIB && OF
 +      depends on OF
        depends on PINCTRL_MSM
        help
          This is the pinctrl, pinmux, pinconf and gpiolib driver for the
@@@ -256,9 -264,18 +264,18 @@@ config PINCTRL_SDX5
         Qualcomm Technologies Inc TLMM block found on the Qualcomm
         Technologies Inc SDX55 platform.
  
+ config PINCTRL_SM6115
+       tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
+       depends on GPIOLIB && OF
+       depends on PINCTRL_MSM
+       help
+        This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+        Qualcomm Technologies Inc TLMM block found on the Qualcomm
+        Technologies Inc SM6115 and SM4250 platforms.
+ 
  config PINCTRL_SM6125
        tristate "Qualcomm Technologies Inc SM6125 pin controller driver"
 -      depends on GPIOLIB && OF
 +      depends on OF
        depends on PINCTRL_MSM
        help
         This is the pinctrl, pinmux, pinconf and gpiolib driver for the