ASoC: sun4i-codec: Rename some sun7i-only registers
authorDanny Milosavljevic <dannym@scratchpost.org>
Thu, 22 Sep 2016 07:13:12 +0000 (09:13 +0200)
committerMark Brown <broonie@kernel.org>
Sat, 24 Sep 2016 18:14:42 +0000 (19:14 +0100)
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>
sound/soc/sunxi/sun4i-codec.c

index 44f170c73b06a95a71d3b1a1680db37a8fb227f8..9d8c027f7c55ca46a06b0831b6393fb3d8a5953d 100644 (file)
@@ -96,8 +96,8 @@
 /* Other various ADC registers */
 #define SUN4I_CODEC_DAC_TXCNT                  (0x30)
 #define SUN4I_CODEC_ADC_RXCNT                  (0x34)
-#define SUN4I_CODEC_AC_SYS_VERI                        (0x38)
-#define SUN4I_CODEC_AC_MIC_PHONE_CAL           (0x3c)
+#define SUN7I_CODEC_AC_DAC_CAL                 (0x38)
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL           (0x3c)
 
 struct sun4i_codec {
        struct device   *dev;
@@ -680,7 +680,7 @@ static const struct regmap_config sun4i_codec_regmap_config = {
        .reg_bits       = 32,
        .reg_stride     = 4,
        .val_bits       = 32,
-       .max_register   = SUN4I_CODEC_AC_MIC_PHONE_CAL,
+       .max_register   = SUN7I_CODEC_AC_MIC_PHONE_CAL,
 };
 
 static const struct of_device_id sun4i_codec_of_match[] = {