mfd: wm8994: Remove unused LDO supply field from WM8994 pdata
PATCH 1/2 mfd: wm8994: 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 <[email protected]>
--- arch/arm/mach-s3c64xx/mach-crag6410-module.c | 6 ++++-- include/linux/mfd/wm8994/pdata.h | 1 - 2 files changed, 4 insertions(+), 3 deletions(-)
arch/arm/mach-s3c64xx/mach-crag6410-module.c +4 -2
@@ -17,6 +17,8 @@#include <linux/mfd/wm831x/gpio.h> #include <linux/mfd/wm8994/pdata.h> +#include <linux/regulator/machine.h> +#include <sound/wm0010.h> #include <sound/wm5100.h> #include <sound/wm8996.h>
@@ -168,8 +170,8 @@ static struct wm8994_pdata wm8994_pdata = { }, .irq_base = CODEC_IRQ_BASE, .ldo = { - { .supply = "WALLVDD" }, - { .supply = "WALLVDD" }, + { }, + { }, }, };
include/linux/mfd/wm8994/pdata.h +0 -1
@@ -22,7 +22,6 @@ struct wm8994_ldo_pdata {/** GPIOs to enable regulator, 0 or less if not available */ int enable; -const char *supply;const struct regulator_init_data *init_data; };
Signature · 1 line
1.7.9.1
PATCH 2/2 ARM: S3C64XX: Hook up supply for WM8994 LDOs on Littlemill
Signed-off-by Mark Brown <[email protected]>
---
Kukjin, are you OK with this going via the MFD tree? It depends on the previous change.
arch/arm/mach-s3c64xx/mach-crag6410-module.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
arch/arm/mach-s3c64xx/mach-crag6410-module.c +10 -2
@@ -163,6 +163,14 @@ static const struct i2c_board_info wm1259_devs[] = { }, }; +static struct regulator_init_data wm8994_ldo1 = { + .supply_regulator ="WALLVDD" , +}; + +static struct regulator_init_data wm8994_ldo2 = { + .supply_regulator ="WALLVDD" , +}; +static struct wm8994_pdata wm8994_pdata = { .gpio_base =CODEC_GPIO_BASE , .gpio_defaults = {
@@ -170,8 +178,8 @@ static struct wm8994_pdata wm8994_pdata = { }, .irq_base = CODEC_IRQ_BASE, .ldo = { - { }, - { }, + { .init_data = &wm8994_ldo1, }, + { .init_data = &wm8994_ldo2, }, }, };
Signature · 1 line
1.7.9.1