Merge "ARM: dts: msm: enable sensor node on msm8996 and apq8096"

2 files changed, 54 insertions, 0 deletions

diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 2604d3f387ba..c06237170542 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -296,6 +296,7 @@ header-y += msm_audio_amrnb.h
 header-y += msm_audio_amrwb.h
 header-y += msm_audio_amrwbplus.h
 header-y += msm_audio_calibration.h
+header-y += msm_audio_anc.h
 header-y += msm_audio_mvs.h
 header-y += msm_audio_qcp.h
 header-y += msm_audio_sbc.h
diff --git a/include/uapi/linux/msm_audio_anc.h b/include/uapi/linux/msm_audio_anc.h
new file mode 100644
index 000000000000..028d381bc1a6
--- /dev/null
+++ b/include/uapi/linux/msm_audio_anc.h
@@ -0,0 +1,53 @@
+#ifndef _UAPI_MSM_AUDIO_ANC_H
+#define _UAPI_MSM_AUDIO_ANC_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#define ANC_IOCTL_MAGIC 'a'
+
+#define AUDIO_ANC_SET_PARAM		_IOWR(ANC_IOCTL_MAGIC, \
+		300, struct audio_anc_packet *)
+#define AUDIO_ANC_GET_PARAM		_IOWR(ANC_IOCTL_MAGIC, \
+		301, struct audio_anc_packet *)
+
+#define ANC_CMD_START   0
+#define ANC_CMD_STOP   1
+#define ANC_CMD_RPM    2
+#define ANC_CMD_BYPASS_MODE    3
+#define ANC_CMD_ALGO_MODULE    4
+
+/* room for ANC_CMD define extend */
+#define ANC_CMD_MAX   0xFF
+
+struct audio_anc_header {
+	int32_t data_size;
+	int32_t version;
+	int32_t anc_cmd;
+	int32_t anc_cmd_size;
+};
+
+struct audio_anc_rpm_info {
+	int32_t rpm;
+};
+
+struct audio_anc_bypass_mode {
+	int32_t mode;
+};
+
+struct audio_anc_algo_module_info {
+	int32_t module_id;
+};
+
+union  audio_anc_data {
+	struct audio_anc_rpm_info rpm_info;
+	struct audio_anc_bypass_mode bypass_mode_info;
+	struct audio_anc_algo_module_info algo_info;
+};
+
+struct audio_anc_packet {
+	struct audio_anc_header hdr;
+	union  audio_anc_data anc_data;
+};
+
+#endif /* _UAPI_MSM_AUDIO_ANC_H */