From 9b255d70f2c1499e3c9fe80081b0f211809564f2 Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Thu, 7 Jan 2016 16:25:44 +0800 Subject: [PATCH] UPSTREAM: ARM: dts: rockchip: set the pinctrl default setting for rk3036 i2s Sometime will hang if you set the i2s pinctrl as the none setting. Let's set the pinctrl as the default setting to enable the gpio bias. Change-Id: I9a6cc57f15ffcfcae59f2c8cdb64fdda681f8977 Signed-off-by: Caesar Wang Signed-off-by: Heiko Stuebner (cherry picked from git.kernel.org next/linux-next.git master commit f47553325ede35ecfb82311342452a8f0f27ad2e) --- arch/arm/boot/dts/rk3036.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index b9567c1e0687..8f1bb0fbf768 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -579,12 +579,12 @@ i2s { i2s_bus: i2s-bus { - rockchip,pins = <1 0 RK_FUNC_1 &pcfg_pull_none>, - <1 1 RK_FUNC_1 &pcfg_pull_none>, - <1 2 RK_FUNC_1 &pcfg_pull_none>, - <1 3 RK_FUNC_1 &pcfg_pull_none>, - <1 4 RK_FUNC_1 &pcfg_pull_none>, - <1 5 RK_FUNC_1 &pcfg_pull_none>; + rockchip,pins = <1 0 RK_FUNC_1 &pcfg_pull_default>, + <1 1 RK_FUNC_1 &pcfg_pull_default>, + <1 2 RK_FUNC_1 &pcfg_pull_default>, + <1 3 RK_FUNC_1 &pcfg_pull_default>, + <1 4 RK_FUNC_1 &pcfg_pull_default>, + <1 5 RK_FUNC_1 &pcfg_pull_default>; }; }; -- 2.34.1