Skip to contentSkip to conversation

ASoC: tlv320aic3x: add missing registers and bits

PATCH Superseded Prchal Jiří 3 participants 4 messages Jun 26, 2012

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: tlv320aic3x: add missing registers and bits

This patch adds missing registers and bits for TLV320AIC3106.

home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.c.new renamed from home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.c +14 -26
@@ -97,32 +97,20 @@
   * There is no point in caching the reset register
   */
  static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = {
-	0x00, 0x00, 0x00, 0x10,	/* 0 */
-	0x04, 0x00, 0x00, 0x00,	/* 4 */
-	0x00, 0x00, 0x00, 0x01,	/* 8 */
-	0x00, 0x00, 0x00, 0x80,	/* 12 */
-	0x80, 0xff, 0xff, 0x78,	/* 16 */
-	0x78, 0x78, 0x78, 0x78,	/* 20 */
-	0x78, 0x00, 0x00, 0xfe,	/* 24 */
-	0x00, 0x00, 0xfe, 0x00,	/* 28 */
-	0x18, 0x18, 0x00, 0x00,	/* 32 */
-	0x00, 0x00, 0x00, 0x00,	/* 36 */
-	0x00, 0x00, 0x00, 0x80,	/* 40 */
-	0x80, 0x00, 0x00, 0x00,	/* 44 */
-	0x00, 0x00, 0x00, 0x04,	/* 48 */
-	0x00, 0x00, 0x00, 0x00,	/* 52 */
-	0x00, 0x00, 0x04, 0x00,	/* 56 */
-	0x00, 0x00, 0x00, 0x00,	/* 60 */
-	0x00, 0x04, 0x00, 0x00,	/* 64 */
-	0x00, 0x00, 0x00, 0x00,	/* 68 */
-	0x04, 0x00, 0x00, 0x00,	/* 72 */
-	0x00, 0x00, 0x00, 0x00,	/* 76 */
-	0x00, 0x00, 0x00, 0x00,	/* 80 */
-	0x00, 0x00, 0x00, 0x00,	/* 84 */
-	0x00, 0x00, 0x00, 0x00,	/* 88 */
-	0x00, 0x00, 0x00, 0x00,	/* 92 */
-	0x00, 0x00, 0x00, 0x00,	/* 96 */
-	0x00, 0x00, 0x02,	/* 100 */
+	0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, /* 0 */
+	0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x80, /* 8 */
+	0x80, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, /* 16 */
+	0x78, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, /* 24 */
+	0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 32 */
+	0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, /* 40 */
+	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, /* 48 */
+	0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, /* 56 */
+	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 64 */
+	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 72 */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 80 */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 88 */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, /* 96 */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00,             /* 104 */
  };
 
  #define SOC_DAPM_SINGLE_AIC3X(xname, reg, shift, mask, invert) \
home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.h.new renamed from home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.h +18 -1
@@ -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
@@ -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 */
@@ -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
@@ -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
#1 lore raw

home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.c.new

Quoted 6 lines · Prchal Jiří

This patch adds missing registers and bits for TLV320AIC3106.

static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = {

home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.c.new renamed from home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.c +1 -1
-	0x00, 0x00, 0x00, 0x10,	/* 0 */
 
+	0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, /* 0 */

This is essentially impossible to review as you've not said what's being fixed and have completely reformatted the table so the diff doesn't highlight the changes at all. What's wrong and what is the change fixing?

#2 lore raw

Hi

My two cents on this:

Quoted 6 lines · Mark Brown
Quoted 4 lines · Prchal Jiří

This patch adds missing registers and bits for TLV320AIC3106.

 static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = {
-     0x00, 0x00, 0x00, 0x10, /* 0 */

Quoted 6 lines
Quoted 1 line

+     0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, /* 0 */

This is essentially impossible to review as you've not said what's being fixed and have completely reformatted the table so the diff doesn't highlight the changes at all.  What's wrong and what is the change fixing?

This is merely a match to the data sheet of various TLV320AIC310x codecs. I've planned on submitting almost the same patch a couple of months ago. The reformatting to my avail adds to readability, no values are changed. Only a couple of 0x00 are added for the missing additional registers and at least the TLV320AIC3101 and the TLV320AIC3106, which essentially were not initialized before.

On the other hand there is nothing for page 1 in this driver, since most probably there are no users of registers > 102 or page 1.

Cheers
Roberto
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#3 lore raw
Quoted 11 lines · Roberto Nibali

On Tue, Jun 26, 2012 at 3:21 PM, Mark Brown

Quoted 4 lines

This is essentially impossible to review as you've not said what's being fixed and have completely reformatted the table so the diff doesn't highlight the changes at all.  What's wrong and what is the change fixing?

This is merely a match to the data sheet of various TLV320AIC310x codecs. I've planned on submitting almost the same patch a couple of months ago. The reformatting to my avail adds to readability, no values are changed. Only a couple of 0x00 are added for the missing

This is irrelevant, you shouldn't be putting several unrelated changes into a single patch. It's bad for review and it's bad for reading the history Mixing minor style changes with bug fixes is especially bad, whatever actual changes you've made are essentially invisible in all the reformating.

To be perfectly honest I personally find your new version less readable, having more numbers per line means more counting is needed to figure out which register is which.

You've still also not clearly described what the actual changes are...