diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /arch/arm/mach-exynos/p4note-power.c | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'arch/arm/mach-exynos/p4note-power.c')
-rw-r--r-- | arch/arm/mach-exynos/p4note-power.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-exynos/p4note-power.c b/arch/arm/mach-exynos/p4note-power.c index 14769a6..5b78e79 100644 --- a/arch/arm/mach-exynos/p4note-power.c +++ b/arch/arm/mach-exynos/p4note-power.c @@ -299,7 +299,7 @@ static struct regulator_consumer_supply ldo8_supply[] = { }; static struct regulator_consumer_supply ldo9_supply[] = { - REGULATOR_SUPPLY("cam_isp_mipi_1.2v", NULL), + REGULATOR_SUPPLY("vled_ic_1.9v", NULL), }; static struct regulator_consumer_supply ldo10_supply[] = { @@ -407,8 +407,13 @@ REGULATOR_INIT(ldo5, "VCC_1.8V_IO", 1800000, 1800000, 0, REGULATOR_CHANGE_STATUS, 1); REGULATOR_INIT(ldo8, "VMIPI_1.0V", 1000000, 1000000, 1, REGULATOR_CHANGE_STATUS, 0); -REGULATOR_INIT(ldo9, "CAM_ISP_MIPI_1.2V", 1200000, 1200000, 0, +#if defined(CONFIG_IR_REMOCON_MC96) +REGULATOR_INIT(ldo9, "VLED_IC_1.9V", 1950000, 1950000, 1, REGULATOR_CHANGE_STATUS, 1); +#else +REGULATOR_INIT(ldo9, "VLED_IC_1.9V", 1950000, 1950000, 0, + REGULATOR_CHANGE_STATUS, 1); +#endif REGULATOR_INIT(ldo10, "VMIPI_1.8V", 1800000, 1800000, 1, REGULATOR_CHANGE_STATUS, 0); REGULATOR_INIT(ldo11, "VABB1_1.9V", 1950000, 1950000, 1, @@ -1099,13 +1104,8 @@ struct s5m_platform_data exynos4_s5m8767_info = { void midas_power_init(void) { -#ifdef CONFIG_MACH_S2PLUS - ldo8_init_data.constraints.always_on = 1; - ldo13_init_data.constraints.always_on = 1; -#else ldo8_init_data.constraints.always_on = 1; ldo10_init_data.constraints.always_on = 1; -#endif } /* End of S5M8767 */ |