Skip to content

Commit

Permalink
mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices
Browse files Browse the repository at this point in the history
This means we don't need to go running round working out struct
devices at runtime.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
Mark Brown authored and Sascha Hauer committed Jan 5, 2010
1 parent 6b7b284 commit edc34a9
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions arch/arm/mach-mx3/mx31ads.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,8 @@ static struct regulator_init_data ldo1_data = {
};

static struct regulator_consumer_supply ldo2_consumers[] = {
{
.supply = "AVDD",
},
{
.supply = "HPVDD",
},
{ .supply = "AVDD", .dev_name = "1-001a" },
{ .supply = "HPVDD", .dev_name = "1-001a" },
};

/* CODEC and SIM */
Expand Down Expand Up @@ -382,8 +378,6 @@ static struct wm8350_audio_platform_data imx32ads_wm8350_setup = {

static int mx31_wm8350_init(struct wm8350 *wm8350)
{
int i;

wm8350_gpio_config(wm8350, 0, WM8350_GPIO_DIR_IN,
WM8350_GPIO0_PWR_ON_IN, WM8350_GPIO_ACTIVE_LOW,
WM8350_GPIO_PULL_UP, WM8350_GPIO_INVERT_OFF,
Expand Down Expand Up @@ -419,10 +413,6 @@ static int mx31_wm8350_init(struct wm8350 *wm8350)
WM8350_GPIO_PULL_NONE, WM8350_GPIO_INVERT_OFF,
WM8350_GPIO_DEBOUNCE_OFF);

/* Fix up for our own supplies. */
for (i = 0; i < ARRAY_SIZE(ldo2_consumers); i++)
ldo2_consumers[i].dev = wm8350->dev;

wm8350_register_regulator(wm8350, WM8350_DCDC_1, &sw1a_data);
wm8350_register_regulator(wm8350, WM8350_DCDC_3, &viohi_data);
wm8350_register_regulator(wm8350, WM8350_DCDC_4, &violo_data);
Expand Down

0 comments on commit edc34a9

Please sign in to comment.