summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaxminath Kasam <lkasam@codeaurora.org>2016-01-20 16:31:57 +0530
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:18:21 -0700
commitc006b9ad3be199764b5f39c3a52c9f7ecb213956 (patch)
tree86fabdd69a1d95e2c15887593f39f63ee04c74ed
parent94ce65be3cb12b0f7f92781f8f076a0e327480fe (diff)
ASoC: qdsp6v2: move AFE clock macros to header
As AFE clock version macros can be used in other drivers, move them to header file. Change-Id: Iae5717c181e81bf7a6161742e8d062d09bedfb78 Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
-rw-r--r--include/sound/q6afe-v2.h5
-rw-r--r--sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/include/sound/q6afe-v2.h b/include/sound/q6afe-v2.h
index c76709b55e6a..55918afa0ea3 100644
--- a/include/sound/q6afe-v2.h
+++ b/include/sound/q6afe-v2.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2016, 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
@@ -39,6 +39,9 @@
#define RT_PROXY_DAI_002_TX 0xE1
#define VIRTUAL_ID_TO_PORTID(val) ((val & 0xF) | 0x2000)
+#define AFE_CLK_VERSION_V1 1
+#define AFE_CLK_VERSION_V2 2
+
enum {
/* IDX 0->4 */
IDX_PRIMARY_I2S_RX,
diff --git a/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c b/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
index 3b4d99e64280..005939788373 100644
--- a/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2016, 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
@@ -36,8 +36,6 @@
#define CHANNEL_STATUS_MASK_INIT 0x0
#define CHANNEL_STATUS_MASK 0x4
#define AFE_API_VERSION_CLOCK_SET 1
-#define AFE_CLK_VERSION_V1 1
-#define AFE_CLK_VERSION_V2 2
static const struct afe_clk_set lpass_clk_set_default = {
AFE_API_VERSION_CLOCK_SET,