ASoC: msm: Enable msm8952 machine driver for msm8905
Enable machine_int_dlkm for msm8905 to use msm8952
machine driver.
Change-Id: I07e518b9815d034d2bb035be943e513767638631
diff --git a/asoc/msm8952.c b/asoc/msm8952.c
index 44db613..27216ec 100644
--- a/asoc/msm8952.c
+++ b/asoc/msm8952.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 2018, 2020, The Linux Foundation.
+ * All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -2968,17 +2969,19 @@
const char *ext_pa = "qcom,msm-ext-pa";
const char *mclk = "qcom,msm-mclk-freq";
const char *wsa = "asoc-wsa-codec-names";
- const char *wsa_prefix = "asoc-wsa-codec-prefixes";
const char *type = NULL;
const char *ext_pa_str = NULL;
- const char *wsa_str = NULL;
- const char *wsa_prefix_str = NULL;
const char *spk_ext_pa = "qcom,msm-spk-ext-pa";
int num_strings;
int id, i, val;
int ret = 0;
struct resource *muxsel;
+#if IS_ENABLED(CONFIG_SND_SOC_WSA881X_ANALOG)
+ const char *wsa_prefix = "asoc-wsa-codec-prefixes";
+ const char *wsa_str = NULL;
+ const char *wsa_prefix_str = NULL;
char *temp_str = NULL;
+#endif
pdata = devm_kzalloc(&pdev->dev,
sizeof(struct msm_asoc_mach_data),
@@ -3060,6 +3063,7 @@
/*reading the gpio configurations from dtsi file*/
num_strings = of_property_count_strings(pdev->dev.of_node,
wsa);
+#if IS_ENABLED(CONFIG_SND_SOC_WSA881X_ANALOG)
if (num_strings > 0) {
if (wsa881x_get_probing_count() < 2) {
ret = -EPROBE_DEFER;
@@ -3125,6 +3129,7 @@
msm_anlg_cdc_update_int_spk_boost(false);
}
}
+#endif
card = msm8952_populate_sndcard_dailinks(&pdev->dev);
dev_dbg(&pdev->dev, "default codec configured\n");