aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Prchal <jiri.prchal@aksignal.cz>2021-04-06 16:24:36 +0200
committerMark Brown <broonie@kernel.org>2021-04-07 16:58:24 +0100
commit73a4808892b83c8336c3d913d44b8de68d881369 (patch)
treef3b558625897a0c4b807f4eacbbd08d91497327b
parentMerge series "kbl_da7219_max9357a machine changes for wov and MST" from vamshi.krishna.gopal@intel.com (diff)
downloadlinux-dev-73a4808892b83c8336c3d913d44b8de68d881369.tar.xz
linux-dev-73a4808892b83c8336c3d913d44b8de68d881369.zip
ASoC: codecs: tlv320aic3x: move model definitions
Model definitions moved to header file. Preparation for SPI and I2C separated files. Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz> Link: https://lore.kernel.org/r/20210406142439.102396-2-jiri.prchal@aksignal.cz Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/tlv320aic3x.c4
-rw-r--r--sound/soc/codecs/tlv320aic3x.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index db1444127444..812f0f117fd3 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -82,10 +82,6 @@ struct aic3x_priv {
int master;
int gpio_reset;
int power;
-#define AIC3X_MODEL_3X 0
-#define AIC3X_MODEL_33 1
-#define AIC3X_MODEL_3007 2
-#define AIC3X_MODEL_3104 3
u16 model;
/* Selects the micbias voltage */
diff --git a/sound/soc/codecs/tlv320aic3x.h b/sound/soc/codecs/tlv320aic3x.h
index 66d3580cf2b1..21dd6edf1059 100644
--- a/sound/soc/codecs/tlv320aic3x.h
+++ b/sound/soc/codecs/tlv320aic3x.h
@@ -9,6 +9,11 @@
#ifndef _AIC3X_H
#define _AIC3X_H
+#define AIC3X_MODEL_3X 0
+#define AIC3X_MODEL_33 1
+#define AIC3X_MODEL_3007 2
+#define AIC3X_MODEL_3104 3
+
/* AIC3X register space */
#define AIC3X_CACHEREGNUM 110