leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OMAP2: Devkit8000: Using the REGULATOR_SUPPLY macro

Browse Source 
Replacing supplies with the REGULATOR_SUPPLY macro.

Signed-off-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Thomas Weber 2010-07-05 17:04:41 +03:00 committed by Tony Lindgren
parent e185469be0
commit 1f489f9eac
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/mach-omap2/board-devkit8000.c
View File

@ -158,14 +158,13 @@ static void devkit8000_panel_disable_dvi(struct omap_dss_device *dssdev)
gpio_set_value(dssdev->reset_gpio, 0); gpio_set_value(dssdev->reset_gpio, 0);
} }
static struct regulator_consumer_supply devkit8000_vmmc1_supply = { static struct regulator_consumer_supply devkit8000_vmmc1_supply =
.supply = "vmmc", REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0");
};
/* ads7846 on SPI */ /* ads7846 on SPI */
static struct regulator_consumer_supply devkit8000_vio_supplies[] = { static struct regulator_consumer_supply devkit8000_vio_supply =
REGULATOR_SUPPLY("vcc", "spi2.0") REGULATOR_SUPPLY("vcc", "spi2.0");
};
static struct omap_dss_device devkit8000_lcd_device = { static struct omap_dss_device devkit8000_lcd_device = {
.name = "lcd", .name = "lcd",
@ -214,10 +213,8 @@ static struct platform_device devkit8000_dss_device = {
}, },
}; };
static struct regulator_consumer_supply devkit8000_vdda_dac_supply = { static struct regulator_consumer_supply devkit8000_vdda_dac_supply =
.supply = "vdda_dac", REGULATOR_SUPPLY("vdda_dac", "omapdss");
.dev = &devkit8000_dss_device.dev,
};
static int board_keymap[] = { static int board_keymap[] = {
KEY(0, 0, KEY_1), KEY(0, 0, KEY_1),
@ -294,12 +291,8 @@ static struct twl4030_gpio_platform_data devkit8000_gpio_data = {
.setup = devkit8000_twl_gpio_setup, .setup = devkit8000_twl_gpio_setup,
}; };
static struct regulator_consumer_supply devkit8000_vpll1_supplies[] = { static struct regulator_consumer_supply devkit8000_vpll1_supply =
{ REGULATOR_SUPPLY("vdds_dsi", "omapdss");
.supply = "vdds_dsi",
.dev = &devkit8000_dss_device.dev,
}
};
/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
static struct regulator_init_data devkit8000_vmmc1 = { static struct regulator_init_data devkit8000_vmmc1 = {
@ -340,8 +333,8 @@ static struct regulator_init_data devkit8000_vpll1 = {
.valid_ops_mask = REGULATOR_CHANGE_MODE .valid_ops_mask = REGULATOR_CHANGE_MODE
| REGULATOR_CHANGE_STATUS, | REGULATOR_CHANGE_STATUS,
}, },
.num_consumer_supplies = ARRAY_SIZE(devkit8000_vpll1_supplies), .num_consumer_supplies = 1,
.consumer_supplies = devkit8000_vpll1_supplies, .consumer_supplies = &devkit8000_vpll1_supply,
}; };
/* VAUX4 for ads7846 and nubs */ /* VAUX4 for ads7846 and nubs */
@ -355,8 +348,8 @@ static struct regulator_init_data devkit8000_vio = {
.valid_ops_mask = REGULATOR_CHANGE_MODE .valid_ops_mask = REGULATOR_CHANGE_MODE
| REGULATOR_CHANGE_STATUS, | REGULATOR_CHANGE_STATUS,
}, },
.num_consumer_supplies = ARRAY_SIZE(devkit8000_vio_supplies), .num_consumer_supplies = 1,
.consumer_supplies = devkit8000_vio_supplies, .consumer_supplies = &devkit8000_vio_supply,
}; };
static struct twl4030_usb_data devkit8000_usb_data = { static struct twl4030_usb_data devkit8000_usb_data = {