Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next

This commit is contained in:
Mark Brown 2015-06-05 18:54:46 +01:00
commit f3b368d3b9
4 changed files with 847 additions and 266 deletions

View file

@ -15,7 +15,6 @@ struct rt5645_platform_data {
/* IN2 can optionally be differential */
bool in2_diff;
bool dmic_en;
unsigned int dmic1_data_pin;
/* 0 = IN2N; 1 = GPIO5; 2 = GPIO11 */
unsigned int dmic2_data_pin;
@ -24,8 +23,6 @@ struct rt5645_platform_data {
unsigned int hp_det_gpio;
bool gpio_hp_det_active_high;
/* true if codec's jd function is used */
bool en_jd_func;
unsigned int jd_mode;
};