Commit 1f489f9e authored by Thomas Weber's avatar Thomas Weber Committed by Tony Lindgren
Browse files

OMAP2: Devkit8000: Using the REGULATOR_SUPPLY macro



Replacing supplies with the REGULATOR_SUPPLY macro.
Signed-off-by: default avatarThomas Weber <weber@corscience.de>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e185469b
......@@ -158,14 +158,13 @@ static void devkit8000_panel_disable_dvi(struct omap_dss_device *dssdev)
gpio_set_value(dssdev->reset_gpio, 0);
}
static struct regulator_consumer_supply devkit8000_vmmc1_supply = {
.supply = "vmmc",
};
static struct regulator_consumer_supply devkit8000_vmmc1_supply =
REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0");
/* ads7846 on SPI */
static struct regulator_consumer_supply devkit8000_vio_supplies[] = {
REGULATOR_SUPPLY("vcc", "spi2.0")
};
static struct regulator_consumer_supply devkit8000_vio_supply =
REGULATOR_SUPPLY("vcc", "spi2.0");
static struct omap_dss_device devkit8000_lcd_device = {
.name = "lcd",
......@@ -214,10 +213,8 @@ static struct platform_device devkit8000_dss_device = {
},
};
static struct regulator_consumer_supply devkit8000_vdda_dac_supply = {
.supply = "vdda_dac",
.dev = &devkit8000_dss_device.dev,
};
static struct regulator_consumer_supply devkit8000_vdda_dac_supply =
REGULATOR_SUPPLY("vdda_dac", "omapdss");
static int board_keymap[] = {
KEY(0, 0, KEY_1),
......@@ -294,12 +291,8 @@ static struct twl4030_gpio_platform_data devkit8000_gpio_data = {
.setup = devkit8000_twl_gpio_setup,
};
static struct regulator_consumer_supply devkit8000_vpll1_supplies[] = {
{
.supply = "vdds_dsi",
.dev = &devkit8000_dss_device.dev,
}
};
static struct regulator_consumer_supply devkit8000_vpll1_supply =
REGULATOR_SUPPLY("vdds_dsi", "omapdss");
/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
static struct regulator_init_data devkit8000_vmmc1 = {
......@@ -340,8 +333,8 @@ static struct regulator_init_data devkit8000_vpll1 = {
.valid_ops_mask = REGULATOR_CHANGE_MODE
| REGULATOR_CHANGE_STATUS,
},
.num_consumer_supplies = ARRAY_SIZE(devkit8000_vpll1_supplies),
.consumer_supplies = devkit8000_vpll1_supplies,
.num_consumer_supplies = 1,
.consumer_supplies = &devkit8000_vpll1_supply,
};
/* VAUX4 for ads7846 and nubs */
......@@ -355,8 +348,8 @@ static struct regulator_init_data devkit8000_vio = {
.valid_ops_mask = REGULATOR_CHANGE_MODE
| REGULATOR_CHANGE_STATUS,
},
.num_consumer_supplies = ARRAY_SIZE(devkit8000_vio_supplies),
.consumer_supplies = devkit8000_vio_supplies,
.num_consumer_supplies = 1,
.consumer_supplies = &devkit8000_vio_supply,
};
static struct twl4030_usb_data devkit8000_usb_data = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment