Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 316286
b: refs/heads/master
c: 784a897
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Prchal authored and Mark Brown committed Jul 4, 2012
1 parent 5453852 commit b7820c8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2974d6b1aa5261d8db1b614437cc6bafd3ddf0f2
refs/heads/master: 784a897e2310410ed169b5b331f2b7f06b7d58b7
19 changes: 18 additions & 1 deletion trunk/sound/soc/codecs/tlv320aic3x.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define _AIC3X_H

/* AIC3X register space */
#define AIC3X_CACHEREGNUM 103
#define AIC3X_CACHEREGNUM 110

/* Page select register */
#define AIC3X_PAGE_SELECT 0
Expand Down Expand Up @@ -74,6 +74,8 @@
#define HPLCOM_CFG 37
/* Right High Power Output control registers */
#define HPRCOM_CFG 38
/* High Power Output Stage Control Register */
#define HPOUT_SC 40
/* DAC Output Switching control registers */
#define DAC_LINE_MUX 41
/* High Power Output Driver Pop Reduction registers */
Expand Down Expand Up @@ -148,6 +150,17 @@
#define AIC3X_GPIOB_REG 101
/* Clock generation control register */
#define AIC3X_CLKGEN_CTRL_REG 102
/* New AGC registers */
#define LAGCN_ATTACK 103
#define LAGCN_DECAY 104
#define RAGCN_ATTACK 105
#define RAGCN_DECAY 106
/* New Programmable ADC Digital Path and I2C Bus Condition Register */
#define NEW_ADC_DIGITALPATH 107
/* Passive Analog Signal Bypass Selection During Powerdown Register */
#define PASSIVE_BYPASS 108
/* DAC Quiescent Current Adjustment Register */
#define DAC_ICC_ADJ 109

/* Page select register bits */
#define PAGE0_SELECT 0
Expand All @@ -163,6 +176,10 @@
#define DUAL_RATE_MODE ((1 << 5) | (1 << 6))
#define LDAC2LCH (0x1 << 3)
#define RDAC2RCH (0x1 << 1)
#define LDAC2RCH (0x2 << 3)
#define RDAC2LCH (0x2 << 1)
#define LDAC2MONOMIX (0x3 << 3)
#define RDAC2MONOMIX (0x3 << 1)

/* PLL registers bitfields */
#define PLLP_SHIFT 0
Expand Down

0 comments on commit b7820c8

Please sign in to comment.