diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2016-09-22 09:13:12 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-24 19:14:42 +0100 |
| commit | 4f0c4e99312d8887483474d60e47ab4e24713114 (patch) | |
| tree | 71b2f4654a4a5b238d245ad404a7f78497613132 /sound | |
| parent | 702650bda073cb9df90e3a091ee515f340133b05 (diff) | |
| download | linux-stable-4f0c4e99312d8887483474d60e47ab4e24713114.tar.gz linux-stable-4f0c4e99312d8887483474d60e47ab4e24713114.tar.bz2 linux-stable-4f0c4e99312d8887483474d60e47ab4e24713114.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sunxi/sun4i-codec.c | 6 |
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 @@ /* 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[] = { |