From: Peng Fan <Peng.Fan@freescale.com>
Date: Fri, 7 Aug 2015 08:43:46 +0000 (+0800)
Subject: fsl: common: pfuze: no use original pfuze code if DM_PMIC
X-Git-Tag: v2015.10-rc2~157
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=125914d4beb1e8319d7a04e6a6e88290763594f8;p=u-boot

fsl: common: pfuze: no use original pfuze code if DM_PMIC

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>
---

diff --git a/board/freescale/common/pfuze.c b/board/freescale/common/pfuze.c
index d6a209e1a3..783c46d882 100644
--- a/board/freescale/common/pfuze.c
+++ b/board/freescale/common/pfuze.c
@@ -9,6 +9,7 @@
 #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;
@@ -90,3 +91,4 @@ struct pmic *pfuze_common_init(unsigned char i2cbus)
 
 	return p;
 }
+#endif