Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edc34a90 authored by Mark Brown's avatar Mark Brown Committed by Sascha Hauer
Browse files

mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices 



This means we don't need to go running round working out struct
devices at runtime.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 6b7b2849

arch/arm/mach-mx3/mx31ads.c

+2 −12
Original line number Diff line number Diff line
@@ -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 */
@@ -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,
@@ -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);