From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peng Fan <b51431@freescale.com>
Date: Thu, 26 Nov 2015 09:27:01 +0800
Subject: [U-Boot] [PATCH] pmic: Fix pfuze100 bit definitions
In-Reply-To: <1448493344-6336-1-git-send-email-marex@denx.de>
References: <1448493344-6336-1-git-send-email-marex@denx.de>
Message-ID: <20151126012659.GA7442@shlinux2>
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

Hi Marek,
On Thu, Nov 26, 2015 at 12:15:44AM +0100, Marek Vasut wrote:
>The following patch changed the PFUZE100 swbst register bit definitions
>and broke PMIC configuration on multiple boards, at least on the novena
>and gw_ventana. This patch fixes it.
>
>commit 8fa46350a4c7dca7710362f6c871098557b934ad
>Author: Peng Fan <Peng.Fan@freescale.com>
>Date:   Fri Aug 7 16:43:45 2015 +0800
>
>    power: regulator: add pfuze100 support
>
>Signed-off-by: Marek Vasut <marex@denx.de>
>Cc: Fabio Estevam <fabio.estevam@freescale.com>
>Cc: Peng Fan <Peng.Fan@freescale.com>
>Cc: Przemyslaw Marczak <p.marczak@samsung.com>
>Cc: Tim Harvey <tharvey@gateworks.com>
>Cc: Vagrant Cascadian <vagrant@aikidev.net>
>---
> include/power/pfuze100_pmic.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/include/power/pfuze100_pmic.h b/include/power/pfuze100_pmic.h
>index 41cb710..cc019a9 100644
>--- a/include/power/pfuze100_pmic.h
>+++ b/include/power/pfuze100_pmic.h
>@@ -215,10 +215,10 @@ enum {
> #define SWBST_VOL_MASK	0x3
> #define SWBST_MODE_MASK	0xC
> #define SWBST_MODE_SHIFT 0x2
>-#define SWBST_MODE_OFF	0
>-#define SWBST_MODE_PFM	1
>-#define SWBST_MODE_AUTO	2
>-#define SWBST_MODE_APS	3
>+#define SWBST_MODE_OFF	(0 << 2)
>+#define SWBST_MODE_PFM	(1 << 2)
>+#define SWBST_MODE_AUTO	(2 << 2)
>+#define SWBST_MODE_APS	(3 << 2)

Can we use "(SWBST_MODE_AUTO << SWBST_MODE_SHIFT)" in the board code,
but not revert this?

Thanks,
Peng.
> 
> /*
>  * Regulator Mode Control
>-- 
>2.6.2
>

--