ASoC: Split build special drives

diff --git a/drivers/elliptic/Makefile b/drivers/elliptic/Makefile
index 5f55905..1bfaceb 100644 (file)
--- a/drivers/elliptic/Makefile
+++ b/drivers/elliptic/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_MACH_XIAOMI_MSM8998) += elliptic.o elliptic_sysfs.o elliptic_data_io.o
+obj-$(CONFIG_MACH_CHIRON) += elliptic.o elliptic_sysfs.o elliptic_data_io.o
 
-ccflags-y := -I$(src)
+ccflags-$(CONFIG_MACH_CHIRON) := -I$(src)

diff --git a/sound/soc/msm/Kconfig b/sound/soc/msm/Kconfig
index 72691c1..f00bc9a 100644 (file)
--- a/sound/soc/msm/Kconfig
+++ b/sound/soc/msm/Kconfig
@@ -236,9 +236,9 @@ config SND_SOC_MSM8998
        select SND_SOC_WCD9335
        select SND_SOC_WCD934X
        select SND_SOC_WSA881X
-       select SND_SOC_TFA98XX
-       select SND_SOC_TAS2559
-       select SND_SOC_TAS2559_MISC
+       select SND_SOC_TFA98XX if MACH_SAGIT
+       select SND_SOC_TAS2559 if MACH_CHIRON
+       select SND_SOC_TAS2559_MISC if MACH_CHIRON
        select SND_SOC_MSM_HDMI_CODEC_RX
        select DTS_SRS_TM
        select QTI_PP

diff --git a/sound/soc/msm/qdsp6v2/Makefile b/sound/soc/msm/qdsp6v2/Makefile
index c217775..411d5e0 100644 (file)
--- a/sound/soc/msm/qdsp6v2/Makefile
+++ b/sound/soc/msm/qdsp6v2/Makefile
@@ -12,8 +12,8 @@ obj-$(CONFIG_SND_SOC_QDSP6V2) += snd-soc-qdsp6v2.o msm-pcm-dtmf-v2.o \
 obj-$(CONFIG_SND_SOC_QDSP6V2_VM) += snd-soc-qdsp6v2.o msm-pcm-dtmf-v2.o \
                                 msm-dai-stub-v2.o
 
-obj-$(CONFIG_MACH_XIAOMI_MSM8998) += msm-elliptic.o apr_elliptic.o
-ccflags-$(CONFIG_MACH_XIAOMI_MSM8998) += -I$(srctree)/drivers/elliptic
+obj-$(CONFIG_MACH_CHIRON) += msm-elliptic.o apr_elliptic.o
+ccflags-$(CONFIG_MACH_CHIRON) += -I$(srctree)/drivers/elliptic
 
 obj-$(CONFIG_SND_HWDEP) += msm-pcm-routing-devdep.o
 obj-$(CONFIG_DOLBY_DAP) += msm-dolby-dap-config.o

diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
index cf2e8a7..159b673 100644 (file)
--- a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
@@ -48,7 +48,7 @@
 #include "q6voice.h"
 #include "sound/q6lsm.h"
 
-#ifdef CONFIG_MACH_XIAOMI_MSM8998
+#ifdef CONFIG_MACH_CHIRON
 #include "msm-elliptic.h"
 #endif
 
@@ -21180,7 +21180,7 @@ static int msm_routing_probe(struct snd_soc_platform *platform)
                platform, msm_routing_feature_support_mixer_controls,
                ARRAY_SIZE(msm_routing_feature_support_mixer_controls));
 
-#ifdef CONFIG_MACH_XIAOMI_MSM8998
+#ifdef CONFIG_MACH_CHIRON
        elliptic_add_platform_controls(platform);
 #endif
 

diff --git a/sound/soc/msm/qdsp6v2/q6afe.c b/sound/soc/msm/qdsp6v2/q6afe.c
index 7ea1a5e..dc4b798 100644 (file)
--- a/sound/soc/msm/qdsp6v2/q6afe.c
+++ b/sound/soc/msm/qdsp6v2/q6afe.c
@@ -30,7 +30,7 @@
 #include <linux/qdsp6v2/apr_tal.h>
 #include <sound/q6core.h>
 
-#ifdef CONFIG_MACH_XIAOMI_MSM8998
+#ifdef CONFIG_MACH_CHIRON
 #include <sound/apr_elliptic.h>
 #endif
 
@@ -116,7 +116,7 @@ struct afe_ctl {
        struct audio_cal_info_spk_prot_cfg      prot_cfg;
        struct afe_spkr_prot_calib_get_resp     calib_data;
 
-#ifdef CONFIG_MACH_XIAOMI_MSM8998
+#ifdef CONFIG_MACH_CHIRON
        struct afe_ultrasound_calib_get_resp    ultrasound_calib_data;
 #endif
 
@@ -624,7 +624,7 @@ static int32_t afe_callback(struct apr_client_data *data, void *priv)
                if (!ret) {
                        return ret;
                }
-#ifdef CONFIG_MACH_XIAOMI_MSM8998
+#ifdef CONFIG_MACH_CHIRON
        } else if (data->opcode == ULTRASOUND_OPCODE) {
                if (data->payload != NULL)
                        elliptic_process_apr_payload(data->payload);
@@ -1706,7 +1706,7 @@ fail_cmd:
        return ret;
 }
 
-#ifdef CONFIG_MACH_XIAOMI_MSM8998
+#ifdef CONFIG_MACH_CHIRON
 /* ELUS Begin */
 afe_ultrasound_state_t elus_afe = {
        .ptr_apr = &this_afe.apr,