diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index bc3db6a903de..84614998b637 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -77,5 +77,40 @@ config ARCH_SDXNIGHTJAR
 	select COMMON_CLK_QCOM
 	select QCOM_GDSC
 	select GENERIC_CLOCKEVENTS_BROADCAST
+
+config ARCH_MONACO
+	bool "Enable support for Qualcomm Technologies, Inc. MONACO"
+	select ARM_GIC
+	select ARM_GIC_V3
+	select ARM_AMBA
+	select HAVE_ARM_ARCH_TIMER
+	select HAVE_PCI
+	select PCI
+	select PINCTRL
+	select QCOM_SCM if SMP
+	select MSM_JTAG_MM if CORESIGHT_ETM
+	select PM_DEVFREQ
+	select COMMON_CLK
+	select COMMON_CLK_QCOM
+	select QCOM_GDSC
+	select GENERIC_CLOCKEVENTS_BROADCAST
+
+config ARCH_SCUBA
+	bool "Enable support for Qualcomm Technologies, Inc. SCUBA"
+	select ARM_GIC
+	select ARM_GIC_V3
+	select ARM_AMBA
+	select HAVE_ARM_ARCH_TIMER
+	select HAVE_PCI
+	select PCI
+	select PINCTRL
+	select QCOM_SCM if SMP
+	select MSM_JTAG_MM if CORESIGHT_ETM
+	select PM_DEVFREQ
+	select COMMON_CLK
+	select COMMON_CLK_QCOM
+	select QCOM_GDSC
+	select GENERIC_CLOCKEVENTS_BROADCAST
+
 endmenu
 endif
diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile
index ea02513a3c89..3900ca3a8715 100644
--- a/arch/arm/mach-qcom/Makefile
+++ b/arch/arm/mach-qcom/Makefile
@@ -3,3 +3,5 @@ obj-$(CONFIG_SMP)	+= platsmp.o
 obj-$(CONFIG_USE_OF) 	+= board-dt.o
 obj-$(CONFIG_ARCH_SDXLEMUR) += board-sdxlemur.o
 obj-$(CONFIG_ARCH_SDXNIGHTJAR) += board-sdxnightjar.o
+obj-$(CONFIG_ARCH_MONACO) += board-monaco.o
+obj-$(CONFIG_ARCH_SCUBA) += board-scuba.o
diff --git a/arch/arm/mach-qcom/board-monaco.c b/arch/arm/mach-qcom/board-monaco.c
new file mode 100644
index 000000000000..1e997e198c6c
--- /dev/null
+++ b/arch/arm/mach-qcom/board-monaco.c
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ */
+
+#include <linux/kernel.h>
+#include "board-dt.h"
+#include <asm/mach/map.h>
+#include <asm/mach/arch.h>
+
+static const char *monaco_dt_match[] __initconst = {
+	"qcom,monaco",
+	NULL
+};
+
+static void __init monaco_init(void)
+{
+	board_dt_populate(NULL);
+}
+
+DT_MACHINE_START(MONACO_DT,
+	"Qualcomm Technologies, Inc. MONACO (Flattened Device Tree)")
+	.init_machine		= monaco_init,
+	.dt_compat		= monaco_dt_match,
+MACHINE_END
diff --git a/arch/arm/mach-qcom/board-scuba.c b/arch/arm/mach-qcom/board-scuba.c
new file mode 100644
index 000000000000..2a47a40b9f0e
--- /dev/null
+++ b/arch/arm/mach-qcom/board-scuba.c
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ */
+
+#include <linux/kernel.h>
+#include "board-dt.h"
+#include <asm/mach/map.h>
+#include <asm/mach/arch.h>
+
+static const char *scuba_dt_match[] __initconst = {
+	"qcom,scuba",
+	NULL
+};
+
+static void __init scuba_init(void)
+{
+	board_dt_populate(NULL);
+}
+
+DT_MACHINE_START(SCUBA_DT,
+	"Qualcomm Technologies, Inc. SCUBA (Flattened Device Tree)")
+	.init_machine		= scuba_init,
+	.dt_compat		= scuba_dt_match,
+MACHINE_END