A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 21:54:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Mark Brown 2012-12-02 13:35:29 +09:00
commit faa9c2a798
6 changed files with 174 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/mfd/wm8994/core.h
View file

@ -19,6 +19,8 @@
#include <linux/interrupt.h>
#include <linux/regmap.h>
#include <linux/mfd/wm8994/pdata.h>
enum wm8994_type {
WM8994 = 0,
WM8958 = 1,
@ -55,6 +57,8 @@ struct regulator_bulk_data;
struct wm8994 {
struct mutex irq_lock;
struct wm8994_pdata pdata;
enum wm8994_type type;
int revision;
int cust_id;

5
include/linux/mfd/wm8994/pdata.h
View file

@ -176,6 +176,11 @@ struct wm8994_pdata {
unsigned int lineout1fb:1;
unsigned int lineout2fb:1;
/* Delay between detecting a jack and starting microphone
* detect (specified in ms)
*/
int micdet_delay;
/* IRQ for microphone detection if brought out directly as a
* signal.
*/