瀏覽代碼

mfd: Remove unused LDO supply field from WM8994 pdata

It's causing confusion with the regulator level field of the same name
and serves no useful function.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Mark Brown 13 年之前
父節點
當前提交
719a42402b
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 4 2
      arch/arm/mach-s3c64xx/mach-crag6410-module.c
  2. 0 1
      include/linux/mfd/wm8994/pdata.h

+ 4 - 2
arch/arm/mach-s3c64xx/mach-crag6410-module.c

@@ -16,6 +16,8 @@
 #include <linux/mfd/wm831x/gpio.h>
 #include <linux/mfd/wm831x/gpio.h>
 #include <linux/mfd/wm8994/pdata.h>
 #include <linux/mfd/wm8994/pdata.h>
 
 
+#include <linux/regulator/machine.h>
+
 #include <sound/wm5100.h>
 #include <sound/wm5100.h>
 #include <sound/wm8996.h>
 #include <sound/wm8996.h>
 #include <sound/wm8962.h>
 #include <sound/wm8962.h>
@@ -141,8 +143,8 @@ static struct wm8994_pdata wm8994_pdata = {
 	},
 	},
 	.irq_base = CODEC_IRQ_BASE,
 	.irq_base = CODEC_IRQ_BASE,
 	.ldo = {
 	.ldo = {
-		{ .supply = "WALLVDD" },
-		{ .supply = "WALLVDD" },
+		 { },
+		 { },
 	},
 	},
 };
 };
 
 

+ 0 - 1
include/linux/mfd/wm8994/pdata.h

@@ -22,7 +22,6 @@ struct wm8994_ldo_pdata {
 	/** GPIOs to enable regulator, 0 or less if not available */
 	/** GPIOs to enable regulator, 0 or less if not available */
 	int enable;
 	int enable;
 
 
-	const char *supply;
 	const struct regulator_init_data *init_data;
 	const struct regulator_init_data *init_data;
 };
 };