Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/ak4642', 'asoc/topic/ak5386' and 'asoc/topic/arizona' into asoc-next

2014-08-04 16:31:23 +01:00
parent 2fd5373467 d8df26bb57 27204ca8b9 2ad7654102 bedd4b1993
commit a486f183da
10 changed files with 347 additions and 53 deletions
--- a/include/linux/mfd/arizona/core.h
+++ b/include/linux/mfd/arizona/core.h
@@ -110,6 +110,12 @@ struct arizona {
 	int clk32k_ref;

 	struct snd_soc_dapm_context *dapm;
+
+	int tdm_width[ARIZONA_MAX_AIF];
+	int tdm_slots[ARIZONA_MAX_AIF];
+
+	uint16_t dac_comp_coeff;
+	uint8_t dac_comp_enabled;
 };

 int arizona_clk32k_enable(struct arizona *arizona);