Merge "ARM: msm: Define scuba architecture on 5.4"

drivers/pinctrl/qcom/Kconfig

@@ -256,6 +256,17 @@ config PINCTRL_YUPIK
 	  Say Y here to compile statically, or M here to compile it as a module.
 	  If unsure, say N.
 
+config PINCTRL_SCUBA
+        tristate "Qualcomm Technologies Inc SCUBA pin controller driver"
+        depends on GPIOLIB && OF
+        select PINCTRL_MSM
+        help
+          This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+          Qualcomm Technologies Inc Top Level Mode Multiplexer block (TLMM)
+          block found on the Qualcomm Technologies Inc SCUBA platform.
+          Say Y here to compile statically, or M here to compile it as a module.
+          If unsure, say N.
+
 config PINCTRL_SDXLEMUR
 	tristate "Qualcomm Technologies Inc SDXLEMUR pin controller driver"
 	depends on GPIOLIB && OF

drivers/pinctrl/qcom/Makefile

@@ -29,6 +29,7 @@ obj-$(CONFIG_PINCTRL_LAHAINA) += pinctrl-lahaina.o
 obj-$(CONFIG_PINCTRL_SHIMA) += pinctrl-shima.o
 obj-$(CONFIG_PINCTRL_HOLI) += pinctrl-holi.o
 obj-$(CONFIG_PINCTRL_YUPIK) += pinctrl-yupik.o
+obj-$(CONFIG_PINCTRL_SCUBA) += pinctrl-scuba.o
 obj-$(CONFIG_PINCTRL_SDXLEMUR) += pinctrl-sdxlemur.o
 obj-$(CONFIG_PINCTRL_SDXNIGHTJAR) += pinctrl-sdxnightjar.o
 obj-$(CONFIG_PINCTRL_MONACO) += pinctrl-monaco.o

drivers/soc/qcom/socinfo.c

@@ -660,6 +660,7 @@ static const struct soc_id soc_id[] = {
 	{ 458, "SDXLEMUR" },
 	{ 475, "YUPIK" },
 	{ 484, "SDXNIGHTJAR" },
+	{ 441, "SCUBA" },
 };
 
 static struct qcom_socinfo *qsocinfo;