From mboxrd@z Thu Jan  1 00:00:00 1970
From: Przemyslaw Marczak <p.marczak@samsung.com>
Date: Wed, 12 Aug 2015 12:10:11 +0200
Subject: [U-Boot] [PATCH V3 6/6] fsl: common: pfuze: no use original
 pfuze code if DM_PMIC
In-Reply-To: <1438937026-8731-7-git-send-email-Peng.Fan@freescale.com>
References: <1438937026-8731-1-git-send-email-Peng.Fan@freescale.com>
 <1438937026-8731-7-git-send-email-Peng.Fan@freescale.com>
Message-ID: <55CB1B83.2030102@samsung.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hello,

On 08/07/2015 10:43 AM, Peng Fan wrote:
> 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>
> ---
>
> Changes v3:
>   None
>
> Changes v2:
>   None
>
>   board/freescale/common/pfuze.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> 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
>

Applied to: u-boot-pmic.

Best regards,
-- 
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com