4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Sugar Zhang <sugar.zh...@rock-chips.com>


[ Upstream commit 9d420e9b4140f8938ad6aa0d29e2428a2af6122b ]

Refer to Chapter 5.3.2 of rk3229 TRM, we can see that GPIO1A[2,4,5]
using RK_FUNC_2 not RK_FUNC_1. This patch fixes it.

Signed-off-by: Sugar Zhang <sugar.zh...@rock-chips.com>
Signed-off-by: Frank Wang <frank.w...@rock-chips.com>
Signed-off-by: Heiko Stuebner <he...@sntech.de>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 arch/arm/boot/dts/rk322x.dtsi |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -617,9 +617,9 @@
                                                <0 12 RK_FUNC_1 
&pcfg_pull_none>,
                                                <0 13 RK_FUNC_1 
&pcfg_pull_none>,
                                                <0 14 RK_FUNC_1 
&pcfg_pull_none>,
-                                               <1 2 RK_FUNC_1 &pcfg_pull_none>,
-                                               <1 4 RK_FUNC_1 &pcfg_pull_none>,
-                                               <1 5 RK_FUNC_1 &pcfg_pull_none>;
+                                               <1 2 RK_FUNC_2 &pcfg_pull_none>,
+                                               <1 4 RK_FUNC_2 &pcfg_pull_none>,
+                                               <1 5 RK_FUNC_2 &pcfg_pull_none>;
                        };
                };
 


Reply via email to