Merge "ASoC: codecs: skip enabling codec power supplies when not defined"
diff --git a/Makefile.am b/Makefile.am
index bce2711..09e2504 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@
ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sdm670 qcs605))
obj-m += asoc/codecs/wcd934x/
endif
-ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), apq8053 sdm670 qcs605))
+ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), apq8053 sdm670 qcs605 apq8009))
obj-m += asoc/codecs/sdm660_cdc/
endif
ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sdm670 qcs605))
diff --git a/asoc/Kbuild b/asoc/Kbuild
index fce6328..229299d 100644
--- a/asoc/Kbuild
+++ b/asoc/Kbuild
@@ -115,6 +115,10 @@
MACHINE_OBJS += msm8952.o
endif
+ifdef CONFIG_SND_SOC_MSM8909
+ MACHINE_INT_OBJS += msm8952.o
+endif
+
# for SDM450 external codec sound card driver
ifdef CONFIG_SND_SOC_EXT_CODEC_SDM450
MACHINE_EXT_OBJS += msm8952-slimbus.o
@@ -214,6 +218,9 @@
obj-$(CONFIG_SND_SOC_SDM450) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)
+obj-$(CONFIG_SND_SOC_MSM8909) += machine_int_dlkm.o
+machine_int_dlkm-y := $(MACHINE_INT_OBJS)
+
obj-$(CONFIG_SND_SOC_EXT_CODEC_8909) += machine_ext_dlkm.o
machine_ext_dlkm-y := $(MACHINE_EXT_OBJS)
diff --git a/asoc/codecs/sdm660_cdc/Kbuild b/asoc/codecs/sdm660_cdc/Kbuild
index e5b3ae9..0744af0 100644
--- a/asoc/codecs/sdm660_cdc/Kbuild
+++ b/asoc/codecs/sdm660_cdc/Kbuild
@@ -40,6 +40,11 @@
export
INCS += -include $(AUDIO_ROOT)/config/sdm450autoconf.h
endif
+ ifeq ($(CONFIG_ARCH_MSM8909), y)
+ include $(AUDIO_ROOT)/config/msm8909auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ endif
endif
# As per target team, build is done as follows:
diff --git a/asoc/codecs/sdm660_cdc/msm-analog-cdc.c b/asoc/codecs/sdm660_cdc/msm-analog-cdc.c
index 77981dd..de112bc 100644
--- a/asoc/codecs/sdm660_cdc/msm-analog-cdc.c
+++ b/asoc/codecs/sdm660_cdc/msm-analog-cdc.c
@@ -4577,7 +4577,7 @@
int adsp_state;
adsp_state = apr_get_subsys_state();
- if (adsp_state != APR_SUBSYS_LOADED ||
+ if (adsp_state == APR_SUBSYS_DOWN ||
!q6core_is_adsp_ready()) {
dev_err(&pdev->dev, "Adsp is not loaded yet %d\n",
adsp_state);
diff --git a/asoc/codecs/sdm660_cdc/msm-digital-cdc-legacy.c b/asoc/codecs/sdm660_cdc/msm-digital-cdc-legacy.c
index 9805b2d..bc56412 100644
--- a/asoc/codecs/sdm660_cdc/msm-digital-cdc-legacy.c
+++ b/asoc/codecs/sdm660_cdc/msm-digital-cdc-legacy.c
@@ -1977,6 +1977,14 @@
u32 dig_cdc_addr;
struct msm_dig_priv *msm_dig_cdc;
struct dig_ctrl_platform_data *pdata;
+ int adsp_state = 0;
+
+ adsp_state = apr_get_subsys_state();
+ if (adsp_state == APR_SUBSYS_DOWN) {
+ dev_err(&pdev->dev, "Adsp is not loaded yet %d\n",
+ adsp_state);
+ return -EPROBE_DEFER;
+ }
msm_dig_cdc = devm_kzalloc(&pdev->dev, sizeof(struct msm_dig_priv),
GFP_KERNEL);
diff --git a/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c b/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c
index de4f399..f18cc81 100644
--- a/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c
+++ b/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c
@@ -757,7 +757,8 @@
if (!ret) {
dev_err(codec->dev, "%s: WDSP boot timed out\n",
__func__);
- wcd_cntl_collect_debug_dumps(cntl, true);
+ if (cntl->dbg_dmp_enable)
+ wcd_cntl_collect_debug_dumps(cntl, true);
ret = -ETIMEDOUT;
goto err_boot;
} else {
@@ -976,6 +977,8 @@
cntl->entry, &cntl->debug_mode);
debugfs_create_bool("ramdump_enable", 0644,
cntl->entry, &cntl->ramdump_enable);
+ debugfs_create_bool("debug_dump_enable", 0644,
+ cntl->entry, &cntl->dbg_dmp_enable);
done:
return;
}
@@ -1038,16 +1041,23 @@
} else if (val[0] == '0') {
if (cntl->boot_reqs == 0) {
dev_err(cntl->codec->dev,
- "%s: WDSP already disabled\n", __func__);
+ "%s: WDSP already disabled\n",
+ __func__);
ret = -EINVAL;
goto done;
}
cntl->boot_reqs--;
vote = false;
} else if (!strcmp(val, "DEBUG_DUMP")) {
- dev_dbg(cntl->codec->dev,
- "%s: Collect dumps for debug use\n", __func__);
- wcd_cntl_collect_debug_dumps(cntl, false);
+ if (cntl->dbg_dmp_enable) {
+ dev_dbg(cntl->codec->dev,
+ "%s: Collect dumps for debug use\n", __func__);
+ wcd_cntl_collect_debug_dumps(cntl, false);
+ }
+ /*
+ * simply ignore the request from userspace
+ * if dbg_dump_enable is not set from debugfs
+ */
goto done;
} else {
dev_err(cntl->codec->dev, "%s: Invalid value %s\n",
diff --git a/asoc/codecs/wcd934x/wcd934x-dsp-cntl.h b/asoc/codecs/wcd934x/wcd934x-dsp-cntl.h
index 2f71d0e..0487c75 100644
--- a/asoc/codecs/wcd934x/wcd934x-dsp-cntl.h
+++ b/asoc/codecs/wcd934x/wcd934x-dsp-cntl.h
@@ -90,6 +90,7 @@
struct dentry *entry;
u32 debug_mode;
bool ramdump_enable;
+ bool dbg_dmp_enable;
/* WDSP manager drivers data */
struct device *m_dev;
diff --git a/asoc/sdm660-common.c b/asoc/sdm660-common.c
index 3695ae5..093eef4 100644
--- a/asoc/sdm660-common.c
+++ b/asoc/sdm660-common.c
@@ -3364,6 +3364,8 @@
.data = "tavil_codec"},
{ .compatible = "qcom,qcs605-dig-asoc-snd",
.data = "digital_codec"},
+ { .compatible = "qcom,qcs605-asoc-snd-tavil",
+ .data = "tavil_codec"},
{},
};
diff --git a/config/msm8909auto.conf b/config/msm8909auto.conf
index ac6f399..2adfae5 100644
--- a/config/msm8909auto.conf
+++ b/config/msm8909auto.conf
@@ -35,3 +35,4 @@
CONFIG_SND_SOC_WSA881X=m
CONFIG_COMMON_CLK_MSM=m
CONFIG_SND_SOC_EXT_CODEC_8909=m
+CONFIG_SND_SOC_WSA881X_ANALOG=m
diff --git a/config/msm8909autoconf.h b/config/msm8909autoconf.h
index bb80f88..9faddb1 100644
--- a/config/msm8909autoconf.h
+++ b/config/msm8909autoconf.h
@@ -48,3 +48,4 @@
#define CONFIG_SND_SOC_WSA881X 1
#define CONFIG_COMMON_CLK_MSM 1
#define CONFIG_SND_SOC_EXT_CODEC_8909 1
+#define CONFIG_SND_SOC_WSA881X_ANALOG 1
diff --git a/dsp/q6core.c b/dsp/q6core.c
index 1844523..2cf5117 100644
--- a/dsp/q6core.c
+++ b/dsp/q6core.c
@@ -18,6 +18,8 @@
#include <linux/mutex.h>
#include <linux/sched.h>
#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/kobject.h>
#include <dsp/q6core.h>
#include <dsp/audio_cal_utils.h>
#include <dsp/apr_audio-v2.h>
@@ -82,6 +84,106 @@
};
static struct generic_get_data_ *generic_get_data;
+static DEFINE_MUTEX(kset_lock);
+static struct kset *audio_uevent_kset;
+
+static int q6core_init_uevent_kset(void)
+{
+ int ret = 0;
+
+ mutex_lock(&kset_lock);
+ if (audio_uevent_kset)
+ goto done;
+
+ /* Create a kset under /sys/kernel/ */
+ audio_uevent_kset = kset_create_and_add("q6audio", NULL, kernel_kobj);
+ if (!audio_uevent_kset) {
+ pr_err("%s: error creating uevent kernel set", __func__);
+ ret = -EINVAL;
+ }
+done:
+ mutex_unlock(&kset_lock);
+ return ret;
+}
+
+static void q6core_destroy_uevent_kset(void)
+{
+ if (audio_uevent_kset) {
+ kset_unregister(audio_uevent_kset);
+ audio_uevent_kset = NULL;
+ }
+}
+
+/**
+ * q6core_init_uevent_data - initialize kernel object required to send uevents.
+ *
+ * @uevent_data: uevent data (dynamically allocated memory).
+ * @name: name of the kernel object.
+ *
+ * Returns 0 on success or error otherwise.
+ */
+int q6core_init_uevent_data(struct audio_uevent_data *uevent_data, char *name)
+{
+ int ret = -EINVAL;
+
+ if (!uevent_data || !name)
+ return ret;
+
+ ret = q6core_init_uevent_kset();
+ if (ret)
+ return ret;
+
+ /* Set kset for kobject before initializing the kobject */
+ uevent_data->kobj.kset = audio_uevent_kset;
+
+ /* Initialize kobject and add it to kernel */
+ ret = kobject_init_and_add(&uevent_data->kobj, &uevent_data->ktype,
+ NULL, "%s", name);
+ if (ret) {
+ pr_err("%s: error initializing uevent kernel object: %d",
+ __func__, ret);
+ kobject_put(&uevent_data->kobj);
+ return ret;
+ }
+
+ /* Send kobject add event to the system */
+ kobject_uevent(&uevent_data->kobj, KOBJ_ADD);
+
+ return ret;
+}
+EXPORT_SYMBOL(q6core_init_uevent_data);
+
+/**
+ * q6core_destroy_uevent_data - destroy kernel object.
+ *
+ * @uevent_data: uevent data.
+ */
+void q6core_destroy_uevent_data(struct audio_uevent_data *uevent_data)
+{
+ if (uevent_data)
+ kobject_put(&uevent_data->kobj);
+}
+EXPORT_SYMBOL(q6core_destroy_uevent_data);
+
+/**
+ * q6core_send_uevent - send uevent to userspace.
+ *
+ * @uevent_data: uevent data.
+ * @event: event to send.
+ *
+ * Returns 0 on success or error otherwise.
+ */
+int q6core_send_uevent(struct audio_uevent_data *uevent_data, char *event)
+{
+ char *env[] = { event, NULL };
+
+ if (!event || !uevent_data)
+ return -EINVAL;
+
+ return kobject_uevent_env(&uevent_data->kobj, KOBJ_CHANGE, env);
+}
+EXPORT_SYMBOL(q6core_send_uevent);
+
static int parse_fwk_version_info(uint32_t *payload)
{
size_t ver_size;
@@ -1110,6 +1212,7 @@
mutex_init(&q6core_lcl.ver_lock);
q6core_init_cal_data();
+ q6core_init_uevent_kset();
return 0;
}
@@ -1119,6 +1222,7 @@
mutex_destroy(&q6core_lcl.cmd_lock);
mutex_destroy(&q6core_lcl.ver_lock);
q6core_delete_cal_data();
+ q6core_destroy_uevent_kset();
}
MODULE_DESCRIPTION("ADSP core driver");
MODULE_LICENSE("GPL v2");
diff --git a/include/dsp/q6core.h b/include/dsp/q6core.h
index f6240a3..03a7b31 100644
--- a/include/dsp/q6core.h
+++ b/include/dsp/q6core.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018, 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
@@ -27,6 +27,15 @@
size_t size);
size_t q6core_get_fwk_version_size(uint32_t service_id);
+struct audio_uevent_data {
+ struct kobject kobj;
+ struct kobj_type ktype;
+};
+
+int q6core_init_uevent_data(struct audio_uevent_data *uevent_data, char *name);
+void q6core_destroy_uevent_data(struct audio_uevent_data *uevent_data);
+int q6core_send_uevent(struct audio_uevent_data *uevent_data, char *name);
+
#define ADSP_CMD_SET_DTS_EAGLE_DATA_ID 0x00012919
#define DTS_EAGLE_LICENSE_ID 0x00028346
struct adsp_dts_eagle {