]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
fsl: common: pfuze: no use original pfuze code if DM_PMIC
authorPeng Fan <Peng.Fan@freescale.com>
Fri, 7 Aug 2015 08:43:46 +0000 (16:43 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 10 Sep 2015 06:17:43 +0000 (08:17 +0200)
If enable DM PMIC and REGULATOR, we should not use original power
framework. So need to comment out the pfuze code for original power
framework, when CONFIG_DM_PMIC_PFUZE100 defined.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
board/freescale/common/pfuze.c

index d6a209e1a3743fd6d732915e44d98293feb07d1d..783c46d882846d1f17e05ce48ed6b32cbca1105f 100644 (file)
@@ -9,6 +9,7 @@
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
+#ifndef CONFIG_DM_PMIC_PFUZE100
 int pfuze_mode_init(struct pmic *p, u32 mode)
 {
        unsigned char offset, i, switch_num;
 int pfuze_mode_init(struct pmic *p, u32 mode)
 {
        unsigned char offset, i, switch_num;
@@ -90,3 +91,4 @@ struct pmic *pfuze_common_init(unsigned char i2cbus)
 
        return p;
 }
 
        return p;
 }
+#endif