diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-08-07 16:43:46 +0800 |
|---|---|---|
| committer | Przemyslaw Marczak <p.marczak@samsung.com> | 2015-08-12 11:05:11 +0200 |
| commit | 125914d4beb1e8319d7a04e6a6e88290763594f8 (patch) | |
| tree | 0090cae273cc400993c9c00bd747a5f0ff6297a5 | |
| parent | 8fa46350a4c7dca7710362f6c871098557b934ad (diff) | |
| download | u-boot-imx-125914d4beb1e8319d7a04e6a6e88290763594f8.zip u-boot-imx-125914d4beb1e8319d7a04e6a6e88290763594f8.tar.gz u-boot-imx-125914d4beb1e8319d7a04e6a6e88290763594f8.tar.bz2 | |
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>
| -rw-r--r-- | board/freescale/common/pfuze.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/board/freescale/common/pfuze.c b/board/freescale/common/pfuze.c index d6a209e..783c46d 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 |