diff --git a/Makefile.am b/Makefile.am
index bd60e53769a6..4a9f96ed5cbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,9 @@ endif
 ifeq ($(TARGET_SUPPORT),qcs40x)
 KBUILD_OPTIONS += CONFIG_ARCH_QCS405=y
 endif
+ifeq ($(TARGET_SUPPORT), sdmsteppe))
+KBUILD_OPTIONS += CONFIG_ARCH_SM6150=y
+endif
 
 obj-m := ipc/
 obj-m += dsp/
@@ -30,7 +33,7 @@ obj-m += dsp/codecs/
 obj-m += soc/
 obj-m += asoc/
 obj-m += asoc/codecs/
-ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sdm670 qcs605))
+ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sdm670 qcs605 sdmsteppe))
 obj-m += asoc/codecs/wcd934x/
 endif
 ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), apq8053 sdm670 qcs605))
@@ -44,6 +47,10 @@ obj-m += asoc/codecs/bolero/
 obj-m += asoc/codecs/csra66x0/
 obj-m += asoc/codecs/ep92/
 endif
+ifeq ($(TARGET_SUPPORT), sdmsteppe))
+obj-m += asoc/codecs/bolero/
+obj-m += asoc/codecs/wcd937x/
+endif
 
 all:
 	$(shell rm -fr $(shell pwd)/soc/core.h)
diff --git a/asoc/sm6150.c b/asoc/sm6150.c
index 65aaa9b84a30..59bbf69664be 100644
--- a/asoc/sm6150.c
+++ b/asoc/sm6150.c
@@ -8035,8 +8035,8 @@ static int msm_init_aux_dev(struct platform_device *pdev,
 	u32 wsa_dev_cnt;
 	u32 codec_aux_dev_cnt = 0;
 	int i;
-	struct msm_wsa881x_dev_info *wsa881x_dev_info;
-	struct aux_codec_dev_info *aux_cdc_dev_info;
+	struct msm_wsa881x_dev_info *wsa881x_dev_info = NULL;
+	struct aux_codec_dev_info *aux_cdc_dev_info = NULL;
 	const char *auxdev_name_prefix[1];
 	char *dev_name_str = NULL;
 	int found = 0;