summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-05-31 08:29:28 +0530
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-17 13:42:05 +0200
commit73da56844b2b16c00071ed2a8a7ac3609dc95c73 (patch)
tree34fe57a0d9cceb2f422d282bfa6c7aaee49a2b6c /arch
parentdbc68a0480280c8ab126b846945f7e9768d89967 (diff)
u5500: add ePOD consumers
ST-Ericsson Linux next: - ST-Ericsson ID: WP332185 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I57ec184ff8288acdf83adae575c2856f02f41dcb Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24181 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/board-u5500-regulators.c11
-rw-r--r--arch/arm/mach-ux500/devices-db5500.c2
2 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-regulators.c b/arch/arm/mach-ux500/board-u5500-regulators.c
index ce9586aadfe..f1b9f119bd5 100644
--- a/arch/arm/mach-ux500/board-u5500-regulators.c
+++ b/arch/arm/mach-ux500/board-u5500-regulators.c
@@ -166,22 +166,29 @@ static struct regulator_consumer_supply u5500_vape_consumers[] = {
static struct regulator_consumer_supply u5500_sga_consumers[] = {
REGULATOR_SUPPLY("debug", "reg-virt-consumer.0"),
+ REGULATOR_SUPPLY("v-mali", NULL),
};
static struct regulator_consumer_supply u5500_hva_consumers[] = {
REGULATOR_SUPPLY("debug", "reg-virt-consumer.1"),
+ REGULATOR_SUPPLY("sva-pipe", "cm_control"),
};
static struct regulator_consumer_supply u5500_sia_consumers[] = {
REGULATOR_SUPPLY("debug", "reg-virt-consumer.2"),
+ REGULATOR_SUPPLY("sia-pipe", "cm_control"),
};
static struct regulator_consumer_supply u5500_disp_consumers[] = {
REGULATOR_SUPPLY("debug", "reg-virt-consumer.3"),
+ REGULATOR_SUPPLY("vsupply", "b2r2_bus"),
+ REGULATOR_SUPPLY("vsupply", "mcde"),
};
static struct regulator_consumer_supply u5500_esram12_consumers[] = {
- REGULATOR_SUPPLY("debug", "reg-virt-consumer.6"),
+ REGULATOR_SUPPLY("debug", "reg-virt-consumer.4"),
+ REGULATOR_SUPPLY("v-esram12", "mcde"),
+ REGULATOR_SUPPLY("esram12", "cm_control"),
};
#define U5500_REGULATOR_SWITCH(lower, upper) \
@@ -218,7 +225,7 @@ static void __init u5500_regulators_init_debug(void)
const char data[] = "debug";
int i;
- for (i = 0; i < 10; i++)
+ for (i = 0; i < 4; i++)
platform_device_register_data(NULL, "reg-virt-consumer", i,
data, sizeof(data));
}
diff --git a/arch/arm/mach-ux500/devices-db5500.c b/arch/arm/mach-ux500/devices-db5500.c
index 9e2478023e9..1a636722f29 100644
--- a/arch/arm/mach-ux500/devices-db5500.c
+++ b/arch/arm/mach-ux500/devices-db5500.c
@@ -200,7 +200,7 @@ static struct mcde_platform_data mcde_pdata = {
.num_overlays = 3,
.regulator_vana_id = "v-ana",
.regulator_mcde_epod_id = "vsupply",
- .regulator_esram_epod_id = "v-esram34",
+ .regulator_esram_epod_id = "v-esram12",
.clock_dsi_id = "hdmi",
.clock_dsi_lp_id = "tv",
.clock_mcde_id = "mcde",