summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gong <yibin.gong@nxp.com>2016-08-30 17:03:36 +0800
committerYe Li <ye.li@nxp.com>2017-04-21 11:43:07 +0800
commit7c12a0043449d7a9788afa62d63e61bde6b1c8cb (patch)
tree894466f0ca358b3f3375b7ef1a195a2f7d1723e6
parent59643c7b34415c6a23e0d73a8aed9145b0220a47 (diff)
downloadu-boot-imx-7c12a0043449d7a9788afa62d63e61bde6b1c8cb.zip
u-boot-imx-7c12a0043449d7a9788afa62d63e61bde6b1c8cb.tar.gz
u-boot-imx-7c12a0043449d7a9788afa62d63e61bde6b1c8cb.tar.bz2
MLK-13141 mx6qpsabresd: Do not touch VGEN3 and VGEN5
VGEN3 and VGEN5 have been fused the right value in PF0100 on i.mx6qp board, so software didn't need to change their voltage output anymore. Otherwise, VGEN3 will be wrongly updated from 1.8v to 2.8v. Signed-off-by: Robin Gong <yibin.gong@nxp.com> (cherry picked from commit 6f7f185664a401f03f6ce6c81b996c1f27fdbe73) Signed-off-by: Ye Li <ye.li@nxp.com>
-rw-r--r--board/freescale/mx6sabresd/mx6sabresd.c51
1 files changed, 28 insertions, 23 deletions
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index decd75a..9f11f36 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -954,18 +954,20 @@ int power_init_board(void)
if (ret < 0)
return ret;
-
- /* Increase VGEN3 from 2.5 to 2.8V */
- pmic_reg_read(pfuze, PFUZE100_VGEN3VOL, &reg);
- reg &= ~LDO_VOL_MASK;
- reg |= LDOB_2_80V;
- pmic_reg_write(pfuze, PFUZE100_VGEN3VOL, reg);
-
- /* Increase VGEN5 from 2.8 to 3V */
- pmic_reg_read(pfuze, PFUZE100_VGEN5VOL, &reg);
- reg &= ~LDO_VOL_MASK;
- reg |= LDOB_3_00V;
- pmic_reg_write(pfuze, PFUZE100_VGEN5VOL, reg);
+ /* VGEN3 and VGEN5 corrected on i.mx6qp board */
+ if (!is_mx6dqp()) {
+ /* Increase VGEN3 from 2.5 to 2.8V */
+ pmic_reg_read(pfuze, PFUZE100_VGEN3VOL, &reg);
+ reg &= ~LDO_VOL_MASK;
+ reg |= LDOB_2_80V;
+ pmic_reg_write(pfuze, PFUZE100_VGEN3VOL, reg);
+
+ /* Increase VGEN5 from 2.8 to 3V */
+ pmic_reg_read(pfuze, PFUZE100_VGEN5VOL, &reg);
+ reg &= ~LDO_VOL_MASK;
+ reg |= LDOB_3_00V;
+ pmic_reg_write(pfuze, PFUZE100_VGEN5VOL, reg);
+ }
if (is_mx6dqp()) {
/* set SW1C staby volatage 1.075V*/
@@ -1038,17 +1040,20 @@ int power_init_board(void)
if (ret < 0)
return ret;
- /* Increase VGEN3 from 2.5 to 2.8V */
- reg = pmic_reg_read(dev, PFUZE100_VGEN3VOL);
- reg &= ~LDO_VOL_MASK;
- reg |= LDOB_2_80V;
- pmic_reg_write(dev, PFUZE100_VGEN3VOL, reg);
-
- /* Increase VGEN5 from 2.8 to 3V */
- reg = pmic_reg_read(dev, PFUZE100_VGEN5VOL);
- reg &= ~LDO_VOL_MASK;
- reg |= LDOB_3_00V;
- pmic_reg_write(dev, PFUZE100_VGEN5VOL, reg);
+ /* VGEN3 and VGEN5 corrected on i.mx6qp board */
+ if (!is_mx6dqp()) {
+ /* Increase VGEN3 from 2.5 to 2.8V */
+ reg = pmic_reg_read(dev, PFUZE100_VGEN3VOL);
+ reg &= ~LDO_VOL_MASK;
+ reg |= LDOB_2_80V;
+ pmic_reg_write(dev, PFUZE100_VGEN3VOL, reg);
+
+ /* Increase VGEN5 from 2.8 to 3V */
+ reg = pmic_reg_read(dev, PFUZE100_VGEN5VOL);
+ reg &= ~LDO_VOL_MASK;
+ reg |= LDOB_3_00V;
+ pmic_reg_write(dev, PFUZE100_VGEN5VOL, reg);
+ }
if (is_mx6dqp()) {
/* set SW1C staby volatage 1.075V*/