aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2016-09-22 03:13:12 -0400
committerMark Brown <broonie@kernel.org>2016-09-24 14:14:42 -0400
commit4f0c4e99312d8887483474d60e47ab4e24713114 (patch)
tree71b2f4654a4a5b238d245ad404a7f78497613132
parent702650bda073cb9df90e3a091ee515f340133b05 (diff)
ASoC: sun4i-codec: Rename some sun7i-only registers
Some of the registers defined in the driver are only usable on the A20. Rename these registers. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/sunxi/sun4i-codec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 44f170c73b06..9d8c027f7c55 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -96,8 +96,8 @@
96/* Other various ADC registers */ 96/* Other various ADC registers */
97#define SUN4I_CODEC_DAC_TXCNT (0x30) 97#define SUN4I_CODEC_DAC_TXCNT (0x30)
98#define SUN4I_CODEC_ADC_RXCNT (0x34) 98#define SUN4I_CODEC_ADC_RXCNT (0x34)
99#define SUN4I_CODEC_AC_SYS_VERI (0x38) 99#define SUN7I_CODEC_AC_DAC_CAL (0x38)
100#define SUN4I_CODEC_AC_MIC_PHONE_CAL (0x3c) 100#define SUN7I_CODEC_AC_MIC_PHONE_CAL (0x3c)
101 101
102struct sun4i_codec { 102struct sun4i_codec {
103 struct device *dev; 103 struct device *dev;
@@ -680,7 +680,7 @@ static const struct regmap_config sun4i_codec_regmap_config = {
680 .reg_bits = 32, 680 .reg_bits = 32,
681 .reg_stride = 4, 681 .reg_stride = 4,
682 .val_bits = 32, 682 .val_bits = 32,
683 .max_register = SUN4I_CODEC_AC_MIC_PHONE_CAL, 683 .max_register = SUN7I_CODEC_AC_MIC_PHONE_CAL,
684}; 684};
685 685
686static const struct of_device_id sun4i_codec_of_match[] = { 686static const struct of_device_id sun4i_codec_of_match[] = {