samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dsp: compile avtimer based on avtimer config

Browse Source 
Enable compilation of avtimer only if CONFIG_MSM_AVTIMER
is enabled.

Change-Id: I64cc8c65dbe22fafee527da80d3615fb5201665f
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
This commit is contained in:
Vignesh Kulothungan
2020-01-02 16:20:19 -08:00
committed by Gerrit - the friendly Code Review server
parent 11c35ea451
commit 923be76f78
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dsp/Kbuild
View File

@@ -121,7 +121,6 @@ ifdef CONFIG_SND_SOC_MSM_QDSP6V2_INTF
Q6_OBJS += q6lsm.o Q6_OBJS += q6lsm.o
Q6_OBJS += adsp_err.o Q6_OBJS += adsp_err.o
Q6_OBJS += msm_audio_ion.o Q6_OBJS += msm_audio_ion.o
Q6_OBJS += avtimer.o
Q6_OBJS += q6_init.o Q6_OBJS += q6_init.o
endif endif
@@ -140,10 +139,13 @@ ifdef CONFIG_SND_SOC_MSM_QDSP6V2_VM
Q6_OBJS += q6lsm.o Q6_OBJS += q6lsm.o
Q6_OBJS += adsp_err.o Q6_OBJS += adsp_err.o
Q6_OBJS += msm_audio_ion_vm.o Q6_OBJS += msm_audio_ion_vm.o
Q6_OBJS += avtimer.o
Q6_OBJS += q6_init.o Q6_OBJS += q6_init.o
endif endif
ifdef CONFIG_MSM_AVTIMER
Q6_OBJS += avtimer.o
endif
ifdef CONFIG_XT_LOGGING ifdef CONFIG_XT_LOGGING
Q6_OBJS += sp_params.o Q6_OBJS += sp_params.o
endif endif

16
dsp/q6_init.h
View File

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
*/ */
#ifndef __Q6_INIT_H__ #ifndef __Q6_INIT_H__
@@ -15,7 +15,14 @@ int audio_cal_init(void);
int core_init(void); int core_init(void);
int rtac_init(void); int rtac_init(void);
int msm_audio_ion_init(void); int msm_audio_ion_init(void);
#if IS_ENABLED(CONFIG_MSM_AVTIMER)
int avtimer_init(void); int avtimer_init(void);
#else
static inline int avtimer_init(void)
{
return 0;
}
#endif
#ifdef CONFIG_MSM_MDF #ifdef CONFIG_MSM_MDF
int msm_mdf_init(void); int msm_mdf_init(void);
void msm_mdf_exit(void); void msm_mdf_exit(void);
@@ -43,7 +50,14 @@ static inline void spk_params_exit(void)
} }
#endif #endif
#if IS_ENABLED(CONFIG_MSM_AVTIMER)
void avtimer_exit(void); void avtimer_exit(void);
#else
static inline void avtimer_exit(void)
{
return;
}
#endif
void msm_audio_ion_exit(void); void msm_audio_ion_exit(void);
void rtac_exit(void); void rtac_exit(void);
void core_exit(void); void core_exit(void);

9
include/dsp/q6core.h
View File

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
*/ */
#ifndef __Q6CORE_H__ #ifndef __Q6CORE_H__
@@ -17,7 +17,14 @@
bool q6core_is_adsp_ready(void); bool q6core_is_adsp_ready(void);
#if IS_ENABLED(CONFIG_MSM_AVTIMER)
int avcs_core_query_timer_offset(int64_t *av_offset, int32_t clock_id); int avcs_core_query_timer_offset(int64_t *av_offset, int32_t clock_id);
#else
static inline int avcs_core_query_timer_offset(int64_t *av_offset,
int32_t clock_id) {
return 0;
}
#endif
int q6core_get_service_version(uint32_t service_id, int q6core_get_service_version(uint32_t service_id,
struct avcs_fwk_ver_info *ver_info, struct avcs_fwk_ver_info *ver_info,
size_t size); size_t size);