aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2013-07-29 13:03:02 -0400
committerTony Lindgren <tony@atomide.com>2013-07-30 02:42:36 -0400
commite18235a62a7ea737d0a3f73c76eacaaec6df3dfe (patch)
tree458eba8f02e5862adc0afc4cb93a1fb8ed01b31e /arch
parent3709d323085853dc537711154004ba8704cefb9c (diff)
ARM: dts: omap5-uevm: fix regulator configurations mandatory for SoC
commit e00c27ef3b4c23e39d0a77b7c8e5be44c28001c7 (ARM: dts: OMAP5: Add Palmas MFD node and regulator nodes) introduced regulator entries for OMAP5uEVM. However, The regulator information is based on an older temporary pre-production board variant and does not reflect production board 750-2628-XXX boards. The following fixes are hence mandatory to ensure right voltage is supplied to key OMAP5 SoC voltage rails: - LDO1 supplies VDDAPHY_CAM which is OMAP5's vdda_csiporta/b/c. This can only be supplied at 1.5V or 1.8V and we currently supply 2.8V. To prevent any potential device damage risk, use the specified 1.5V-1.8V supply. Remove 'always-on' and 'boot-on' settings here as it is a 'on need' supply to SoC IP and is not enabled by PMIC by default at boot. - LDO3 supplies Low Latency Interface(LLI) hardware module which is a special hardware to communicate with Modem. However since uEVM is not setup by default for this communication, this should be disabled by default. Further, vdda_lli is supposed to be 1.5V and not 3V. - LDO4 supplies VDDAPHY_DISP which is vdda_dsiporta/c/vdda_hdmi This can only be supplied at 1.5V or 1.8V and we currently supply 2.2V. To prevent any potential device damage risk, use the specified 1.5V-1.8V supply. Remove 'always-on' and 'boot-on' settings here as it is a 'on need' supply to SoC IP and is not enabled by PMIC by default at boot. - LDO6 supplies the board specified VDDS_1V2_WKUP supply going to ldo_emu_wkup/vdds_hsic. To stay within the SoC specification supply 1.2V instead of 1.5V. - LDO7 supplies VDD_VPP which is vpp1. This is currently configured for 1.5V which as per data manual "A pulse width of 1000 ns and an amplitude of 2V is required to program each eFuse bit. Otherwise, VPP1 must not be supplied". So, fix the voltage to 2V. and disable the supply since we have no plans of programming efuse bits - it can only be done once - in factory. Further it is not enabled by default by PMIC so, 'boot-on' must be removed, and the 'always-on' needs to be removed to achieve pulsing if efuse needs to be programmed. - LDO9 supplies the board specified vdds_sdcard supply going within SoC specification of 1.8V or 3.0V. Further the supply is controlled by switch enabled by REGEN3. So, introduce REGEN3 and map sdcard slot to be powered by LDO9. Remove 'always-on' allowing the LDO to be disabled on need basis. Reported-by: Marc Jüttner <m-juettner@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com> Acked-by: J Keerthy <j-keerthy@ti.com> Acked-by: Benoit Cousson <benoit.cousson@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/omap5-uevm.dts43
1 files changed, 23 insertions, 20 deletions
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index b430b8f884b8..247c03c0d734 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -235,7 +235,7 @@
235}; 235};
236 236
237&mmc1 { 237&mmc1 {
238 vmmc-supply = <&vmmcsd_fixed>; 238 vmmc-supply = <&ldo9_reg>;
239 bus-width = <4>; 239 bus-width = <4>;
240}; 240};
241 241
@@ -348,10 +348,8 @@
348 ldo1_reg: ldo1 { 348 ldo1_reg: ldo1 {
349 /* VDDAPHY_CAM: vdda_csiport */ 349 /* VDDAPHY_CAM: vdda_csiport */
350 regulator-name = "ldo1"; 350 regulator-name = "ldo1";
351 regulator-min-microvolt = <2800000>; 351 regulator-min-microvolt = <1500000>;
352 regulator-max-microvolt = <2800000>; 352 regulator-max-microvolt = <1800000>;
353 regulator-always-on;
354 regulator-boot-on;
355 }; 353 };
356 354
357 ldo2_reg: ldo2 { 355 ldo2_reg: ldo2 {
@@ -366,19 +364,18 @@
366 ldo3_reg: ldo3 { 364 ldo3_reg: ldo3 {
367 /* VDDAPHY_MDM: vdda_lli */ 365 /* VDDAPHY_MDM: vdda_lli */
368 regulator-name = "ldo3"; 366 regulator-name = "ldo3";
369 regulator-min-microvolt = <3000000>; 367 regulator-min-microvolt = <1500000>;
370 regulator-max-microvolt = <3000000>; 368 regulator-max-microvolt = <1500000>;
371 regulator-always-on;
372 regulator-boot-on; 369 regulator-boot-on;
370 /* Only if Modem is used */
371 status = "disabled";
373 }; 372 };
374 373
375 ldo4_reg: ldo4 { 374 ldo4_reg: ldo4 {
376 /* VDDAPHY_DISP: vdda_dsiport/hdmi */ 375 /* VDDAPHY_DISP: vdda_dsiport/hdmi */
377 regulator-name = "ldo4"; 376 regulator-name = "ldo4";
378 regulator-min-microvolt = <2200000>; 377 regulator-min-microvolt = <1500000>;
379 regulator-max-microvolt = <2200000>; 378 regulator-max-microvolt = <1800000>;
380 regulator-always-on;
381 regulator-boot-on;
382 }; 379 };
383 380
384 ldo5_reg: ldo5 { 381 ldo5_reg: ldo5 {
@@ -393,8 +390,8 @@
393 ldo6_reg: ldo6 { 390 ldo6_reg: ldo6 {
394 /* VDDS_1V2_WKUP: hsic/ldo_emu_wkup */ 391 /* VDDS_1V2_WKUP: hsic/ldo_emu_wkup */
395 regulator-name = "ldo6"; 392 regulator-name = "ldo6";
396 regulator-min-microvolt = <1500000>; 393 regulator-min-microvolt = <1200000>;
397 regulator-max-microvolt = <1500000>; 394 regulator-max-microvolt = <1200000>;
398 regulator-always-on; 395 regulator-always-on;
399 regulator-boot-on; 396 regulator-boot-on;
400 }; 397 };
@@ -402,10 +399,10 @@
402 ldo7_reg: ldo7 { 399 ldo7_reg: ldo7 {
403 /* VDD_VPP: vpp1 */ 400 /* VDD_VPP: vpp1 */
404 regulator-name = "ldo7"; 401 regulator-name = "ldo7";
405 regulator-min-microvolt = <1500000>; 402 regulator-min-microvolt = <2000000>;
406 regulator-max-microvolt = <1500000>; 403 regulator-max-microvolt = <2000000>;
407 regulator-always-on; 404 /* Only for efuse reprograming! */
408 regulator-boot-on; 405 status = "disabled";
409 }; 406 };
410 407
411 ldo8_reg: ldo8 { 408 ldo8_reg: ldo8 {
@@ -421,8 +418,7 @@
421 /* VCC_DV_SDIO: vdds_sdcard */ 418 /* VCC_DV_SDIO: vdds_sdcard */
422 regulator-name = "ldo9"; 419 regulator-name = "ldo9";
423 regulator-min-microvolt = <1800000>; 420 regulator-min-microvolt = <1800000>;
424 regulator-max-microvolt = <3300000>; 421 regulator-max-microvolt = <3000000>;
425 regulator-always-on;
426 regulator-boot-on; 422 regulator-boot-on;
427 }; 423 };
428 424
@@ -443,6 +439,13 @@
443 regulator-always-on; 439 regulator-always-on;
444 regulator-boot-on; 440 regulator-boot-on;
445 }; 441 };
442
443 regen3_reg: regen3 {
444 /* REGEN3 controls LDO9 supply to card */
445 regulator-name = "regen3";
446 regulator-always-on;
447 regulator-boot-on;
448 };
446 }; 449 };
447 }; 450 };
448 }; 451 };