diff options
| author | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2011-09-21 11:30:31 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 13:01:04 +0200 |
| commit | 7abb8e9fedbca8a901e1b94608118d781fb9cc19 (patch) | |
| tree | 6d35aca8244c0da9c508eb205166315c7cc0c583 | |
| parent | a694b5813ce0b8ae50f7858a2590588cf8d59b09 (diff) | |
ux500: mcde: update supply names
Regulator supply name update according to the mainline version of regulator
framework.
Change-Id: I4ab2cd0b2d015a8ce2e67ae5c040e81e6bdf78aa
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32125
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-mcde.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c index 4460a0dab76..9e967f72138 100644 --- a/arch/arm/mach-ux500/board-mop500-mcde.c +++ b/arch/arm/mach-ux500/board-mop500-mcde.c @@ -120,7 +120,7 @@ static struct mcde_port port0 = { static struct mcde_display_generic_platform_data generic_display0_pdata = { .reset_delay = 1, #ifdef CONFIG_REGULATOR - .regulator_id = "v-display", + .regulator_id = "vaux12v5", .min_supply_voltage = 2500000, /* 2.5V */ .max_supply_voltage = 2800000 /* 2.8V */ #endif @@ -182,7 +182,7 @@ static struct mcde_port subdisplay_port = { static struct mcde_display_generic_platform_data generic_subdisplay_pdata = { .reset_delay = 1, #ifdef CONFIG_REGULATOR - .regulator_id = "v-display", + .regulator_id = "vaux12v5", .min_supply_voltage = 2500000, /* 2.5V */ .max_supply_voltage = 2800000 /* 2.8V */ #endif @@ -301,7 +301,7 @@ static struct mcde_port port_tvout1 = { static struct ab8500_display_platform_data ab8500_display_pdata = { .nr_regulators = 2, - .regulator_id = {"v-tvout", "v-ab8500-AV-switch"}, + .regulator_id = {"vtvout", "vcc-N2158"}, .rgb_2_yCbCr_transform = &rgb_2_yCbCr_transform, }; @@ -405,7 +405,7 @@ static struct mcde_display_hdmi_platform_data av8100_hdmi_pdata = { .reset_gpio = 0, .reset_delay = 1, .regulator_id = NULL, /* TODO: "display_main" */ - .cvbs_regulator_id = "v-av8100-AV-switch", + .cvbs_regulator_id = "vcc-N2158", .ddb_id = 1, .rgb_2_yCbCr_transform = &rgb_2_yCbCr_transform, }; diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index b7b98829a0e..266196f1810 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -223,7 +223,7 @@ static struct mcde_platform_data mcde_pdata = { .num_channels = 4, .num_overlays = 6, #ifdef CONFIG_MCDE_DISPLAY_DSI - .regulator_vana_id = "v-ana", + .regulator_vana_id = "vdddsi1v2", #endif .regulator_mcde_epod_id = "vsupply", .regulator_esram_epod_id = "v-esram34", |