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

4 files changed, 402 insertions, 0 deletions

diff --git a/include/linux/qdsp6v2/audio-anc-dev-mgr.h b/include/linux/qdsp6v2/audio-anc-dev-mgr.h
new file mode 100644
index 000000000000..dfa6752bc31b
--- /dev/null
+++ b/include/linux/qdsp6v2/audio-anc-dev-mgr.h
@@ -0,0 +1,46 @@
+/* Copyright (c) 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _AUDIO_ANC_DEV_MGR_H_
+#define _AUDIO_ANC_DEV_MGR_H_
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/wcd9xxx/core.h>
+#include <linux/bitops.h>
+#include <linux/slab.h>
+#include <linux/clk.h>
+#include <linux/of_device.h>
+#include <linux/clk/msm-clk.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/apr_audio-v2.h>
+#include <sound/q6afe-v2.h>
+#include <sound/msm-dai-q6-v2.h>
+#include <linux/msm_audio_anc.h>
+
+int msm_anc_dev_init(void);
+int msm_anc_dev_deinit(void);
+
+int msm_anc_dev_start(void);
+int msm_anc_dev_stop(void);
+
+int msm_anc_dev_set_info(void *info_p, int32_t anc_cmd);
+
+int msm_anc_dev_create(struct platform_device *pdev);
+
+int msm_anc_dev_destroy(struct platform_device *pdev);
+
+#endif
diff --git a/include/linux/qdsp6v2/sdsp_anc.h b/include/linux/qdsp6v2/sdsp_anc.h
new file mode 100644
index 000000000000..3b236e827e3d
--- /dev/null
+++ b/include/linux/qdsp6v2/sdsp_anc.h
@@ -0,0 +1,302 @@
+/* Copyright (c) 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef __SDSP_ANC_H__
+#define __SDSP_ANC_H__
+
+#include <sound/q6afe-v2.h>
+#include <sound/apr_audio-v2.h>
+
+
+#define AUD_MSVC_MODULE_AUDIO_DEV_RESOURCE_SHARE           0x0001028A
+#define AUD_MSVC_PARAM_ID_PORT_SHARE_RESOURCE_CONFIG       0x00010297
+#define AUD_MSVC_API_VERSION_SHARE_RESOURCE_CONFIG         0x1
+#define AUD_MSVC_MODULE_AUDIO_DEV_ANC_REFS                 0x00010254
+#define AUD_MSVC_PARAM_ID_DEV_ANC_REFS_CONFIG              0x00010286
+#define AUD_MSVC_API_VERSION_DEV_ANC_REFS_CONFIG           0x1
+#define AUD_MSVC_MODULE_AUDIO_DEV_ANC_ALGO                 0x00010234
+#define AUD_MSVC_PARAM_ID_PORT_ANC_ALGO_RPM                0x00010235
+#define AUD_MSVC_API_VERSION_DEV_ANC_ALGO_RPM              0x1
+
+struct aud_msvc_port_param_data_v2 {
+	/* ID of the module to be configured.
+	 * Supported values: Valid module ID
+	 */
+	u32 module_id;
+
+	/* ID of the parameter corresponding to the supported parameters
+	 * for the module ID.
+	 * Supported values: Valid parameter ID
+	 */
+	u32 param_id;
+
+	/* Actual size of the data for the
+	 * module_id/param_id pair. The size is a
+	 * multiple of four bytes.
+	 * Supported values: > 0
+	 */
+	u16 param_size;
+
+	/* This field must be set to zero.
+	 */
+	u16 reserved;
+} __packed;
+
+
+/*  Payload of the #AFE_PORT_CMD_SET_PARAM_V2 command's
+ * configuration/calibration settings for the AFE port.
+ */
+struct aud_msvc_port_cmd_set_param_v2 {
+	/* Port interface and direction (Rx or Tx) to start.
+	 */
+	u16 port_id;
+
+	/* Actual size of the payload in bytes.
+	 * This is used for parsing the parameter payload.
+	 * Supported values: > 0
+	 */
+	u16 payload_size;
+
+	/* LSW of 64 bit Payload address.
+	 * Address should be 32-byte,
+	 * 4kbyte aligned and must be contiguous memory.
+	 */
+	u32 payload_address_lsw;
+
+	/* MSW of 64 bit Payload address.
+	 * In case of 32-bit shared memory address,
+	 * this field must be set to zero.
+	 * In case of 36-bit shared memory address,
+	 * bit-4 to bit-31 must be set to zero.
+	 * Address should be 32-byte, 4kbyte aligned
+	 * and must be contiguous memory.
+	 */
+	u32 payload_address_msw;
+
+	/* Memory map handle returned by
+	 * AFE_SERVICE_CMD_SHARED_MEM_MAP_REGIONS commands.
+	 * Supported Values:
+	 * - NULL -- Message. The parameter data is in-band.
+	 * - Non-NULL -- The parameter data is Out-band.Pointer to
+	 * the physical address
+	 * in shared memory of the payload data.
+	 * An optional field is available if parameter
+	 * data is in-band:
+	 * aud_msvc_param_data_v2 param_data[...].
+	 * For detailed payload content, see the
+	 * aud_msvc_port_param_data_v2 structure.
+	 */
+	u32 mem_map_handle;
+
+} __packed;
+
+/*  Payload of the #AFE_PORT_CMD_GET_PARAM_V2 command,
+ * which queries for one post/preprocessing parameter of a
+ * stream.
+ */
+struct aud_msvc_port_cmd_get_param_v2 {
+	/* Port interface and direction (Rx or Tx) to start. */
+	u16 port_id;
+
+	/* Maximum data size of the parameter ID/module ID combination.
+	 * This is a multiple of four bytes
+	 * Supported values: > 0
+	 */
+	u16 payload_size;
+
+	/* LSW of 64 bit Payload address. Address should be 32-byte,
+	 * 4kbyte aligned and must be contig memory.
+	 */
+	u32 payload_address_lsw;
+
+	/* MSW of 64 bit Payload address. In case of 32-bit shared
+	 * memory address, this field must be set to zero. In case of 36-bit
+	 * shared memory address, bit-4 to bit-31 must be set to zero.
+	 * Address should be 32-byte, 4kbyte aligned and must be contiguous
+	 * memory.
+	 */
+	u32 payload_address_msw;
+
+	/* Memory map handle returned by
+	 * AFE_SERVICE_CMD_SHARED_MEM_MAP_REGIONS commands.
+	 * Supported Values: - NULL -- Message. The parameter data is
+	 * in-band. - Non-NULL -- The parameter data is Out-band.Pointer to
+	 * - the physical address in shared memory of the payload data.
+	 * For detailed payload content, see the aud_msvc_port_param_data_v2
+	 * structure
+	 */
+	u32 mem_map_handle;
+
+	/* ID of the module to be queried.
+	 * Supported values: Valid module ID
+	 */
+	 u32 module_id;
+
+	 /* ID of the parameter to be queried.
+	 * Supported values: Valid parameter ID
+	 */
+	u32 param_id;
+
+} __packed;
+
+struct aud_audioif_config_command {
+	struct apr_hdr			hdr;
+	struct aud_msvc_port_cmd_set_param_v2 param;
+	struct aud_msvc_port_param_data_v2    pdata;
+	union afe_port_config            port;
+} __packed;
+
+struct aud_msvc_param_id_dev_share_resource_cfg {
+	u32                  minor_version;
+	u16                  rddma_idx;
+	u16                  wrdma_idx;
+	u32                  lpm_start_addr;
+	u32                  lpm_length;
+} __packed;
+
+
+struct aud_msvc_param_id_dev_anc_algo_rpm {
+	u32                  minor_version;
+	u32                  rpm;
+} __packed;
+
+
+struct aud_msvc_param_id_dev_anc_refs_cfg {
+	u32                  minor_version;
+	u16                  port_id;
+	u16                  num_channel;
+	u32                  sample_rate;
+	u32                  bit_width;
+} __packed;
+
+
+struct anc_share_resource_command {
+	struct apr_hdr			hdr;
+	struct aud_msvc_port_cmd_set_param_v2 param;
+	struct aud_msvc_port_param_data_v2    pdata;
+	struct aud_msvc_param_id_dev_share_resource_cfg resource;
+} __packed;
+
+
+struct anc_config_ref_command {
+	struct apr_hdr			hdr;
+	struct aud_msvc_port_cmd_set_param_v2 param;
+	struct aud_msvc_port_param_data_v2    pdata;
+	struct aud_msvc_param_id_dev_anc_refs_cfg refs;
+} __packed;
+
+
+
+struct anc_set_rpm_command {
+	struct apr_hdr			hdr;
+	struct aud_msvc_port_cmd_set_param_v2 param;
+	struct aud_msvc_port_param_data_v2    pdata;
+	struct aud_msvc_param_id_dev_anc_algo_rpm set_rpm;
+} __packed;
+
+struct anc_get_rpm_command {
+	struct apr_hdr			hdr;
+	struct aud_msvc_port_cmd_get_param_v2 param;
+	struct aud_msvc_port_param_data_v2    pdata;
+	struct aud_msvc_param_id_dev_anc_algo_rpm get_rpm;
+} __packed;
+
+struct anc_get_rpm_resp {
+	uint32_t status;
+	struct aud_msvc_port_param_data_v2 pdata;
+	struct aud_msvc_param_id_dev_anc_algo_rpm res_rpm;
+} __packed;
+
+#define AUD_MSVC_PARAM_ID_PORT_ANC_ALGO_BYPASS_MODE      0x0001029B
+
+#define AUD_MSVC_API_VERSION_DEV_ANC_ALGO_BYPASS_MODE    0x1
+
+#define AUD_MSVC_ANC_ALGO_BYPASS_MODE_NO                               0x0
+#define AUD_MSVC_ANC_ALGO_BYPASS_MODE_REFS_TO_ANC_SPKR                 0x1
+#define AUD_MSVC_ANC_ALGO_BYPASS_MODE_ANC_MIC_TO_ANC_SPKR              0x2
+#define AUD_MSVC_ANC_ALGO_BYPASS_MODE_REFS_MIXED_ANC_MIC_TO_ANC_SPKR   0x3
+
+struct aud_msvc_param_id_dev_anc_algo_bypass_mode {
+	uint32_t                  minor_version;
+	uint32_t                  bypass_mode;
+} __packed;
+
+struct anc_set_bypass_mode_command {
+	struct apr_hdr                   hdr;
+	struct aud_msvc_port_cmd_set_param_v2 param;
+	struct aud_msvc_port_param_data_v2    pdata;
+	struct aud_msvc_param_id_dev_anc_algo_bypass_mode set_bypass_mode;
+} __packed;
+
+#define AUD_MSVC_PARAM_ID_PORT_ANC_ALGO_MODULE_ID      0x0001023A
+
+struct aud_msvc_param_id_dev_anc_algo_module_id {
+	uint32_t                  minor_version;
+	uint32_t                  module_id;
+} __packed;
+
+struct anc_set_algo_module_id_command {
+	struct apr_hdr                   hdr;
+	struct aud_msvc_port_cmd_set_param_v2 param;
+	struct aud_msvc_port_param_data_v2    pdata;
+	struct aud_msvc_param_id_dev_anc_algo_module_id set_algo_module_id;
+} __packed;
+
+
+#define AUD_MSVC_PARAM_ID_PORT_ANC_MIC_SPKR_LAYOUT_INFO   0x0001029C
+
+#define AUD_MSVC_API_VERSION_DEV_ANC_MIC_SPKR_LAYOUT_INFO        0x1
+
+#define AUD_MSVC_ANC_MAX_NUM_OF_MICS              16
+#define AUD_MSVC_ANC_MAX_NUM_OF_SPKRS             16
+
+struct aud_msvc_param_id_dev_anc_mic_spkr_layout_info {
+	uint32_t minor_version;
+	uint16_t mic_layout_array[AUD_MSVC_ANC_MAX_NUM_OF_MICS];
+	uint16_t spkr_layout_array[AUD_MSVC_ANC_MAX_NUM_OF_SPKRS];
+	uint16_t num_anc_mic;
+	uint16_t num_anc_spkr;
+	uint16_t num_add_mic_signal;
+	uint16_t num_add_spkr_signal;
+} __packed;
+
+struct anc_set_mic_spkr_layout_info_command {
+	struct apr_hdr                   hdr;
+	struct aud_msvc_port_cmd_set_param_v2 param;
+	struct aud_msvc_port_param_data_v2    pdata;
+	struct aud_msvc_param_id_dev_anc_mic_spkr_layout_info
+		set_mic_spkr_layout;
+} __packed;
+
+int anc_if_tdm_port_start(u16 port_id, struct afe_tdm_port_config *tdm_port);
+
+int anc_if_tdm_port_stop(u16 port_id);
+
+int anc_if_share_resource(u16 port_id, u16 rddma_idx, u16 wrdma_idx,
+		u32 lpm_start_addr, u32 lpm_length);
+
+int anc_if_config_ref(u16 port_id, u32 sample_rate, u32 bit_width,
+		u16 num_channel);
+
+int anc_if_set_rpm(u16 port_id, u32 rpm);
+
+int anc_if_set_bypass_mode(u16 port_id, u32 bypass_mode);
+
+int anc_if_set_algo_module_id(u16 port_id, u32 module_id);
+
+int anc_if_set_anc_mic_spkr_layout(u16 port_id,
+struct aud_msvc_param_id_dev_anc_mic_spkr_layout_info *set_mic_spkr_layout_p);
+
+int anc_if_shared_mem_map(void);
+
+int anc_if_shared_mem_unmap(void);
+
+#endif /* __SDSP_ANC_H__ */
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 */