Switch to new pmic generic driver.

Signed-off-by: Stefano Babic <sba...@denx.de>
CC: Jason Liu <jason....@linaro.org>
---
Changes:

 -moved pmic_init into power_init() (Marek Vasut)

 board/freescale/mx53evk/mx53evk.c |   17 +++++++++++------
 include/configs/mx53evk.h         |    5 +++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/board/freescale/mx53evk/mx53evk.c 
b/board/freescale/mx53evk/mx53evk.c
index fd821c0..eab9c5f 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -32,6 +32,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
+#include <pmic.h>
 #include <fsl_pmic.h>
 #include <asm/gpio.h>
 #include <mc13892.h>
@@ -124,12 +125,16 @@ static void setup_i2c(unsigned int port_number)
 void power_init(void)
 {
        unsigned int val;
+       struct pmic *p;
+
+       pmic_init();
+       p = get_pmic();
 
        /* Set VDDA to 1.25V */
-       val = pmic_reg_read(REG_SW_2);
+       pmic_reg_read(p, REG_SW_2, &val);
        val &= ~SWX_OUT_MASK;
        val |= SWX_OUT_1_25;
-       pmic_reg_write(REG_SW_2, val);
+       pmic_reg_write(p, REG_SW_2, val);
 
        /*
         * Need increase VCC and VDDA to 1.3V
@@ -137,16 +142,16 @@ void power_init(void)
         */
        if (is_soc_rev(CHIP_REV_2_0) == 0) {
                /* Set VCC to 1.3V for TO2 */
-               val = pmic_reg_read(REG_SW_1);
+               pmic_reg_read(p, REG_SW_1, &val);
                val &= ~SWX_OUT_MASK;
                val |= SWX_OUT_1_30;
-               pmic_reg_write(REG_SW_1, val);
+               pmic_reg_write(p, REG_SW_1, val);
 
                /* Set VDDA to 1.3V for TO2 */
-               val = pmic_reg_read(REG_SW_2);
+               pmic_reg_read(p, REG_SW_2, &val);
                val &= ~SWX_OUT_MASK;
                val |= SWX_OUT_1_30;
-               pmic_reg_write(REG_SW_2, val);
+               pmic_reg_write(p, REG_SW_2, val);
        }
 }
 
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index b127b06..dfe07bf 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -59,8 +59,9 @@
 #define CONFIG_SYS_I2C_SLAVE            0xfe
 
 /* PMIC Configs */
-#define CONFIG_FSL_PMIC
-#define CONFIG_FSL_PMIC_I2C
+#define CONFIG_PMIC
+#define CONFIG_PMIC_I2C
+#define CONFIG_PMIC_FSL
 #define CONFIG_SYS_FSL_PMIC_I2C_ADDR    8
 
 /* MMC Configs */
-- 
1.7.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to