fixing build error when algo enabledTAS2562_v1.0

4 files changed, 34 insertions, 1 deletions

diff --git a/dsp/smart_amp.h b/dsp/smart_amp.h
index 4b0aa10..5331264 100644
--- a/dsp/smart_amp.h
+++ b/dsp/smart_amp.h
@@ -67,6 +67,7 @@ typedef enum {
         IV_SENSE_FORMAT_12_BIT_WITH_8BIT_VBAT = 1,
 } ti_smartamp_iv_vbat_format_t;
 
+#ifdef INSTANCE_ID_0
 struct afe_smartamp_set_params_t {
         uint32_t  payload[TAS_PAYLOAD_SIZE];
 } __packed;
@@ -87,6 +88,30 @@ struct afe_smartamp_calib_get_resp {
         struct param_hdr_v3 pdata;
         struct afe_smartamp_get_params_t res_cfg;
 } __packed;
+#else
+struct afe_smartamp_set_params_t {
+        uint32_t  payload[TAS_PAYLOAD_SIZE];
+} __packed;     
+struct afe_smartamp_config_command {
+        struct apr_hdr                      hdr;
+        struct afe_port_cmd_set_param_v2    param;
+        struct afe_port_param_data_v2       pdata;
+        struct afe_smartamp_set_params_t  prot_config;
+} __packed;
+
+struct afe_smartamp_get_calib {
+        struct apr_hdr hdr;
+        struct afe_port_cmd_get_param_v2   get_param;
+        struct afe_port_param_data_v2      pdata;
+        struct afe_smartamp_set_params_t   res_cfg;
+} __packed;
+
+struct afe_smartamp_calib_get_resp {
+        uint32_t status;
+        struct afe_port_param_data_v2 pdata;
+        struct afe_smartamp_set_params_t res_cfg;
+} __packed;     
+#endif
 
 int afe_smartamp_get_calib_data(struct afe_smartamp_get_calib *calib_resp,
                 uint32_t param_id, uint32_t module_id, uint32_t port_id);
diff --git a/tas2562-codec.c b/tas2562-codec.c
index 4b0ea19..70ba4c5 100644
--- a/tas2562-codec.c
+++ b/tas2562-codec.c
@@ -45,7 +45,11 @@
 
 #include "tas2562.h"
 #ifdef CONFIG_TAS25XX_ALGO
+#ifdef CONFIG_PLATFORM_EXYNOS
 #include <sound/smart_amp.h>
+#else
+#include <dsp/smart_amp.h>
+#endif /*CONFIG_PLATFORM_EXYNOS*/
 #include "tas25xx-calib.h"
 #endif /*CONFIG_TAS25XX_ALGO*/
 
diff --git a/tas2562-regmap.c b/tas2562-regmap.c
index 7d5ab21..b3bbc55 100644
--- a/tas2562-regmap.c
+++ b/tas2562-regmap.c
@@ -40,7 +40,11 @@
 #include "tas2562-codec.h"
 #include "tas2562-misc.h"
 #ifdef CONFIG_TAS25XX_ALGO
+#ifdef CONFIG_PLATFORM_EXYNOS
 #include <sound/smart_amp.h>
+#else
+#include <dsp/smart_amp.h>
+#endif
 #endif /*CONFIG_TAS25XX_ALGO*/
 
 static char p_icn_threshold[] = {0x00, 0x01, 0x2f, 0x2c};
diff --git a/tas25xx-calib.c b/tas25xx-calib.c
index 259b6b9..3bb2d3d 100644
--- a/tas25xx-calib.c
+++ b/tas25xx-calib.c
@@ -101,7 +101,7 @@ static int smartamp_params_ctrl(uint8_t *input, u8 dir, u8 count)
          * AFE_PARAM_ID_ENABLE and AFE_PARAM_ID_SMARTAMP_DEFAULT
          */
 
-        #ifndef PLATFORM_EXYNOS
+        #ifndef CONFIG_PLATFORM_EXYNOS
         if (paramid == CAPI_V2_TAS_TX_ENABLE ||
                 paramid == CAPI_V2_TAS_TX_CFG ||
                 paramid == CAPI_V2_TAS_RX_ENABLE ||