diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile
index 8c3a333a46fa..fc44c7ebcad2 100644
--- a/arch/arm/mach-qcom/Makefile
+++ b/arch/arm/mach-qcom/Makefile
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_SMP)	+= platsmp.o
 obj-$(CONFIG_USE_OF) 	+= board-dt.o
+obj-$(CONFIG_ARCH_SDXLEMUR) += board-sdxlemur.o
diff --git a/arch/arm/mach-qcom/board-sdxlemur.c b/arch/arm/mach-qcom/board-sdxlemur.c
new file mode 100644
index 000000000000..0d806589f08d
--- /dev/null
+++ b/arch/arm/mach-qcom/board-sdxlemur.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 *sdxlemur_dt_match[] __initconst = {
+	"qcom,sdxlemur",
+	NULL
+};
+
+static void __init sdxlemur_init(void)
+{
+	board_dt_populate(NULL);
+}
+
+DT_MACHINE_START(SDXLEMUR_DT,
+	"Qualcomm Technologies, Inc. SDXLEMUR (Flattened Device Tree)")
+	.init_machine		= sdxlemur_init,
+	.dt_compat		= sdxlemur_dt_match,
+MACHINE_END
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index da367cb1c7ac..35b305ba6aca 100644
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -651,6 +651,7 @@ static const struct soc_id soc_id[] = {
 	{ 415, "LAHAINA" },
 	{ 450, "SHIMA" },
 	{ 454, "HOLI" },
+	{ 458, "SDXLEMUR" },
 };
 
 static struct qcom_socinfo *qsocinfo;
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 8ae9a95ebf5b..fd9e0a145843 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -199,7 +199,7 @@ extern void clockevents_suspend(void);
 extern void clockevents_resume(void);
 
 # ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
-#  ifdef CONFIG_ARCH_HAS_TICK_BROADCAST
+#  if defined(CONFIG_ARCH_HAS_TICK_BROADCAST) && defined(CONFIG_SMP)
 extern void tick_broadcast(const struct cpumask *mask);
 #  else
 #   define tick_broadcast	NULL