Revert "ASoC: msm: qdsp6v2: Propagate device HW delay to AFE."
This reverts commit 88928532db06d3f595b79256616941233fefaaef
Change-Id: I9217571fe42b2834e4b5f2d6e27c7fe2dc8d6c3b
diff --git a/include/linux/msm_audio_acdb.h b/include/linux/msm_audio_acdb.h
index d88d3e4..e7f06b5 100644
--- a/include/linux/msm_audio_acdb.h
+++ b/include/linux/msm_audio_acdb.h
@@ -39,10 +39,8 @@
(AUDIO_MAX_COMMON_IOCTL_NUM+16), unsigned)
#define AUDIO_SET_AFE_RX_CAL _IOW(AUDIO_IOCTL_MAGIC, \
(AUDIO_MAX_COMMON_IOCTL_NUM+17), unsigned)
-#define AUDIO_SET_HW_DELAY_RX _IOW(AUDIO_IOCTL_MAGIC, \
- (AUDIO_MAX_COMMON_IOCTL_NUM+18), struct hw_delay)
-#define AUDIO_SET_HW_DELAY_TX _IOW(AUDIO_IOCTL_MAGIC, \
- (AUDIO_MAX_COMMON_IOCTL_NUM+19), struct hw_delay)
+
+
#define AUDIO_MAX_ACDB_IOCTL (AUDIO_MAX_COMMON_IOCTL_NUM+30)
/* ACDB structures */
@@ -56,10 +54,6 @@
uint16_t gain;
};
-struct hw_delay {
- uint32_t num_entries;
- void *delay_info;
-};
/* For Real-Time Audio Calibration */
#define AUDIO_GET_RTAC_ADM_INFO _IOR(AUDIO_IOCTL_MAGIC, \
(AUDIO_MAX_ACDB_IOCTL+1), unsigned)
diff --git a/include/sound/apr_audio.h b/include/sound/apr_audio.h
index f303c62..0711b2b 100644
--- a/include/sound/apr_audio.h
+++ b/include/sound/apr_audio.h
@@ -304,14 +304,6 @@
#define AFE_PORT_MULTI_CHAN_HDMI_AUDIO_IF_CONFIG 0x000100D9
#define AFE_PORT_CMD_I2S_CONFIG 0x000100E7
-#define AFE_PARAM_ID_DEVICE_HW_DELAY 0x00010243
-#define AFE_API_VERSION_DEVICE_HW_DELAY 0x1
-
-struct afe_param_id_device_hw_delay_cfg {
- uint32_t device_hw_delay_minor_version;
- uint32_t delay_in_us;
-} __packed;
-
union afe_port_config {
struct afe_port_pcm_cfg pcm;
struct afe_port_mi2s_cfg mi2s;
@@ -425,7 +417,6 @@
struct afe_param_channels channels;
struct afe_param_loopback_gain loopback_gain;
struct afe_param_loopback_cfg loopback_cfg;
- struct afe_param_id_device_hw_delay_cfg hw_delay;
} __attribute__((packed)) param;
} __attribute__ ((packed));