arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions

PATCH New Marek Vasut 6 participants 9 messages Nov 26, 2015 – Dec 1, 2015

Share & tools

Marek Vasut

author

2015-11-26 13:08 UTC #0 lore raw

PATCH 1/1 arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions

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 <[email protected]>
Date:   Fri Aug 7 16:43:45 2015 +0800

power: regulator: add pfuze100 support

Signed-off-by Marek Vasut <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Peng Fan <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

Cc Vagrant Cascadian <[email protected]>

---
 board/gateworks/gw_ventana/common.c | 2 +-
 board/kosagi/novena/novena.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

board/gateworks/gw_ventana/common.c +1 -1

index d406c83..a20190e 100644
@@ -806,7 +806,7 @@ void setup_pmic(void)
 			/* Set SWBST to 5.0V and enable */
 			pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
 			reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
-			reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+			reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT));
 			pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
 		}
 	}

board/kosagi/novena/novena.c +1 -1

index babba85..b3159d3 100644
@@ -216,7 +216,7 @@ int power_init_board(void)
 	/* Set SWBST to 5.0V and enable (for USB) */
 	pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
 	reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
-	reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+	reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT));
 	pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
 
 	return 0;

Signature · 1 line

2.1.4

Przemyslaw Marczak

2015-11-26 16:18 UTC #1 lore raw

PATCH 1/1 arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions

Hello Marek,

Quoted 41 lines · Marek Vasut

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 <[email protected]>
Date:   Fri Aug 7 16:43:45 2015 +0800
power: regulator: add pfuze100 support
Signed-off-by Marek Vasut <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Peng Fan <[email protected]>
Cc Przemyslaw Marczak <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Tim Harvey <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
  board/gateworks/gw_ventana/common.c | 2 +-
  board/kosagi/novena/novena.c        | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
board/gateworks/gw_ventana/common.c +1 -1
index d406c83..a20190e 100644
@@ -806,7 +806,7 @@ void setup_pmic(void)
  			/* Set SWBST to 5.0V and enable */
  			pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
  			reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
-			reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+			reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT));
  			pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
  		}
  	}
board/kosagi/novena/novena.c +0 -0
index babba85..b3159d3 100644

board/kosagi/novena/novena.c int power_init_board(void) · line 222

Quoted 8 lines

board/kosagi/novena/novena.c +1 -1

@@ -216,7 +216,7 @@ int power_init_board(void)
  	/* Set SWBST to 5.0V and enable (for USB) */
  	pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
  	reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
-	reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+	reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT));
  	pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
 
  	return 0;

Thanks for fixing :)

Reviewed-by Przemyslaw Marczak <[email protected]>

Best regards,

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Vagrant Cascadian

2015-11-27 20:18 UTC #2 lore raw

PATCH 1/1 arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions

In reply to Marek Vasut

Quoted 3 lines · Marek Vasut

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.

Works on novena.

Tested-by Vagrant Cascadian <[email protected]>

live well,
vagrant

Quoted 46 lines

commit 8fa46350a4c7dca7710362f6c871098557b934ad

Author: Peng Fan <[email protected]>
Date:   Fri Aug 7 16:43:45 2015 +0800

power: regulator: add pfuze100 support

Signed-off-by Marek Vasut <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Peng Fan <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

Cc Vagrant Cascadian <[email protected]>

---
 board/gateworks/gw_ventana/common.c | 2 +-
 board/kosagi/novena/novena.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

board/gateworks/gw_ventana/common.c +1 -1

index d406c83..a20190e 100644
@@ -806,7 +806,7 @@ void setup_pmic(void)
 			/* Set SWBST to 5.0V and enable */
 			pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
 			reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
-			reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+			reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT));
 			pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
 		}
 	}

board/kosagi/novena/novena.c +1 -1

index babba85..b3159d3 100644
@@ -216,7 +216,7 @@ int power_init_board(void)
 	/* Set SWBST to 5.0V and enable (for USB) */
 	pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
 	reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
-	reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+	reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT));
 	pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
 
 	return 0;

Signature · 1 line

2.1.4

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151127/c1ca47cd/attachment.sig>

Peng Fan

2015-11-28 02:47 UTC #3 lore raw

PATCH 1/1 arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions

In reply to Marek Vasut

Quoted 40 lines · Marek Vasut

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 <[email protected]>
Date:   Fri Aug 7 16:43:45 2015 +0800
power: regulator: add pfuze100 support
Signed-off-by Marek Vasut <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Peng Fan <[email protected]>
Cc Przemyslaw Marczak <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Tim Harvey <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
board/gateworks/gw_ventana/common.c | 2 +-
board/kosagi/novena/novena.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
board/gateworks/gw_ventana/common.c +1 -1
index d406c83..a20190e 100644
@@ -806,7 +806,7 @@ void setup_pmic(void)
 			/* Set SWBST to 5.0V and enable */
 			pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
 			reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
-			reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+			reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT));
 			pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
 		}
 	}
board/kosagi/novena/novena.c +0 -0
index babba85..b3159d3 100644

board/kosagi/novena/novena.c int power_init_board(void) · line 222

Quoted 8 lines

board/kosagi/novena/novena.c +1 -1

@@ -216,7 +216,7 @@ int power_init_board(void)
 	/* Set SWBST to 5.0V and enable (for USB) */
 	pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
 	reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
-	reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+	reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT));
 	pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
 
 	return 0;

Reviewed-by Peng Fan <[email protected]>

Quoted 3 lines

Signature · 1 line
2.1.4

Przemyslaw Marczak

2015-11-30 09:53 UTC #4 lore raw

PATCH 1/1 arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions

In reply to Marek Vasut

Hello Stefano,

Quoted 17 lines · Marek Vasut

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 <[email protected]>
Date:   Fri Aug 7 16:43:45 2015 +0800
power: regulator: add pfuze100 support
Signed-off-by Marek Vasut <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Peng Fan <[email protected]>
Cc Przemyslaw Marczak <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Tim Harvey <[email protected]>
Cc Vagrant Cascadian <[email protected]>

Quoted 4 lines

---
  board/gateworks/gw_ventana/common.c | 2 +-
  board/kosagi/novena/novena.c        | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

Will you pick-up this patch, or should it go through PMIC tree?

Best regards,

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Stefano Babic

2015-11-30 10:00 UTC #5 lore raw

PATCH 1/1 arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions

Quoted 25 lines · Przemyslaw Marczak

Hello Stefano,
Quoted 17 lines · Marek Vasut
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 <[email protected]>
Date:   Fri Aug 7 16:43:45 2015 +0800
power: regulator: add pfuze100 support
Signed-off-by Marek Vasut <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Peng Fan <[email protected]>
Cc Przemyslaw Marczak <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Tim Harvey <[email protected]>
Cc Vagrant Cascadian <[email protected]>
Quoted 4 lines
---
  board/gateworks/gw_ventana/common.c | 2 +-
  board/kosagi/novena/novena.c        | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

Quoted 1 line

Will you pick-up this patch, or should it go through PMIC tree?

They are i.MXes, I pick them up.

Best regards,
Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Przemyslaw Marczak

2015-11-30 10:13 UTC #6 lore raw

PATCH 1/1 arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions

Quoted 26 lines · Stefano Babic

Quoted 25 lines · Przemyslaw Marczak
Hello Stefano,
Quoted 21 lines · Marek Vasut
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 <[email protected]>
Date:   Fri Aug 7 16:43:45 2015 +0800
power: regulator: add pfuze100 support
Signed-off-by Marek Vasut <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Peng Fan <[email protected]>
Cc Przemyslaw Marczak <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Tim Harvey <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
   board/gateworks/gw_ventana/common.c | 2 +-
   board/kosagi/novena/novena.c        | 2 +-
   2 files changed, 2 insertions(+), 2 deletions(-)

Quoted 8 lines

Quoted 1 line
Will you pick-up this patch, or should it go through PMIC tree?
They are i.MXes, I pick them up.
Best regards,
Stefano

Ok, thank you.

Best regards,

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Tim Harvey

2015-11-30 16:32 UTC #7 lore raw

PATCH 1/1 arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions

In reply to Marek Vasut

Quoted 49 lines · Marek Vasut

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 <[email protected]>
Date:   Fri Aug 7 16:43:45 2015 +0800

power: regulator: add pfuze100 support

Signed-off-by Marek Vasut <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Peng Fan <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Tim Harvey <[email protected]>

Cc Vagrant Cascadian <[email protected]>

---
 board/gateworks/gw_ventana/common.c | 2 +-
 board/kosagi/novena/novena.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

board/gateworks/gw_ventana/common.c +1 -1

index d406c83..a20190e 100644
@@ -806,7 +806,7 @@ void setup_pmic(void)
                        /* Set SWBST to 5.0V and enable */
                        pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
                        reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
-                       reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+                       reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT));
                        pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
                }
        }

board/kosagi/novena/novena.c +1 -2

index babba85..b3159d3 100644
@@ -216,7 +216,7 @@ int power_init_board(void)
        /* Set SWBST to 5.0V and enable (for USB) */
        pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
        reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
-       reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+       reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT));
        pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
 
        return 0;
--

Quoted 2 lines

2.1.4

Acked-by Tim Harvey <[email protected]>

Thanks Marek!

Tim

Stefano Babic

2015-12-01 15:10 UTC #8 lore raw

PATCH 1/1 arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions

In reply to Marek Vasut

Quoted 10 lines · Marek Vasut

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 <[email protected]>
Date:   Fri Aug 7 16:43:45 2015 +0800
power: regulator: add pfuze100 support

Quoted 8 lines

Signed-off-by Marek Vasut <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Peng Fan <[email protected]>
Cc Przemyslaw Marczak <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Tim Harvey <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---

Applied to u-boot-imx, thanks!

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================