[U-Boot,v1,1/2] rockchip: pinctrl: rk3399: fix GPIO2B1 and GPIO2B2 shift value

Message ID 20180312135642.16173-2-klaus.goger@theobroma-systems.com
State Accepted
Commit 339267a08df9a87ce2849d5cb3c0dcbc4c00e5e6
Delegated to: Philipp Tomsich
Headers show
Series
  • Add pinctrl support for RK3399 I2C[123467]
Related show

Commit Message

Klaus Goger March 12, 2018, 1:56 p.m.
From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

The shift values for GPIO2B1 and GPIO2B2 had in fact referred to
GPIO2B0 and GPIO2B1, respectively.  This substitutes the correct
values.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
---

 arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Dr. Philipp Tomsich March 14, 2018, 10:37 a.m. | #1
> From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> 
> The shift values for GPIO2B1 and GPIO2B2 had in fact referred to
> GPIO2B0 and GPIO2B1, respectively.  This substitutes the correct
> values.
> 
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
> ---
> 
>  arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Dr. Philipp Tomsich March 18, 2018, 4:04 p.m. | #2
> From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> 
> The shift values for GPIO2B1 and GPIO2B2 had in fact referred to
> GPIO2B0 and GPIO2B1, respectively.  This substitutes the correct
> values.
> 
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
>  arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

Applied to u-boot-rockchip, thanks!

Patch

diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
index b541e2caa1..fbcec932b4 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
@@ -325,10 +325,10 @@  check_member(rk3399_pmusgrf_regs, slv_secure_con4, 0xe3d4);
 
 enum {
 	/* GRF_GPIO2B_IOMUX */
-	GRF_GPIO2B1_SEL_SHIFT	= 0,
+	GRF_GPIO2B1_SEL_SHIFT	= 2,
 	GRF_GPIO2B1_SEL_MASK	= 3 << GRF_GPIO2B1_SEL_SHIFT,
 	GRF_SPI2TPM_RXD		= 1,
-	GRF_GPIO2B2_SEL_SHIFT	= 2,
+	GRF_GPIO2B2_SEL_SHIFT	= 4,
 	GRF_GPIO2B2_SEL_MASK	= 3 << GRF_GPIO2B2_SEL_SHIFT,
 	GRF_SPI2TPM_TXD		= 1,
 	GRF_GPIO2B3_SEL_SHIFT	= 6,