Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc/topic/wm0010', 'asoc/topic/wm8904' and 'asoc/topic/wm8962' into asoc-next

2014-08-04 16:32:18 +01:00
parent c5e64c7636 3e3e2922c1 563fe71fe7 5bca396919 8bfcab7c6b d7821953cf
commit e99a866c4c
60 changed files with 360 additions and 304 deletions
@@ -37,6 +37,7 @@
 #define WM8962_GPIO_FN_MICSCD          22

 struct wm8962_pdata {
+	struct clk *mclk;
 	int gpio_base;
 	u32 gpio_init[WM8962_MAX_GPIO];