summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorCaesar Wang <wxt@rock-chips.com>2016-01-07 09:25:44 +0100
committerHeiko Stuebner <heiko@sntech.de>2016-01-24 23:28:23 +0100
commitf47553325ede35ecfb82311342452a8f0f27ad2e (patch)
tree41e46350fe4b58ed4bfad5234752993e7ac0e3b1 /arch
parentLinux 4.5-rc1 (diff)
downloadlinux-f47553325ede35ecfb82311342452a8f0f27ad2e.tar.xz
linux-f47553325ede35ecfb82311342452a8f0f27ad2e.zip
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. Signed-off-by: Caesar Wang <wxt@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/rk3036.dtsi12
1 files 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>;
};
};