Skip to content

L
linux
Commit 1714196c authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Mark Brown
Browse files
Options

ASoC: tlv320aic32x4: Use AIC32X4_REG macro for all register definitions 

All register definitions should use the AIC32X4_REG macro, even the ones
in page 0. This makes datasheet lookup more consistent and helps with
alignment both in this file and across other tlv320aic* drivers.
Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4fbd8d19
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 75 deletions
sound/soc/codecs/tlv320aic32x4.h
View file @ 1714196c
...@@ -19,81 +19,83 @@ int aic32x4_remove(struct device *dev); ...@@ -19,81 +19,83 @@ int aic32x4_remove(struct device *dev);
/* tlv320aic32x4 register space (in decimal to match datasheet) */ /* tlv320aic32x4 register space (in decimal to match datasheet) */
#define AIC32X4_PAGE1 128 #define AIC32X4_REG(page, reg) ((page * 128) + reg)
#define AIC32X4_PSEL 0 #define AIC32X4_PSEL AIC32X4_REG(0, 0)
#define AIC32X4_RESET 1
#define AIC32X4_CLKMUX 4 #define AIC32X4_RESET AIC32X4_REG(0, 1)
#define AIC32X4_PLLPR 5 #define AIC32X4_CLKMUX AIC32X4_REG(0, 4)
#define AIC32X4_PLLJ 6 #define AIC32X4_PLLPR AIC32X4_REG(0, 5)
#define AIC32X4_PLLDMSB 7 #define AIC32X4_PLLJ AIC32X4_REG(0, 6)
#define AIC32X4_PLLDLSB 8 #define AIC32X4_PLLDMSB AIC32X4_REG(0, 7)
#define AIC32X4_NDAC 11 #define AIC32X4_PLLDLSB AIC32X4_REG(0, 8)
#define AIC32X4_MDAC 12 #define AIC32X4_NDAC AIC32X4_REG(0, 11)
#define AIC32X4_DOSRMSB 13 #define AIC32X4_MDAC AIC32X4_REG(0, 12)
#define AIC32X4_DOSRLSB 14 #define AIC32X4_DOSRMSB AIC32X4_REG(0, 13)
#define AIC32X4_NADC 18 #define AIC32X4_DOSRLSB AIC32X4_REG(0, 14)
#define AIC32X4_MADC 19 #define AIC32X4_NADC AIC32X4_REG(0, 18)
#define AIC32X4_AOSR 20 #define AIC32X4_MADC AIC32X4_REG(0, 19)
#define AIC32X4_CLKMUX2 25 #define AIC32X4_AOSR AIC32X4_REG(0, 20)
#define AIC32X4_CLKOUTM 26 #define AIC32X4_CLKMUX2 AIC32X4_REG(0, 25)
#define AIC32X4_IFACE1 27 #define AIC32X4_CLKOUTM AIC32X4_REG(0, 26)
#define AIC32X4_IFACE2 28 #define AIC32X4_IFACE1 AIC32X4_REG(0, 27)
#define AIC32X4_IFACE3 29 #define AIC32X4_IFACE2 AIC32X4_REG(0, 28)
#define AIC32X4_BCLKN 30 #define AIC32X4_IFACE3 AIC32X4_REG(0, 29)
#define AIC32X4_IFACE4 31 #define AIC32X4_BCLKN AIC32X4_REG(0, 30)
#define AIC32X4_IFACE5 32 #define AIC32X4_IFACE4 AIC32X4_REG(0, 31)
#define AIC32X4_IFACE6 33 #define AIC32X4_IFACE5 AIC32X4_REG(0, 32)
#define AIC32X4_GPIOCTL 52 #define AIC32X4_IFACE6 AIC32X4_REG(0, 33)
#define AIC32X4_DOUTCTL 53 #define AIC32X4_GPIOCTL AIC32X4_REG(0, 52)
#define AIC32X4_DINCTL 54 #define AIC32X4_DOUTCTL AIC32X4_REG(0, 53)
#define AIC32X4_MISOCTL 55 #define AIC32X4_DINCTL AIC32X4_REG(0, 54)
#define AIC32X4_SCLKCTL 56 #define AIC32X4_MISOCTL AIC32X4_REG(0, 55)
#define AIC32X4_DACSPB 60 #define AIC32X4_SCLKCTL AIC32X4_REG(0, 56)
#define AIC32X4_ADCSPB 61 #define AIC32X4_DACSPB AIC32X4_REG(0, 60)
#define AIC32X4_DACSETUP 63 #define AIC32X4_ADCSPB AIC32X4_REG(0, 61)
#define AIC32X4_DACMUTE 64 #define AIC32X4_DACSETUP AIC32X4_REG(0, 63)
#define AIC32X4_LDACVOL 65 #define AIC32X4_DACMUTE AIC32X4_REG(0, 64)
#define AIC32X4_RDACVOL 66 #define AIC32X4_LDACVOL AIC32X4_REG(0, 65)
#define AIC32X4_ADCSETUP 81 #define AIC32X4_RDACVOL AIC32X4_REG(0, 66)
#define AIC32X4_ADCFGA 82 #define AIC32X4_ADCSETUP AIC32X4_REG(0, 81)
#define AIC32X4_LADCVOL 83 #define AIC32X4_ADCFGA AIC32X4_REG(0, 82)
#define AIC32X4_RADCVOL 84 #define AIC32X4_LADCVOL AIC32X4_REG(0, 83)
#define AIC32X4_LAGC1 86 #define AIC32X4_RADCVOL AIC32X4_REG(0, 84)
#define AIC32X4_LAGC2 87 #define AIC32X4_LAGC1 AIC32X4_REG(0, 86)
#define AIC32X4_LAGC3 88 #define AIC32X4_LAGC2 AIC32X4_REG(0, 87)
#define AIC32X4_LAGC4 89 #define AIC32X4_LAGC3 AIC32X4_REG(0, 88)
#define AIC32X4_LAGC5 90 #define AIC32X4_LAGC4 AIC32X4_REG(0, 89)
#define AIC32X4_LAGC6 91 #define AIC32X4_LAGC5 AIC32X4_REG(0, 90)
#define AIC32X4_LAGC7 92 #define AIC32X4_LAGC6 AIC32X4_REG(0, 91)
#define AIC32X4_RAGC1 94 #define AIC32X4_LAGC7 AIC32X4_REG(0, 92)
#define AIC32X4_RAGC2 95 #define AIC32X4_RAGC1 AIC32X4_REG(0, 94)
#define AIC32X4_RAGC3 96 #define AIC32X4_RAGC2 AIC32X4_REG(0, 95)
#define AIC32X4_RAGC4 97 #define AIC32X4_RAGC3 AIC32X4_REG(0, 96)
#define AIC32X4_RAGC5 98 #define AIC32X4_RAGC4 AIC32X4_REG(0, 97)
#define AIC32X4_RAGC6 99 #define AIC32X4_RAGC5 AIC32X4_REG(0, 98)
#define AIC32X4_RAGC7 100 #define AIC32X4_RAGC6 AIC32X4_REG(0, 99)
#define AIC32X4_PWRCFG (AIC32X4_PAGE1 + 1) #define AIC32X4_RAGC7 AIC32X4_REG(0, 100)
#define AIC32X4_LDOCTL (AIC32X4_PAGE1 + 2)
#define AIC32X4_OUTPWRCTL (AIC32X4_PAGE1 + 9) #define AIC32X4_PWRCFG AIC32X4_REG(1, 1)
#define AIC32X4_CMMODE (AIC32X4_PAGE1 + 10) #define AIC32X4_LDOCTL AIC32X4_REG(1, 2)
#define AIC32X4_HPLROUTE (AIC32X4_PAGE1 + 12) #define AIC32X4_OUTPWRCTL AIC32X4_REG(1, 9)
#define AIC32X4_HPRROUTE (AIC32X4_PAGE1 + 13) #define AIC32X4_CMMODE AIC32X4_REG(1, 10)
#define AIC32X4_LOLROUTE (AIC32X4_PAGE1 + 14) #define AIC32X4_HPLROUTE AIC32X4_REG(1, 12)
#define AIC32X4_LORROUTE (AIC32X4_PAGE1 + 15) #define AIC32X4_HPRROUTE AIC32X4_REG(1, 13)
#define AIC32X4_HPLGAIN (AIC32X4_PAGE1 + 16) #define AIC32X4_LOLROUTE AIC32X4_REG(1, 14)
#define AIC32X4_HPRGAIN (AIC32X4_PAGE1 + 17) #define AIC32X4_LORROUTE AIC32X4_REG(1, 15)
#define AIC32X4_LOLGAIN (AIC32X4_PAGE1 + 18) #define AIC32X4_HPLGAIN AIC32X4_REG(1, 16)
#define AIC32X4_LORGAIN (AIC32X4_PAGE1 + 19) #define AIC32X4_HPRGAIN AIC32X4_REG(1, 17)
#define AIC32X4_HEADSTART (AIC32X4_PAGE1 + 20) #define AIC32X4_LOLGAIN AIC32X4_REG(1, 18)
#define AIC32X4_MICBIAS (AIC32X4_PAGE1 + 51) #define AIC32X4_LORGAIN AIC32X4_REG(1, 19)
#define AIC32X4_LMICPGAPIN (AIC32X4_PAGE1 + 52) #define AIC32X4_HEADSTART AIC32X4_REG(1, 20)
#define AIC32X4_LMICPGANIN (AIC32X4_PAGE1 + 54) #define AIC32X4_MICBIAS AIC32X4_REG(1, 51)
#define AIC32X4_RMICPGAPIN (AIC32X4_PAGE1 + 55) #define AIC32X4_LMICPGAPIN AIC32X4_REG(1, 52)
#define AIC32X4_RMICPGANIN (AIC32X4_PAGE1 + 57) #define AIC32X4_LMICPGANIN AIC32X4_REG(1, 54)
#define AIC32X4_FLOATINGINPUT (AIC32X4_PAGE1 + 58) #define AIC32X4_RMICPGAPIN AIC32X4_REG(1, 55)
#define AIC32X4_LMICPGAVOL (AIC32X4_PAGE1 + 59) #define AIC32X4_RMICPGANIN AIC32X4_REG(1, 57)
#define AIC32X4_RMICPGAVOL (AIC32X4_PAGE1 + 60) #define AIC32X4_FLOATINGINPUT AIC32X4_REG(1, 58)
#define AIC32X4_LMICPGAVOL AIC32X4_REG(1, 59)
#define AIC32X4_RMICPGAVOL AIC32X4_REG(1, 60)
#define AIC32X4_FREQ_12000000 12000000 #define AIC32X4_FREQ_12000000 12000000
#define AIC32X4_FREQ_24000000 24000000 #define AIC32X4_FREQ_24000000 24000000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7