public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Przemyslaw Marczak <p.marczak@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH V3 6/6] fsl: common: pfuze: no use original pfuze code if DM_PMIC
Date: Wed, 12 Aug 2015 12:10:11 +0200	[thread overview]
Message-ID: <55CB1B83.2030102@samsung.com> (raw)
In-Reply-To: <1438937026-8731-7-git-send-email-Peng.Fan@freescale.com>

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

      reply	other threads:[~2015-08-12 10:10 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-07  8:43 [U-Boot] [PATCH V3 0/5] power: pfuze100: support driver model and regulator Peng Fan
2015-08-07  8:43 ` [U-Boot] [PATCH V3 1/6] power: pfuze100 correct SWBST macro definition Peng Fan
2015-08-12 10:09   ` Przemyslaw Marczak
2015-08-07  8:43 ` [U-Boot] [PATCH V3 2/6] power: regulator use node name when no regulator-name Peng Fan
2015-08-07 15:39   ` Simon Glass
2015-08-12 10:09   ` Przemyslaw Marczak
2015-08-07  8:43 ` [U-Boot] [PATCH V3 3/6] power: regulator: update comments for regulator-name Peng Fan
2015-08-12 10:09   ` Przemyslaw Marczak
2015-08-07  8:43 ` [U-Boot] [PATCH V3 4/6] power: pmic: pfuze100 support driver model Peng Fan
2015-08-12 10:09   ` Przemyslaw Marczak
2015-08-07  8:43 ` [U-Boot] [PATCH V3 5/6] power: regulator: add pfuze100 support Peng Fan
2015-08-07 19:09   ` Simon Glass
2015-08-12 10:10   ` Przemyslaw Marczak
2015-08-07  8:43 ` [U-Boot] [PATCH V3 6/6] fsl: common: pfuze: no use original pfuze code if DM_PMIC Peng Fan
2015-08-12 10:10   ` Przemyslaw Marczak [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=55CB1B83.2030102@samsung.com \
    --to=p.marczak@samsung.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox