aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-16 14:36:29 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-03-16 14:36:29 -0400
commit719a42402b3abd2323c31a03bc8f03d6b8c78eaf (patch)
tree0b38403252dae1c3233bce34c5129286edbaa602
parent39ecb0376508b5cd20a951388d10aed2d719a77f (diff)
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>
-rw-r--r--arch/arm/mach-s3c64xx/mach-crag6410-module.c6
-rw-r--r--include/linux/mfd/wm8994/pdata.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index cd3c97e2ee75..e1ea2ffb6c02 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -16,6 +16,8 @@
16#include <linux/mfd/wm831x/gpio.h> 16#include <linux/mfd/wm831x/gpio.h>
17#include <linux/mfd/wm8994/pdata.h> 17#include <linux/mfd/wm8994/pdata.h>
18 18
19#include <linux/regulator/machine.h>
20
19#include <sound/wm5100.h> 21#include <sound/wm5100.h>
20#include <sound/wm8996.h> 22#include <sound/wm8996.h>
21#include <sound/wm8962.h> 23#include <sound/wm8962.h>
@@ -141,8 +143,8 @@ static struct wm8994_pdata wm8994_pdata = {
141 }, 143 },
142 .irq_base = CODEC_IRQ_BASE, 144 .irq_base = CODEC_IRQ_BASE,
143 .ldo = { 145 .ldo = {
144 { .supply = "WALLVDD" }, 146 { },
145 { .supply = "WALLVDD" }, 147 { },
146 }, 148 },
147}; 149};
148 150
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index 3fb1f407d5e6..4c1fb71c8107 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -22,7 +22,6 @@ struct wm8994_ldo_pdata {
22 /** GPIOs to enable regulator, 0 or less if not available */ 22 /** GPIOs to enable regulator, 0 or less if not available */
23 int enable; 23 int enable;
24 24
25 const char *supply;
26 const struct regulator_init_data *init_data; 25 const struct regulator_init_data *init_data;
27}; 26};
28 27