summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-05 13:54:46 -0400
committerMark Brown <broonie@kernel.org>2015-06-05 13:54:46 -0400
commitf3b368d3b9a22bb1ddc80808a64ecb7559791e87 (patch)
treeffe7f0c236b24d441fd779a839f7a1224e6be8e6 /include/sound
parent977732b06045a508edc7b105e9fef524163616df (diff)
parent345b0f50e74671fd8299e26c73ab50c5a0cf6ed9 (diff)
Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/rt5645.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h
index 120d9610054e..652cb9e4afe5 100644
--- a/include/sound/rt5645.h
+++ b/include/sound/rt5645.h
@@ -15,7 +15,6 @@ struct rt5645_platform_data {
15 /* IN2 can optionally be differential */ 15 /* IN2 can optionally be differential */
16 bool in2_diff; 16 bool in2_diff;
17 17
18 bool dmic_en;
19 unsigned int dmic1_data_pin; 18 unsigned int dmic1_data_pin;
20 /* 0 = IN2N; 1 = GPIO5; 2 = GPIO11 */ 19 /* 0 = IN2N; 1 = GPIO5; 2 = GPIO11 */
21 unsigned int dmic2_data_pin; 20 unsigned int dmic2_data_pin;
@@ -24,8 +23,6 @@ struct rt5645_platform_data {
24 unsigned int hp_det_gpio; 23 unsigned int hp_det_gpio;
25 bool gpio_hp_det_active_high; 24 bool gpio_hp_det_active_high;
26 25
27 /* true if codec's jd function is used */
28 bool en_jd_func;
29 unsigned int jd_mode; 26 unsigned int jd_mode;
30}; 27};
31 28